Browse Source

Merge remote-tracking branch 'origin/master'

lg 4 weeks ago
parent
commit
bb987b3915
33 changed files with 1159 additions and 49 deletions
  1. 19 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhEventMapper.java
  2. 18 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhMapper.java
  3. 18 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhRectificationMapper.java
  4. 18 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhRpMapper.java
  5. 18 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhValidateMapper.java
  6. 1 4
      qhse-common/src/main/java/com/rongwei/bscommon/sys/common/fegin/AdminFeginService.java
  7. 1 4
      qhse-common/src/main/java/com/rongwei/bscommon/sys/common/fegin/AdminFeginServiceImpl.java
  8. 13 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhEventService.java
  9. 13 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhRectificationService.java
  10. 13 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhRpService.java
  11. 13 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhService.java
  12. 13 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhValidateService.java
  13. 22 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/RohhService.java
  14. 10 10
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/FileFormatConversionServiceImpl.java
  15. 23 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhEventServiceImpl.java
  16. 23 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhRectificationServiceImpl.java
  17. 23 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhRpServiceImpl.java
  18. 21 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhServiceImpl.java
  19. 23 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhValidateServiceImpl.java
  20. 17 17
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseTargetResponsibilityDocumentServiceImpl.java
  21. 7 7
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseVisitorManagementServiceImpl.java
  22. 180 0
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/RohhServiceImpl.java
  23. 0 3
      qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SysPagePartServiceImpl.java
  24. 2 2
      qhse-common/src/main/java/com/rongwei/bscommon/sys/utils/WordUtils.java
  25. 246 0
      qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhDo.java
  26. 51 0
      qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhEventDo.java
  27. 69 0
      qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhRectificationDo.java
  28. 88 0
      qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhRpDo.java
  29. 67 0
      qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhValidateDo.java
  30. 21 0
      qhse-entity/src/main/java/com/rongwei/bsentity/vo/ROHHEventVo.java
  31. 18 0
      qhse-entity/src/main/java/com/rongwei/bsentity/vo/TaskTransferVo.java
  32. 0 2
      qhse-server/src/main/java/com/rongwei/controller/QhseVisitorManagementController.java
  33. 90 0
      qhse-server/src/main/java/com/rongwei/controller/RohhController.java

+ 19 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhEventMapper.java

@@ -0,0 +1,19 @@
+package com.rongwei.bscommon.sys.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwei.bsentity.domain.QhseRohhEventDo;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_event(隐患任务信息-事件信息)】的数据库操作Mapper
+* @createDate 2025-08-20 10:58:59
+* @Entity generator.domain.QhseRohhEvent
+*/
+public interface QhseRohhEventMapper extends BaseMapper<QhseRohhEventDo> {
+
+}
+
+
+
+

+ 18 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhMapper.java

@@ -0,0 +1,18 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.QhseRohhDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh(隐患任务信息)】的数据库操作Mapper
+* @createDate 2025-08-18 17:05:53
+* @Entity generator.domain.QhseRohh
+*/
+public interface QhseRohhMapper extends BaseMapper<QhseRohhDo> {
+
+}
+
+
+
+

+ 18 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhRectificationMapper.java

@@ -0,0 +1,18 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.QhseRohhRectificationDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_rectification(隐患任务-整改详情)】的数据库操作Mapper
+* @createDate 2025-08-18 17:05:53
+* @Entity generator.domain.QhseRohhRectification
+*/
+public interface QhseRohhRectificationMapper extends BaseMapper<QhseRohhRectificationDo> {
+
+}
+
+
+
+

+ 18 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhRpMapper.java

@@ -0,0 +1,18 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.QhseRohhRpDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_rp(隐患任务信息-奖惩)】的数据库操作Mapper
+* @createDate 2025-08-18 17:05:53
+* @Entity generator.domain.QhseRohhRp
+*/
+public interface QhseRohhRpMapper extends BaseMapper<QhseRohhRpDo> {
+
+}
+
+
+
+

+ 18 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/dao/QhseRohhValidateMapper.java

@@ -0,0 +1,18 @@
+package com.rongwei.bscommon.sys.dao;
+
+import com.rongwei.bsentity.domain.QhseRohhValidateDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_validate(隐患任务-验证详情)】的数据库操作Mapper
+* @createDate 2025-08-18 17:05:53
+* @Entity generator.domain.QhseRohhValidate
+*/
+public interface QhseRohhValidateMapper extends BaseMapper<QhseRohhValidateDo> {
+
+}
+
+
+
+

+ 1 - 4
qhse-common/src/main/java/com/rongwei/bscommon/sys/common/fegin/AdminFeginService.java

@@ -1,12 +1,9 @@
-package com.rongwei.bscommon.sys.common.fegin;
+package com.rongwei.bscommon.sys.fegin;
 
