Skip to content

A
amos-boot-biz
Commit 4195a80d authored by chenhao's avatar chenhao
Browse files
Options

修改Bug 5476

parent caa5b1d8
Show whitespace changes
Inline Side-by-side
Showing with 433 additions and 266 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/controller/LatentDangerController.java
View file @ 4195a80d
...@@ -240,7 +240,9 @@ public class LatentDangerController extends BaseController { ...@@ -240,7 +240,9 @@ public class LatentDangerController extends BaseController {
@PostMapping(value = "/page/list") @PostMapping(value = "/page/list")
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
public ResponseModel listDanger(@ApiParam(value = "查询条件", required = true) @RequestBody PageParam pageParam) throws Exception { public ResponseModel listDanger(@ApiParam(value = "查询条件", required = true) @RequestBody PageParam pageParam) throws Exception {
IPage<LatentDanger> result = iLatentDangerService.pageListDanger(pageParam); AgencyUserModel user = getUserInfo();
String userId = user.getUserId();
IPage<LatentDanger> result = iLatentDangerService.pageListDanger(pageParam,userId);
return ResponseHelper.buildResponse(result); return ResponseHelper.buildResponse(result);
} }
...@@ -339,7 +341,9 @@ public class LatentDangerController extends BaseController { ...@@ -339,7 +341,9 @@ public class LatentDangerController extends BaseController {
@PostMapping(value = "/supervision/page/reviewList") @PostMapping(value = "/supervision/page/reviewList")
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
public ResponseModel reviewListDanger(@ApiParam(value = "查询条件", required = true) @RequestBody PageParam pageParam) throws Exception { public ResponseModel reviewListDanger(@ApiParam(value = "查询条件", required = true) @RequestBody PageParam pageParam) throws Exception {
IPage<LatentDanger> result = iLatentDangerService.reviewListDanger(pageParam); AgencyUserModel user = getUserInfo();
String userId = user.getUserId();
IPage<LatentDanger> result = iLatentDangerService.reviewListDanger(pageParam,userId);
return ResponseHelper.buildResponse(result); return ResponseHelper.buildResponse(result);
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java
View file @ 4195a80d
...@@ -121,7 +121,8 @@ import com.yeejoin.amos.latentdanger.feign.RemoteSecurityService; ...@@ -121,7 +121,8 @@ import com.yeejoin.amos.latentdanger.feign.RemoteSecurityService;
import com.yeejoin.amos.latentdanger.mqtt.WebMqttComponent; import com.yeejoin.amos.latentdanger.mqtt.WebMqttComponent;
@Service("latentDangerService") @Service("latentDangerService")
public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentDanger, LatentDangerMapper> implements ILatentDangerService { public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentDanger, LatentDangerMapper>
implements ILatentDangerService {
private static final String permissionType = "SUBMENU"; private static final String permissionType = "SUBMENU";
private static final String acctivePermissionType = "activitiItem"; private static final String acctivePermissionType = "activitiItem";
...@@ -198,7 +199,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -198,7 +199,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
LatentDangerDto latentDto = new LatentDangerDto(); LatentDangerDto latentDto = new LatentDangerDto();
Bean.copyExistPropertis(latentDangerDto, latentDto); Bean.copyExistPropertis(latentDangerDto, latentDto);
LatentDanger latentDanger = saveLatentDanger(latentDto, userId, departmentId, businessKey, orgCode, LatentDangerTypeEnum.随手拍); LatentDanger latentDanger = saveLatentDanger(latentDto, userId, departmentId, businessKey, orgCode,
LatentDangerTypeEnum.随手拍);
// 更新p_check_input表state字段 // 更新p_check_input表state字段
// updateCheckInputDangerState(latentDanger.getBizId(), DangerHandleStateEnum.HANDLE.getCode()); // updateCheckInputDangerState(latentDanger.getBizId(), DangerHandleStateEnum.HANDLE.getCode());
...@@ -218,13 +220,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -218,13 +220,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
latentDanger.setInstanceId(instance.getString("id")); latentDanger.setInstanceId(instance.getString("id"));
JSONObject flowJson = new JSONObject(); JSONObject flowJson = new JSONObject();
flowJson.put("photoUrls", latentDangerDto.getPhotoUrl()); flowJson.put("photoUrls", latentDangerDto.getPhotoUrl());
LatentDangerFlowRecord record = saveFlowRecord(instance.getString("id"), "提交隐患", userId, departmentId, LatentDangerFlowRecord record = saveFlowRecord(instance.getString("id"), "提交隐患", userId, departmentId, flowJson,
flowJson, dangerId, role, LatentDangerExecuteTypeEnum.填写隐患完成.getName(), latentDangerDto.getRemark(), dangerId, role, LatentDangerExecuteTypeEnum.填写隐患完成.getName(), latentDangerDto.getRemark(), userRealName,
userRealName, departmentName, latentDanger.getDangerState(), 0); departmentName, latentDanger.getDangerState(), 0);
latentDanger.setCurrentFlowRecordId(record.getId()); latentDanger.setCurrentFlowRecordId(record.getId());
latentDangerMapper.updateById(latentDanger); latentDangerMapper.updateById(latentDanger);
sendMessage(latentDanger, LatentDangerExecuteTypeEnum.填写隐患完成, null, sendMessage(latentDanger, LatentDangerExecuteTypeEnum.填写隐患完成, null, "隐患排查与治理",
"隐患排查与治理", this.getNextExecuteUsers(latentDanger.getInstanceId()), userRealName, departmentName); this.getNextExecuteUsers(latentDanger.getInstanceId()), userRealName, departmentName);
try { try {
webMqttComponent.publish(dangerTopic, ""); webMqttComponent.publish(dangerTopic, "");
} catch (Exception e) { } catch (Exception e) {
...@@ -235,16 +237,15 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -235,16 +237,15 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public List<LatentDanger> savePatrol(List<LatentDangerDto> latentDangerDtoList, String userId, public List<LatentDanger> savePatrol(List<LatentDangerDto> latentDangerDtoList, String userId, String userRealName,
String userRealName, String departmentId, String departmentName, String companyId, String orgCode, RoleBo role)
String departmentId, String departmentName, String companyId, String orgCode, RoleBo role) throws Exception { throws Exception {
if (ValidationUtil.isEmpty(latentDangerDtoList)) { if (ValidationUtil.isEmpty(latentDangerDtoList)) {
throw new Exception("参数有误"); throw new Exception("参数有误");
} }
// 获取业务类型枚举 // 获取业务类型枚举
LatentDangerBizTypeEnum bizTypeEnum = LatentDangerBizTypeEnum bizTypeEnum = LatentDangerBizTypeEnum.getByCode(bizType);
LatentDangerBizTypeEnum.getByCode(bizType);
if (ValidationUtil.isEmpty(bizTypeEnum)) { if (ValidationUtil.isEmpty(bizTypeEnum)) {
throw new Exception("业务类型有误"); throw new Exception("业务类型有误");
} }
...@@ -257,15 +258,15 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -257,15 +258,15 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
throw new Exception("隐患等级参数有误"); throw new Exception("隐患等级参数有误");
} }
LatentDangerTypeEnum dangerTypeEnum = LatentDangerTypeEnum dangerTypeEnum = LatentDangerTypeEnum
LatentDangerTypeEnum.getByCode(latentDangerDtoList.get(0).getCheckMode()); .getByCode(latentDangerDtoList.get(0).getCheckMode());
if (ValidationUtil.isEmpty(dangerTypeEnum)) { if (ValidationUtil.isEmpty(dangerTypeEnum)) {
throw new Exception("检查类型参数有误"); throw new Exception("检查类型参数有误");
} }
Date endTime = DateUtils.getTargetEndTime(param.getReformLimitDate()); Date endTime = DateUtils.getTargetEndTime(param.getReformLimitDate());
param.setReformLimitDate(endTime); param.setReformLimitDate(endTime);
// 保存隐患 // 保存隐患
LatentDanger latentDanger = saveLatentDanger(param, userId, departmentId, businessKey, orgCode, LatentDanger latentDanger = importSaveLatentDanger(param, userId, departmentId, businessKey, orgCode,
dangerTypeEnum); dangerTypeEnum);
JSONObject instance = new JSONObject(); JSONObject instance = new JSONObject();
...@@ -295,9 +296,10 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -295,9 +296,10 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
if (ValidationUtil.isEmpty(param.getId())) { if (ValidationUtil.isEmpty(param.getId())) {
// 第一次保存隐患提交记录 // 第一次保存隐患提交记录
LatentDangerFlowRecord inputRecord = saveFlowRecord(instance.getString("id"), "提交隐患", userId, departmentId, LatentDangerFlowRecord inputRecord = saveFlowRecord(instance.getString("id"), "提交隐患", userId,
flowJson, latentDanger.getId(), role, LatentDangerExecuteTypeEnum.填写隐患完成.getName(), departmentId, flowJson, latentDanger.getId(), role,
latentDanger.getRemark(), userRealName, departmentName, latentDanger.getDangerState(), ExecuteTypeEnum.通过.getCode()); LatentDangerExecuteTypeEnum.填写隐患完成.getName(), latentDanger.getRemark(), userRealName,
departmentName, latentDanger.getDangerState(), ExecuteTypeEnum.通过.getCode());
latentDanger.setCurrentFlowRecordId(inputRecord.getId()); latentDanger.setCurrentFlowRecordId(inputRecord.getId());
latentDanger.setInstanceId(instance.getString("id")); latentDanger.setInstanceId(instance.getString("id"));
latentDangerMapper.updateById(latentDanger); latentDangerMapper.updateById(latentDanger);
...@@ -374,9 +376,42 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -374,9 +376,42 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
// return latentDanger; // return latentDanger;
// } // }
public LatentDanger saveLatentDanger(LatentDangerDto dangerDto, String userId, public LatentDanger saveLatentDanger(LatentDangerDto dangerDto, String userId, String departmentId,
String departmentId, String businessKey, String orgCode, String businessKey, String orgCode, LatentDangerTypeEnum dangerTypeEnum) {
LatentDangerTypeEnum dangerTypeEnum) { LatentDanger latentDanger = new LatentDanger();
Bean.copyExistPropertis(dangerDto, latentDanger);
if (ValidationUtil.isEmpty(dangerDto.getId())) {
// 新增
latentDanger.setBusinessKey(businessKey == null ? "" : businessKey);
latentDanger.setDiscovererDepartmentId(departmentId == null ? "" : departmentId);
latentDanger.setDiscovererUserId(userId == null ? "" : userId);
latentDanger.setOrgCode(orgCode == null ? "" : orgCode);
latentDanger.setDangerType(dangerTypeEnum.getCode() == null ? "" : dangerTypeEnum.getCode());
latentDanger.setDangerTypeName(dangerTypeEnum.getName() == null ? "" : dangerTypeEnum.getName());
if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode() == null ? ""
: LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode());
latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName() == null ? ""
: LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName());
} else if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) {
latentDanger.setDangerState(LatentDangerState.PatrolDangerStateEnum.待评审.getCode() == null ? ""
: LatentDangerState.PatrolDangerStateEnum.待评审.getCode());
latentDanger.setDangerStateName(LatentDangerState.PatrolDangerStateEnum.待评审.getName() == null ? ""
: LatentDangerState.PatrolDangerStateEnum.待评审.getName());
}
if (ValidationUtil.isEmpty(dangerDto.getDangerName())) {
latentDanger.setDangerName(dangerDto.getInputItemName());
}
}
if (!ValidationUtil.isEmpty(dangerDto.getPhotoUrl())) {
latentDanger.setPhotoUrls(Joiner.on(",").join(dangerDto.getPhotoUrl()));
}
this.saveOrUpdate(latentDanger);
return latentDanger;
}
public LatentDanger importSaveLatentDanger(LatentDangerDto dangerDto, String userId, String departmentId,
String businessKey, String orgCode, LatentDangerTypeEnum dangerTypeEnum) {
LatentDanger latentDanger = new LatentDanger(); LatentDanger latentDanger = new LatentDanger();
Bean.copyExistPropertis(dangerDto, latentDanger); Bean.copyExistPropertis(dangerDto, latentDanger);
if (ValidationUtil.isEmpty(dangerDto.getId())) { if (ValidationUtil.isEmpty(dangerDto.getId())) {
...@@ -388,15 +423,24 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -388,15 +423,24 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
latentDanger.setDangerType(dangerTypeEnum.getCode() == null ? "" : dangerTypeEnum.getCode()); latentDanger.setDangerType(dangerTypeEnum.getCode() == null ? "" : dangerTypeEnum.getCode());
latentDanger.setDangerTypeName(dangerTypeEnum.getName() == null ? "" : dangerTypeEnum.getName()); latentDanger.setDangerTypeName(dangerTypeEnum.getName() == null ? "" : dangerTypeEnum.getName());
if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) { if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode() == null ? "" : LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode()); latentDanger.setDangerState("draft");
latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName() == null ? "" : LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName()); latentDanger.setDangerStateName("草稿");
} else if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) { } else if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) {
latentDanger.setDangerState(LatentDangerState.PatrolDangerStateEnum.待评审.getCode() == null ? "" : LatentDangerState.PatrolDangerStateEnum.待评审.getCode()); latentDanger.setDangerState(LatentDangerState.PatrolDangerStateEnum.待评审.getCode() == null ? ""
latentDanger.setDangerStateName(LatentDangerState.PatrolDangerStateEnum.待评审.getName() == null ? "" : LatentDangerState.PatrolDangerStateEnum.待评审.getName()); : LatentDangerState.PatrolDangerStateEnum.待评审.getCode());
latentDanger.setDangerStateName(LatentDangerState.PatrolDangerStateEnum.待评审.getName() == null ? ""
: LatentDangerState.PatrolDangerStateEnum.待评审.getName());
} }
if (ValidationUtil.isEmpty(dangerDto.getDangerName())) { if (ValidationUtil.isEmpty(dangerDto.getDangerName())) {
latentDanger.setDangerName(dangerDto.getInputItemName()); latentDanger.setDangerName(dangerDto.getInputItemName());
} }
}else {
if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode() == null ? ""
: LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode());
latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName() == null ? ""
: LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName());
}
} }
if (!ValidationUtil.isEmpty(dangerDto.getPhotoUrl())) { if (!ValidationUtil.isEmpty(dangerDto.getPhotoUrl())) {
latentDanger.setPhotoUrls(Joiner.on(",").join(dangerDto.getPhotoUrl())); latentDanger.setPhotoUrls(Joiner.on(",").join(dangerDto.getPhotoUrl()));
...@@ -406,8 +450,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -406,8 +450,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
public LatentDangerFlowRecord saveFlowRecord(String taskId, String taskName, String userId, String departmentId, public LatentDangerFlowRecord saveFlowRecord(String taskId, String taskName, String userId, String departmentId,
JSONObject flowJson, Long dangerId, RoleBo role, JSONObject flowJson, Long dangerId, RoleBo role, String executeResult, String remark, String userName,
String executeResult, String remark, String userName,
String departmentName, String dangerState, Integer executeState) { String departmentName, String dangerState, Integer executeState) {
LatentDangerFlowRecord record = new LatentDangerFlowRecord(); LatentDangerFlowRecord record = new LatentDangerFlowRecord();
record.setFlowTaskId(taskId); record.setFlowTaskId(taskId);
...@@ -515,11 +558,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -515,11 +558,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
@Override @Override
public CommonResponse list(String toke, String product, String appKey, LatentDangerListParam latentDangerListParam, AgencyUserModel user, String loginOrgCode, String deptId) { public CommonResponse list(String toke, String product, String appKey, LatentDangerListParam latentDangerListParam,
AgencyUserModel user, String loginOrgCode, String deptId) {
JSONObject respBody; JSONObject respBody;
Date startDate = new Date(); Date startDate = new Date();
if (latentDangerListParam.getIsHandle()) { if (latentDangerListParam.getIsHandle()) {
respBody = remoteWorkFlowService.completedPageTask(user.getUserName(), latentDangerListParam.getBelongType()); respBody = remoteWorkFlowService.completedPageTask(user.getUserName(),
latentDangerListParam.getBelongType());
} else { } else {
respBody = remoteWorkFlowService.pageTask(user.getUserId(), latentDangerListParam.getBelongType()); respBody = remoteWorkFlowService.pageTask(user.getUserId(), latentDangerListParam.getBelongType());
} }
...@@ -542,7 +587,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -542,7 +587,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
Date startDate1 = new Date(); Date startDate1 = new Date();
int dangerListSize = latentDangerMapper.countByBathBusinessKeys(bussinessKeys, latentDangerListParam); int dangerListSize = latentDangerMapper.countByBathBusinessKeys(bussinessKeys, latentDangerListParam);
List<LatentDangerBo> dangerList = latentDangerMapper.getByBathBusinessKeys(bussinessKeys, latentDangerListParam); List<LatentDangerBo> dangerList = latentDangerMapper.getByBathBusinessKeys(bussinessKeys,
latentDangerListParam);
Date endDate1 = new Date(); Date endDate1 = new Date();
logger.info("-------------------------sql时间" + (endDate1.getTime() - startDate1.getTime())); logger.info("-------------------------sql时间" + (endDate1.getTime() - startDate1.getTime()));
// Map<String, Object> map = buildQueryMapForList(latentDangerListParam, userId); // Map<String, Object> map = buildQueryMapForList(latentDangerListParam, userId);
...@@ -561,7 +607,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -561,7 +607,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
List<AgencyUserModel> users = remoteSecurityService.listUserByUserIds(toke, product, appKey, userIdsStr); List<AgencyUserModel> users = remoteSecurityService.listUserByUserIds(toke, product, appKey, userIdsStr);
Map<String, AgencyUserModel> userMap = Maps.uniqueIndex(users, AgencyUserModel::getUserId); Map<String, AgencyUserModel> userMap = Maps.uniqueIndex(users, AgencyUserModel::getUserId);
for (LatentDangerBo bo : dangerList) { for (LatentDangerBo bo : dangerList) {
JSONObject task = taskList.stream().filter(t -> t.getString("businessKey").equals(bo.getBusinessKey())).collect(Collectors.toList()).get(0); JSONObject task = taskList.stream().filter(t -> t.getString("businessKey").equals(bo.getBusinessKey()))
.collect(Collectors.toList()).get(0);
LatentDangerListVo vo = new LatentDangerListVo(); LatentDangerListVo vo = new LatentDangerListVo();
vo.setTaskId(task.getString("id")); vo.setTaskId(task.getString("id"));
vo.setDangerId(bo.getId()); vo.setDangerId(bo.getId());
...@@ -611,7 +658,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -611,7 +658,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
private String getLimitDesc(LatentDangerBo bo, Date start) { private String getLimitDesc(LatentDangerBo bo, Date start) {
String dangerState = bo.getDangerState(); String dangerState = bo.getDangerState();
if (LatentDangerStateEnum.已撤销.getCode().equals(dangerState) || LatentDangerStateEnum.治理完毕.getCode().equals(dangerState)) { if (LatentDangerStateEnum.已撤销.getCode().equals(dangerState)
|| LatentDangerStateEnum.治理完毕.getCode().equals(dangerState)) {
if (bo.getOvertimeState().equals(LatentDangerOvertimeStateEnum.已逾期.getCode())) { if (bo.getOvertimeState().equals(LatentDangerOvertimeStateEnum.已逾期.getCode())) {
return "逾期治理"; return "逾期治理";
} else { } else {
...@@ -651,7 +699,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -651,7 +699,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public DangerExecuteSubmitDto execute(LatentDangerExecuteParam latentDangerExecuteParam, String userId, String userRealName, String departmentId, String departmentName, ReginParams reginParams) throws Exception { public DangerExecuteSubmitDto execute(LatentDangerExecuteParam latentDangerExecuteParam, String userId,
String userRealName, String departmentId, String departmentName, ReginParams reginParams) throws Exception {
DangerExecuteSubmitDto executeSubmitDto = new DangerExecuteSubmitDto(); DangerExecuteSubmitDto executeSubmitDto = new DangerExecuteSubmitDto();
LatentDanger latentDanger = latentDangerMapper.selectById(latentDangerExecuteParam.getDangerId()); LatentDanger latentDanger = latentDangerMapper.selectById(latentDangerExecuteParam.getDangerId());
...@@ -714,30 +763,32 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -714,30 +763,32 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
detailVo.setDangerLevelName(levelEnum.getName()); detailVo.setDangerLevelName(levelEnum.getName());
} }
if (latentDanger.getReformType() != null) { if (latentDanger.getReformType() != null) {
LatentDangerReformTypeEnum typeEnum = LatentDangerReformTypeEnum.getEnumByCode(latentDanger.getReformType()); LatentDangerReformTypeEnum typeEnum = LatentDangerReformTypeEnum
.getEnumByCode(latentDanger.getReformType());
if (typeEnum != null) { if (typeEnum != null) {
detailVo.setReformTypeName(typeEnum.getName()); detailVo.setReformTypeName(typeEnum.getName());
} }
} }
if (!StringUtils.isEmpty(latentDanger.getReformJson())) { if (!StringUtils.isEmpty(latentDanger.getReformJson())) {
JSONObject reformJsonObject = latentDanger.getReformJson(); JSONObject reformJsonObject = latentDanger.getReformJson();
LatentDangerFlowRecordBo doBo = latentDangerFlowRecordMapper.getByDangerIdAndActionFlag(latentDanger.getId(),"governLeaderReviewConfirm"); LatentDangerFlowRecordBo doBo = latentDangerFlowRecordMapper
if(doBo!=null) { .getByDangerIdAndActionFlag(latentDanger.getId(), "governLeaderReviewConfirm");
if (doBo != null) {
String flowJsonString = doBo.getFlowJson(); String flowJsonString = doBo.getFlowJson();
JSONObject flowJsonObject= JSONObject.parseObject(flowJsonString); JSONObject flowJsonObject = JSONObject.parseObject(flowJsonString);
JSONArray picturesArray = flowJsonObject.getJSONArray("pictures"); JSONArray picturesArray = flowJsonObject.getJSONArray("pictures");
JSONArray jsonArray =new JSONArray(); JSONArray jsonArray = new JSONArray();
picturesArray.stream().forEach(i->{ picturesArray.stream().forEach(i -> {
JSONObject jsonObject= new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("url", i); jsonObject.put("url", i);
jsonObject.put("name", ""); jsonObject.put("name", "");
jsonObject.put("type", "image"); jsonObject.put("type", "image");
jsonArray.add(jsonObject); jsonArray.add(jsonObject);
}); });
reformJsonObject.put("reviewImages",jsonArray ); reformJsonObject.put("reviewImages", jsonArray);
}else { } else {
reformJsonObject.put("reviewImages", null); reformJsonObject.put("reviewImages", null);
} }
...@@ -751,7 +802,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -751,7 +802,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
List<LatentDangerFlowRecordBo> records = latentDangerFlowRecordMapper.listByDangerId(latentDanger.getId()); List<LatentDangerFlowRecordBo> records = latentDangerFlowRecordMapper.listByDangerId(latentDanger.getId());
if (!CollectionUtils.isEmpty(records)) { if (!CollectionUtils.isEmpty(records)) {
for (LatentDangerFlowRecordBo recordBo : records) { for (LatentDangerFlowRecordBo recordBo : records) {
recordBo.setExecuteTime(DateUtil.date2Str(recordBo.getCreateDate(), DateUtil.DATETIME_DEFAULT_FORMAT)); recordBo.setExecuteTime(
DateUtil.date2Str(recordBo.getCreateDate(), DateUtil.DATETIME_DEFAULT_FORMAT));
} }
detailVo.setRecords(records); detailVo.setRecords(records);
} }
...@@ -788,7 +840,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -788,7 +840,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
riskVo.setPointLevel(!ValidationUtil.isEmpty(patrolBo.getPointLevel()) ? patrolBo.getPointLevel() : ""); riskVo.setPointLevel(!ValidationUtil.isEmpty(patrolBo.getPointLevel()) ? patrolBo.getPointLevel() : "");
riskVo.setPlanName(patrolBo.getPlanName()); riskVo.setPlanName(patrolBo.getPlanName());
riskVo.setCheckTime(patrolBo.getCheckTime()); riskVo.setCheckTime(patrolBo.getCheckTime());
AgencyUserModel checkUser = remoteSecurityService.getUserById(RequestContext.getToken(), getProduct(), RequestContext.getAppKey(), patrolBo.getCheckUserId()); AgencyUserModel checkUser = remoteSecurityService.getUserById(RequestContext.getToken(), getProduct(),
RequestContext.getAppKey(), patrolBo.getCheckUserId());
if (!ValidationUtil.isEmpty(checkUser)) { if (!ValidationUtil.isEmpty(checkUser)) {
riskVo.setCheckUser(checkUser.getRealName()); riskVo.setCheckUser(checkUser.getRealName());
} }
...@@ -832,8 +885,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -832,8 +885,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
LatentDangerPatrolBo patrolBo = null; LatentDangerPatrolBo patrolBo = null;
if (latentDangerBo.getDangerType().equals(LatentDangerTypeEnum.计划检查.getCode())) { if (latentDangerBo.getDangerType().equals(LatentDangerTypeEnum.计划检查.getCode())) {
patrolBo = latentDangerPatrolMapper.getByDangerId(latentDangerBo.getId()); patrolBo = latentDangerPatrolMapper.getByDangerId(latentDangerBo.getId());
JSONArray checkTypeArray = remoteSecurityService.listDictionaryByDictCode(RequestContext.getToken(), getProduct(), JSONArray checkTypeArray = remoteSecurityService.listDictionaryByDictCode(RequestContext.getToken(),
RequestContext.getAppKey(), Constants.CHECK_TYPE); getProduct(), RequestContext.getAppKey(), Constants.CHECK_TYPE);
Map<String, String> checkTypeMap = Maps.newHashMap(); Map<String, String> checkTypeMap = Maps.newHashMap();
for (int i = 0; i < checkTypeArray.size(); i++) { for (int i = 0; i < checkTypeArray.size(); i++) {
JSONObject categoryJson = checkTypeArray.getJSONObject(i); JSONObject categoryJson = checkTypeArray.getJSONObject(i);
...@@ -852,7 +905,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -852,7 +905,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
JSONObject object = arr.getJSONObject(i); JSONObject object = arr.getJSONObject(i);
itemBasisBuilder.append(object.getString("name")).append(","); itemBasisBuilder.append(object.getString("name")).append(",");
} }
itemBasis = itemBasisBuilder.length() > 0 ? itemBasisBuilder.substring(0, itemBasisBuilder.length() - 1) : itemBasis; itemBasis = itemBasisBuilder.length() > 0
? itemBasisBuilder.substring(0, itemBasisBuilder.length() - 1)
: itemBasis;
} }
// if (riskFactorBo != null) { // if (riskFactorBo != null) {
if (true) { if (true) {
...@@ -868,12 +923,15 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -868,12 +923,15 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
dangerInfo.put("itemName", patrolBo.getItemName()); dangerInfo.put("itemName", patrolBo.getItemName());
dangerInfo.put("itemBasis", itemBasis); dangerInfo.put("itemBasis", itemBasis);
dangerInfo.put("itemRemark", patrolBo.getItemRemark()); dangerInfo.put("itemRemark", patrolBo.getItemRemark());
dangerInfo.put("checkTime", DateUtil.str2Date(patrolBo.getCheckTime(), DateUtil.DATETIME_DEFAULT_FORMAT)); dangerInfo.put("checkTime",
DateUtil.str2Date(patrolBo.getCheckTime(), DateUtil.DATETIME_DEFAULT_FORMAT));
} }
} }
} }
LatentDangerFlowRecordBo reviewRecordBo = latentDangerFlowRecordMapper.getByDangerIdAndActionFlag(latentDangerBo.getId(), "B_2"); LatentDangerFlowRecordBo reviewRecordBo = latentDangerFlowRecordMapper
LatentDangerFlowRecordBo reformRecordBo = latentDangerFlowRecordMapper.getByDangerIdAndActionFlag(latentDangerBo.getId(), "B_3"); .getByDangerIdAndActionFlag(latentDangerBo.getId(), "B_2");
LatentDangerFlowRecordBo reformRecordBo = latentDangerFlowRecordMapper
.getByDangerIdAndActionFlag(latentDangerBo.getId(), "B_3");
if (reviewRecordBo != null) { if (reviewRecordBo != null) {
userIds.add(reviewRecordBo.getExecuteUserId()); userIds.add(reviewRecordBo.getExecuteUserId());
} }
...@@ -889,7 +947,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -889,7 +947,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
if (user != null) { if (user != null) {
baseInfo.put("userName", user.getRealName()); baseInfo.put("userName", user.getRealName());
} }
DepartmentBo departmentBo = remoteSecurityService.getDepartmentByDeptId(latentDangerBo.getDiscovererDepartmentId()); DepartmentBo departmentBo = remoteSecurityService
.getDepartmentByDeptId(latentDangerBo.getDiscovererDepartmentId());
if (departmentBo != null) { if (departmentBo != null) {
baseInfo.put("department", departmentBo.getDepartmentName()); baseInfo.put("department", departmentBo.getDepartmentName());
} }
...@@ -917,7 +976,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -917,7 +976,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
} }
if (patrolBo.getCheckDepartmentId() != null) { if (patrolBo.getCheckDepartmentId() != null) {
DepartmentBo checkDepartment = remoteSecurityService.getDepartmentByDeptId(patrolBo.getCheckDepartmentId()); DepartmentBo checkDepartment = remoteSecurityService
.getDepartmentByDeptId(patrolBo.getCheckDepartmentId());
if (checkDepartment != null) { if (checkDepartment != null) {
dangerInfo.put("checkUserDeptName", checkDepartment.getDepartmentName()); dangerInfo.put("checkUserDeptName", checkDepartment.getDepartmentName());
} }
...@@ -927,7 +987,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -927,7 +987,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
AgencyUserModel reviewUser = userMap.get(reviewRecordBo.getExecuteUserId()); AgencyUserModel reviewUser = userMap.get(reviewRecordBo.getExecuteUserId());
reviewInfo.put("reviewUserName", !ValidationUtil.isEmpty(reviewUser) ? reviewUser.getRealName() : ""); reviewInfo.put("reviewUserName", !ValidationUtil.isEmpty(reviewUser) ? reviewUser.getRealName() : "");
reviewInfo.put("reviewDate", !ValidationUtil.isEmpty(reviewUser) ? reviewRecordBo.getUpdateDate() : ""); reviewInfo.put("reviewDate", !ValidationUtil.isEmpty(reviewUser) ? reviewRecordBo.getUpdateDate() : "");
reviewInfo.put("reviewResult", !ValidationUtil.isEmpty(reviewUser) ? reviewRecordBo.getExecuteResult() : ""); reviewInfo.put("reviewResult",
!ValidationUtil.isEmpty(reviewUser) ? reviewRecordBo.getExecuteResult() : "");
} }
result.put("baseInfo", baseInfo); result.put("baseInfo", baseInfo);
result.put("dangerInfo", dangerInfo); result.put("dangerInfo", dangerInfo);
...@@ -946,13 +1007,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -946,13 +1007,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
String userId, String userRealName, String departmentId, String departmentName) { String userId, String userRealName, String departmentId, String departmentName) {
DangerExecuteSubmitDto executeSubmitDto = new DangerExecuteSubmitDto(); DangerExecuteSubmitDto executeSubmitDto = new DangerExecuteSubmitDto();
executeSubmitDto.setIsOk(true); executeSubmitDto.setIsOk(true);
LatentDanger latentDanger = LatentDanger latentDanger = latentDangerMapper
latentDangerMapper.selectOne(new LambdaQueryWrapper<LatentDanger>().eq(LatentDanger::getInstanceId, .selectOne(new LambdaQueryWrapper<LatentDanger>().eq(LatentDanger::getInstanceId, instanceId));
instanceId));
if (latentDanger != null) { if (latentDanger != null) {
LatentDangerFlowRecordBo currentRecord = latentDangerFlowRecordMapper.getById(latentDanger.getCurrentFlowRecordId()); LatentDangerFlowRecordBo currentRecord = latentDangerFlowRecordMapper
.getById(latentDanger.getCurrentFlowRecordId());
if (actionType.equals(1)) { if (actionType.equals(1)) {
//通过 // 通过
LatentDangerExecuteTypeEnum executeTypeEnum = LatentDangerExecuteTypeEnum.公司负责人审核通过; LatentDangerExecuteTypeEnum executeTypeEnum = LatentDangerExecuteTypeEnum.公司负责人审核通过;
updateFlowRecord(currentRecord, executeTypeEnum, userId, departmentId, remark, null); updateFlowRecord(currentRecord, executeTypeEnum, userId, departmentId, remark, null);
JSONObject flowJson = remoteWorkFlowService.allTasksInProcessInstanceId(latentDanger.getInstanceId()); JSONObject flowJson = remoteWorkFlowService.allTasksInProcessInstanceId(latentDanger.getInstanceId());
...@@ -966,7 +1027,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -966,7 +1027,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
patrolBo = latentDangerPatrolMapper.getByDangerId(latentDanger.getId()); patrolBo = latentDangerPatrolMapper.getByDangerId(latentDanger.getId());
userIds = Joiner.on(",").join(getUserIdsStrByPerTypeAndDefKey(flowJson)); userIds = Joiner.on(",").join(getUserIdsStrByPerTypeAndDefKey(flowJson));
} else { } else {
LatentDangerFlowRecordBo recordBo = latentDangerFlowRecordMapper.getByDangerIdAndActionFlag(latentDanger.getId(), "B_8"); LatentDangerFlowRecordBo recordBo = latentDangerFlowRecordMapper
.getByDangerIdAndActionFlag(latentDanger.getId(), "B_8");
userIds = recordBo.getFlowTaskUserIds(); userIds = recordBo.getFlowTaskUserIds();
} }
LatentDangerFlowRecordBo record = saveFlowRecord(flowJson.getString("id"), userIds, LatentDangerFlowRecordBo record = saveFlowRecord(flowJson.getString("id"), userIds,
...@@ -974,12 +1036,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -974,12 +1036,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
latentDanger.setCurrentFlowRecordId(record.getId()); latentDanger.setCurrentFlowRecordId(record.getId());
latentDanger.setDangerState(executeTypeEnum.getNextState().getCode().toString()); latentDanger.setDangerState(executeTypeEnum.getNextState().getCode().toString());
latentDangerMapper.updateById(latentDanger); latentDangerMapper.updateById(latentDanger);
///web推送刷新消息 /// web推送刷新消息
// dangerStateChangeWebSockte(latentDangerBo); // dangerStateChangeWebSockte(latentDangerBo);
// Set<String> nextExecuteUserIds = Sets.newHashSet(Arrays.asList(userIds.split(","))); // Set<String> nextExecuteUserIds = Sets.newHashSet(Arrays.asList(userIds.split(",")));
sendMessage(latentDanger, executeTypeEnum, patrolBo, currentRecord.getFlowTaskName(), this.getNextExecuteUsers(latentDanger.getInstanceId()), userRealName, departmentName); sendMessage(latentDanger, executeTypeEnum, patrolBo, currentRecord.getFlowTaskName(),
this.getNextExecuteUsers(latentDanger.getInstanceId()), userRealName, departmentName);
} else if (actionType.equals(2)) { } else if (actionType.equals(2)) {
//终止 // 终止
latentDanger.setDangerState(LatentDangerStateEnum.已撤销.getCode().toString()); latentDanger.setDangerState(LatentDangerStateEnum.已撤销.getCode().toString());
latentDangerMapper.updateById(latentDanger); latentDangerMapper.updateById(latentDanger);
if (latentDanger.getDangerType().equals(LatentDangerTypeEnum.计划检查.getCode())) { if (latentDanger.getDangerType().equals(LatentDangerTypeEnum.计划检查.getCode())) {
...@@ -988,9 +1051,11 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -988,9 +1051,11 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
// updateMeasuresContentStatus(Long.valueOf(patrolBo.getClassifyOriginalId()), Long.valueOf(patrolBo.getItemOriginalId()), // updateMeasuresContentStatus(Long.valueOf(patrolBo.getClassifyOriginalId()), Long.valueOf(patrolBo.getItemOriginalId()),
// patrolBo.getRiskFactorFlowId(), RiskFactorsCmStatusEnum.Control); // patrolBo.getRiskFactorFlowId(), RiskFactorsCmStatusEnum.Control);
} }
LatentDangerLevelEnum levelEnum = LatentDangerLevelEnum.getEnumByCode(latentDanger.getDangerLevel()); LatentDangerLevelEnum levelEnum = LatentDangerLevelEnum
.getEnumByCode(latentDanger.getDangerLevel());
if (levelEnum != null) { if (levelEnum != null) {
updateRiskSourceDangerState(false, Long.valueOf(patrolBo.getPointOriginalId()), levelEnum, patrolBo.getPointId(), latentDanger.getId()); updateRiskSourceDangerState(false, Long.valueOf(patrolBo.getPointOriginalId()), levelEnum,
patrolBo.getPointId(), latentDanger.getId());
} }
executeSubmitDto.setDangerId(latentDanger.getId()); executeSubmitDto.setDangerId(latentDanger.getId());
executeSubmitDto.setDangerName(latentDanger.getDangerName()); executeSubmitDto.setDangerName(latentDanger.getDangerName());
...@@ -999,7 +1064,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -999,7 +1064,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
executeSubmitDto.setExecuteTypeEnum(LatentDangerExecuteTypeEnum.隐患评审拒绝); executeSubmitDto.setExecuteTypeEnum(LatentDangerExecuteTypeEnum.隐患评审拒绝);
} }
} else if (actionType.equals(3)) { } else if (actionType.equals(3)) {
//拒绝 // 拒绝
LatentDangerExecuteTypeEnum executeTypeEnum = LatentDangerExecuteTypeEnum.公司负责人审核拒绝; LatentDangerExecuteTypeEnum executeTypeEnum = LatentDangerExecuteTypeEnum.公司负责人审核拒绝;
updateFlowRecord(currentRecord, executeTypeEnum, userId, departmentId, remark, null); updateFlowRecord(currentRecord, executeTypeEnum, userId, departmentId, remark, null);
JSONObject flowJson = remoteWorkFlowService.allTasksInProcessInstanceId(latentDanger.getInstanceId()); JSONObject flowJson = remoteWorkFlowService.allTasksInProcessInstanceId(latentDanger.getInstanceId());
...@@ -1013,7 +1078,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1013,7 +1078,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
patrolBo = latentDangerPatrolMapper.getByDangerId(latentDanger.getId()); patrolBo = latentDangerPatrolMapper.getByDangerId(latentDanger.getId());
userIds = Joiner.on(",").join(getUserIdsStrByPerTypeAndDefKey(flowJson)); userIds = Joiner.on(",").join(getUserIdsStrByPerTypeAndDefKey(flowJson));
} else { } else {
LatentDangerFlowRecordBo recordBo = latentDangerFlowRecordMapper.getByDangerIdAndActionFlag(latentDanger.getId(), "B_3"); LatentDangerFlowRecordBo recordBo = latentDangerFlowRecordMapper
.getByDangerIdAndActionFlag(latentDanger.getId(), "B_3");
userIds = recordBo.getFlowTaskUserIds(); userIds = recordBo.getFlowTaskUserIds();
} }
LatentDangerFlowRecordBo record = saveFlowRecord(flowJson.getString("id"), userIds, LatentDangerFlowRecordBo record = saveFlowRecord(flowJson.getString("id"), userIds,
...@@ -1021,10 +1087,11 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1021,10 +1087,11 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
latentDanger.setCurrentFlowRecordId(record.getId()); latentDanger.setCurrentFlowRecordId(record.getId());
latentDanger.setDangerState(executeTypeEnum.getNextState().getCode().toString()); latentDanger.setDangerState(executeTypeEnum.getNextState().getCode().toString());
latentDangerMapper.updateById(latentDanger); latentDangerMapper.updateById(latentDanger);
///web推送刷新消息 /// web推送刷新消息
// dangerStateChangeWebSocket(latentDangerBo); // dangerStateChangeWebSocket(latentDangerBo);
// Set<String> nextExecuteUserIds = Sets.newHashSet(Arrays.asList(userIds.split(","))); // Set<String> nextExecuteUserIds = Sets.newHashSet(Arrays.asList(userIds.split(",")));
sendMessage(latentDanger, executeTypeEnum, patrolBo, currentRecord.getFlowTaskName(), this.getNextExecuteUsers(latentDanger.getInstanceId()), userRealName, departmentName); sendMessage(latentDanger, executeTypeEnum, patrolBo, currentRecord.getFlowTaskName(),
this.getNextExecuteUsers(latentDanger.getInstanceId()), userRealName, departmentName);
} }
} }
return executeSubmitDto; return executeSubmitDto;
...@@ -1037,8 +1104,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1037,8 +1104,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) { if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) {
dangerState = "2,3,4"; dangerState = "2,3,4";
} else if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) { } else if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
dangerState = "taskDispatch,governFileSubmit,governLeaderConfirm,governChargerConfirm," + dangerState = "taskDispatch,governFileSubmit,governLeaderConfirm,governChargerConfirm,"
"governLeadershipConfirm,governLeaderReviewConfirm,governSecondReviewConfirm"; + "governLeadershipConfirm,governLeaderReviewConfirm,governSecondReviewConfirm";
} }
List<String> dangerStateList = Lists.newArrayList(dangerState.split(",")); List<String> dangerStateList = Lists.newArrayList(dangerState.split(","));
List<LatentDangerBo> overtimeList = latentDangerMapper.listOfOvertime(dangerStateList); List<LatentDangerBo> overtimeList = latentDangerMapper.listOfOvertime(dangerStateList);
...@@ -1049,8 +1116,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1049,8 +1116,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
latentDangerBo.setOvertimeState(LatentDangerOvertimeStateEnum.已逾期.getCode()); latentDangerBo.setOvertimeState(LatentDangerOvertimeStateEnum.已逾期.getCode());
latentDangerMapper.update(latentDangerBo); latentDangerMapper.update(latentDangerBo);
if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType) && if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)
latentDangerBo.getDangerType().equals(LatentDangerTypeEnum.计划检查.getCode())) { && latentDangerBo.getDangerType().equals(LatentDangerTypeEnum.计划检查.getCode())) {
// TODO 远程调用修改 // TODO 远程调用修改
LatentDangerPatrolBo patrolBo = latentDangerPatrolMapper.getByDangerId(latentDangerBo.getId()); LatentDangerPatrolBo patrolBo = latentDangerPatrolMapper.getByDangerId(latentDangerBo.getId());
LatentDangerResultPushSpcRequest spcRequest = new LatentDangerResultPushSpcRequest(); LatentDangerResultPushSpcRequest spcRequest = new LatentDangerResultPushSpcRequest();
...@@ -1071,10 +1138,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1071,10 +1138,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
logger.info("隐患治理即将逾期通知》》》》"); logger.info("隐患治理即将逾期通知》》》》");
needNoticeDangerList.forEach(danger -> { needNoticeDangerList.forEach(danger -> {
asyncTask.pushLatentDangerReformLimitDateExpireMessage(this.getNextExecuteUsers(danger.getInstanceId()), asyncTask.pushLatentDangerReformLimitDateExpireMessage(this.getNextExecuteUsers(danger.getInstanceId()),
danger.getOrgCode(), danger.getOrgCode(), danger.getDangerName(),
danger.getDangerName(), DateUtil.date2Str(danger.getReformLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT), DateUtil.date2Str(danger.getReformLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT),
danger.getDangerId(), danger.getDangerId(), danger.getDangerState(), "");
danger.getDangerState(), "");
}); });
} }
} }
...@@ -1085,8 +1151,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1085,8 +1151,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
private void dangerStateChangeWebSocket(LatentDangerBo latentDangerBo) { private void dangerStateChangeWebSocket(LatentDangerBo latentDangerBo) {
String state = latentDangerBo.getDangerState(); String state = latentDangerBo.getDangerState();
String type = latentDangerBo.getDangerType(); String type = latentDangerBo.getDangerType();
if (LatentDangerTypeEnum.计划检查.getCode().equals(type) if (LatentDangerTypeEnum.计划检查.getCode().equals(type) || LatentDangerTypeEnum.无计划检查.getCode().equals(type)) {
|| LatentDangerTypeEnum.无计划检查.getCode().equals(type)) {
if (LatentDangerStateEnum.待治理.getCode().equals(state) if (LatentDangerStateEnum.待治理.getCode().equals(state)
// || LatentDangerStateEnum.安措计划中.getCode().equals(state) // || LatentDangerStateEnum.安措计划中.getCode().equals(state)
|| LatentDangerStateEnum.待验证.getCode().equals(state)) { || LatentDangerStateEnum.待验证.getCode().equals(state)) {
...@@ -1122,10 +1187,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1122,10 +1187,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
deptIds.add(e.getExcuteDepartmentId()); deptIds.add(e.getExcuteDepartmentId());
} }
}); });
List<DepartmentModel> departmentBos = remoteSecurityService.getlistDepartmentByDeptIds(token, product, appKey, Joiner.on(",").join(deptIds)); List<DepartmentModel> departmentBos = remoteSecurityService.getlistDepartmentByDeptIds(token, product,
List<AgencyUserModel> userModels = remoteSecurityService.listUserByUserIds(token, product, appKey, Joiner.on(",").join(userIds)); appKey, Joiner.on(",").join(deptIds));
List<AgencyUserModel> userModels = remoteSecurityService.listUserByUserIds(token, product, appKey,
Joiner.on(",").join(userIds));
Map<String, AgencyUserModel> userMap = Maps.uniqueIndex(userModels, AgencyUserModel::getUserId); Map<String, AgencyUserModel> userMap = Maps.uniqueIndex(userModels, AgencyUserModel::getUserId);
Map<Long, DepartmentModel> departmentBoMap = Maps.uniqueIndex(departmentBos, DepartmentModel::getSequenceNbr); Map<Long, DepartmentModel> departmentBoMap = Maps.uniqueIndex(departmentBos,
DepartmentModel::getSequenceNbr);
for (LatentDangerFlowRecordBo recordBo : records) { for (LatentDangerFlowRecordBo recordBo : records) {
AgencyUserModel user = userMap.get(recordBo.getExecuteUserId()); AgencyUserModel user = userMap.get(recordBo.getExecuteUserId());
if (user != null) { if (user != null) {
...@@ -1154,14 +1222,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1154,14 +1222,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
* @param executeSubmitDto * @param executeSubmitDto
* @return * @return
*/ */
public DangerExecuteSubmitDto executeSubmit(LatentDangerExecuteParam param, public DangerExecuteSubmitDto executeSubmit(LatentDangerExecuteParam param, LatentDanger latentDanger,
LatentDanger latentDanger, String userId, String userRealName, String departmentId, String departmentName,
String userId, DangerExecuteSubmitDto executeSubmitDto, ReginParams reginParams) throws Exception {
String userRealName,
String departmentId,
String departmentName,
DangerExecuteSubmitDto executeSubmitDto,
ReginParams reginParams) throws Exception {
// 根据业务类型不同执行不同逻辑 // 根据业务类型不同执行不同逻辑
if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) { if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
// 防火监督业务 // 防火监督业务
...@@ -1169,8 +1232,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1169,8 +1232,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
executeSubmitDto, reginParams); executeSubmitDto, reginParams);
} else if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) { } else if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) {
// 巡检业务 // 巡检业务
executePatrolBiz(param, latentDanger, userId, userRealName, departmentId, departmentName, executePatrolBiz(param, latentDanger, userId, userRealName, departmentId, departmentName, executeSubmitDto,
executeSubmitDto, reginParams); reginParams);
} }
return executeSubmitDto; return executeSubmitDto;
...@@ -1178,13 +1241,12 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1178,13 +1241,12 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
DangerExecuteSubmitDto executeSupervisionBiz(LatentDangerExecuteParam param, LatentDanger latentDanger, DangerExecuteSubmitDto executeSupervisionBiz(LatentDangerExecuteParam param, LatentDanger latentDanger,
String userId, String userRealName, String departmentId, String userId, String userRealName, String departmentId, String departmentName,
String departmentName, DangerExecuteSubmitDto executeSubmitDto, ReginParams reginParams) throws Exception {
DangerExecuteSubmitDto executeSubmitDto,
ReginParams reginParams) throws Exception {
// 隐患的巡查信息 // 隐患的巡查信息
JSONObject bizInfo = latentDanger.getBizInfo(); JSONObject bizInfo = latentDanger.getBizInfo();
if (ValidationUtil.isEmpty(bizInfo) || ValidationUtil.isEmpty(bizInfo.get("planType")) || ValidationUtil.isEmpty(bizInfo.get("leadPeopleId"))) { if (ValidationUtil.isEmpty(bizInfo) || ValidationUtil.isEmpty(bizInfo.get("planType"))
|| ValidationUtil.isEmpty(bizInfo.get("leadPeopleId"))) {
executeSubmitDto.setIsOk(false); executeSubmitDto.setIsOk(false);
executeSubmitDto.setMsg("业务信息错误"); executeSubmitDto.setMsg("业务信息错误");
return executeSubmitDto; return executeSubmitDto;
...@@ -1202,8 +1264,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1202,8 +1264,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
String processInstanceId = latentDanger.getInstanceId(); String processInstanceId = latentDanger.getInstanceId();
String currentDangerState = latentDanger.getDangerState(); String currentDangerState = latentDanger.getDangerState();
LatentDangerState.SupervisionDangerStateEnum currentStateEnum = LatentDangerState.SupervisionDangerStateEnum currentStateEnum = LatentDangerState.SupervisionDangerStateEnum
LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(currentDangerState); .getEnumByCode(currentDangerState);
String executeResultMsg = ""; String executeResultMsg = "";
String condition; String condition;
...@@ -1241,11 +1303,11 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1241,11 +1303,11 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
JSONObject body = new JSONObject(); JSONObject body = new JSONObject();
body.put("businessKey", latentDanger.getBusinessKey()); body.put("businessKey", latentDanger.getBusinessKey());
body.put("processDefinitionKey", workflowProcessDefinitionKey); body.put("processDefinitionKey", workflowProcessDefinitionKey);
/* 修改现场确认的工作流流程的节点执行条件分支------strat by chenhao 2022-01-18*/ /* 修改现场确认的工作流流程的节点执行条件分支------strat by chenhao 2022-01-18 */
HashMap<String, Object> conditionMap = new HashMap<>(); HashMap<String, Object> conditionMap = new HashMap<>();
conditionMap.put(WorkFlowEnum.CONDITION.getCode(), startCondition); conditionMap.put(WorkFlowEnum.CONDITION.getCode(), startCondition);
body.put("variables", conditionMap); body.put("variables", conditionMap);
/* 修改现场确认的工作流流程的节点执行条件分支------end by chenhao 2022-01-18*/ /* 修改现场确认的工作流流程的节点执行条件分支------end by chenhao 2022-01-18 */
JSONObject result = workflowFeignService.startByVariable(body); JSONObject result = workflowFeignService.startByVariable(body);
if (result == null || ValidationUtil.isEmpty(result.get("data"))) { if (result == null || ValidationUtil.isEmpty(result.get("data"))) {
executeSubmitDto.setIsOk(false); executeSubmitDto.setIsOk(false);
...@@ -1292,13 +1354,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1292,13 +1354,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
// 5、保存日志信息 // 5、保存日志信息
executeResultMsg = latentDanger.getDangerStateName() + ExecuteTypeEnum.通过.getName(); executeResultMsg = latentDanger.getDangerStateName() + ExecuteTypeEnum.通过.getName();
record = saveFlowRecord("", latentDanger.getDangerStateName(), userId, departmentId, latentDanger.getFlowJson(), record = saveFlowRecord("", latentDanger.getDangerStateName(), userId, departmentId,
latentDanger.getId(), reginParams.getRole(), executeResultMsg, "", userRealName, departmentName, latentDanger.getFlowJson(), latentDanger.getId(), reginParams.getRole(), executeResultMsg, "",
latentDanger.getDangerState(), 0); userRealName, departmentName, latentDanger.getDangerState(), 0);
LatentDangerState.SupervisionDangerStateEnum curEnum = LatentDangerState.SupervisionDangerStateEnum curEnum = LatentDangerState.SupervisionDangerStateEnum
LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(latentDanger.getDangerState()); .getEnumByCode(latentDanger.getDangerState());
LatentDangerState.SupervisionDangerStateEnum nextEnum = LatentDangerState.SupervisionDangerStateEnum nextEnum = LatentDangerState.SupervisionDangerStateEnum
LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(curEnum.getNext()); .getEnumByCode(curEnum.getNext());
latentDanger.setDangerState(nextEnum.getCode()); latentDanger.setDangerState(nextEnum.getCode());
latentDanger.setDangerStateName(nextEnum.getName()); latentDanger.setDangerStateName(nextEnum.getName());
...@@ -1311,11 +1373,14 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1311,11 +1373,14 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
// 查询上一步流程信息，如果为拒绝，则又回到了现场确认，此时需要重新设置condition为计划类型 // 查询上一步流程信息，如果为拒绝，则又回到了现场确认，此时需要重新设置condition为计划类型
List<LatentDangerFlowRecord> recordList = List<LatentDangerFlowRecord> recordList = latentDangerFlowRecordService
latentDangerFlowRecordService.list(new LambdaQueryWrapper<LatentDangerFlowRecord>().eq(LatentDangerFlowRecord::getDangerId, latentDanger.getId()).orderByDesc(LatentDangerFlowRecord::getCreateDate)); .list(new LambdaQueryWrapper<LatentDangerFlowRecord>()
.eq(LatentDangerFlowRecord::getDangerId, latentDanger.getId())
.orderByDesc(LatentDangerFlowRecord::getCreateDate));
LatentDangerFlowRecord preRecord = recordList.get(0); LatentDangerFlowRecord preRecord = recordList.get(0);
if (LatentDangerState.SupervisionDangerStateEnum.现场确认.getCode().equals(latentDanger.getDangerState()) && if (LatentDangerState.SupervisionDangerStateEnum.现场确认.getCode().equals(latentDanger.getDangerState())
!ValidationUtil.isEmpty(latentDanger.getInstanceId()) && ExecuteTypeEnum.驳回.getCode().equals(preRecord.getExecuteState())) { && !ValidationUtil.isEmpty(latentDanger.getInstanceId())
&& ExecuteTypeEnum.驳回.getCode().equals(preRecord.getExecuteState())) {
condition = planType; condition = planType;
} else { } else {
ExecuteTypeEnum executeTypeEnum = ExecuteTypeEnum.getByCode(param.getExecuteType()); ExecuteTypeEnum executeTypeEnum = ExecuteTypeEnum.getByCode(param.getExecuteType());
...@@ -1331,8 +1396,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1331,8 +1396,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
// 当隐患当前节点状态是现场确认，在执行完节点后需要将检查组长设置为下个节点执行人 // 当隐患当前节点状态是现场确认，在执行完节点后需要将检查组长设置为下个节点执行人
if (LatentDangerState.SupervisionDangerStateEnum.现场确认.getCode().equals(latentDanger.getDangerState()) && if (LatentDangerState.SupervisionDangerStateEnum.现场确认.getCode().equals(latentDanger.getDangerState())
!ValidationUtil.isEmpty(latentDanger.getInstanceId()) && ExecuteTypeEnum.驳回.getCode().equals(preRecord.getExecuteState())) { && !ValidationUtil.isEmpty(latentDanger.getInstanceId())
&& ExecuteTypeEnum.驳回.getCode().equals(preRecord.getExecuteState())) {
// 在检查组长驳回后再现场确认需要将检查组长id设置为下个节点执行人 // 在检查组长驳回后再现场确认需要将检查组长id设置为下个节点执行人
Object resultObj = workflowExecuteService.setTaskAssign(latentDanger.getInstanceId(), checkLeaderId); Object resultObj = workflowExecuteService.setTaskAssign(latentDanger.getInstanceId(), checkLeaderId);
executeSubmitDto.setCheckLeaderId(userModel.getUserId()); executeSubmitDto.setCheckLeaderId(userModel.getUserId());
...@@ -1348,8 +1414,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1348,8 +1414,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
String nextStateName = ""; String nextStateName = "";
if (ExecuteTypeEnum.通过.getCode().equals(param.getExecuteType())) { if (ExecuteTypeEnum.通过.getCode().equals(param.getExecuteType())) {
// 执行成功更新隐患状态 // 执行成功更新隐患状态
LatentDangerState.SupervisionDangerStateEnum nextStateEnum = LatentDangerState.SupervisionDangerStateEnum nextStateEnum = LatentDangerState.SupervisionDangerStateEnum
LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(currentStateEnum.getNext()); .getEnumByCode(currentStateEnum.getNext());
// 单位检查提交整改资料的下一节点需特殊处理 // 单位检查提交整改资料的下一节点需特殊处理
if ("supervised".equals(planType)) { if ("supervised".equals(planType)) {
if (LatentDangerState.SupervisionDangerStateEnum.提交整改资料.getCode().equals(currentDangerState)) { if (LatentDangerState.SupervisionDangerStateEnum.提交整改资料.getCode().equals(currentDangerState)) {
...@@ -1365,16 +1431,16 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1365,16 +1431,16 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
nextState = nextStateEnum.getCode(); nextState = nextStateEnum.getCode();
nextStateName = nextStateEnum.getName(); nextStateName = nextStateEnum.getName();
if (("supervised".equals(planType) && if (("supervised".equals(planType)
LatentDangerState.SupervisionDangerStateEnum.整改检查分管领导确认.getCode().equals(currentDangerState)) && LatentDangerState.SupervisionDangerStateEnum.整改检查分管领导确认.getCode().equals(currentDangerState))
|| LatentDangerState.SupervisionDangerStateEnum.整改二次审核确认.getCode().equals(currentDangerState)) { || LatentDangerState.SupervisionDangerStateEnum.整改二次审核确认.getCode().equals(currentDangerState)) {
nextState = LatentDangerState.SupervisionDangerStateEnum.整改完毕.getCode(); nextState = LatentDangerState.SupervisionDangerStateEnum.整改完毕.getCode();
nextStateName = LatentDangerState.SupervisionDangerStateEnum.整改完毕.getName(); nextStateName = LatentDangerState.SupervisionDangerStateEnum.整改完毕.getName();
} }
executeResultMsg = currentStateEnum.getName() + ExecuteTypeEnum.通过.getName(); executeResultMsg = currentStateEnum.getName() + ExecuteTypeEnum.通过.getName();
} else {// 审核驳回 } else {// 审核驳回
LatentDangerState.SupervisionDangerStateEnum nextStateEnum = LatentDangerState.SupervisionDangerStateEnum nextStateEnum = LatentDangerState.SupervisionDangerStateEnum
LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(currentStateEnum.getRejectNext()); .getEnumByCode(currentStateEnum.getRejectNext());
nextState = nextStateEnum.getCode(); nextState = nextStateEnum.getCode();
nextStateName = nextStateEnum.getName(); nextStateName = nextStateEnum.getName();
executeResultMsg = currentStateEnum.getName() + ExecuteTypeEnum.驳回.getName(); executeResultMsg = currentStateEnum.getName() + ExecuteTypeEnum.驳回.getName();
...@@ -1382,8 +1448,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1382,8 +1448,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
// 驳回到提交整改资料节点需重新设置工作流节点执行人为整改责任人 // 驳回到提交整改资料节点需重新设置工作流节点执行人为整改责任人
if (nextStateEnum == LatentDangerState.SupervisionDangerStateEnum.提交整改资料) { if (nextStateEnum == LatentDangerState.SupervisionDangerStateEnum.提交整改资料) {
JSONObject reformJson = latentDanger.getReformJson(); JSONObject reformJson = latentDanger.getReformJson();
AgencyUserModel checkLeader = AgencyUserModel checkLeader = jcsFeignClient
jcsFeignClient.getAmosIdByUserId((String) reformJson.get("reformLeaderId")).getResult(); .getAmosIdByUserId((String) reformJson.get("reformLeaderId")).getResult();
Object result = workflowExecuteService.setTaskAssign(processInstanceId, checkLeader.getUserName()); Object result = workflowExecuteService.setTaskAssign(processInstanceId, checkLeader.getUserName());
if (!(Boolean) result) { if (!(Boolean) result) {
executeSubmitDto.setIsOk(false); executeSubmitDto.setIsOk(false);
...@@ -1406,8 +1472,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1406,8 +1472,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
return executeSubmitDto; return executeSubmitDto;
} }
AgencyUserModel checkLeader = jcsFeignClient.getAmosIdByUserId(param.getReformLeaderId()).getResult(); AgencyUserModel checkLeader = jcsFeignClient.getAmosIdByUserId(param.getReformLeaderId()).getResult();
JSONObject reformJson = ValidationUtil.isEmpty(latentDanger.getReformJson()) ? new JSONObject() : JSONObject reformJson = ValidationUtil.isEmpty(latentDanger.getReformJson()) ? new JSONObject()
latentDanger.getReformJson(); : latentDanger.getReformJson();
reformJson.put("reformLeaderId", param.getReformLeaderId()); reformJson.put("reformLeaderId", param.getReformLeaderId());
latentDanger.setReformJson(reformJson); latentDanger.setReformJson(reformJson);
Object result = workflowExecuteService.setTaskAssign(processInstanceId, checkLeader.getUserName()); Object result = workflowExecuteService.setTaskAssign(processInstanceId, checkLeader.getUserName());
...@@ -1425,7 +1491,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1425,7 +1491,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
// 当计划为单位检查且隐患状态当前节点是提交整改资料时，在执行完节点后需要将整改资料审核人id（检查组长）设置为下个节点执行人 // 当计划为单位检查且隐患状态当前节点是提交整改资料时，在执行完节点后需要将整改资料审核人id（检查组长）设置为下个节点执行人
if ("supervised".equals(planType) && LatentDangerState.SupervisionDangerStateEnum.提交整改资料.getCode().equals(currentStateEnum.getCode())) { if ("supervised".equals(planType)
&& LatentDangerState.SupervisionDangerStateEnum.提交整改资料.getCode().equals(currentStateEnum.getCode())) {
Object result = workflowExecuteService.setTaskAssign(processInstanceId, checkLeaderId); Object result = workflowExecuteService.setTaskAssign(processInstanceId, checkLeaderId);
if (!(Boolean) result) { if (!(Boolean) result) {
executeSubmitDto.setIsOk(false); executeSubmitDto.setIsOk(false);
...@@ -1434,7 +1501,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1434,7 +1501,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
// 当计划为公司专项或日常检查且隐患状态当前节点是整改分管领导审核（二级审核）时， // 当计划为公司专项或日常检查且隐患状态当前节点是整改分管领导审核（二级审核）时，
// 在执行完节点后需要将整改三级审核人id（检查组长）设置为下个节点执行人 // 在执行完节点后需要将整改三级审核人id（检查组长）设置为下个节点执行人
if (!"supervised".equals(planType) && LatentDangerState.SupervisionDangerStateEnum.整改检查分管领导确认.getCode().equals(currentStateEnum.getCode())) { if (!"supervised".equals(planType) && LatentDangerState.SupervisionDangerStateEnum.整改检查分管领导确认.getCode()
.equals(currentStateEnum.getCode())) {
Object result = workflowExecuteService.setTaskAssign(processInstanceId, checkLeaderId); Object result = workflowExecuteService.setTaskAssign(processInstanceId, checkLeaderId);
if (!(Boolean) result) { if (!(Boolean) result) {
executeSubmitDto.setIsOk(false); executeSubmitDto.setIsOk(false);
...@@ -1455,9 +1523,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1455,9 +1523,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
private DangerExecuteSubmitDto executePatrolBiz(LatentDangerExecuteParam param, LatentDanger latentDanger, private DangerExecuteSubmitDto executePatrolBiz(LatentDangerExecuteParam param, LatentDanger latentDanger,
String userId, String userRealName, String departmentId, String userId, String userRealName, String departmentId, String departmentName,
String departmentName, DangerExecuteSubmitDto executeSubmitDto, DangerExecuteSubmitDto executeSubmitDto, ReginParams reginParams) {
ReginParams reginParams) {
if (!ValidationUtil.isEmpty(param.getReformLimitDate())) { if (!ValidationUtil.isEmpty(param.getReformLimitDate())) {
param.setReformLimitDate(param.getReformLimitDate() + " 23:59:59"); param.setReformLimitDate(param.getReformLimitDate() + " 23:59:59");
} }
...@@ -1510,9 +1577,10 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1510,9 +1577,10 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
param.getFlowJson(), param.getDangerId(), reginParams.getRole(), executeTypeEnum.getName(), param.getFlowJson(), param.getDangerId(), reginParams.getRole(), executeTypeEnum.getName(),
param.getRemark(), userRealName, departmentName, latentDanger.getDangerState(), 0); param.getRemark(), userRealName, departmentName, latentDanger.getDangerState(), 0);
} else { } else {
LatentDangerFlowRecord flowRecord = saveFlowRecord(executeJson.getString("id"), data.getString("name"), userId, departmentId, LatentDangerFlowRecord flowRecord = saveFlowRecord(executeJson.getString("id"), data.getString("name"),
param.getFlowJson(), param.getDangerId(), reginParams.getRole(), executeTypeEnum.getName(), userId, departmentId, param.getFlowJson(), param.getDangerId(), reginParams.getRole(),
param.getRemark(), userRealName, departmentName, latentDanger.getDangerState(), 0); executeTypeEnum.getName(), param.getRemark(), userRealName, departmentName,
latentDanger.getDangerState(), 0);
latentDanger.setCurrentFlowRecordId(flowRecord.getId()); latentDanger.setCurrentFlowRecordId(flowRecord.getId());
latentDanger.setDangerState(executeTypeEnum.getNextState().getCode()); latentDanger.setDangerState(executeTypeEnum.getNextState().getCode());
if (executeTypeEnum.equals(LatentDangerExecuteTypeEnum.隐患常规治理)) { if (executeTypeEnum.equals(LatentDangerExecuteTypeEnum.隐患常规治理)) {
...@@ -1527,10 +1595,12 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1527,10 +1595,12 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
latentDanger.setInferOtherThings(param.getInferOtherThings()); latentDanger.setInferOtherThings(param.getInferOtherThings());
latentDanger.setProblemDescription(param.getReasonAnalysis()); latentDanger.setProblemDescription(param.getReasonAnalysis());
latentDanger.setReasonAnalysis(param.getRemark()); latentDanger.setReasonAnalysis(param.getRemark());
latentDanger.setDelayLimitDate(DateUtil.str2Date(param.getDelayLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT)); latentDanger.setDelayLimitDate(
DateUtil.str2Date(param.getDelayLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT));
} }
if (executeTypeEnum.equals(LatentDangerExecuteTypeEnum.隐患评审通过)) { if (executeTypeEnum.equals(LatentDangerExecuteTypeEnum.隐患评审通过)) {
latentDanger.setReformLimitDate(DateUtil.str2Date(param.getReformLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT)); latentDanger.setReformLimitDate(
DateUtil.str2Date(param.getReformLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT));
latentDanger.setDangerLevel(param.getDangerLevel()); latentDanger.setDangerLevel(param.getDangerLevel());
} }
} }
...@@ -1541,8 +1611,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1541,8 +1611,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
latentDanger.setReformLimitDate(latentDanger.getDelayLimitDate()); latentDanger.setReformLimitDate(latentDanger.getDelayLimitDate());
} else {// 延期治理评审通过且 需要 公司审核 } else {// 延期治理评审通过且 需要 公司审核
latentDanger.setDangerState(LatentDangerStateEnum.延期治理申请待公司审核.getCode()); latentDanger.setDangerState(LatentDangerStateEnum.延期治理申请待公司审核.getCode());
LatentDangerFlowRecordBo recordBo = LatentDangerFlowRecordBo recordBo = latentDangerFlowRecordMapper
latentDangerFlowRecordMapper.getByDangerIdAndCreate(latentDanger.getId()); .getByDangerIdAndCreate(latentDanger.getId());
String flowJsonStr = recordBo.getFlowJson(); String flowJsonStr = recordBo.getFlowJson();
JSONObject flowJson = JSONObject.parseObject(flowJsonStr); JSONObject flowJson = JSONObject.parseObject(flowJsonStr);
flowJson.put("needCompanyVerify", param.getNeedCompanyVerify()); flowJson.put("needCompanyVerify", param.getNeedCompanyVerify());
...@@ -1566,24 +1636,29 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1566,24 +1636,29 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
executeSubmitDto.setExecuteTypeEnum(executeTypeEnum); executeSubmitDto.setExecuteTypeEnum(executeTypeEnum);
executeSubmitDto.setDangerName(latentDanger.getDangerName()); executeSubmitDto.setDangerName(latentDanger.getDangerName());
executeSubmitDto.setDangerId(latentDanger.getId()); executeSubmitDto.setDangerId(latentDanger.getId());
sendMessage(latentDanger, executeTypeEnum, patrolBo, executeTypeEnum.getName(), this.getNextExecuteUsers(latentDanger.getInstanceId()), userRealName, departmentName); sendMessage(latentDanger, executeTypeEnum, patrolBo, executeTypeEnum.getName(),
this.getNextExecuteUsers(latentDanger.getInstanceId()), userRealName, departmentName);
return executeSubmitDto; return executeSubmitDto;
} }
private void sendMessage(LatentDanger latentDanger, LatentDangerExecuteTypeEnum executeTypeEnum, private void sendMessage(LatentDanger latentDanger, LatentDangerExecuteTypeEnum executeTypeEnum,
LatentDangerPatrolBo patrolBo, String flowTaskName, String informerList, LatentDangerPatrolBo patrolBo, String flowTaskName, String informerList, String userRealName,
String userRealName, String departmentName) { String departmentName) {
if (LatentDangerBizTypeEnum.巡检.getCode().equals(latentDanger.getBizType())) { if (LatentDangerBizTypeEnum.巡检.getCode().equals(latentDanger.getBizType())) {
// 巡检流程消息处理 // 巡检流程消息处理
sendPatrolDangerMessage(latentDanger, executeTypeEnum, patrolBo, flowTaskName, informerList, userRealName, departmentName); sendPatrolDangerMessage(latentDanger, executeTypeEnum, patrolBo, flowTaskName, informerList, userRealName,
departmentName);
} else if (LatentDangerBizTypeEnum.防火监督.getCode().equals(latentDanger.getBizType())) { } else if (LatentDangerBizTypeEnum.防火监督.getCode().equals(latentDanger.getBizType())) {
// TODO 防火监督消息处理 // TODO 防火监督消息处理
sendSupervisionDangerMessage(latentDanger, executeTypeEnum, patrolBo, flowTaskName, informerList, userRealName, departmentName); sendSupervisionDangerMessage(latentDanger, executeTypeEnum, patrolBo, flowTaskName, informerList,
userRealName, departmentName);
} }
} }
// 巡检流程消息处理 // 巡检流程消息处理
private void sendPatrolDangerMessage(LatentDanger latentDanger, LatentDangerExecuteTypeEnum executeTypeEnum, LatentDangerPatrolBo patrolBo, String flowTaskName, String informerList, String userRealName, String departmentName) { private void sendPatrolDangerMessage(LatentDanger latentDanger, LatentDangerExecuteTypeEnum executeTypeEnum,
LatentDangerPatrolBo patrolBo, String flowTaskName, String informerList, String userRealName,
String departmentName) {
try { try {
if (executeTypeEnum.equals(LatentDangerExecuteTypeEnum.隐患评审拒绝)) { if (executeTypeEnum.equals(LatentDangerExecuteTypeEnum.隐患评审拒绝)) {
String pointName = null; String pointName = null;
...@@ -1592,8 +1667,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1592,8 +1667,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
Set<String> sendUserIds = Sets.newHashSet(latentDanger.getDiscovererUserId()); Set<String> sendUserIds = Sets.newHashSet(latentDanger.getDiscovererUserId());
asyncTask.pushLatentDangerExecuteMessage(informerList, latentDanger.getOrgCode(), asyncTask.pushLatentDangerExecuteMessage(informerList, latentDanger.getOrgCode(),
latentDanger.getDangerName(), pointName, latentDanger.getDangerName(), pointName, departmentName, latentDanger.getId(), userRealName,
departmentName, latentDanger.getId(), userRealName,
flowTaskName, ExecuteStateEnum.驳回.getName(), flowTaskName, ExecuteStateEnum.驳回.getName(),
DateUtil.date2Str(new Date(), DateUtil.DATETIME_DEFAULT_FORMAT), DateUtil.date2Str(new Date(), DateUtil.DATETIME_DEFAULT_FORMAT),
Integer.valueOf(latentDanger.getDangerState())); Integer.valueOf(latentDanger.getDangerState()));
...@@ -1614,8 +1688,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1614,8 +1688,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
pointName = patrolBo.getPointName(); pointName = patrolBo.getPointName();
} }
asyncTask.pushLatentDangerExecuteMessage(informerList, latentDanger.getOrgCode(), asyncTask.pushLatentDangerExecuteMessage(informerList, latentDanger.getOrgCode(),
latentDanger.getDangerName(), pointName, latentDanger.getDangerName(), pointName, departmentName, latentDanger.getId(), userRealName,
departmentName, latentDanger.getId(), userRealName,
flowTaskName, executeTypeEnum.getExecuteState().getName(), flowTaskName, executeTypeEnum.getExecuteState().getName(),
DateUtil.date2Str(new Date(), DateUtil.DATETIME_DEFAULT_FORMAT), DateUtil.date2Str(new Date(), DateUtil.DATETIME_DEFAULT_FORMAT),
Integer.valueOf(latentDanger.getDangerState())); Integer.valueOf(latentDanger.getDangerState()));
...@@ -1623,11 +1696,10 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1623,11 +1696,10 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
// 隐患治理到期时间为当天，则立即提示消息 // 隐患治理到期时间为当天，则立即提示消息
Date reformLimitDate = latentDanger.getReformLimitDate(); Date reformLimitDate = latentDanger.getReformLimitDate();
if (DateUtil.getDateFormat(new Date()).equals(DateUtil.getDateFormat(reformLimitDate))) { if (DateUtil.getDateFormat(new Date()).equals(DateUtil.getDateFormat(reformLimitDate))) {
asyncTask.pushLatentDangerReformLimitDateExpireMessage(informerList, asyncTask.pushLatentDangerReformLimitDateExpireMessage(informerList, latentDanger.getOrgCode(),
latentDanger.getOrgCode(), latentDanger.getDangerName(), latentDanger.getDangerName(),
DateUtil.date2Str(latentDanger.getReformLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT), DateUtil.date2Str(latentDanger.getReformLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT),
latentDanger.getId(), latentDanger.getId(), Integer.valueOf(latentDanger.getDangerState()), userRealName);
Integer.valueOf(latentDanger.getDangerState()), userRealName);
} }
} }
} }
...@@ -1638,7 +1710,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1638,7 +1710,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
// 防火监督流程消息处理 // 防火监督流程消息处理
private void sendSupervisionDangerMessage(LatentDanger latentDanger, LatentDangerExecuteTypeEnum executeTypeEnum, private void sendSupervisionDangerMessage(LatentDanger latentDanger, LatentDangerExecuteTypeEnum executeTypeEnum,
LatentDangerPatrolBo patrolBo, String flowTaskName, String informerList, String userRealName, String departmentName) { LatentDangerPatrolBo patrolBo, String flowTaskName, String informerList, String userRealName,
String departmentName) {
} }
@Async @Async
...@@ -1675,7 +1748,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1675,7 +1748,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
List<LatentDangerPatrolBo> patrolList = latentDangerPatrolMapper.listByPointId(pointId); List<LatentDangerPatrolBo> patrolList = latentDangerPatrolMapper.listByPointId(pointId);
if (!CollectionUtils.isEmpty(patrolList)) { if (!CollectionUtils.isEmpty(patrolList)) {
List<Long> dangerIds = Lists.transform(patrolList, LatentDangerPatrolBo::getLatentDangerId); List<Long> dangerIds = Lists.transform(patrolList, LatentDangerPatrolBo::getLatentDangerId);
List<LatentDangerFlowRecordBo> flowRecordBos = latentDangerFlowRecordMapper.listNewestRecordByDangerIds(dangerIds); List<LatentDangerFlowRecordBo> flowRecordBos = latentDangerFlowRecordMapper
.listNewestRecordByDangerIds(dangerIds);
flowRecordBos.forEach(l -> { flowRecordBos.forEach(l -> {
String status = null; String status = null;
if (l.getDangerState().equals(LatentDangerStateEnum.待治理.getCode()) if (l.getDangerState().equals(LatentDangerStateEnum.待治理.getCode())
...@@ -1700,8 +1774,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1700,8 +1774,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
return troubleList; return troubleList;
} }
private void updateRiskSourceDangerState(Boolean isSave, Long riskSourceId, LatentDangerLevelEnum private void updateRiskSourceDangerState(Boolean isSave, Long riskSourceId, LatentDangerLevelEnum levelEnum,
levelEnum, Long pointId, Long dangerId) { Long pointId, Long dangerId) {
// RiskSourceBo riskSourceBo = riskSourceMapper.getById(riskSourceId); // RiskSourceBo riskSourceBo = riskSourceMapper.getById(riskSourceId);
// if (riskSourceBo != null) { // if (riskSourceBo != null) {
// if (isSave) { // if (isSave) {
...@@ -1739,11 +1813,12 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1739,11 +1813,12 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
private String checkHasSeriousDanger(List<LatentDangerBo> latentDangerBos) { private String checkHasSeriousDanger(List<LatentDangerBo> latentDangerBos) {
String dangerLevel; String dangerLevel;
List<LatentDangerLevelEnum> levelEnums = Lists.newArrayList(); List<LatentDangerLevelEnum> levelEnums = Lists.newArrayList();
Map<String, List<LatentDangerBo>> map = Map<String, List<LatentDangerBo>> map = latentDangerBos.stream()
latentDangerBos.stream().collect(Collectors.groupingBy(LatentDangerBo::getDangerLevel)); .collect(Collectors.groupingBy(LatentDangerBo::getDangerLevel));
map.keySet().forEach(l -> levelEnums.add(LatentDangerLevelEnum.getEnumByCode(l))); map.keySet().forEach(l -> levelEnums.add(LatentDangerLevelEnum.getEnumByCode(l)));
int order = levelEnums.stream().mapToInt(LatentDangerLevelEnum::getOrder).max().getAsInt(); int order = levelEnums.stream().mapToInt(LatentDangerLevelEnum::getOrder).max().getAsInt();
dangerLevel = Objects.requireNonNull(LatentDangerLevelEnum.getEnumByOrder(order)).getRiskSourceDangerLevelCode(); dangerLevel = Objects.requireNonNull(LatentDangerLevelEnum.getEnumByOrder(order))
.getRiskSourceDangerLevelCode();
return dangerLevel; return dangerLevel;
} }
...@@ -1832,12 +1907,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1832,12 +1907,13 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
return result.getResult(); return result.getResult();
} }
@Override @Override
public Set<Map<String, String>> getAllDangerState() { public Set<Map<String, String>> getAllDangerState() {
Set<Map<String, String>> levelList = new HashSet<Map<String, String>>(); Set<Map<String, String>> levelList = new HashSet<Map<String, String>>();
List<LatentDangerState.SupervisionDangerStateEnum> supervisionDangerStateList = Lists.newArrayList(LatentDangerState.SupervisionDangerStateEnum.values()); List<LatentDangerState.SupervisionDangerStateEnum> supervisionDangerStateList = Lists
List<LatentDangerState.PatrolDangerStateEnum> patrolDangerStateEnumList = Lists.newArrayList(LatentDangerState.PatrolDangerStateEnum.values()); .newArrayList(LatentDangerState.SupervisionDangerStateEnum.values());
List<LatentDangerState.PatrolDangerStateEnum> patrolDangerStateEnumList = Lists
.newArrayList(LatentDangerState.PatrolDangerStateEnum.values());
Set<String> bizTypeSet = getBizTypeSet(); Set<String> bizTypeSet = getBizTypeSet();
...@@ -1863,11 +1939,12 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1863,11 +1939,12 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
private Set<String> getBizTypeSet() { private Set<String> getBizTypeSet() {
ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId() ReginParams reginParam = JSON.parseObject(redisUtils
, RequestContext.getToken())).toString(), ReginParams.class); .get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(),
ReginParams.class);
// 获取隐患列表配置的数据权限 // 获取隐患列表配置的数据权限
Map<String, List<PermissionDataruleModel>> dataAuthorization = Privilege.permissionDataruleClient.queryByUser(reginParam.getUserModel().getUserId(), Map<String, List<PermissionDataruleModel>> dataAuthorization = Privilege.permissionDataruleClient
dangerDataAuthInterfacePath).getResult(); .queryByUser(reginParam.getUserModel().getUserId(), dangerDataAuthInterfacePath).getResult();
Set<String> bizTypeSet = Sets.newHashSet(); Set<String> bizTypeSet = Sets.newHashSet();
// 没有隐患列表的数据权限，返回空 // 没有隐患列表的数据权限，返回空
if (ValidationUtil.isEmpty(dataAuthorization)) { if (ValidationUtil.isEmpty(dataAuthorization)) {
...@@ -1912,8 +1989,10 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1912,8 +1989,10 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
if (!ValidationUtil.isEmpty(userModels)) { if (!ValidationUtil.isEmpty(userModels)) {
Map<String, AgencyUserModel> userMap = Maps.uniqueIndex(userModels, AgencyUserModel::getUserId); Map<String, AgencyUserModel> userMap = Maps.uniqueIndex(userModels, AgencyUserModel::getUserId);
result.forEach(r -> { result.forEach(r -> {
r.put("executeUserName", !ValidationUtil.isEmpty(r.get("executeUserId")) ? userMap.get(r.get( r.put("executeUserName",
"executeUserId")).getRealName() : ""); !ValidationUtil.isEmpty(r.get("executeUserId"))
? userMap.get(r.get("executeUserId")).getRealName()
: "");
List<String> handleUserNames = Lists.newArrayList(); List<String> handleUserNames = Lists.newArrayList();
if (!ValidationUtil.isEmpty(r.get("handleUserIds"))) { if (!ValidationUtil.isEmpty(r.get("handleUserIds"))) {
List<String> handleUserIds = Arrays.asList(r.get("handleUserIds").toString().split(",")); List<String> handleUserIds = Arrays.asList(r.get("handleUserIds").toString().split(","));
...@@ -1939,7 +2018,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1939,7 +2018,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
@Override @Override
public IPage<LatentDanger> pageListDanger(PageParam pageParam) throws Exception { public IPage<LatentDanger> pageListDanger(PageParam pageParam, String userId) throws Exception {
List allTaskList; List allTaskList;
String idsStr = (String) pageParam.get("dangerIds"); String idsStr = (String) pageParam.get("dangerIds");
List<String> dangerIdList = Lists.newArrayList(); List<String> dangerIdList = Lists.newArrayList();
...@@ -1957,8 +2036,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1957,8 +2036,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
if (!ValidationUtil.isEmpty(allTaskList)) { if (!ValidationUtil.isEmpty(allTaskList)) {
allTaskList.forEach(m -> instanceIdList.add(((Map) m).get("processInstanceId").toString())); allTaskList.forEach(m -> instanceIdList.add(((Map) m).get("processInstanceId").toString()));
// 查询对应instanceId的隐患数据 // 查询对应instanceId的隐患数据
dangers = dangers = this.baseMapper.selectList(
this.baseMapper.selectList(new LambdaQueryWrapper<LatentDanger>().in(LatentDanger::getInstanceId, instanceIdList)); new LambdaQueryWrapper<LatentDanger>().in(LatentDanger::getInstanceId, instanceIdList));
List<String> finalDangerIdList = dangerIdList; List<String> finalDangerIdList = dangerIdList;
dangers.forEach(d -> finalDangerIdList.add(d.getId().toString())); dangers.forEach(d -> finalDangerIdList.add(d.getId().toString()));
} }
...@@ -1979,7 +2058,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -1979,7 +2058,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
if (structureId != null && structureId.toString().trim().length() > 0) { if (structureId != null && structureId.toString().trim().length() > 0) {
ResponseModel<Object> response = equipFeign.getBuildingTree(); ResponseModel<Object> response = equipFeign.getBuildingTree();
List<Map<String, Object>> buildingTree = (List<Map<String, Object>>) response.getResult(); List<Map<String, Object>> buildingTree = (List<Map<String, Object>>) response.getResult();
Map<String, Object> node = getAllNodes(buildingTree).stream().filter(map -> structureId.equals(map.get("id"))).findFirst().orElse(null); Map<String, Object> node = getAllNodes(buildingTree).stream()
.filter(map -> structureId.equals(map.get("id"))).findFirst().orElse(null);
if (node != null) { if (node != null) {
structureIdList = findBuildChildrenIds(node); structureIdList = findBuildChildrenIds(node);
pageParam.put("structureIdList", structureIdList); pageParam.put("structureIdList", structureIdList);
...@@ -2021,9 +2101,29 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2021,9 +2101,29 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
} }
// pageParam.put("bizType", bizType); // pageParam.put("bizType", bizType);
Page page = new Page(pageParam.getParamPageCurrent(), pageParam.getParamPageSize()); Page page = new Page(pageParam.getParamPageCurrent(), pageParam.getParamPageSize());
/*
* 处置隐患页面excle导入外部隐患信息无法实现，获取不到数据，以及由当前人导入的数据只能由当前人看见的权限设置------------------by
* 陈浩 on 2022-04-14--start
*/
int isDraft =0;
if(pageParam.containsKey("isDraft")) {
isDraft = Integer.parseInt(pageParam.get("isDraft").toString());
if (isDraft == 1) {
pageParam.put("userId", userId);
}
}else {
pageParam.put("isDraft", 0);
}
IPage<LatentDanger> iPage = this.baseMapper.selectPageByParam(page, (Map<String, Object>) pageParam); IPage<LatentDanger> iPage = this.baseMapper.selectPageByParam(page, (Map<String, Object>) pageParam);
if (isDraft == 1 && pageParam.containsKey("userId")) {
pageParam.remove("userId");
pageParam.remove("isDraft");
}
/*
* 处置隐患页面excle导入外部隐患信息无法实现，获取不到数据，以及由当前人导入的数据只能由当前人看见的权限设置------------------by
* 陈浩 on 2022-04-14--end
*/
if (iPage.getCurrent() != pageParam.getParamPageCurrent()) { if (iPage.getCurrent() != pageParam.getParamPageCurrent()) {
iPage.setRecords(Lists.newArrayList()); iPage.setRecords(Lists.newArrayList());
iPage.setTotal(0); iPage.setTotal(0);
...@@ -2039,30 +2139,39 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2039,30 +2139,39 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
} catch (Exception e) { } catch (Exception e) {
} }
Map<String, Object> finalBuildingAbsolutePositionMap = Map<String, Object> finalBuildingAbsolutePositionMap = ValidationUtil.isEmpty(buildingAbsolutePositionMap)
ValidationUtil.isEmpty(buildingAbsolutePositionMap) ? new HashMap<>() : buildingAbsolutePositionMap; ? new HashMap<>()
: buildingAbsolutePositionMap;
iPage.getRecords().forEach(danger -> { iPage.getRecords().forEach(danger -> {
if (!ValidationUtil.isEmpty(danger.getStructureId()) && !ValidationUtil.isEmpty(finalBuildingAbsolutePositionMap.get(danger.getStructureId().toString()))) { if (!ValidationUtil.isEmpty(danger.getStructureId()) && !ValidationUtil
danger.setStructureName(finalBuildingAbsolutePositionMap.get(danger.getStructureId().toString()).toString()); .isEmpty(finalBuildingAbsolutePositionMap.get(danger.getStructureId().toString()))) {
danger.setStructureName(
finalBuildingAbsolutePositionMap.get(danger.getStructureId().toString()).toString());
} }
LatentDangerBizTypeEnum bizTypeEnum = LatentDangerBizTypeEnum.getByCode(danger.getBizType()); LatentDangerBizTypeEnum bizTypeEnum = LatentDangerBizTypeEnum.getByCode(danger.getBizType());
if (bizType.equals(danger.getBizType())) { if (bizType.equals(danger.getBizType())) {
LatentDangerState.SupervisionDangerStateEnum dangerStateEnum = LatentDangerState.SupervisionDangerStateEnum.getEnumByCode(danger.getDangerState()); LatentDangerState.SupervisionDangerStateEnum dangerStateEnum = LatentDangerState.SupervisionDangerStateEnum
.getEnumByCode(danger.getDangerState());
danger.setProcessState(dangerStateEnum.getProcessState()); danger.setProcessState(dangerStateEnum.getProcessState());
LatentDangerProcessStateEnum processStateEnum = LatentDangerProcessStateEnum.getByCode(danger.getProcessState()); LatentDangerProcessStateEnum processStateEnum = LatentDangerProcessStateEnum
.getByCode(danger.getProcessState());
danger.setProcessStateName(processStateEnum.getName()); danger.setProcessStateName(processStateEnum.getName());
} }
if (LatentDangerBizTypeEnum.巡检.getCode().equals(danger.getBizType())) { if (LatentDangerBizTypeEnum.巡检.getCode().equals(danger.getBizType())) {
// 巡检隐患等级 // 巡检隐患等级
LatentDangerLevelEnum levelEnum = Arrays.stream(LatentDangerLevelEnum.values()).filter(l -> l.getCode().equals(danger.getDangerLevel())).findFirst().get(); LatentDangerLevelEnum levelEnum = Arrays.stream(LatentDangerLevelEnum.values())
.filter(l -> l.getCode().equals(danger.getDangerLevel())).findFirst().get();
danger.setDangerLevelName(levelEnum.getName()); danger.setDangerLevelName(levelEnum.getName());
// 巡检整改方式 // 巡检整改方式
if (!ValidationUtil.isEmpty(danger.getReformType())) { if (!ValidationUtil.isEmpty(danger.getReformType())) {
LatentDangerReformTypeEnum reformTypeEnum = Arrays.stream(LatentDangerReformTypeEnum.values()).filter(l -> l.getCode().equals(danger.getReformType())).findFirst().get(); LatentDangerReformTypeEnum reformTypeEnum = Arrays.stream(LatentDangerReformTypeEnum.values())
.filter(l -> l.getCode().equals(danger.getReformType())).findFirst().get();
danger.setReformTypeName(reformTypeEnum.getName()); danger.setReformTypeName(reformTypeEnum.getName());
} }
// 巡检隐患状态 // 巡检隐患状态
LatentDangerState.PatrolDangerStateEnum patrolDangerStateEnum = Arrays.stream(LatentDangerState.PatrolDangerStateEnum.values()).filter(l -> l.getCode().equals(danger.getDangerState())).findFirst().get(); LatentDangerState.PatrolDangerStateEnum patrolDangerStateEnum = Arrays
.stream(LatentDangerState.PatrolDangerStateEnum.values())
.filter(l -> l.getCode().equals(danger.getDangerState())).findFirst().get();
danger.setDangerStateName(patrolDangerStateEnum.getName()); danger.setDangerStateName(patrolDangerStateEnum.getName());
// 巡检隐患来源 // 巡检隐患来源
danger.setDangerTypeName(LatentDangerTypeEnum.getEnumName(danger.getDangerType())); danger.setDangerTypeName(LatentDangerTypeEnum.getEnumName(danger.getDangerType()));
...@@ -2088,7 +2197,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2088,7 +2197,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
private List<Long> findBuildChildrenIds(Map<String, Object> building) { private List<Long> findBuildChildrenIds(Map<String, Object> building) {
List<Map<String, Object>> buildingTree = getAllNodes(Collections.singletonList(building)); List<Map<String, Object>> buildingTree = getAllNodes(Collections.singletonList(building));
return buildingTree.stream().map(build -> Long.valueOf(build.get("id").toString())).collect(Collectors.toList()); return buildingTree.stream().map(build -> Long.valueOf(build.get("id").toString()))
.collect(Collectors.toList());
} }
@Override @Override
...@@ -2107,9 +2217,11 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2107,9 +2217,11 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
Map<String, Object> param = new HashMap<>(); Map<String, Object> param = new HashMap<>();
String beginTime = ""; String beginTime = "";
if (dateTime != null && dateTime == 7) { if (dateTime != null && dateTime == 7) {
beginTime = com.yeejoin.amos.latentdanger.core.util.DateUtil.getIntervalDateStr(new Date(), -7, "yyyy-MM-dd"); beginTime = com.yeejoin.amos.latentdanger.core.util.DateUtil.getIntervalDateStr(new Date(), -7,
"yyyy-MM-dd");
} else if (dateTime != null && dateTime == 30) { } else if (dateTime != null && dateTime == 30) {
beginTime = com.yeejoin.amos.latentdanger.core.util.DateUtil.getIntervalDateStr(new Date(), -30, "yyyy-MM-dd"); beginTime = com.yeejoin.amos.latentdanger.core.util.DateUtil.getIntervalDateStr(new Date(), -30,
"yyyy-MM-dd");
} else { } else {
beginTime = com.yeejoin.amos.latentdanger.core.util.DateUtil.getShortCurrentDate(); beginTime = com.yeejoin.amos.latentdanger.core.util.DateUtil.getShortCurrentDate();
} }
...@@ -2118,15 +2230,20 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2118,15 +2230,20 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
String d; String d;
if (0 < list.size()) { if (0 < list.size()) {
for (DangerTimeAxisVo vo : list) { for (DangerTimeAxisVo vo : list) {
AgencyUserModel userModel = remoteSecurityService.getUserById(RequestContext.getToken(), getProduct(), RequestContext.getAppKey(), vo.getExecuteUserId().toString()); AgencyUserModel userModel = remoteSecurityService.getUserById(RequestContext.getToken(), getProduct(),
RequestContext.getAppKey(), vo.getExecuteUserId().toString());
vo.setUserName(userModel.getRealName()); vo.setUserName(userModel.getRealName());
vo.setDangerState(LatentDangerStateEnum.getEnumName(vo.getDangerState())); vo.setDangerState(LatentDangerStateEnum.getEnumName(vo.getDangerState()));
vo.setXAxis(null == vo.getUpdateDate() ? DateUtil.getDateFormat(new Date(), DateUtil.DATETIME_DEFAULT_FORMAT) : DateUtil.getDateFormat(vo.getUpdateDate(), DateUtil.DATETIME_DEFAULT_FORMAT)); vo.setXAxis(null == vo.getUpdateDate()
? DateUtil.getDateFormat(new Date(), DateUtil.DATETIME_DEFAULT_FORMAT)
: DateUtil.getDateFormat(vo.getUpdateDate(), DateUtil.DATETIME_DEFAULT_FORMAT));
vo.setRow1(vo.getUserName() + "-" + vo.getDangerState() + "-" + vo.getDangerName()); vo.setRow1(vo.getUserName() + "-" + vo.getDangerState() + "-" + vo.getDangerName());
if ("3".equals(vo.getReformType())) { if ("3".equals(vo.getReformType())) {
d = null == vo.getDelayLimitDate() ? "无" : DateUtil.getDateFormat(vo.getDelayLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT); d = null == vo.getDelayLimitDate() ? "无"
: DateUtil.getDateFormat(vo.getDelayLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT);
} else { } else {
d = null == vo.getReformLimitDate() ? "无" : DateUtil.getDateFormat(vo.getReformLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT); d = null == vo.getReformLimitDate() ? "无"
: DateUtil.getDateFormat(vo.getReformLimitDate(), DateUtil.DATETIME_DEFAULT_FORMAT);
} }
vo.setRow2(vo.getStructureName() + "-" + d); vo.setRow2(vo.getStructureName() + "-" + d);
} }
...@@ -2135,16 +2252,17 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2135,16 +2252,17 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
} }
private List<DangerListResponse> dangerList(List<DangerListResponse> dangerListResponseList) { private List<DangerListResponse> dangerList(List<DangerListResponse> dangerListResponseList) {
JSONArray array = remoteSecurityService.listDictionaryByDictCode(RequestContext.getToken(), getProduct(), RequestContext.getAppKey(), JSONArray array = remoteSecurityService.listDictionaryByDictCode(RequestContext.getToken(), getProduct(),
DictTypeEnum.DANGERLEVEL.getCode()); RequestContext.getAppKey(), DictTypeEnum.DANGERLEVEL.getCode());
List<DictBo> dangerLevelList = JSONArray.parseArray(array.toJSONString(), DictBo.class); List<DictBo> dangerLevelList = JSONArray.parseArray(array.toJSONString(), DictBo.class);
for (DangerListResponse e : dangerListResponseList) { for (DangerListResponse e : dangerListResponseList) {
e.setDangerState(LatentDangerStateEnum.getEnumName(e.getDangerState())); e.setDangerState(LatentDangerStateEnum.getEnumName(e.getDangerState()));
DictBo dangerLevel = DictBo dangerLevel = dangerLevelList.stream()
dangerLevelList.stream().filter(item -> item.getDictDataKey().equals(e.getDangerLevel())).collect(Collectors.toList()).get(0); .filter(item -> item.getDictDataKey().equals(e.getDangerLevel())).collect(Collectors.toList())
.get(0);
e.setDangerLevel(dangerLevel.getDictDataValue()); e.setDangerLevel(dangerLevel.getDictDataValue());
e.setReformType(!!ValidationUtil.isEmpty(e.getReformType()) ? "" : e.setReformType(!!ValidationUtil.isEmpty(e.getReformType()) ? ""
LatentDangerReformTypeEnum.getEnumByCode(e.getReformType()).getName()); : LatentDangerReformTypeEnum.getEnumByCode(e.getReformType()).getName());
e.setOvertimeState("0".equals(e.getOvertimeState()) ? "否" : "是"); e.setOvertimeState("0".equals(e.getOvertimeState()) ? "否" : "是");
e.setDangerTypeName(LatentDangerTypeEnum.getEnumName(e.getDangerType())); e.setDangerTypeName(LatentDangerTypeEnum.getEnumName(e.getDangerType()));
e.setDeadline(null == e.getDeadlineDate() ? "" : DateUtil.getLongDate(e.getDeadlineDate())); e.setDeadline(null == e.getDeadlineDate() ? "" : DateUtil.getLongDate(e.getDeadlineDate()));
...@@ -2188,10 +2306,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2188,10 +2306,9 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
lambdaQueryWrapper.le(LatentDanger::getCreateDate, searchParam.getEndTime()); lambdaQueryWrapper.le(LatentDanger::getCreateDate, searchParam.getEndTime());
} }
if (ValidationUtil.isEmpty(searchParam.getDangerIds())) { if (ValidationUtil.isEmpty(searchParam.getDangerIds())) {
lambdaQueryWrapper.and(o -> lambdaQueryWrapper.and(o -> o.likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "*").or()
o.likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "*") .likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "-").or()
.or().likeRight(LatentDanger::getOrgCode, searchParam.getOrgCode() + "-") .eq(LatentDanger::getOrgCode, searchParam.getOrgCode()));
.or().eq(LatentDanger::getOrgCode, searchParam.getOrgCode()));
} }
List<LatentDanger> latentDangerList = this.baseMapper.selectList(lambdaQueryWrapper); List<LatentDanger> latentDangerList = this.baseMapper.selectList(lambdaQueryWrapper);
if (!ValidationUtil.isEmpty(latentDangerList)) { if (!ValidationUtil.isEmpty(latentDangerList)) {
...@@ -2199,17 +2316,18 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2199,17 +2316,18 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
latentDangerList.forEach(danger -> { latentDangerList.forEach(danger -> {
List<LatentDangerFlowRecordBo> recordList = latentDangerFlowRecordMapper.listByDangerId(danger.getId()); List<LatentDangerFlowRecordBo> recordList = latentDangerFlowRecordMapper.listByDangerId(danger.getId());
if (!ValidationUtil.isEmpty(recordList)) { if (!ValidationUtil.isEmpty(recordList)) {
List<LatentDangerState.SupervisionDangerStateEnum> stateEnums = List<LatentDangerState.SupervisionDangerStateEnum> stateEnums = LatentDangerState.SupervisionDangerStateEnum
LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.待复核.getCode()); .getEnumListByProcessState(LatentDangerProcessStateEnum.待复核.getCode());
Set<String> stateSet = Sets.newHashSet(); Set<String> stateSet = Sets.newHashSet();
List<String> stateList = Lists.transform(stateEnums, List<String> stateList = Lists.transform(stateEnums,
LatentDangerState.SupervisionDangerStateEnum::getCode); LatentDangerState.SupervisionDangerStateEnum::getCode);
stateSet.addAll(stateList); stateSet.addAll(stateList);
List<LatentDangerFlowRecordBo> firstRecord = List<LatentDangerFlowRecordBo> firstRecord = recordList.stream().filter(
recordList.stream().filter(r -> LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode().equals(r.getActionFlag())).collect(Collectors.toList()); r -> LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode().equals(r.getActionFlag()))
.collect(Collectors.toList());
danger.setCheckUserName(firstRecord.get(0).getExecuteUserName()); danger.setCheckUserName(firstRecord.get(0).getExecuteUserName());
recordList = recordList = recordList.stream().filter(r -> stateSet.contains(r.getDangerState()))
recordList.stream().filter(r -> stateSet.contains(r.getDangerState())).collect(Collectors.toList()); .collect(Collectors.toList());
Set<String> nameSet = Sets.newHashSet(); Set<String> nameSet = Sets.newHashSet();
nameSet.addAll(Lists.transform(recordList, LatentDangerFlowRecordBo::getExecuteUserName)); nameSet.addAll(Lists.transform(recordList, LatentDangerFlowRecordBo::getExecuteUserName));
danger.setExecuteUserName(Joiner.on(",").join(nameSet)); danger.setExecuteUserName(Joiner.on(",").join(nameSet));
...@@ -2221,8 +2339,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2221,8 +2339,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
@Override @Override
public Boolean delete(String ids) throws Exception { public Boolean delete(String ids) throws Exception {
List<Long> dangerIdList = List<Long> dangerIdList = Arrays.stream(ids.split(",")).mapToLong(Long::parseLong).boxed()
Arrays.stream(ids.split(",")).mapToLong(Long::parseLong).boxed().collect(Collectors.toList()); .collect(Collectors.toList());
LambdaQueryWrapper<LatentDanger> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LatentDanger> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(LatentDanger::getId, dangerIdList).isNull(LatentDanger::getInstanceId); queryWrapper.in(LatentDanger::getId, dangerIdList).isNull(LatentDanger::getInstanceId);
List<LatentDanger> dangerList = this.baseMapper.selectList(queryWrapper); List<LatentDanger> dangerList = this.baseMapper.selectList(queryWrapper);
...@@ -2259,8 +2377,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2259,8 +2377,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public ExecuteSubmitDto dangerAudit(LatentDangerDto latentDangerDto, Integer executeType, String userId, String userName, public ExecuteSubmitDto dangerAudit(LatentDangerDto latentDangerDto, Integer executeType, String userId,
String deptId, String deptName, ReginParams reginParams) throws Exception { String userName, String deptId, String deptName, ReginParams reginParams) throws Exception {
LatentDanger latentDanger = this.baseMapper.selectById(latentDangerDto.getId()); LatentDanger latentDanger = this.baseMapper.selectById(latentDangerDto.getId());
if (ValidationUtil.isEmpty(latentDanger)) { if (ValidationUtil.isEmpty(latentDanger)) {
throw new Exception("隐患不存"); throw new Exception("隐患不存");
...@@ -2274,8 +2392,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2274,8 +2392,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
this.updateById(latentDanger); this.updateById(latentDanger);
DangerExecuteSubmitDto executeSubmitDto = new DangerExecuteSubmitDto(); DangerExecuteSubmitDto executeSubmitDto = new DangerExecuteSubmitDto();
LatentDangerExecuteParam executeParam = new LatentDangerExecuteParam(); LatentDangerExecuteParam executeParam = new LatentDangerExecuteParam();
if (ValidationUtil.isEmpty(executeType) || if (ValidationUtil.isEmpty(executeType) || (LatentDangerState.SupervisionDangerStateEnum.整改任务分配.getCode()
(LatentDangerState.SupervisionDangerStateEnum.整改任务分配.getCode().equals(latentDangerDto.getDangerState()) .equals(latentDangerDto.getDangerState())
&& ValidationUtil.isEmpty(latentDangerDto.getReformLeaderId()))) { && ValidationUtil.isEmpty(latentDangerDto.getReformLeaderId()))) {
executeSubmitDto.setIsOk(false); executeSubmitDto.setIsOk(false);
executeSubmitDto.setMsg("执行参数有误"); executeSubmitDto.setMsg("执行参数有误");
...@@ -2296,31 +2414,35 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2296,31 +2414,35 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
return executeSubmitDto; return executeSubmitDto;
} }
public void sendSubmitMessage(Integer executeType, LatentDanger latentDanger, DangerExecuteSubmitDto executeSubmitDto) throws Exception { public void sendSubmitMessage(Integer executeType, LatentDanger latentDanger,
List<String> userIds = workflowExecuteService.getUserIdsByWorkflow(latentDanger.getInstanceId(), executeSubmitDto.getCheckLeaderId()); DangerExecuteSubmitDto executeSubmitDto) throws Exception {
ruleDangerService.addDangerSubmitRule(latentDanger, userIds, RuleTypeEnum.隐患审核.getCode(), ExecuteTypeEnum.getNameByCode(executeType)); List<String> userIds = workflowExecuteService.getUserIdsByWorkflow(latentDanger.getInstanceId(),
executeSubmitDto.getCheckLeaderId());
ruleDangerService.addDangerSubmitRule(latentDanger, userIds, RuleTypeEnum.隐患审核.getCode(),
ExecuteTypeEnum.getNameByCode(executeType));
} }
@Override @Override
public IPage<LatentDanger> reviewListDanger(PageParam pageParam) throws Exception { public IPage<LatentDanger> reviewListDanger(PageParam pageParam, String userId) throws Exception {
String type = pageParam.get("type").toString(); String type = pageParam.get("type").toString();
if (AuditEnum.AUDIT.getCode().equals(type)) { if (AuditEnum.AUDIT.getCode().equals(type)) {
List<LatentDangerState.SupervisionDangerStateEnum> stateEnums = List<LatentDangerState.SupervisionDangerStateEnum> stateEnums = LatentDangerState.SupervisionDangerStateEnum
LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.待审核.getCode()); .getEnumListByProcessState(LatentDangerProcessStateEnum.待审核.getCode());
List<String> dangerState = stateEnums.stream().map(stateEnum -> stateEnum != null ? List<String> dangerState = stateEnums.stream()
stateEnum.getCode() : null).collect(Collectors.toList()); .map(stateEnum -> stateEnum != null ? stateEnum.getCode() : null).collect(Collectors.toList());
dangerState.add(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode()); dangerState.add(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode());
// 审核状态 // 审核状态
pageParam.put("dangerState", Joiner.on(",").join(dangerState)); pageParam.put("dangerState", Joiner.on(",").join(dangerState));
} else if (AuditEnum.REVIEW.getCode().equals(type)) { } else if (AuditEnum.REVIEW.getCode().equals(type)) {
List<LatentDangerState.SupervisionDangerStateEnum> stateEnums = List<LatentDangerState.SupervisionDangerStateEnum> stateEnums = LatentDangerState.SupervisionDangerStateEnum
LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.待复核.getCode()); .getEnumListByProcessState(LatentDangerProcessStateEnum.待复核.getCode());
List<String> dangerState = stateEnums.stream().map(stateEnum -> stateEnum != null ? stateEnum.getCode() : null).collect(Collectors.toList()); List<String> dangerState = stateEnums.stream()
.map(stateEnum -> stateEnum != null ? stateEnum.getCode() : null).collect(Collectors.toList());
// 复核状态 // 复核状态
pageParam.put("dangerState", Joiner.on(",").join(dangerState)); pageParam.put("dangerState", Joiner.on(",").join(dangerState));
} }
pageParam.put("bizType", bizType); pageParam.put("bizType", bizType);
return pageListDanger(pageParam); return pageListDanger(pageParam, userId);
} }
@Override @Override
...@@ -2333,11 +2455,18 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2333,11 +2455,18 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
pDangerStateEnumList.add(LatentDangerState.PatrolDangerStateEnum.已撤销); pDangerStateEnumList.add(LatentDangerState.PatrolDangerStateEnum.已撤销);
// 防火监督未关闭隐患状态集合 // 防火监督未关闭隐患状态集合
List<LatentDangerState.SupervisionDangerStateEnum> sDangerStateEnumList = Lists.newArrayList(); List<LatentDangerState.SupervisionDangerStateEnum> sDangerStateEnumList = Lists.newArrayList();
sDangerStateEnumList.addAll(LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.未审核.getCode())); sDangerStateEnumList.addAll(LatentDangerState.SupervisionDangerStateEnum
sDangerStateEnumList.addAll(LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.待审核.getCode())); .getEnumListByProcessState(LatentDangerProcessStateEnum.未审核.getCode()));
sDangerStateEnumList.addAll(LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.治理完毕.getCode())); sDangerStateEnumList.addAll(LatentDangerState.SupervisionDangerStateEnum
.getEnumListByProcessState(LatentDangerProcessStateEnum.待审核.getCode()));
sDangerStateEnumList.addAll(LatentDangerState.SupervisionDangerStateEnum
.getEnumListByProcessState(LatentDangerProcessStateEnum.治理完毕.getCode()));
return this.baseMapper.selectUnFinishedCount(pDangerStateEnumList.stream().map(LatentDangerState.PatrolDangerStateEnum::getCode).collect(Collectors.toList()), sDangerStateEnumList.stream().map(LatentDangerState.SupervisionDangerStateEnum::getCode).collect(Collectors.toList())); return this.baseMapper.selectUnFinishedCount(
pDangerStateEnumList.stream().map(LatentDangerState.PatrolDangerStateEnum::getCode)
.collect(Collectors.toList()),
sDangerStateEnumList.stream().map(LatentDangerState.SupervisionDangerStateEnum::getCode)
.collect(Collectors.toList()));
} }
@Override @Override
...@@ -2350,77 +2479,101 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD ...@@ -2350,77 +2479,101 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
List<LatentDanger> dangerList = listAllDanger(param); List<LatentDanger> dangerList = listAllDanger(param);
Map<String, List<LatentDanger>> map = Maps.newHashMap(); Map<String, List<LatentDanger>> map = Maps.newHashMap();
List<LatentDangerState.SupervisionDangerStateEnum> reviewEnum1 = List<LatentDangerState.SupervisionDangerStateEnum> reviewEnum1 = LatentDangerState.SupervisionDangerStateEnum
LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.待整改资料提交.getCode()); .getEnumListByProcessState(LatentDangerProcessStateEnum.待整改资料提交.getCode());
List<LatentDangerState.SupervisionDangerStateEnum> reviewEnum2 = List<LatentDangerState.SupervisionDangerStateEnum> reviewEnum2 = LatentDangerState.SupervisionDangerStateEnum
LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.待复核.getCode()); .getEnumListByProcessState(LatentDangerProcessStateEnum.待复核.getCode());
Set<String> reviewStateNameSet = Sets.newHashSet(); Set<String> reviewStateNameSet = Sets.newHashSet();
Set<String> finishStateNameSet = Sets.newHashSet(); Set<String> finishStateNameSet = Sets.newHashSet();
// 复查隐患指的是在本次在T1至 T2时间段内，提交隐患整改资料，并进入隐患整改审核流程 的隐患 // 复查隐患指的是在本次在T1至 T2时间段内，提交隐患整改资料，并进入隐患整改审核流程 的隐患
reviewStateNameSet.addAll(reviewEnum1.stream().map(supervisionDangerStateEnum -> reviewStateNameSet.addAll(reviewEnum1.stream()
supervisionDangerStateEnum != null ? supervisionDangerStateEnum.getCode() : null).collect(Collectors.toList())); .map(supervisionDangerStateEnum -> supervisionDangerStateEnum != null
reviewStateNameSet.addAll(reviewEnum2.stream().map(supervisionDangerStateEnum -> ? supervisionDangerStateEnum.getCode()
supervisionDangerStateEnum != null ? supervisionDangerStateEnum.getCode() : null).collect(Collectors.toList())); : null)
.collect(Collectors.toList()));
reviewStateNameSet.addAll(reviewEnum2.stream()
.map(supervisionDangerStateEnum -> supervisionDangerStateEnum != null
? supervisionDangerStateEnum.getCode()
: null)
.collect(Collectors.toList()));
// 复查已整改隐患指的是在本次在T1至 T2时间段内，已经审核通过（全部审核流程通过）的隐患 // 复查已整改隐患指的是在本次在T1至 T2时间段内，已经审核通过（全部审核流程通过）的隐患
List<LatentDangerState.SupervisionDangerStateEnum> reviewEnum3 = List<LatentDangerState.SupervisionDangerStateEnum> reviewEnum3 = LatentDangerState.SupervisionDangerStateEnum
LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.治理完毕.getCode()); .getEnumListByProcessState(LatentDangerProcessStateEnum.治理完毕.getCode());
finishStateNameSet.addAll(reviewEnum3.stream().map(supervisionDangerStateEnum -> finishStateNameSet.addAll(reviewEnum3.stream()
supervisionDangerStateEnum != null ? supervisionDangerStateEnum.getCode() : null).collect(Collectors.toList())); .map(supervisionDangerStateEnum -> supervisionDangerStateEnum != null
? supervisionDangerStateEnum.getCode()
: null)
.collect(Collectors.toList()));
// 复查隐患 // 复查隐患
map.put("reviewDangerList", dangerList.stream().filter(d -> reviewStateNameSet.contains(d.getDangerState())).collect(Collectors.toList())); map.put("reviewDangerList", dangerList.stream().filter(d -> reviewStateNameSet.contains(d.getDangerState()))
.collect(Collectors.toList()));
// 复查已整改隐患 // 复查已整改隐患
map.put("reviewReformedList", dangerList.stream().filter(d -> finishStateNameSet.contains(d.getDangerState())).collect(Collectors.toList())); map.put("reviewReformedList", dangerList.stream().filter(d -> finishStateNameSet.contains(d.getDangerState()))
.collect(Collectors.toList()));
// 遗留隐患问题：指的是截止T2时间，尚未提交隐患整改资料的 隐患数量。 // 遗留隐患问题：指的是截止T2时间，尚未提交隐患整改资料的 隐患数量。
param.setStartTime(null); param.setStartTime(null);
List<LatentDanger> dangerList2 = listAllDanger(param); List<LatentDanger> dangerList2 = listAllDanger(param);
Set<String> remainingStateNameSet = Sets.newHashSet(); Set<String> remainingStateNameSet = Sets.newHashSet();
List<LatentDangerState.SupervisionDangerStateEnum> reviewEnum4 = List<LatentDangerState.SupervisionDangerStateEnum> reviewEnum4 = LatentDangerState.SupervisionDangerStateEnum
LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.未审核.getCode()); .getEnumListByProcessState(LatentDangerProcessStateEnum.未审核.getCode());
List<LatentDangerState.SupervisionDangerStateEnum> reviewEnum5 = List<LatentDangerState.SupervisionDangerStateEnum> reviewEnum5 = LatentDangerState.SupervisionDangerStateEnum
LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.待审核.getCode()); .getEnumListByProcessState(LatentDangerProcessStateEnum.待审核.getCode());
List<LatentDangerState.SupervisionDangerStateEnum> reviewEnum6 = List<LatentDangerState.SupervisionDangerStateEnum> reviewEnum6 = LatentDangerState.SupervisionDangerStateEnum
LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.待整改.getCode()); .getEnumListByProcessState(LatentDangerProcessStateEnum.待整改.getCode());
remainingStateNameSet.addAll(reviewEnum4.stream().map(supervisionDangerStateEnum -> remainingStateNameSet.addAll(reviewEnum4.stream()
supervisionDangerStateEnum != null ? supervisionDangerStateEnum.getCode() : null).collect(Collectors.toList())); .map(supervisionDangerStateEnum -> supervisionDangerStateEnum != null
remainingStateNameSet.addAll(reviewEnum5.stream().map(supervisionDangerStateEnum -> ? supervisionDangerStateEnum.getCode()
supervisionDangerStateEnum != null ? supervisionDangerStateEnum.getCode() : null).collect(Collectors.toList())); : null)
remainingStateNameSet.addAll(reviewEnum6.stream().map(supervisionDangerStateEnum -> .collect(Collectors.toList()));
supervisionDangerStateEnum != null ? supervisionDangerStateEnum.getCode() : null).collect(Collectors.toList())); remainingStateNameSet.addAll(reviewEnum5.stream()
map.put("remainingList", dangerList2.stream().filter(d -> remainingStateNameSet.contains(d.getDangerState())).collect(Collectors.toList())); .map(supervisionDangerStateEnum -> supervisionDangerStateEnum != null
? supervisionDangerStateEnum.getCode()
: null)
.collect(Collectors.toList()));
remainingStateNameSet.addAll(reviewEnum6.stream()
.map(supervisionDangerStateEnum -> supervisionDangerStateEnum != null
? supervisionDangerStateEnum.getCode()
: null)
.collect(Collectors.toList()));
map.put("remainingList", dangerList2.stream().filter(d -> remainingStateNameSet.contains(d.getDangerState()))
.collect(Collectors.toList()));
return map; return map;
} }
@Override @Override
public Map<String,Integer> getUnFinishedDangerCountMap( String loginOrgCode) { public Map<String, Integer> getUnFinishedDangerCountMap(String loginOrgCode) {
Map<String, Integer> resultMap = Maps.newHashMap(); Map<String, Integer> resultMap = Maps.newHashMap();
// 巡检隐患未关闭状态集合 // 巡检隐患未关闭状态集合
List<LatentDangerState.PatrolDangerStateEnum> pDangerStateEnumList = Lists.newArrayList(); List<LatentDangerState.PatrolDangerStateEnum> pDangerStateEnumList = Lists.newArrayList();
pDangerStateEnumList.add(LatentDangerState.PatrolDangerStateEnum.治理完毕); pDangerStateEnumList.add(LatentDangerState.PatrolDangerStateEnum.治理完毕);
pDangerStateEnumList.add(LatentDangerState.PatrolDangerStateEnum.待评审); pDangerStateEnumList.add(LatentDangerState.PatrolDangerStateEnum.待评审);
pDangerStateEnumList.add(LatentDangerState.PatrolDangerStateEnum.已撤销); pDangerStateEnumList.add(LatentDangerState.PatrolDangerStateEnum.已撤销);
Integer pDangerCount = Integer pDangerCount = this.baseMapper.selectUnFinishedCountByParam("patrol", pDangerStateEnumList.stream()
this.baseMapper.selectUnFinishedCountByParam("patrol", .map(LatentDangerState.PatrolDangerStateEnum::getCode).collect(Collectors.toList()), loginOrgCode);
pDangerStateEnumList.stream().map(LatentDangerState.PatrolDangerStateEnum::getCode).collect(Collectors.toList()),loginOrgCode);
resultMap.put("patrol", pDangerCount); resultMap.put("patrol", pDangerCount);
// 防火监督未关闭隐患状态集合 // 防火监督未关闭隐患状态集合
List<LatentDangerState.SupervisionDangerStateEnum> sDangerStateEnumList = Lists.newArrayList(); List<LatentDangerState.SupervisionDangerStateEnum> sDangerStateEnumList = Lists.newArrayList();
sDangerStateEnumList.addAll(LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.未审核.getCode())); sDangerStateEnumList.addAll(LatentDangerState.SupervisionDangerStateEnum
sDangerStateEnumList.addAll(LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.待审核.getCode())); .getEnumListByProcessState(LatentDangerProcessStateEnum.未审核.getCode()));
sDangerStateEnumList.addAll(LatentDangerState.SupervisionDangerStateEnum.getEnumListByProcessState(LatentDangerProcessStateEnum.治理完毕.getCode())); sDangerStateEnumList.addAll(LatentDangerState.SupervisionDangerStateEnum
Integer sDangerCount = this.baseMapper.selectUnFinishedCountByParam("supervision", .getEnumListByProcessState(LatentDangerProcessStateEnum.待审核.getCode()));
sDangerStateEnumList.stream().map(LatentDangerState.SupervisionDangerStateEnum::getCode).collect(Collectors.toList()),loginOrgCode); sDangerStateEnumList.addAll(LatentDangerState.SupervisionDangerStateEnum
.getEnumListByProcessState(LatentDangerProcessStateEnum.治理完毕.getCode()));
Integer sDangerCount = this.baseMapper.selectUnFinishedCountByParam("supervision", sDangerStateEnumList.stream()
.map(LatentDangerState.SupervisionDangerStateEnum::getCode).collect(Collectors.toList()), loginOrgCode);
resultMap.put("supervision", sDangerCount); resultMap.put("supervision", sDangerCount);
return resultMap; return resultMap;
} }
@Autowired @Autowired
OrgUsrServiceImpl iOrgUsrService; OrgUsrServiceImpl iOrgUsrService;
@Override @Override
public Map<String, Integer> currentLandgerCount(String companyId,String loginOrgCode) { public Map<String, Integer> currentLandgerCount(String companyId, String loginOrgCode) {
Map<String, Integer> resultMap = new HashMap<String, Integer>(); Map<String, Integer> resultMap = new HashMap<String, Integer>();
List<String> dangerState = new ArrayList<String>(); List<String> dangerState = new ArrayList<String>();
dangerState.add(LatentDangerState.PatrolDangerStateEnum.治理完毕.getCode()); dangerState.add(LatentDangerState.PatrolDangerStateEnum.治理完毕.getCode());
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/intfc/ILatentDangerService.java
View file @ 4195a80d
...@@ -101,7 +101,7 @@ public interface ILatentDangerService { ...@@ -101,7 +101,7 @@ public interface ILatentDangerService {
*/ */
JSONObject getReviewInfo(Long dangerId); JSONObject getReviewInfo(Long dangerId);
IPage<LatentDanger> pageListDanger(PageParam pageParam) throws Exception; IPage<LatentDanger> pageListDanger(PageParam pageParam,String userId) throws Exception;
List<DangerListResponse> export(PageParam pageParam); List<DangerListResponse> export(PageParam pageParam);
...@@ -147,7 +147,7 @@ public interface ILatentDangerService { ...@@ -147,7 +147,7 @@ public interface ILatentDangerService {
* @param pageParam * @param pageParam
* @return * @return
*/ */
IPage<LatentDanger> reviewListDanger(PageParam pageParam) throws Exception; IPage<LatentDanger> reviewListDanger(PageParam pageParam,String userId) throws Exception;
/** /**
* 获取多个业务的隐患等级 * 获取多个业务的隐患等级
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java
View file @ 4195a80d
...@@ -163,7 +163,11 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService { ...@@ -163,7 +163,11 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
List<Long> dangerIds = Lists.transform(dangers, HiddenDangerDto::getLatentDangerId); List<Long> dangerIds = Lists.transform(dangers, HiddenDangerDto::getLatentDangerId);
String dangerIdsStr = "".equals(Joiner.on(",").join(dangerIds)) ? "-1" : Joiner.on(",").join(dangerIds); String dangerIdsStr = "".equals(Joiner.on(",").join(dangerIds)) ? "-1" : Joiner.on(",").join(dangerIds);
Map<String, Object> param = buildRequestBody(page, level, status, dangerIdsStr); Map<String, Object> param = buildRequestBody(page, level, status, dangerIdsStr);
//可以获取导入的隐患列表信息，不加入instanceId 的判断,因为这个接口调用了隐患列表，需要一个参数判断是否有使用 --- by 陈浩 2022-04-14 --start
param.put("isDraft", 1);
FeignClientResult<Page<DangerDto>> feignClientResult = feignClient.pageList(param); FeignClientResult<Page<DangerDto>> feignClientResult = feignClient.pageList(param);
param.remove("isDraft");
//可以获取导入的隐患列表信息，不加入instanceId 的判断,因为这个接口调用了隐患列表，需要一个参数判断是否有使用 --- by 陈浩 2022-04-14 --end
Page<DangerDto> dangerDtoIPage = feignClientResult.getResult(); Page<DangerDto> dangerDtoIPage = feignClientResult.getResult();
Map<Long, HiddenDangerDto> keyMap = dangers.stream().collect(Collectors.toMap(HiddenDangerDto::getLatentDangerId, Function.identity())); Map<Long, HiddenDangerDto> keyMap = dangers.stream().collect(Collectors.toMap(HiddenDangerDto::getLatentDangerId, Function.identity()));
dangerDtoIPage.getRecords().forEach(r -> { dangerDtoIPage.getRecords().forEach(r -> {
......
amos-boot-system-latentdanger/src/main/resources/db/mapper/LatentDangerMapper.xml
View file @ 4195a80d
...@@ -973,8 +973,14 @@ ...@@ -973,8 +973,14 @@
a.biz_info a.biz_info
from p_latent_danger a from p_latent_danger a
<where> <where>
deleted = 0 and instance_id is not null deleted = 0
<foreach collection="paramMap" index="key" item="value"> <foreach collection="paramMap" index="key" item="value">
<if test="key == 'isDraft' and value == 1">
\ and a.danger_state = 'draft' and discoverer_user_id = #{paramMap[userId]}
</if>
<if test="key == 'isDraft' and value == 0">
\ and a.danger_state != 'draft'
</if>
<if test="key == 'bizType' and value != null and value != ''"> <if test="key == 'bizType' and value != null and value != ''">
and a.biz_type = #{value} and a.biz_type = #{value}
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment