From 9db8e5840247ef01026f997ad051059e00e670ab Mon Sep 17 00:00:00 2001 From: mythxb Date: Wed, 19 Jul 2023 15:21:21 +0800 Subject: [PATCH] =?UTF-8?q?bug=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rzyc/controller/PcCompanyController.java | 4 +-- .../rzyc/service/AssignmentTaskThread.java | 30 +++++++++++-------- .../rzyc/service/SaveIndustryPostThread.java | 10 +++++-- .../src/main/resources/application-test.yml | 17 ++++------- .../src/main/resources/application-test.yml | 6 ++-- 5 files changed, 34 insertions(+), 33 deletions(-) diff --git a/inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java b/inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java index 8774041..b547364 100644 --- a/inventory-ent/src/main/java/com/rzyc/controller/PcCompanyController.java +++ b/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 entRegister(EntRegisterDto entRegisterDto)throws Exception{ + public SingleResult entRegister(@RequestBody EntRegisterDto entRegisterDto)throws Exception{ SingleResult 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; } diff --git a/inventory-ent/src/main/java/com/rzyc/service/AssignmentTaskThread.java b/inventory-ent/src/main/java/com/rzyc/service/AssignmentTaskThread.java index 12aa660..ec8da43 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/AssignmentTaskThread.java +++ b/inventory-ent/src/main/java/com/rzyc/service/AssignmentTaskThread.java @@ -109,19 +109,21 @@ public class AssignmentTaskThread implements Runnable{ //企业对应岗位的清单 EntPost entPost = entPostMapper.selectById(postId); InPostItem inPostItem = inPostItemMapper.selectByPostId(entPost.getPublicPostId()); - ListinPostLists = inPostListMapper.selectByListId(null,inPostItem.getInPostItemId()); - for (InPostList ipl:inPostLists) { - AddOrUpdateEntUserPostListDto addOrUpdateEntUserPostTaskDto = new AddOrUpdateEntUserPostListDto(); - addOrUpdateEntUserPostTaskDto.setEntUserId(userId); - addOrUpdateEntUserPostTaskDto.setEnterpriseId(enterpriseId); - addOrUpdateEntUserPostTaskDto.setPostId(postId); - addOrUpdateEntUserPostTaskDto.setEntListId(ipl.getPublicPostListId()); - addOrUpdateEntUserPostTaskDto.setFrequency(ipl.getFrequency()); - addOrUpdateEntUserPostTaskDto.setItemContent(ipl.getPublicItemContent()); - addOrUpdateEntUserPostTaskDto.setItemTitle(ipl.getPublicItemTitle()); - addOrUpdateEntUserPostTaskDto.setListId(ipl.getListId()); - addOrUpdateEntUserPostTaskDto.setStandard(ipl.getStandard()); - insertListAndTask(addOrUpdateEntUserPostTaskDto,createByUserId); + if(null != inPostItem){ + ListinPostLists = inPostListMapper.selectByListId(null,inPostItem.getInPostItemId()); + for (InPostList ipl:inPostLists) { + AddOrUpdateEntUserPostListDto addOrUpdateEntUserPostTaskDto = new AddOrUpdateEntUserPostListDto(); + addOrUpdateEntUserPostTaskDto.setEntUserId(userId); + addOrUpdateEntUserPostTaskDto.setEnterpriseId(enterpriseId); + addOrUpdateEntUserPostTaskDto.setPostId(postId); + addOrUpdateEntUserPostTaskDto.setEntListId(ipl.getPublicPostListId()); + addOrUpdateEntUserPostTaskDto.setFrequency(ipl.getFrequency()); + addOrUpdateEntUserPostTaskDto.setItemContent(ipl.getPublicItemContent()); + addOrUpdateEntUserPostTaskDto.setItemTitle(ipl.getPublicItemTitle()); + addOrUpdateEntUserPostTaskDto.setListId(ipl.getListId()); + addOrUpdateEntUserPostTaskDto.setStandard(ipl.getStandard()); + insertListAndTask(addOrUpdateEntUserPostTaskDto,createByUserId); + } } } @@ -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; diff --git a/inventory-ent/src/main/java/com/rzyc/service/SaveIndustryPostThread.java b/inventory-ent/src/main/java/com/rzyc/service/SaveIndustryPostThread.java index 321b765..3d1aaa9 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/SaveIndustryPostThread.java +++ b/inventory-ent/src/main/java/com/rzyc/service/SaveIndustryPostThread.java @@ -165,8 +165,12 @@ public class SaveIndustryPostThread implements Runnable { } private void finishLastList(){ - entPostDutyMapper.insertList(entPostDutyList); - entPostDutyList = ListUtils.newArrayListWithExpectedSize(BATCH_COUNT); + if(null != entPostDutyList && entPostDutyList.size() > 0){ + entPostDutyMapper.insertList(entPostDutyList); + entPostDutyList = ListUtils.newArrayListWithExpectedSize(BATCH_COUNT); + } + + } @@ -179,4 +183,4 @@ public class SaveIndustryPostThread implements Runnable { } } -} \ No newline at end of file +} diff --git a/inventory-ent/src/main/resources/application-test.yml b/inventory-ent/src/main/resources/application-test.yml index c1089d9..c74bd3d 100644 --- a/inventory-ent/src/main/resources/application-test.yml +++ b/inventory-ent/src/main/resources/application-test.yml @@ -3,14 +3,9 @@ server: spring: redis: - host: 172.27.181.247 - password: gzQdzRedis - #host: 127.0.0.1 - # 进入哨兵项目-这个端口就不用了，除非是单体 - port: 8011 - # sentinel: - # master: mymaster - # nodes: 172.27.181.247:26379,172.27.181.247:26380,172.27.181.247:26381 + host: 42.193.40.239 + password: zysoft2023@com + port: 6937 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 - username: ENC(QE4vB4KHgFwuqi42wTs27w==) - password: ENC(9mRKdl9UCE8tkEsoO376nx5rCx58Htk1) + url: jdbc:mysql://42.193.40.239:33063/inventory_23?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false + username: zyjy + password: eaNCBySJdHLb23GW tomcat: max-active: 10 min-idle: 10 diff --git a/inventory-gov/src/main/resources/application-test.yml b/inventory-gov/src/main/resources/application-test.yml index 6676bde..126597f 100644 --- a/inventory-gov/src/main/resources/application-test.yml +++ b/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 - username: ENC(QE4vB4KHgFwuqi42wTs27w==) - password: ENC(9mRKdl9UCE8tkEsoO376nx5rCx58Htk1) + url: jdbc:mysql://42.193.40.239:33063/inventory_23?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false + username: zyjy + password: eaNCBySJdHLb23GW tomcat: max-active: 10 min-idle: 10