-import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 
-import java.util.List;
-
 @FeignClient(value = "rw-admin",fallback = AdminFeginServiceImpl.class)
 public interface AdminFeginService {
 

+ 1 - 4
qhse-common/src/main/java/com/rongwei/bscommon/sys/common/fegin/AdminFeginServiceImpl.java

@@ -1,12 +1,9 @@
-package com.rongwei.bscommon.sys.common.fegin;
+package com.rongwei.bscommon.sys.fegin;
 
 
 import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
 import org.springframework.stereotype.Component;
 
-
-import java.util.List;
-
 @Component
 public class AdminFeginServiceImpl implements AdminFeginService {
 

+ 13 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhEventService.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.QhseRohhEventDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_event(隐患任务信息-事件信息)】的数据库操作Service
+* @createDate 2025-08-20 10:58:59
+*/
+public interface QhseRohhEventService extends IService<QhseRohhEventDo> {
+
+}

+ 13 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhRectificationService.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.QhseRohhRectificationDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_rectification(隐患任务-整改详情)】的数据库操作Service
+* @createDate 2025-08-18 17:05:53
+*/
+public interface QhseRohhRectificationService extends IService<QhseRohhRectificationDo> {
+
+}

+ 13 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhRpService.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.QhseRohhRpDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_rp(隐患任务信息-奖惩)】的数据库操作Service
+* @createDate 2025-08-18 17:05:53
+*/
+public interface QhseRohhRpService extends IService<QhseRohhRpDo> {
+
+}

+ 13 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhService.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.QhseRohhDo;
+
+/**
+ * @author libai
+ * @description 针对表【qhse_rohh(隐患任务信息)】的数据库操作Service
+ * @createDate 2025-08-18 17:05:53
+ */
+public interface QhseRohhService extends IService<QhseRohhDo> {
+
+}

+ 13 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/QhseRohhValidateService.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.domain.QhseRohhValidateDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_validate(隐患任务-验证详情)】的数据库操作Service
+* @createDate 2025-08-18 17:05:53
+*/
+public interface QhseRohhValidateService extends IService<QhseRohhValidateDo> {
+
+}

+ 22 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/RohhService.java

@@ -0,0 +1,22 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.bsentity.vo.ROHHEventVo;
+import com.rongwei.bsentity.vo.TaskTransferVo;
+
+/**
+ * RohhService class
+ *
+ * @author XH
+ * @date 2025/08/18
+ */
+public interface RohhService {
+    void createRectification(String id);
+
+    void createValidate(String id);
+
+    void createRP(String id);
+
+    void createRPEvent(ROHHEventVo rohhEventVo);
+
+    void taskTransfer(TaskTransferVo taskTransferVo);
+}

+ 10 - 10
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/FileFormatConversionServiceImpl.java

@@ -55,7 +55,7 @@ public class FileFormatConversionServiceImpl implements FileFormatConversionServ
     public SysFileItemDo fileCheck(String id) {
         SysFileItemDo sysFileItemDo = sysFileItemServiceImpl.getById(id);
         if (sysFileItemDo == null) {
-            throw new CustomException("无法根据ID获取到文件信息");
+            throw new CustomException("200","无法根据ID获取到文件信息");
         }
         log.debug("获取到的文件id:{}", sysFileItemDo.getId());
         return sysFileItemDo;
@@ -75,7 +75,7 @@ public class FileFormatConversionServiceImpl implements FileFormatConversionServ
         log.info("开始进行文件格式转换Id为:{}", id);
         if (StringUtils.isBlank(id)) {
             log.error("参数异常");
-            throw new CustomException("文件ID为空,请联系系统管理员");
+            throw new CustomException("200","文件ID为空,请联系系统管理员");
         }
         SysFileItemDo sysFileItemDo = fileCheck(id);
         String lowerCaseFileTYpe = sysFileItemDo.getFiletype().toLowerCase();
@@ -84,7 +84,7 @@ public class FileFormatConversionServiceImpl implements FileFormatConversionServ
         try {
             fileName = URLEncoder.encode(sysFileItemDo.getFilename(), "utf-8");
         } catch (Exception e) {
-            throw new CustomException("文件名转换失败!请联系系统管理员");
+            throw new CustomException("200","文件名转换失败!请联系系统管理员");
         }
 
         response.setHeader("Content-Disposition", "inline; filename=" + fileName);
@@ -114,7 +114,7 @@ public class FileFormatConversionServiceImpl implements FileFormatConversionServ
                 Files.copy(Paths.get(fullpath), response.getOutputStream());
             } catch (Exception e) {
                 log.error("文件名:{}格式化失败- 原因: {} | 异常类型: {}", sysFileItemDo.getFilename(), e.getMessage(), e.getClass().getSimpleName(), e);
-                throw new CustomException("获取预览文件失败!请联系系统管理员");
+                throw new CustomException("200","获取预览文件失败!请联系系统管理员");
             }
 
         }
@@ -185,7 +185,7 @@ public class FileFormatConversionServiceImpl implements FileFormatConversionServ
             }
         } catch (Exception e) {
             log.error("图片加水印处理失败- 原因: {} | 异常类型: {}", e.getMessage(), e.getClass().getSimpleName(), e);
-            throw new CustomException("文件处理异常");
+            throw new CustomException("200","文件处理异常");
         }
     }
 
@@ -225,7 +225,7 @@ public class FileFormatConversionServiceImpl implements FileFormatConversionServ
             out.flush();
         } catch (Exception e) {
             log.error("pdf预览失败- 原因: {} | 异常类型: {}", e.getMessage(), e.getClass().getSimpleName(), e);
-            throw new CustomException("获取预览文件失败!请联系系统管理员");
+            throw new CustomException("200","获取预览文件失败!请联系系统管理员");
         }
     }
 
@@ -267,7 +267,7 @@ public class FileFormatConversionServiceImpl implements FileFormatConversionServ
                 }
             } catch (Exception e) {
                 log.error("Excel转PDF失败- 原因: {} | 异常类型: {}", e.getMessage(), e.getClass().getSimpleName(), e);
-                throw new CustomException("文件转换失败,请联系系统管理员");
+                throw new CustomException("200","文件转换失败,请联系系统管理员");
             }
 
         } else {
@@ -290,7 +290,7 @@ public class FileFormatConversionServiceImpl implements FileFormatConversionServ
                 out.flush();
             } catch (Exception e) {
                 log.error("excel转pdf失败- 原因: {} | 异常类型: {}", e.getMessage(), e.getClass().getSimpleName(), e);
-                throw new CustomException("获取预览文件失败!请联系系统管理员");
+                throw new CustomException("200","获取预览文件失败!请联系系统管理员");
             }
         }
 
