隐患排查的调整

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/hazard/vo/IotHazardRespVO.java

@@ -20,6 +20,15 @@ public class IotHazardRespVO {
     @ExcelProperty("状态")
     private String status;
 
+    @Schema(description = "隐患排查分类")
+    private String classify;
+
+    @Schema(description = "隐患排查分类名称")
+    private String classifyName;
+
+    @Schema(description = "隐患排查来源")
+    private String source;
+
     @Schema(description = "地点", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("地点")
     private String address;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/hazard/vo/IotHazardSaveReqVO.java

@@ -16,6 +16,12 @@ public class IotHazardSaveReqVO {
 //    @NotEmpty(message = "状态不能为空")
     private String status;
 
+    @Schema(description = "隐患排查分类")
+    private String classify;
+
+    @Schema(description = "隐患排查来源")
+    private String source;
+
     @Schema(description = "地点", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "地点不能为空")
     private String address;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/hazard/IotHazardDO.java

@@ -34,6 +34,7 @@ public class IotHazardDO extends BaseDO {
      * 隐患排查分类
      */
     private String classify;
+    private String classifyName;
     /**
      * 隐患排查来源
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/hazard/IotHazardServiceImpl.java

@@ -9,8 +9,11 @@ import cn.iocoder.yudao.module.pms.controller.admin.qhse.hazard.vo.IotHazardPage
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.hazard.vo.IotHazardRectifyVO;
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.hazard.vo.IotHazardSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.hazard.IotHazardDO;
+import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.hazard.IotHazardTypeDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.qhse.hazard.IotHazardMapper;
+import cn.iocoder.yudao.module.pms.dal.mysql.qhse.hazard.IotHazardTypeMapper;
 import cn.iocoder.yudao.module.system.service.dept.DeptService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -36,6 +39,8 @@ public class IotHazardServiceImpl implements IotHazardService {
     private IotHazardMapper iotHazardMapper;
     @Autowired
     private DeptService deptService;
+    @Autowired
+    private IotHazardTypeMapper iotHazardTypeMapper;
 
     @Override
     public Long createIotHazard(IotHazardSaveReqVO createReqVO) {
@@ -46,6 +51,13 @@ public class IotHazardServiceImpl implements IotHazardService {
         iotHazard.setStatus("todo");
         Long deptId = SecurityFrameworkUtils.getLoginUserDeptId();
         iotHazard.setDeptId(deptId);
+        if (Objects.nonNull(createReqVO.getClassify())&& StringUtils.isNotBlank(createReqVO.getClassify())) {
+            IotHazardTypeDO iotHazardTypeDO = iotHazardTypeMapper.selectById(Long.valueOf(createReqVO.getClassify()));
+            if (Objects.isNull(iotHazardTypeDO)) {
+                throw new ServiceException(new ErrorCode(2,"不存在隐患排查分类"));
+            }
+            iotHazard.setClassifyName(iotHazardTypeDO.getName());
+        }
         iotHazardMapper.insert(iotHazard);
         // 返回
         return iotHazard.getId();
@@ -57,6 +69,13 @@ public class IotHazardServiceImpl implements IotHazardService {
         validateIotHazardExists(updateReqVO.getId());
         // 更新
         IotHazardDO updateObj = BeanUtils.toBean(updateReqVO, IotHazardDO.class);
+        if (Objects.nonNull(updateObj.getClassify())&& StringUtils.isNotBlank(updateObj.getClassify())) {
+            IotHazardTypeDO iotHazardTypeDO = iotHazardTypeMapper.selectById(Long.valueOf(updateObj.getClassify()));
+            if (Objects.isNull(iotHazardTypeDO)) {
+                throw new ServiceException(new ErrorCode(2,"不存在隐患排查分类"));
+            }
+            updateObj.setClassifyName(iotHazardTypeDO.getName());
+        }
         iotHazardMapper.updateById(updateObj);
     }