修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/controller/LatentDangerController.java

@@ -87,7 +87,8 @@ public class LatentDangerController extends BaseController {
     @ApiOperation(value = "创建巡检隐患", notes = "创建巡检隐患")
     @PostMapping(value = "/patrol/save")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    public ResponseModel<List<LatentDanger>> savePatrol(@ApiParam(value = "隐患对象", required = true) @RequestBody List<LatentDangerDto> latentDangerDtoList) throws Exception {
+    public ResponseModel<List<LatentDanger>> savePatrol(@ApiParam(value = "隐患对象", required = true) @RequestBody List<LatentDangerDto> latentDangerDtoList,
+                                                        @RequestParam String flag  ) throws Exception {
         AgencyUserModel user = getUserInfo();
         ReginParams reginParams = getSelectedOrgInfo();
         String loginOrgCode = getOrgCode(reginParams);
@@ -96,7 +97,7 @@ public class LatentDangerController extends BaseController {
         String departmentName = getDepartmentName(reginParams);
         RoleBo role = reginParams.getRole();
         return ResponseHelper.buildResponse(iLatentDangerService.savePatrol(latentDangerDtoList, user.getUserId(),
-                user.getRealName(), deptId, departmentName, companyId, loginOrgCode, role,null));
+                user.getRealName(), deptId, departmentName, companyId, loginOrgCode, role,flag));
     }
 
     @ApiOperation(value = "隐患列表", notes = "隐患列表")

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -236,91 +236,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 		return CommonResponseUtil.success();
 	}
 
-	@Transactional(rollbackFor = Exception.class)
-	public List<LatentDanger> savePatrolPlanB(List<LatentDangerDto> latentDangerDtoList, String userId, String userRealName,
-			String departmentId, String departmentName, String companyId, String orgCode, RoleBo role)
-			throws Exception {
-		if (ValidationUtil.isEmpty(latentDangerDtoList)) {
-			throw new Exception("参数有误");
-		}
-
-		// 获取业务类型枚举
-		LatentDangerBizTypeEnum bizTypeEnum = LatentDangerBizTypeEnum.getByCode(bizType);
-		if (ValidationUtil.isEmpty(bizTypeEnum)) {
-			throw new Exception("业务类型有误");
-		}
-
-		List<LatentDanger> dangerList = Lists.newArrayList();
-		for (LatentDangerDto param : latentDangerDtoList) {
-			String businessKey = RandomUtil.buildOrderNo();
-			LatentDangerLevelEnum levelEnum = LatentDangerLevelEnum.getEnumByCode(param.getDangerLevel());
-			if (levelEnum == null) {
-				throw new Exception("隐患等级参数有误");
-			}
-
-			LatentDangerTypeEnum dangerTypeEnum = LatentDangerTypeEnum
-					.getByCode(latentDangerDtoList.get(0).getCheckMode());
-			if (ValidationUtil.isEmpty(dangerTypeEnum)) {
-				throw new Exception("检查类型参数有误");
-			}
-			Date endTime = DateUtils.getTargetEndTime(param.getReformLimitDate());
-			param.setReformLimitDate(endTime);
-			// 保存隐患
-			LatentDanger latentDanger = importSaveLatentDanger(param, userId, departmentId, businessKey, orgCode,
-					dangerTypeEnum);
-
-			JSONObject instance = new JSONObject();
-			// 巡检业务需要在填写隐患后直接开启工作流
-			if (bizTypeEnum == LatentDangerBizTypeEnum.巡检) {
-				// 更新巡检p_check_input表state字段
-				updateCheckInputDangerState(latentDanger.getBizId(), DangerHandleStateEnum.HANDLE.getCode());
-
-				Long dangerId = latentDanger.getId();
-				Date startDate = new Date();
-				JSONObject jsonObject = remoteWorkFlowService.startNew(dangerId, businessKey, processDefinitionKey);
-				Date endDate = new Date();
-				logger.info("-------------------------提交隐患时间" + (endDate.getTime() - startDate.getTime()));
-				if (jsonObject == null) {
-					TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-					throw new Exception("启动流程失败");
-				}
-				instance = jsonObject.getJSONObject("data");
-				if (instance == null) {
-					throw new Exception("无提交隐患权限");
-				}
-			}
-
-			JSONObject flowJson = new JSONObject();
-			if (!ValidationUtil.isEmpty(param.getPhotoUrl())) {
-				flowJson.put("photoUrls", Joiner.on(",").join(param.getPhotoUrl()));
-			}
-
-			if (!ValidationUtil.isEmpty(param.getId()) && !"draft".equals(latentDanger.getDangerState()) || !ValidationUtil.isEmpty(param.getId()) &&"dangerSubmit".equals(latentDanger.getDangerState()) ) {
-				// 第一次保存隐患提交记录
-				LatentDangerFlowRecord inputRecord = saveFlowRecord(instance.getString("id"), "提交隐患", userId,
-						departmentId, flowJson, latentDanger.getId(), role,
-						LatentDangerExecuteTypeEnum.填写隐患完成.getName(), latentDanger.getRemark(), userRealName,
-						departmentName, latentDanger.getDangerState(), ExecuteTypeEnum.通过.getCode());
-				latentDanger.setCurrentFlowRecordId(inputRecord.getId());
-				latentDanger.setInstanceId(instance.getString("id"));
-				latentDangerMapper.updateById(latentDanger);
-				ruleDangerService.addLatentDangerRule(latentDanger, RuleTypeEnum.隐患第一次提交.getCode(), onSiteConfirmRole);
-			}
-
-			// TODO 使用远程调用替换
-//            LatentDangerPatrolBo patrolBo = latentDangerPatrolMapper.getByDangerId(latentDanger.getId());
-//            sendMessage(latentDanger, LatentDangerExecuteTypeEnum.填写隐患完成, patrolBo,
-//                    "巡检隐患排查与治理", this.getNextExecuteUsers(latentDanger.getInstanceId()), userRealName, departmentName);
-//            try {
-//                webMqttComponent.publish(dangerTopic, "");
-//            } catch (Exception e) {
-//                logger.error("巡检隐患提交数字换流站页面推送失败-----------" + e.getMessage());
-//            }
 
-			dangerList.add(latentDanger);
-		}
-		return dangerList;
-	}
 
 	@Transactional(rollbackFor = Exception.class)
 	@Override