@@ -367,7 +367,7 @@ public class FileFormatConversionServiceImpl implements FileFormatConversionServ
                 }
             } catch (Exception e) {
                 log.error("Excel转PDF失败- 原因: {} | 异常类型: {}", e.getMessage(), e.getClass().getSimpleName(), e);
-                throw new CustomException("文件转换失败,请联系系统管理员");
+                throw new CustomException("200","文件转换失败,请联系系统管理员");
             }
 
         } else {
@@ -382,7 +382,7 @@ public class FileFormatConversionServiceImpl implements FileFormatConversionServ
                 out.flush();
             } catch (Exception e) {
                 log.error("word转pdf失败- 原因: {} | 异常类型: {}", e.getMessage(), e.getClass().getSimpleName(), e);
-                throw new CustomException("获取预览文件失败!请联系系统管理员");
+                throw new CustomException("200","获取预览文件失败!请联系系统管理员");
             }
         }
     }

+ 23 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhEventServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.rongwei.bscommon.sys.dao.QhseRohhEventMapper;
+import com.rongwei.bscommon.sys.service.QhseRohhEventService;
+import com.rongwei.bsentity.domain.QhseRohhEventDo;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author libai
+ * @description 针对表【qhse_rohh_event(隐患任务信息-事件信息)】的数据库操作Service实现
+ * @createDate 2025-08-20 10:58:59
+ */
+@Service
+public class QhseRohhEventServiceImpl extends ServiceImpl<QhseRohhEventMapper, QhseRohhEventDo>
+        implements QhseRohhEventService {
+
+}
+
+
+
+

+ 23 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhRectificationServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.rongwei.bscommon.sys.dao.QhseRohhRectificationMapper;
+import com.rongwei.bscommon.sys.service.QhseRohhRectificationService;
+import com.rongwei.bsentity.domain.QhseRohhRectificationDo;
+import org.springframework.stereotype.Service;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_rectification(隐患任务-整改详情)】的数据库操作Service实现
+* @createDate 2025-08-18 17:05:53
+*/
+@Service
+public class QhseRohhRectificationServiceImpl extends ServiceImpl<QhseRohhRectificationMapper, QhseRohhRectificationDo>
+    implements QhseRohhRectificationService {
+
+}
+
+
+
+

+ 23 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhRpServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import com.rongwei.bscommon.sys.dao.QhseRohhRpMapper;
+import com.rongwei.bscommon.sys.service.QhseRohhRpService;
+import com.rongwei.bsentity.domain.QhseRohhRpDo;
+import org.springframework.stereotype.Service;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_rp(隐患任务信息-奖惩)】的数据库操作Service实现
+* @createDate 2025-08-18 17:05:53
+*/
+@Service
+public class QhseRohhRpServiceImpl extends ServiceImpl<QhseRohhRpMapper, QhseRohhRpDo>
+    implements QhseRohhRpService{
+
+}
+
+
+
+

+ 21 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhServiceImpl.java

@@ -0,0 +1,21 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.QhseRohhMapper;
+import com.rongwei.bscommon.sys.service.QhseRohhService;
+import com.rongwei.bsentity.domain.QhseRohhDo;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author libai
+ * @description 针对表【qhse_rohh(隐患任务信息)】的数据库操作Service实现
+ * @createDate 2025-08-18 17:05:53
+ */
+@Service
+public class QhseRohhServiceImpl extends ServiceImpl<QhseRohhMapper, QhseRohhDo> implements QhseRohhService {
+
+}
+
+
+
+

+ 23 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseRohhValidateServiceImpl.java

@@ -0,0 +1,23 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.bscommon.sys.dao.QhseRohhValidateMapper;
+import com.rongwei.bscommon.sys.service.QhseRohhValidateService;
+import com.rongwei.bsentity.domain.QhseRohhValidateDo;
+
+import org.springframework.stereotype.Service;
+
+/**
+* @author libai
+* @description 针对表【qhse_rohh_validate(隐患任务-验证详情)】的数据库操作Service实现
+* @createDate 2025-08-18 17:05:53
+*/
+@Service
+public class QhseRohhValidateServiceImpl extends ServiceImpl<QhseRohhValidateMapper, QhseRohhValidateDo>
+    implements QhseRohhValidateService {
+
+}
+
+
+
+

+ 17 - 17
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseTargetResponsibilityDocumentServiceImpl.java

@@ -64,11 +64,11 @@ public class QhseTargetResponsibilityDocumentServiceImpl extends ServiceImpl<Qhs
         QhseTargetResponsibilityDocumentDo qhseTargetResponsibilityDocumentDo = this.getById(mainId);
         if (qhseTargetResponsibilityDocumentDo == null) {
             log.error("无法获取到责任书信息");
-            throw new CustomException("无法获取到责任书信息");
+            throw new CustomException("200","无法获取到责任书信息");
         }
         String responsibilityfiles = qhseTargetResponsibilityDocumentDo.getResponsibilityfiles();
         if (StringUtils.isBlank(responsibilityfiles)) {
-            throw new CustomException("未上传责任书附件");
+            throw new CustomException("200","未上传责任书附件");
         }
         String fileId = responsibilityfiles.split(FILE_SEPARATOR)[1];
 
