隐患流程修改

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

@@ -60,12 +60,9 @@ public class LatentDangerController extends BaseController {
     @ApiOperation(value = "创建无码无计划隐患", notes = "创建无码无计划隐患")
     @PostMapping(value = "/normal/save")
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    public CommonResponse saveNormal(@ApiParam(value = "隐患对象", required = true) @RequestBody LatentDangerNormalParam latentDangerParam) {
+    public CommonResponse saveNormal(@ApiParam(value = "隐患对象", required = true) @RequestBody LatentDangerDto latentDangerParam) {
         try {
             AgencyUserModel user = getUserInfo();
-            if (ObjectUtils.isEmpty(user)) {
-                return CommonResponseUtil.failure("登录过期，请重新登录");
-            }
 
             ReginParams reginParams = getSelectedOrgInfo();
             String loginOrgCode = getOrgCode(reginParams);

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/param/LatentDangerDto.java

@@ -36,7 +36,7 @@ public class LatentDangerDto {
     /**
      * 创建隐患的业务id（p_check_input）
      */
-    private Long bizId;
+    private Long bizId = 0L;
 
     /**
      * 建筑id

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

@@ -176,7 +176,8 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public CommonResponse saveNormal(LatentDangerNormalParam latentDangerDto, String userId, String userRealName, String departmentId, String departmentName, String companyId, String orgCode, RoleBo role) {
+    public CommonResponse saveNormal(LatentDangerDto latentDangerDto, String userId, String userRealName,
+                                     String departmentId, String departmentName, String companyId, String orgCode, RoleBo role) {
 
         LatentDangerLevelEnum dangerLevelEnum = LatentDangerLevelEnum.getEnumByCode(latentDangerDto.getDangerLevel());
         if (ValidationUtil.isEmpty(dangerLevelEnum)) {
@@ -185,12 +186,10 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
 
         String businessKey = buildOrderNo();
 
-        LatentDanger latentDanger = saveLatentDanger("", "", "", latentDangerDto.getRemark(),
-                userId, departmentId, businessKey, orgCode, latentDangerDto.getDangerName(), latentDangerDto.getDangerLevel()
-                , latentDangerDto.getDangerPosition(), LatentDangerTypeEnum.随手拍,
-                latentDangerDto.getPhotoUrl(), 0L, latentDangerDto.getStructureId(),
-                latentDangerDto.getStructureName(), InstanceKeyEnum.NORMAL.getCode(),
-                latentDangerDto.getLongitude(), latentDangerDto.getLatitude());
+        LatentDangerDto latentDto = new LatentDangerDto();
+        Bean.copyExistPropertis(latentDangerDto, latentDto);
+        LatentDanger latentDanger = saveLatentDanger2(latentDto, userId, departmentId, businessKey, orgCode, LatentDangerTypeEnum.随手拍);
+
         // 更新p_check_input表state字段
 //        updateCheckInputDangerState(latentDanger.getBizId(), DangerHandleStateEnum.HANDLE.getCode());
         Long dangerId = latentDanger.getId();
@@ -364,22 +363,25 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         return latentDanger;
     }
 
-    public LatentDanger saveLatentDanger2(LatentDangerDto param, String userId,
+    public LatentDanger saveLatentDanger2(LatentDangerDto dangerDto, String userId,
                                           String departmentId, String businessKey, String orgCode,
                                           LatentDangerTypeEnum dangerTypeEnum) {
         LatentDanger latentDanger = new LatentDanger();
-        Bean.copyExistPropertis(param, latentDanger);
-        if (ValidationUtil.isEmpty(param.getId())) {
+        Bean.copyExistPropertis(dangerDto, latentDanger);
+        if (ValidationUtil.isEmpty(dangerDto.getId())) {
             // 新增
             latentDanger.setBusinessKey(businessKey);
             latentDanger.setDiscovererDepartmentId(departmentId);
             latentDanger.setDiscovererUserId(userId);
             latentDanger.setOrgCode(orgCode);
             latentDanger.setDangerType(dangerTypeEnum.getCode());
-            if (ValidationUtil.isEmpty(param.getDangerName())) {
-                latentDanger.setDangerName(param.getInputItemName());
+            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;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/intfc/ILatentDangerService.java

@@ -36,7 +36,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
  */
 public interface ILatentDangerService {
 
-    CommonResponse saveNormal(LatentDangerNormalParam latentDangerParam, String userId, String userRealName,
+    CommonResponse saveNormal(LatentDangerDto latentDangerParam, String userId, String userRealName,
                               String departmentId, String departmentName, String companyId, String orgCode, RoleBo role);
 
     List<LatentDanger> savePatrol(List<LatentDangerDto> latentDangerDtoList, String userId, String userRealName,