ganzi/ganzi-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug解决

Browse Source
This commit is contained in:
mythxb 2023-07-19 15:21:21 +08:00
parent c9ee1f056e
commit 9db8e58402
5 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}

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

@ -109,19 +109,21 @@ public class AssignmentTaskThread implements Runnable{
//企业对应岗位的清单
EntPost entPost = entPostMapper.selectById(postId);
InPostItem inPostItem = inPostItemMapper.selectByPostId(entPost.getPublicPostId());
List<InPostList>inPostLists = 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){
List<InPostList>inPostLists = 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;

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

@ -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 {
}
}
}
}

17
inventory-ent/src/main/resources/application-test.yml
View File

@ -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

6
inventory-gov/src/main/resources/application-test.yml
View File

@ -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