@@ -88,30 +88,30 @@ public class QhseTargetResponsibilityDocumentServiceImpl extends ServiceImpl<Qhs
         SysFileItemDo tempDo = fileFormatConversionService.fileCheck(fileId);
         if (tempDo == null) {
             log.error("无法根据id:{}获取到责任书文件信息", fileId);
-            throw new CustomException("无法获取到责任书");
+            throw new CustomException("200","无法获取到责任书");
         }
         // 模板路径
         String tempFullpath = tempDo.getFullpath();
         if (StringUtils.isBlank(tempFullpath)) {
             log.error("无法根据id:{}获取到责任书文件信息", fileId);
-            throw new CustomException("无法获取到责任书");
+            throw new CustomException("200","无法获取到责任书");
         }
         SysFileItemDo signatureDo = fileFormatConversionService.fileCheck(signatureId);
         if (signatureDo == null) {
             log.error("无法根据id:{}获取到签名信息", signatureId);
-            throw new CustomException("无法获取到签名");
+            throw new CustomException("200","无法获取到签名");
         }
         // 乙方签名路径
         String signaturePath = signatureDo.getFullpath();
         if (StringUtils.isBlank(signaturePath)) {
             log.error("无法根据id:{}获取到签名信息", signatureId);
-            throw new CustomException("无法获取到签名");
+            throw new CustomException("200","无法获取到签名");
         }
 
         String filetype = tempDo.getFiletype();
         if (!DOCX.equals(filetype) && !DOC.equals(filetype)) {
             log.error("责任书格式:{}不正确", filetype);
-            throw new CustomException("责任书格式不正确");
+            throw new CustomException("200","责任书格式不正确");
         }
 
         try (InputStream templateStream = Files.newInputStream(Paths.get(tempFullpath));
@@ -128,7 +128,7 @@ public class QhseTargetResponsibilityDocumentServiceImpl extends ServiceImpl<Qhs
             try {
                 fileName = URLEncoder.encode(tempDo.getFilename(), "utf-8");
             } catch (Exception e) {
-                throw new CustomException("文件名转换异常");
+                throw new CustomException("200","文件名转换异常");
             }
             response.setContentType("application/pdf");
             response.setHeader("Content-Disposition", "inline; filename=" + fileName);
@@ -143,7 +143,7 @@ public class QhseTargetResponsibilityDocumentServiceImpl extends ServiceImpl<Qhs
             out.flush();
         } catch (Exception e) {
             log.error("excel转pdf失败- 原因: {} | 异常类型: {}", e.getMessage(), e.getClass().getSimpleName(), e);
-            throw new CustomException("获取签名责任书失败!请联系系统管理员");
+            throw new CustomException("200","获取签名责任书失败!请联系系统管理员");
         }
     }
 
@@ -162,22 +162,22 @@ public class QhseTargetResponsibilityDocumentServiceImpl extends ServiceImpl<Qhs
         QhseTargetResponsibilityDocumentDo qhseTargetResponsibilityDocumentDo = this.getById(id);
         if (qhseTargetResponsibilityDocumentDo == null) {
             log.error("无法获取到责任书信息");
-            throw new CustomException("该记录可能已被其他人删除,请联系系统管理员");
+            throw new CustomException("200","该记录可能已被其他人删除,请联系系统管理员");
         }
         if (StringUtils.isBlank(qhseTargetResponsibilityDocumentDo.getResponsibilityfiles())) {
             log.error("责任书目录不存在");
-            throw new CustomException("无法获取到责任书信息,请联系系统管理员");
+            throw new CustomException("200","无法获取到责任书信息,请联系系统管理员");
         }
         String responsibilityfiles = qhseTargetResponsibilityDocumentDo.getResponsibilityfiles();
         SysFileItemDo tempFile = sysFileItemServiceImpl.getById(responsibilityfiles.split(FILE_SEPARATOR, 2)[1]);
         if (tempFile == null) {
             log.error("责任书在目录中存在");
-            throw new CustomException("无法获取到责任书信息,请联系系统管理员");
+            throw new CustomException("200","无法获取到责任书信息,请联系系统管理员");
         }
 
         if (StringUtils.isBlank(tempFile.getFullpath())) {
             log.error("责任书在目录中存在");
-            throw new CustomException("无法获取到责任书信息,请联系系统管理员");
+            throw new CustomException("200","无法获取到责任书信息,请联系系统管理员");
         }
 
 
@@ -188,7 +188,7 @@ public class QhseTargetResponsibilityDocumentServiceImpl extends ServiceImpl<Qhs
 
         boolean noSignatureData = documentSignatureDo.stream().anyMatch(info -> StringUtils.isNotBlank(info.getSignature()));
         if (!noSignatureData) {
-            throw new CustomException("目标责任书未含甲方及乙方的签名,无法下载!");
+            throw new CustomException("200","目标责任书未含甲方及乙方的签名,无法下载!");
         }
 
         Map<String, String> signatureDataMap = documentSignatureDo.stream().filter(info -> StringUtils.isNotBlank(info.getSignature())).collect(Collectors.groupingBy(QhseTargetResponsibilityDocumentSignatureDo::getSignaturesource,
@@ -242,7 +242,7 @@ public class QhseTargetResponsibilityDocumentServiceImpl extends ServiceImpl<Qhs
         try {
             fileName = URLEncoder.encode(value + docName + ".zip", "utf-8");
         } catch (Exception e) {
-            throw new CustomException("文件名转换异常");
+            throw new CustomException("200","文件名转换异常");
         }
         response.setContentType("application/zip");
         response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
@@ -256,7 +256,7 @@ public class QhseTargetResponsibilityDocumentServiceImpl extends ServiceImpl<Qhs
             templateBytes = Files.readAllBytes(Paths.get(tempPath));
         } catch (IOException e) {
             log.error("模板文件读取失败: {}", tempPath, e);
-            throw new CustomException("模板文件加载失败");
+            throw new CustomException("200","模板文件加载失败");
         }
 
 
@@ -284,7 +284,7 @@ public class QhseTargetResponsibilityDocumentServiceImpl extends ServiceImpl<Qhs
             }
         } catch (Exception e) {
             log.error("责任书压缩包生成失败- 原因: {} | 异常类型: {}", e.getMessage(), e.getClass().getSimpleName(), e);
-            throw new CustomException("文件生成失败,请联系系统管理员!");
+            throw new CustomException("200","文件生成失败,请联系系统管理员!");
         }
     }
 

+ 7 - 7
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/QhseVisitorManagementServiceImpl.java

@@ -5,7 +5,7 @@ import com.aspose.cells.PdfSaveOptions;
 import com.aspose.words.Document;
 import com.aspose.words.SaveFormat;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.common.fegin.AdminFeginService;
