FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2022-03-23 16:54:30 +08:00
parent 890e6bc463 776fdd3e51
commit 2ac8eda3be
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/search/server/ResetSearchCenterService.java
+2 -2
View File
@@ -313,7 +313,7 @@ public class ResetSearchCenterService {
sarStandardsInfo.setSarStandAttrEOStr(JSONObject.toJSONString(sarStandardsInfo.getAttrInfoMap())); sarStandardsInfo.setSarStandAttrEOStr(JSONObject.toJSONString(sarStandardsInfo.getAttrInfoMap()));
} }
Map<String, Object> indexstate = elasticsearchService.searchDataById("stand","stand",standId,null); Map<String, Object> indexstate = elasticsearchService.searchDataById("stand","stand",standId,null);
if(!indexstate.isEmpty()){ if(indexstate!=null && !indexstate.isEmpty()){
createStandMQService.sendStandMQ(sarStandardsInfo,"update"); createStandMQService.sendStandMQ(sarStandardsInfo,"update");
}else{ }else{
createStandMQService.sendStandMQ(sarStandardsInfo,"add"); createStandMQService.sendStandMQ(sarStandardsInfo,"add");
@@ -336,7 +336,7 @@ public class ResetSearchCenterService {
sarBussionessStand.setSarStandAttrEOStr(JSONObject.toJSONString(sarBussionessStand.getAttrInfoMap())); sarBussionessStand.setSarStandAttrEOStr(JSONObject.toJSONString(sarBussionessStand.getAttrInfoMap()));
} }
Map<String, Object> indexstate = elasticsearchService.searchDataById("bussstand","bussstand",standId,null); Map<String, Object> indexstate = elasticsearchService.searchDataById("bussstand","bussstand",standId,null);
if(!indexstate.isEmpty()){ if(indexstate!=null && !indexstate.isEmpty()){
createStandMQService.sendBussStandMQ(sarBussionessStand,"update"); createStandMQService.sendBussStandMQ(sarBussionessStand,"update");
}else{ }else{
createStandMQService.sendBussStandMQ(sarBussionessStand,"add"); createStandMQService.sendBussStandMQ(sarBussionessStand,"add");
adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/entity/TsPositionRoleVO.java
+17 -15
View File
@@ -1,15 +1,17 @@
package com.adc.da.slrs.sarPosition.entity; package com.adc.da.slrs.sarPosition.entity;
import com.adc.da.slrs.sarRole.entity.TsRole; import com.adc.da.slrs.sarRole.entity.TsRole;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
@Data @Data
public class TsPositionRoleVO { public class TsPositionRoleVO {
@NotNull(message = "positionId不能为空") @NotNull(message = "positionId不能为空")
private String positionId; private String positionId;
@NotNull(message = "roleIds不能为空") @NotNull(message = "roleIds不能为空")
private List<String> roleIds; private List<String> roleIds;
}
private String operator;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java
+2
View File
@@ -84,12 +84,14 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
tsPositionDao.insertRole(tsPositionRoleVO.getPositionId(),id); tsPositionDao.insertRole(tsPositionRoleVO.getPositionId(),id);
updateWrapper.eq("id", tsPositionRoleVO.getPositionId()); updateWrapper.eq("id", tsPositionRoleVO.getPositionId());
tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis())); tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis()));
tsPosition.setOperator(tsPositionRoleVO.getOperator());
baseMapper.update(tsPosition,updateWrapper); baseMapper.update(tsPosition,updateWrapper);
} }
for(String id:deleteIds){ for(String id:deleteIds){
tsPositionDao.deleteRole(tsPositionRoleVO.getPositionId(),id); tsPositionDao.deleteRole(tsPositionRoleVO.getPositionId(),id);
updateWrapper.eq("id", tsPositionRoleVO.getPositionId()); updateWrapper.eq("id", tsPositionRoleVO.getPositionId());
tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis())); tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis()));
tsPosition.setOperator(tsPositionRoleVO.getOperator());
baseMapper.update(tsPosition,updateWrapper); baseMapper.update(tsPosition,updateWrapper);
} }
List<TsRole> roles=getRole(tsPositionRoleVO.getPositionId()); List<TsRole> roles=getRole(tsPositionRoleVO.getPositionId());