bug解决

inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java

@@ -1073,7 +1073,7 @@ public class PcCompanyController extends BaseController{
      */
     @ApiOperation(value = "企业注册", notes = "企业注册")
     @PostMapping("/entRegister")
-    public SingleResult<SysEnterprise> entRegister(EntRegisterDto entRegisterDto)throws Exception{
+    public SingleResult<SysEnterprise> entRegister(@RequestBody EntRegisterDto entRegisterDto)throws Exception{
         SingleResult<SysEnterprise> result = new SingleResult<>();
 
         SysEnterprise enterprise = new SysEnterprise();
@@ -1125,9 +1125,7 @@ public class PcCompanyController extends BaseController{
             Thread ttThread=new Thread(textThread);
             ttThread.start();
             t.start();
-
         }
-
         return result;
     }
 

inventory-ent/src/main/java/com/rzyc/service/AssignmentTaskThread.java

@@ -109,6 +109,7 @@ public class AssignmentTaskThread implements Runnable{
         //企业对应岗位的清单
         EntPost entPost = entPostMapper.selectById(postId);
         InPostItem inPostItem = inPostItemMapper.selectByPostId(entPost.getPublicPostId());
+        if(null != inPostItem){
             List<InPostList>inPostLists = inPostListMapper.selectByListId(null,inPostItem.getInPostItemId());
             for (InPostList ipl:inPostLists) {
                 AddOrUpdateEntUserPostListDto addOrUpdateEntUserPostTaskDto = new AddOrUpdateEntUserPostListDto();
@@ -124,6 +125,7 @@ public class AssignmentTaskThread implements Runnable{
                 insertListAndTask(addOrUpdateEntUserPostTaskDto,createByUserId);
             }
         }
+    }
 
     private SingleResult insertListAndTask(AddOrUpdateEntUserPostListDto addOrUpdateEntUserPostTaskDto,String createByUserId) throws Exception {
         EntPostList entPostList = new EntPostList();
@@ -136,11 +138,13 @@ public class AssignmentTaskThread implements Runnable{
         entPostList.setPostListId(RandomNumber.getUUid());
         //默认清单时间当前年
         entPostList.setYearNum(calendar.get(Calendar.YEAR));
+
         int  result = entPostListMapper.insert(entPostList);
         if (result != 1 ){
             singleResult.setCode(Code.ERROR.getCode());
             singleResult.setMessage(Message.ERROR);
         }
+
         //插入任务
         addFactorTask(entPostList,createByUserId);
         return singleResult;

inventory-ent/src/main/java/com/rzyc/service/SaveIndustryPostThread.java

@@ -165,11 +165,15 @@ public class SaveIndustryPostThread implements Runnable {
     }
 
     private void  finishLastList(){
+        if(null != entPostDutyList && entPostDutyList.size() > 0){
             entPostDutyMapper.insertList(entPostDutyList);
             entPostDutyList = ListUtils.newArrayListWithExpectedSize(BATCH_COUNT);
         }
 
 
+    }
+
+
     @Override
     public void run() {
         if (batch == true){

inventory-ent/src/main/resources/application-test.yml

@@ -3,14 +3,9 @@ server:
 
 spring:
   redis:
-    host: 172.27.181.247
+    host: 42.193.40.239
-    password: gzQdzRedis
+    password: zysoft2023@com
-    #host: 127.0.0.1
+    port: 6937
-    #    进入哨兵项目-这个端口就不用了，除非是单体
-    port: 8011
-    #    sentinel:
-    #      master: mymaster
-    #      nodes: 172.27.181.247:26379,172.27.181.247:26380,172.27.181.247:26381
     lettuce:
       pool:
         max-active: 8
@@ -44,9 +39,9 @@ spring:
   #数据库
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.27.181.52:3306/inventory_23?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
+    url: jdbc:mysql://42.193.40.239:33063/inventory_23?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
-    username: ENC(QE4vB4KHgFwuqi42wTs27w==)
+    username: zyjy
-    password: ENC(9mRKdl9UCE8tkEsoO376nx5rCx58Htk1)
+    password: eaNCBySJdHLb23GW
     tomcat:
       max-active: 10
       min-idle: 10

inventory-gov/src/main/resources/application-test.yml

@@ -28,9 +28,9 @@ spring:
   #数据库
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://172.27.181.52:3306/inventory_23?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&autoReconnect=true
+    url: jdbc:mysql://42.193.40.239:33063/inventory_23?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false
-    username: ENC(QE4vB4KHgFwuqi42wTs27w==)
+    username: zyjy
-    password: ENC(9mRKdl9UCE8tkEsoO376nx5rCx58Htk1)
+    password: eaNCBySJdHLb23GW
     tomcat:
       max-active: 10
       min-idle: 10