+import com.rongwei.bscommon.sys.fegin.AdminFeginService;
 import com.rongwei.bscommon.sys.dao.QhseVisitorManagementDao;
 import com.rongwei.bscommon.sys.service.QhseVisitorManagementService;
 import com.rongwei.bscommon.sys.utils.WordMergeHandler;
@@ -95,27 +95,27 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
         SysFileItemDo tempDo = fileFormatConversionService.fileCheck(fileId);
         if (tempDo == null) {
             logger.error("无法根据id:{}获取到文件信息", fileId);
-            throw new CustomException("无法获取到附件模板");
+            throw new CustomException("200","无法获取到附件模板");
         }
 
         // 模板路径
         String tempFullpath = tempDo.getFullpath();
         if (StringUtils.isBlank(tempFullpath)) {
             logger.error("无法根据id:{}获取到文件信息", fileId);
-            throw new CustomException("无法获取到附件模板");
+            throw new CustomException("200","无法获取到附件模板");
         }
 
         String signatureId = signature.split(FILE_SEPARATOR)[1];
         SysFileItemDo signatureDo = fileFormatConversionService.fileCheck(signatureId);
         if (signatureDo == null) {
             logger.error("无法根据id:{}获取到签名信息", signatureId);
-            throw new CustomException("无法获取到签名");
+            throw new CustomException("200","无法获取到签名");
         }
         // 乙方签名路径
         String signaturePath = signatureDo.getFullpath();
         if (StringUtils.isBlank(signaturePath)) {
             logger.error("无法根据id:{}获取到签名信息", signatureId);
-            throw new CustomException("无法获取到签名");
+            throw new CustomException("200","无法获取到签名");
         }
 
         File file = new File(tempFullpath);
@@ -135,7 +135,7 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
                fileName = URLEncoder.encode(tempDo.getFilename(), "utf-8");
 
             } catch (Exception e) {
-                throw new CustomException("文件名转换异常");
+                throw new CustomException("200","文件名转换异常");
             }
             response.setContentType("application/pdf");
 
@@ -152,7 +152,7 @@ public class QhseVisitorManagementServiceImpl extends ServiceImpl<QhseVisitorMan
             out.flush();
         } catch (Exception e) {
             logger.error("excel转pdf失败- 原因: {} | 异常类型: {}", e.getMessage(), e.getClass().getSimpleName(), e);
-            throw new CustomException("获取签名责任书失败!请联系系统管理员");
+            throw new CustomException("200","获取签名责任书失败!请联系系统管理员");
         }
     }
 }

+ 180 - 0
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/RohhServiceImpl.java