@@ -354,7 +270,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 			param.setReformLimitDate(endTime);
 			// 保存隐患
 			LatentDanger latentDanger = importSaveLatentDanger(param, userId, departmentId, businessKey, orgCode,
-					dangerTypeEnum);
+					dangerTypeEnum,flag);
 
 			JSONObject instance = new JSONObject();
 			// 巡检业务需要在填写隐患后直接开启工作流
@@ -381,8 +297,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 			if (!ValidationUtil.isEmpty(param.getPhotoUrl())) {
 				flowJson.put("photoUrls", Joiner.on(",").join(param.getPhotoUrl()));
 			}
-			//为不影响其他业余 加一个判断 flag == 1 是外部单位导入的隐患
-			if (flag == null){
+			//为不影响其他业余 加一个判断 flag == null 是外部单位导入的隐患  == 1 是保存并提交按钮
+			if (flag.equals("1")){
 				if (ValidationUtil.isEmpty(param.getId()) && !"draft".equals(latentDanger.getDangerState())  ) {
 					// 第一次保存隐患提交记录
 					LatentDangerFlowRecord inputRecord = saveFlowRecord(instance.getString("id"), "提交隐患", userId,
@@ -394,7 +310,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 					latentDangerMapper.updateById(latentDanger);
 					ruleDangerService.addLatentDangerRule(latentDanger, RuleTypeEnum.隐患第一次提交.getCode(), onSiteConfirmRole);
 				}
-			}else if(flag.equals("1")){
+			}else if(flag == null){
 				if (!ValidationUtil.isEmpty(param.getId()) && !"draft".equals(latentDanger.getDangerState())  ) {
 					// 第一次保存隐患提交记录
 					LatentDangerFlowRecord inputRecord = saveFlowRecord(instance.getString("id"), "提交隐患", userId,
@@ -515,7 +431,7 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 	}
 
 	public LatentDanger importSaveLatentDanger(LatentDangerDto dangerDto, String userId, String departmentId,
-			String businessKey, String orgCode, LatentDangerTypeEnum dangerTypeEnum) {
+			String businessKey, String orgCode, LatentDangerTypeEnum dangerTypeEnum,String flag) {
 		LatentDanger latentDanger = new LatentDanger();
 		Bean.copyExistPropertis(dangerDto, latentDanger);
 		if (ValidationUtil.isEmpty(dangerDto.getId())) {
@@ -526,10 +442,17 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 			latentDanger.setOrgCode(orgCode == null ? "" : orgCode);
 			latentDanger.setDangerType(dangerTypeEnum.getCode() == null ? "" : dangerTypeEnum.getCode());
 			latentDanger.setDangerTypeName(dangerTypeEnum.getName() == null ? "" : dangerTypeEnum.getName());
-			if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
+			//手机端提交隐患 有保存和提交两个类型 flag用来区分
+			if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType) && flag.equals("0")) {
 				latentDanger.setDangerState("draft");
 				latentDanger.setDangerStateName("草稿");
-			} else if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) {
+			} else if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType) && flag.equals("1")) {
+				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 ? ""

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/feign/DangerFeignClient.java

@@ -44,7 +44,7 @@ public interface DangerFeignClient {
      * @return FeignClientResult
      */
     @PostMapping(value = "/patrol/save")
-    FeignClientResult<List<DangerDto>> saveOrUpdateBatch(@RequestBody List<DangerDto> latentDangerDtoList);
+    FeignClientResult<List<DangerDto>> saveOrUpdateBatch(@RequestBody List<DangerDto> latentDangerDtoList, @RequestParam String flag);
 
     /**
      * 隐患分页查询

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/CheckServiceImpl.java

@@ -1623,7 +1623,7 @@ public class CheckServiceImpl implements ICheckService {
             });
             // 1.feign调用保存隐患
             log.info(String.format("隐患参数：%s", JSON.toJSONString(allDanger)));
-            FeignClientResult<List<DangerDto>> listFeignClientResult = DangerFeignClient.saveOrUpdateBatch(allDanger);
+            FeignClientResult<List<DangerDto>> listFeignClientResult = DangerFeignClient.saveOrUpdateBatch(allDanger,recordParam.getPlanTaskStatus());
             if (ObjectUtils.isEmpty(listFeignClientResult.getResult()) || listFeignClientResult.getStatus() != HTTP_OK_STATUS) {
                 throw new RuntimeException(listFeignClientResult.getDevMessage());
             }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/HiddenDangerServiceImpl.java

@@ -145,7 +145,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
         Map<String, Object> bizInfo = this.buildBizInfo(hiddenDangerDto);
         dangerDto.setBizInfo(JSON.parseObject(JSON.toJSONString(bizInfo)));
         //feign 调用保存
-        FeignClientResult<List<DangerDto>> feignClientResult = feignClient.saveOrUpdateBatch(Collections.singletonList(dangerDto));
+        FeignClientResult<List<DangerDto>> feignClientResult = feignClient.saveOrUpdateBatch(Collections.singletonList(dangerDto),"3");
         //更新隐患
         List<DangerDto> saveDangers = feignClientResult.getResult();
         if (!saveDangers.isEmpty()) {
@@ -227,7 +227,7 @@ public class HiddenDangerServiceImpl implements IHiddenDangerService {
             }
             return dangerDto;
         }).collect(Collectors.toList());
-        FeignClientResult<List<DangerDto>> feignClientResult = feignClient.saveOrUpdateBatch(dtoList);
+        FeignClientResult<List<DangerDto>> feignClientResult = feignClient.saveOrUpdateBatch(dtoList,"0");
         List<DangerDto> dangerDbs = feignClientResult.getResult();
         //2.保存隐患关系表
         List<HiddenDanger> hiddenDangers = dangerDbs.stream().map(d -> {