1.更新平台amos-feign-privilege依赖版本至1.8.5。

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/StationBasicController.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
 import com.yeejoin.amos.boot.module.jxiop.api.dto.StationInfoDto;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.HouseholdPvDistrictServiceImpl;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.HouseholdPvServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.StationCoordinateServiceImpl;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import org.springframework.http.HttpStatus;
@@ -36,6 +38,8 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 @Api(tags = "场站基础信息表Api")
 @RequestMapping(value = "/station-basic")
 public class StationBasicController extends BaseController {
+    @Autowired
+    HouseholdPvDistrictServiceImpl householdPvDistrictServiceImpl;
 
     @Autowired
     StationBasicServiceImpl stationBasicServiceImpl;
@@ -98,6 +102,10 @@ public class StationBasicController extends BaseController {
     @DeleteMapping(value = "/delete")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除场站基础信息表", notes = "根据sequenceNbr删除场站基础信息表")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @RequestParam(value = "ids") String ids) {
+        String checkResult = householdPvDistrictServiceImpl.removeCheck(Long.valueOf(ids));
+        if(!("ok".equals(checkResult))){
+            return  this.buildResponseFalse(checkResult);
+        }
         if (stationBasicServiceImpl.getStationPersonByStationID(ids) > 0) {
             return this.buildResponseFalse("请删除场站下的人员后再删除场站！");
         }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -13,6 +13,7 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+import com.yeejoin.amos.feign.privilege.model.LoginInfoModel;
 import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -127,6 +128,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         usd.setLockStatus("UNLOCK");
         //新增平台用户
         AgencyUserModel agencyUserModel = this.setcreateUser(usd);
+//        this.createLoginInfo(usd);
         //查询部门
         DepartmentModel departmentModel = null;
         if (personAccount.getDepartmentId() != null) {
@@ -209,6 +211,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         usd.setUserId(personAccount.getPuserId());
         //新增平台用户
         AgencyUserModel agencyUserModel = this.updateuser(personAccount.getPuserId(), usd);
+//        this.updateLoginInfo();
         //查询部门
         DepartmentModel departmentModel = null;
         if (personAccount.getDepartmentId() != null) {
@@ -285,6 +288,7 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         //删除平台
         int deleteResult = personBasicMapper.deleteList(ids);
         this.deleuser(String.join(",", userid));
+//        this.deleteLoginInfo();
         return deleteResult;
     }
 
@@ -303,6 +307,15 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         }
         return user;
     }
+    private LoginInfoModel createLoginInfo(AgencyUserModel userDto) {
+        FeignClientResult<LoginInfoModel> amosLoginfo = null;
+        try {
+            amosLoginfo = Privilege.agencyUserClient.createLoginInfo(userDto);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return amosLoginfo.getResult();
+    }
 
     //修改平台用户
     private AgencyUserModel updateuser(String userId, AgencyUserModel userDto) {
@@ -318,7 +331,15 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         }
         return user;
     }
-
+    private LoginInfoModel updateLoginInfo(String loginId,AgencyUserModel userDto) {
+        FeignClientResult<LoginInfoModel> amosLoginfo = null;
+        try {
+            amosLoginfo = Privilege.agencyUserClient.updateLoginInfo(userDto,loginId);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return amosLoginfo.getResult();
+    }
     private DepartmentModel getdepartmentModel(Long departmentId) {
         FeignClientResult<DepartmentModel> de = Privilege.departmentClient.seleteOne(departmentId);
 
@@ -358,6 +379,15 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         }
     }
 
+    private String deleteLoginInfo(String loginId) {
+        FeignClientResult<String> amosLoginfo = null;
+        try {
+            amosLoginfo = Privilege.agencyUserClient.deleteLoginInfo(loginId);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return amosLoginfo.getResult();
+    }
     /**
      * 分页查询
      */

amos-boot-system-jxiop/pom.xml

@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.yeejoin</groupId>
             <artifactId>amos-feign-privilege</artifactId>
-            <version>1.7.14-SNAPSHOT</version>
+            <version>1.8.5</version>
         </dependency>
 
 
@@ -82,7 +82,11 @@
             <artifactId>logstash-logback-encoder</artifactId>
             <version>6.3</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.kingbase8</groupId>
+            <artifactId>kingbase8</artifactId>
+            <version>8.6.0</version>
+        </dependency>
     </dependencies>
 
 </project>