@@ -0,0 +1,180 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.rongwei.bscommon.sys.service.RohhService;
+import com.rongwei.bscommon.sys.utils.QHSEUtils;
+import com.rongwei.bsentity.domain.*;
+import com.rongwei.bsentity.vo.ROHHEventVo;
+import com.rongwei.bsentity.vo.TaskTransferVo;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import com.rongwei.rwcommon.base.exception.CustomException;
+import com.rongwei.rwcommon.utils.SecurityUtil;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * RohhServiceImpl class
+ *
+ * @author XH
+ * @date 2025/08/18
+ */
+@Service
+public class RohhServiceImpl implements RohhService {
+    private static final Logger log = LoggerFactory.getLogger(RohhServiceImpl.class);
+
+    @Autowired
+    private QhseRohhServiceImpl qhseRohhService;
+    @Autowired
+    private QhseRohhRectificationServiceImpl qhseRohhRectificationService;
+    @Autowired
+    private QhseRohhValidateServiceImpl qhseRohhValidateService;
+    @Autowired
+    private QhseRohhRpServiceImpl qhseRohhRpService;
+    @Autowired
+    private QhseRohhEventServiceImpl qhseRohhEventService;
+
+    @Override
+    public void createRectification(String id) {
+        QhseRohhDo qhseRohhDo = rohhCheck(id);
+        SysUserVo currentUser = QHSEUtils.getCurrentUser();
+        QhseRohhRectificationDo qhseRohhRectificationDo = new QhseRohhRectificationDo();
+        qhseRohhRectificationDo.setId(SecurityUtil.getUUID());
+        QHSEUtils.initModelGeneralParameters(qhseRohhRectificationDo, currentUser);
+        qhseRohhRectificationDo.setRectificationplan(qhseRohhDo.getRectificationplan());
+        qhseRohhRectificationDo.setPlanatt(qhseRohhDo.getPlanatt());
+        qhseRohhRectificationDo.setRectificationphoto(qhseRohhDo.getRectificationphoto());
+        qhseRohhRectificationDo.setRectificationtime(qhseRohhDo.getRectificationtime());
+        qhseRohhRectificationDo.setRohhid(id);
+        qhseRohhRectificationDo.setUserid(currentUser.getId());
+        qhseRohhRectificationDo.setUsername(currentUser.getName());
+        qhseRohhRectificationService.save(qhseRohhRectificationDo);
+        // 增加事件
+        ROHHEventVo rohhEventVo = new ROHHEventVo();
+        rohhEventVo.setRohhid(id);
+        rohhEventVo.setEventname("分配");
+        rohhEventVo.setEventtype("任务分配");
+        rohhEventVo.setDescribe("当前任务已交由" + qhseRohhDo.getRectificationuser() + "整改");
+        createRPEvent(rohhEventVo);
+    }
+
+    @Override
+    public void createValidate(String id) {
+        QhseRohhDo qhseRohhDo = rohhCheck(id);
+        SysUserVo currentUser = QHSEUtils.getCurrentUser();
+        QhseRohhValidateDo qhseRohhValidateDo = new QhseRohhValidateDo();
+        qhseRohhValidateDo.setId(SecurityUtil.getUUID());
+        QHSEUtils.initModelGeneralParameters(qhseRohhValidateDo, currentUser);
+        qhseRohhValidateDo.setRohhid(id);
+        qhseRohhValidateDo.setVerifier(qhseRohhDo.getVerifier());
+        qhseRohhValidateDo.setVerifierid(qhseRohhDo.getVerifierid());
+        qhseRohhValidateDo.setHdtype(qhseRohhDo.getHdtype());
+        qhseRohhValidateDo.setVerifierdesc(qhseRohhDo.getVerifierdesc());
+        qhseRohhValidateDo.setVerifierphoto(qhseRohhDo.getVerifierphoto());
+        qhseRohhValidateDo.setVerifierresult(qhseRohhDo.getVerifierresult());
+        qhseRohhValidateService.save(qhseRohhValidateDo);
+    }
+
+    @Override
+    public void createRP(String id) {
+        QhseRohhDo qhseRohhDo = rohhCheck(id);
+        SysUserVo currentUser = QHSEUtils.getCurrentUser();
+        QhseRohhRpDo qhseRohhRpDo = new QhseRohhRpDo();
+        QHSEUtils.initModelGeneralParameters(qhseRohhRpDo, currentUser);
+        qhseRohhRpDo.setId(id);
+        qhseRohhRpDo.setRohhid(qhseRohhDo.getId());
+        qhseRohhRpDo.setRptype("1");
+        qhseRohhRpDo.setUsername(qhseRohhDo.getInspectuser());
+        qhseRohhRpDo.setUserid(qhseRohhDo.getInspectuserid());
+        qhseRohhRpDo.setDeptid(qhseRohhDo.getInspectuserdeptid());
+        qhseRohhRpDo.setDeptname(qhseRohhDo.getInspectuserdept());
+        qhseRohhRpService.save(qhseRohhRpDo);
+    }
+
+    @Override
+    public void createRPEvent(ROHHEventVo rohhEventVo) {
+        QhseRohhEventDo qhseRohhEventDo = new QhseRohhEventDo();
+        SysUserVo currentUser = QHSEUtils.getCurrentUser();
+        QHSEUtils.initModelGeneralParameters(qhseRohhEventDo, currentUser);
+        qhseRohhEventDo.setId(SecurityUtil.getUUID());
+        qhseRohhEventDo.setRohhid(rohhEventVo.getRohhid());
+        qhseRohhEventDo.setEventname(rohhEventVo.getEventname());
+        qhseRohhEventDo.setEventtype(rohhEventVo.getEventtype());
+        qhseRohhEventDo.setDescribe(rohhEventVo.getDescribe());
+        qhseRohhEventService.save(qhseRohhEventDo);
+    }
+
+    @Override
+    public void taskTransfer(TaskTransferVo taskTransferVo) {
+        List<String> ids = taskTransferVo.getIds();
+        if (ids == null || ids.isEmpty()) {
+            throw new CustomException("200","参数异常");
+        }
+        String userId = taskTransferVo.getUserId();
+        String userName = taskTransferVo.getUserName();
+        if (StringUtils.isBlank(userId) || StringUtils.isBlank(userName)) {
+            throw new CustomException("200","重新选择的整改人为空");
+        }
+        QhseRohhDo qhseRohhDo;
+        QhseRohhEventDo qhseRohhEventDo;
+        List<QhseRohhDo> savaList = new ArrayList<>();
+        List<QhseRohhEventDo> eventSavaList = new ArrayList<>();
+        SysUserVo currentUser = QHSEUtils.getCurrentUser();
+        for (String id : ids) {
+            if (StringUtils.isBlank(id)) {
+                continue;
+            }
+            qhseRohhDo = new QhseRohhDo();
+
+            qhseRohhDo.setId(id);
+            qhseRohhDo.setModifydate(new Date());
+            qhseRohhDo.setModifyuserid(currentUser.getId());
+            qhseRohhDo.setModifyusername(currentUser.getName());
+            qhseRohhDo.setState("2");
+            qhseRohhDo.setRectificationuser(userName);
+            qhseRohhDo.setRectificationuserid(userId);
+            savaList.add(qhseRohhDo);
+
+
+            qhseRohhEventDo = new QhseRohhEventDo();
+            qhseRohhEventDo.setRohhid(id);
+            qhseRohhEventDo.setId(SecurityUtil.getUUID());
+            qhseRohhEventDo.setEventname("整改");
+            qhseRohhEventDo.setEventtype("任务转派");
+            qhseRohhEventDo.setDescribe("当前任务已交由" + userName + "处理");
+            QHSEUtils.initModelGeneralParameters(qhseRohhEventDo, currentUser);
+            eventSavaList.add(qhseRohhEventDo);
+
+        }
+
+        if (!savaList.isEmpty()) {
+            qhseRohhService.updateBatchById(savaList);
+        }
+        if (!eventSavaList.isEmpty()) {
+            qhseRohhEventService.saveBatch(eventSavaList);
+        }
+    }
+
+    /**
+     * 参数校验
+     *
+     * @param id
+     * @return
+     */
+    public QhseRohhDo rohhCheck(String id) {
+        if (StringUtils.isBlank(id)) {
+            throw new CustomException("200","参数异常");
+        }
+        QhseRohhDo qhseRohhDo = qhseRohhService.getById(id);
+        if (qhseRohhDo == null) {
+            throw new CustomException("200","无法获取到隐患任务信息");
+        }
+
+        return qhseRohhDo;
+    }
+}

+ 0 - 3
qhse-common/src/main/java/com/rongwei/bscommon/sys/service/impl/SysPagePartServiceImpl.java

@@ -1,12 +1,9 @@
 package com.rongwei.bscommon.sys.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.rongwei.bscommon.sys.common.fegin.AdminFeginService;
 import com.rongwei.bscommon.sys.dao.SysPagePartDao;
 import com.rongwei.bscommon.sys.service.SysPagePartService;
 import com.rongwei.bsentity.domain.SysPagePartDo;
-import com.rongwei.rwcommon.vo.generalsql.MasterSlaveInsertVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**

+ 2 - 2
qhse-common/src/main/java/com/rongwei/bscommon/sys/utils/WordUtils.java

@@ -30,7 +30,7 @@ public class WordUtils {
             // response.setHeader("Content-Disposition", "attachment;filename=AccidentHandlingSheet.docx");
             // doc.save(response.getOutputStream(), SaveFormat.DOCX);
         } catch (Exception e) {
-            throw new CustomException("文件导出异常");
+            throw new CustomException("200","文件导出异常");
         }
     }
     public static void MailMergeFill(Map<String, String> wordMap, Document doc) {
@@ -45,7 +45,7 @@ public class WordUtils {
             // response.setHeader("Content-Disposition", "attachment;filename=AccidentHandlingSheet.docx");
             // doc.save(response.getOutputStream(), SaveFormat.DOCX);
         } catch (Exception e) {
-            throw new CustomException("文件导出异常");
+            throw new CustomException("200","文件导出异常");
         }
     }
 }

+ 246 - 0
qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhDo.java

@@ -0,0 +1,246 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 隐患任务信息
+ * @TableName qhse_rohh
+ */
+@TableName(value ="qhse_rohh")
+@Data
+public class QhseRohhDo extends BaseDo {
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 状态
+     */
+    private String state;
+
+    /**
+     * 编号
+     */
+    private String serialnumber;
+
+    /**
+     * 检查类型
+     */
+    private String inspecttype;
+
+    /**
+     * 隐患时间
+     */
+    private Date registertime;
+
+    /**
+     * 检查人
+     */
+    private String inspectuser;
+
+    /**
+     * 检查人ID
+     */
+    private String inspectuserid;
+
+    /**
+     * 检查人所属部门
+     */
+    private String inspectuserdept;
+
+    /**
+     * 检查人所属部门ID
+     */
+    private String inspectuserdeptid;
+
+    /**
+     * 隐患大类
+     */
+    private String hdmc;
+
+    /**
+     * 隐患小类
+     */
+    private String hdsc;
+
+    /**
+     * 隐患等级
+     */
+    private String hdlevel;
+
+    /**
+     * 期限整改天数
+     */
+    private Integer rectificationdays;
+
+    /**
+     * 期限整改日期
+     */
+    private Date rectificationdate;
+
+    /**
+     * 整改建议
+     */
+    private String rectificationproposal;
+
+    /**
+     * 隐患描述
+     */
+    private String hddesc;
+
+    /**
+     * 隐患照片
+     */
+    private String hdphoto;
+
+    /**
+     * 整改部门
+     */
+    private String rectificationdept;
+
+    /**
+     * 整改部门ID
+     */
+    private String rectificationdeptid;
+
+    /**
+     * 整改车间
+     */
+    private String rectificationworkshop;
+
+    /**
+     * 整改车间ID
+     */
+    private String rectificationworkshopid;
+
+    /**
+     * 整改分包商
+     */
+    private String rectificationworksubcontractor;
+
+    /**
+     * 整改分包商ID
+     */
+    private String rectificationworksubcontractorid;
+
+    /**
+     * 网格ID
+     */
+    private String gridid;
+
+    /**
+     * 责任网格
+     */
+    private String grid;
+
+    /**
+     * 网格责任人
+     */
+    private String gridmanager;
+
+    /**
+     * 网格责任人ID
+     */
+    private String gridmanagerid;
+
+    /**
+     * 整改责任人
+     */
+    private String rectificationuser;
+
+    /**
+     * 整改责任人ID
+     */
+    private String rectificationuserid;
+
+    /**
+     * 详细位置
+     */
+    private String location;
+
+    /**
+     * 退回原因
+     */
+    private String returnreason;
+
+    /**
+     * 取消原因
+     */
+    private String cancelreason;
+
+    /**
+     * 整改方案
+     */
+    private String rectificationplan;
+
+    /**
+     * 方案附件
+     */
+    private String planatt;
+
+    /**
+     * 整改图片
+     */
+    private String rectificationphoto;
+
+    /**
+     * 整改时间
+     */
+    private Date rectificationtime;
+
+    /**
+     * 验证人
+     */
+    private String verifier;
+
+    /**
+     * 验证人ID
+     */
+    private String verifierid;
+
+    /**
+     * 隐患类型(安全/环保/文明生产/治安/消防/交通)
+     */
+    private String hdtype;
+
+    /**
+     * 验证说明
+     */
+    private String verifierdesc;
+
+    /**
+     * 验证图片
+     */
+    private String verifierphoto;
+
+    /**
+     * 验证结果(通过/继续整改/取消)
+     */
+    private String verifierresult;
+
+    /**
+     * 同步状态
+     */
+    private String syncstate;
+    /**
+     * 整改退回次数
+      */
+    private int rectificationreturncount;
+}

+ 51 - 0
qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhEventDo.java

@@ -0,0 +1,51 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 隐患任务信息-事件信息
+ * @TableName qhse_rohh_event
+ */
+@TableName(value ="qhse_rohh_event")
+@Data
+public class QhseRohhEventDo extends BaseDo {
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 隐患任务ID
+     */
+    private String rohhid;
+
+    /**
+     * 事件名称
+     */
+    private String eventname;
+
+    /**
+     * 事件类型
+     */
+    private String eventtype;
+
+    /**
+     * 说明
+     */
+    private String describe;
+}

+ 69 - 0
qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhRectificationDo.java

@@ -0,0 +1,69 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 隐患任务-整改详情
+ * @TableName qhse_rohh_rectification
+ */
+@TableName(value ="qhse_rohh_rectification")
+@Data
+public class QhseRohhRectificationDo extends BaseDo {
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+
+    /**
+     * 整改方案
+     */
+    private String rectificationplan;
+
+    /**
+     * 方案附件
+     */
+    private String planatt;
+
+    /**
+     * 整改图片
+     */
+    private String rectificationphoto;
+
+    /**
+     * 整改时间
+     */
+    private Date rectificationtime;
+
+    /**
+     * 隐患任务ID
+     */
+    private String rohhid;
+
+    /**
+     * 整改人
+     */
+    private String userid;
+
+    /**
+     * 整改人名称
+     */
+    private String username;
+}

+ 88 - 0
qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhRpDo.java

@@ -0,0 +1,88 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 隐患任务信息-奖惩
+ * @TableName qhse_rohh_rp
+ */
+@TableName(value ="qhse_rohh_rp")
+@Data
+public class QhseRohhRpDo  extends BaseDo {
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 奖惩类型
+     */
+    private String rptype;
+
+    /**
+     * 分数
+     */
+    private BigDecimal point;
+
+    /**
+     * 金额
+     */
+    private BigDecimal money;
+
+    /**
+     * 奖惩人员
+     */
+    private String username;
+
+    /**
+     * 用户ID
+     */
+    private String userid;
+
+    /**
+     * 生效时间
+     */
+    private Date effectivetime;
+
+    /**
+     * 隐患任务ID
+     */
+    private String rohhid;
+
+    /**
+     * 奖励ID
+     */
+    private String rewardid;
+
+    /**
+     * 奖励标注
+     */
+    private String rewardannotation;
+
+    /**
+     * 部门ID
+     */
+    private String deptid;
+
+    /**
+     * 部门名称
+     */
+    private String deptname;
+}

+ 67 - 0
qhse-entity/src/main/java/com/rongwei/bsentity/domain/QhseRohhValidateDo.java

@@ -0,0 +1,67 @@
+package com.rongwei.bsentity.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 隐患任务-验证详情
+ * @TableName qhse_rohh_validate
+ */
+@TableName(value ="qhse_rohh_validate")
+@Data
+public class QhseRohhValidateDo  extends BaseDo {
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 隐患任务ID
+     */
+    private String rohhid;
+
+    /**
+     * 验证人
+     */
+    private String verifier;
+
+    /**
+     * 验证人ID
+     */
+    private String verifierid;
+
+    /**
+     * 隐患类型(安全/环保/文明生产/治安/消防/交通)
+     */
+    private String hdtype;
+
+    /**
+     * 验证说明
+     */
+    private String verifierdesc;
+
+    /**
+     * 验证图片
+     */
+    private String verifierphoto;
+
+    /**
+     * 验证结果(通过/继续整改/取消)
+     */
+    private String verifierresult;
+}

+ 21 - 0
qhse-entity/src/main/java/com/rongwei/bsentity/vo/ROHHEventVo.java

@@ -0,0 +1,21 @@
+package com.rongwei.bsentity.vo;
+
+import lombok.Data;
+
+/**
+ * ROHHEventVo class
+ *
+ * @author XH
+ * @date 2025/08/20
+ */
+@Data
+public class ROHHEventVo {
+    private String eventname;
+    private String eventtype;
+    private String describe;
+    private String rohhid;
+}
+
+
+
+

+ 18 - 0
qhse-entity/src/main/java/com/rongwei/bsentity/vo/TaskTransferVo.java

@@ -0,0 +1,18 @@
+package com.rongwei.bsentity.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * TaskTransferVo class
+ *
+ * @author XH
+ * @date 2025/08/20
+ */
+@Data
+public class TaskTransferVo {
+    private List<String> ids;
+    private String userId;
+    private String userName;
+}

+ 0 - 2
qhse-server/src/main/java/com/rongwei/controller/QhseVisitorManagementController.java

@@ -124,6 +124,4 @@ public class QhseVisitorManagementController  {
         qhseVisitorManagementService.previewForAttachmentWithSignature(signature,fileId, response);
     }
 
-
 }
-

+ 90 - 0
qhse-server/src/main/java/com/rongwei/controller/RohhController.java

@@ -0,0 +1,90 @@
+package com.rongwei.controller;
+
+import com.rongwei.bscommon.sys.service.impl.RohhServiceImpl;
+import com.rongwei.bsentity.vo.ROHHEventVo;
+import com.rongwei.bsentity.vo.TaskTransferVo;
+import com.rongwei.rwcommon.base.R;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * RohhController class
+ *
+ * @author XH
+ * @date 2025/08/18
+ */
+
+@RestController
+@RequestMapping("/rohh")
+public class RohhController {
+    private static final Logger log = LoggerFactory.getLogger(RohhController.class);
+
+    @Autowired
+    private RohhServiceImpl rohhService;
+
+    /**
+     * 新增整改信息
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/create/rectification/{id}")
+    public R createRectification(@PathVariable String id) {
+        log.info("开始创建隐患整改记录: {}", id);
+        rohhService.createRectification(id);
+        return R.ok();
+    }
+
+    /**
+     * 新增整改信息
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/create/validate/{id}")
+    public R createValidate(@PathVariable String id) {
+        log.info("开始创建隐患验证记录: {}", id);
+        rohhService.createValidate(id);
+        return R.ok();
+    }
+
+    /**
+     * 创建奖惩人员信息
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/create/rp/{id}")
+    public R createRP(@PathVariable String id) {
+        log.info("开始创建奖惩人员信息: {}", id);
+        rohhService.createRP(id);
+        return R.ok();
+    }
+
+    /**
+     * 创建整改任务事件信息
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/create/event")
+    public R createRPEvent(@RequestBody ROHHEventVo rohhEventVo) {
+        log.info("创建整改任务事件信息: {}", rohhEventVo);
+        rohhService.createRPEvent(rohhEventVo);
+        return R.ok();
+    }
+    /**
+     * 任务转派
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/task/transfer")
+    public R taskTransfer(@RequestBody TaskTransferVo taskTransferVo) {
+        log.info("开始任务转派: {}", taskTransferVo);
+        rohhService.taskTransfer(taskTransferVo);
+        return R.ok();
+    }
+}