唐山和包头对接文档开发

pom.xml

@@ -295,6 +295,17 @@
             <artifactId>rocketmq-spring-boot-starter</artifactId>
             <version>2.3.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>1.5.5.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+            <version>1.5.5.Final</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 

src/main/java/com/zcloud/config/ShiroConfig.java

@@ -69,7 +69,7 @@ public class ShiroConfig {
 
         filterMap.put("/tangshan/**", "anon");
         filterMap.put("/wh/**", "anon");
-        filterMap.put("/tangshan/**", "anon");
+        filterMap.put("/baotou/**", "anon");
 
         filterMap.put("/**", "oauth2");
         return filterMap;

src/main/java/com/zcloud/modules/data/config/TyConfiguration.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
  * <a href="http://47.92.113.182:3000/docking/doc/src/branch/main/%E5%9B%AD%E5%8C%BA%E7%BA%A7%E5%AF%B9%E6%8E%A5%E6%96%87%E4%BB%B6/%E5%9C%9F%E5%8F%B3%E5%9B%AD%E5%8C%BA%E4%BC%81%E4%B8%9A%E5%B9%B3%E5%8F%B0%E6%95%B0%E6%8D%AE%E4%BA%A4%E6%8D%A2%E8%A7%84%E8%8C%83V1.6.doc">git地址</a>
  */
 @Component
-@ConfigurationProperties(prefix = "baotou.dj")
+@ConfigurationProperties(prefix = "baotou.ty")
 @Data
 public class TyConfiguration {
     /**

src/main/java/com/zcloud/modules/data/controller/baotou/ty/v16/TyPullDataController.java

@@ -4,7 +4,7 @@ import com.zcloud.common.utils.R;
 import com.zcloud.modules.data.base.BaseController;
 import com.zcloud.modules.data.dto.baotou.ty.req.*;
 import com.zcloud.modules.data.dto.baotou.ty.resp.TyEnterpriseAreaRespDto;
-import com.zcloud.modules.data.service.baotou.ty.TyPullDataService;
+import com.zcloud.modules.data.thirdservice.baotou.ty.TyPullDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/zcloud/modules/data/controller/tangshan/dj/v2/DjPullDataController.java

@@ -2,7 +2,7 @@ package com.zcloud.modules.data.controller.tangshan.dj.v2;
 
 import com.zcloud.common.utils.R;
 import com.zcloud.modules.data.dto.tangshan.dj.req.*;
-import com.zcloud.modules.data.service.tangshan.dj.DjPullDataService;
+import com.zcloud.modules.data.thirdservice.tangshan.dj.DjPullDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/zcloud/modules/data/controller/tangshan/ds/v1/DsPullDataController.java

@@ -1,9 +1,8 @@
 package com.zcloud.modules.data.controller.tangshan.ds.v1;
 
 import com.zcloud.common.utils.R;
-import com.zcloud.modules.data.dto.tangshan.dj.req.*;
 import com.zcloud.modules.data.dto.tangshan.ds.req.*;
-import com.zcloud.modules.data.service.tangshan.ds.DsPullDataService;
+import com.zcloud.modules.data.thirdservice.tangshan.ds.DsPullDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/zcloud/modules/data/controller/wh/hebei/v10/WhSjPullDataController.java

@@ -4,7 +4,7 @@ import com.zcloud.common.utils.R;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV10.req.*;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV10.res.SjGetRequestLogResDto;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV10.res.SjgetLogResDto;
-import com.zcloud.modules.data.service.wh.WhSjPullDataService;
+import com.zcloud.modules.data.thirdservice.wh.WhSjPullDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/zcloud/modules/data/dao/dj/DjBlindPlateWorkDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjBlindPlateWorkEntity;
+
+/**
+ * 盲板抽堵作业表(唐山东江)(DjBlindPlateWork)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 13:53:59
+ */
+public interface DjBlindPlateWorkDao extends BaseMapper<DjBlindPlateWorkEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/dj/DjCheckAcceptDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjCheckAcceptEntity;
+
+/**
+ * 特殊作业验收信息表(唐山东江)(DjCheckAccept)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 15:11:18
+ */
+public interface DjCheckAcceptDao extends BaseMapper<DjCheckAcceptEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/dj/DjConfinedSpaceWorkDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjConfinedSpaceWorkEntity;
+
+/**
+ * 受限空间作业表(唐山东江)(DjConfinedSpaceWork)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 13:35:57
+ */
+public interface DjConfinedSpaceWorkDao extends BaseMapper<DjConfinedSpaceWorkEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/dj/DjDangerCheckRecordDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjDangerCheckRecordEntity;
+
+/**
+ * 隐患排查记录表(唐山东江)(DjDangerCheckRecord)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 11:37:58
+ */
+public interface DjDangerCheckRecordDao extends BaseMapper<DjDangerCheckRecordEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/dj/DjDangerCheckTaskDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjDangerCheckTaskEntity;
+
+/**
+ * 隐患排查任务表(唐山东江)(DjDangerCheckTask)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 11:19:24
+ */
+public interface DjDangerCheckTaskDao extends BaseMapper<DjDangerCheckTaskEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/dj/DjDangerInfoDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjDangerInfoEntity;
+
+/**
+ * 隐患信息表(唐山东江)(DjDangerInfo)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 11:38:21
+ */
+public interface DjDangerInfoDao extends BaseMapper<DjDangerInfoEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/dj/DjElectricityWorkDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjElectricityWorkEntity;
+
+/**
+ * 临时用电作业表(唐山东江)(DjElectricityWork)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 14:48:55
+ */
+public interface DjElectricityWorkDao extends BaseMapper<DjElectricityWorkEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/dj/DjGasAnalysisDataDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjGasAnalysisDataEntity;
+
+/**
+ * 特殊作业气体分析数据表(唐山东江)(DjGasAnalysisData)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 15:07:41
+ */
+public interface DjGasAnalysisDataDao extends BaseMapper<DjGasAnalysisDataEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/dj/DjGroundBreakWorkDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjGroundBreakWorkEntity;
+
+/**
+ * 动土作业表(唐山东江)(DjGroundBreakWork)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 14:27:42
+ */
+public interface DjGroundBreakWorkDao extends BaseMapper<DjGroundBreakWorkEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/dj/DjHighWorkDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjHighWorkEntity;
+
+/**
+ * 高处作业表(唐山东江)(DjHighWork)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 14:41:09
+ */
+public interface DjHighWorkDao extends BaseMapper<DjHighWorkEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/dj/DjHoistWorkDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjHoistWorkEntity;
+
+/**
+ * 吊装作业表（唐山东江）(DjHoistWork)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 15:01:25
+ */
+public interface DjHoistWorkDao extends BaseMapper<DjHoistWorkEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/dj/DjHotWorkDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjHotWorkEntity;
+
+/**
+ * 动火作业表(唐山东江)(DjHotWork)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 11:51:03
+ */
+public interface DjHotWorkDao extends BaseMapper<DjHotWorkEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/dj/DjOpenCircuitWorkDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjOpenCircuitWorkEntity;
+
+/**
+ * 断路作业表(唐山东江)(DjOpenCircuitWork)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 14:01:33
+ */
+public interface DjOpenCircuitWorkDao extends BaseMapper<DjOpenCircuitWorkEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/dj/DjRepositoryAggregate.java

@@ -0,0 +1,27 @@
+package com.zcloud.modules.data.dao.dj;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class DjRepositoryAggregate {
+
+
+    public final DjSafeRiskAnalysisUnitDao safeRiskAnalysisUnitDao;
+    public final DjSafeRiskEventDao safeRiskEventDao;
+    public final DjSafeRiskControlMeasureDao safeRiskControlMeasureDao;
+    public final DjDangerCheckTaskDao dangerCheckTaskDao;
+    public final DjDangerCheckRecordDao dangerCheckRecordDao;
+    public final DjDangerInfoDao dangerInfoDao;
+    public final DjHotWorkDao hotWorkDao;
+    public final DjConfinedSpaceWorkDao confinedSpaceWorkDao;
+    public final DjBlindPlateWorkDao blindPlateWorkDao;
+    public final DjOpenCircuitWorkDao openCircuitWorkDao;
+    public final DjGroundBreakWorkDao groundBreakWorkDao;
+    public final DjHighWorkDao highWorkDao;
+    public final DjElectricityWorkDao electricityWorkDao;
+    public final DjHoistWorkDao hoistWorkDao;
+    public final DjGasAnalysisDataDao gasAnalysisDataDao;
+    public final DjCheckAcceptDao checkAcceptDao;
+}

src/main/java/com/zcloud/modules/data/dao/dj/DjSafeRiskAnalysisUnitDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjSafeRiskAnalysisUnitEntity;
+
+/**
+ * 唐山东江安全风险分析单元表(DjSafeRiskAnalysisUnit)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 10:04:53
+ */
+public interface DjSafeRiskAnalysisUnitDao extends BaseMapper<DjSafeRiskAnalysisUnitEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/dj/DjSafeRiskControlMeasureDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjSafeRiskControlMeasureEntity;
+
+/**
+ * 安全风险管控措施表(唐山东江)(DjSafeRiskControlMeasure)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 11:10:26
+ */
+public interface DjSafeRiskControlMeasureDao extends BaseMapper<DjSafeRiskControlMeasureEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/dj/DjSafeRiskEventDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.dj;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.dj.DjSafeRiskEventEntity;
+
+/**
+ * 唐山东江安全风险事件表(DjSafeRiskEvent)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 10:39:49
+ */
+public interface DjSafeRiskEventDao extends BaseMapper<DjSafeRiskEventEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/ty/TyDeviceRunStatusDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.ty;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.ty.TyDeviceRunStatusEntity;
+
+/**
+ * 土右上报承诺装置运行状态表(TyDeviceRunStatus)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 17:58:00
+ */
+public interface TyDeviceRunStatusDao extends BaseMapper<TyDeviceRunStatusEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/ty/TyEmployeeFileDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.ty;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.ty.TyEmployeeFileEntity;
+
+/**
+ * 人员档案信息表(TyEmployeeFile)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 18:10:40
+ */
+public interface TyEmployeeFileDao extends BaseMapper<TyEmployeeFileEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/ty/TyEmployeeRealLocationDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.ty;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.ty.TyEmployeeRealLocationEntity;
+
+/**
+ * 人员实时定位数据表(TyEmployeeRealLocation)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 18:10:51
+ */
+public interface TyEmployeeRealLocationDao extends BaseMapper<TyEmployeeRealLocationEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/ty/TyHiddenCheckMissionDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.ty;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.ty.TyHiddenCheckMissionEntity;
+
+/**
+ * 土右上报隐患排查任务数据表(TyHiddenCheckMission)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 16:48:15
+ */
+public interface TyHiddenCheckMissionDao extends BaseMapper<TyHiddenCheckMissionEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/ty/TyHiddenCheckRecordDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.ty;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.ty.TyHiddenCheckRecordEntity;
+
+/**
+ * 土右上报隐患排查记录数据表(TyHiddenCheckRecord)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 16:48:28
+ */
+public interface TyHiddenCheckRecordDao extends BaseMapper<TyHiddenCheckRecordEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/ty/TyHiddenDangerInfoCheckDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.ty;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.ty.TyHiddenDangerInfoCheckEntity;
+
+/**
+ * 土右专项检查隐患信息表(TyHiddenDangerInfoCheck)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 17:27:29
+ */
+public interface TyHiddenDangerInfoCheckDao extends BaseMapper<TyHiddenDangerInfoCheckEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/ty/TyHiddenDangerInfoDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.ty;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.ty.TyHiddenDangerInfoEntity;
+
+/**
+ * 土右上报隐患信息数据表(TyHiddenDangerInfo)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 16:48:40
+ */
+public interface TyHiddenDangerInfoDao extends BaseMapper<TyHiddenDangerInfoEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/ty/TyMaintenanceRecordDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.ty;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.ty.TyMaintenanceRecordEntity;
+
+/**
+ * 土右上报停用/检修记录表(TyMaintenanceRecord)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 17:27:44
+ */
+public interface TyMaintenanceRecordDao extends BaseMapper<TyMaintenanceRecordEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/ty/TyProductionPromiseDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.ty;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.ty.TyProductionPromiseEntity;
+
+/**
+ * 土右上报安全承诺数据表(TyProductionPromise)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 17:48:33
+ */
+public interface TyProductionPromiseDao extends BaseMapper<TyProductionPromiseEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/ty/TyPromiseTicketDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.ty;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.ty.TyPromiseTicketEntity;
+
+/**
+ * 土右上报承诺作业票详情表(TyPromiseTicket)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 18:02:47
+ */
+public interface TyPromiseTicketDao extends BaseMapper<TyPromiseTicketEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/ty/TyRiskControlMeasuresDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.ty;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.ty.TyRiskControlMeasuresEntity;
+
+/**
+ * 土右上报安全风险控制措施数据表(TyRiskControlMeasures)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 16:29:55
+ */
+public interface TyRiskControlMeasuresDao extends BaseMapper<TyRiskControlMeasuresEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/ty/TyRiskEventsDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.ty;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.ty.TyRiskEventsEntity;
+
+/**
+ * 土右上报安全风险事件数据表(TyRiskEvents)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 16:14:25
+ */
+public interface TyRiskEventsDao extends BaseMapper<TyRiskEventsEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dao/ty/TyRiskUnitDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao.ty;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.ty.TyRiskUnitEntity;
+
+/**
+ * 上报安全风险分析单元数据表(TyRiskUnit)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-30 15:27:05
+ */
+public interface TyRiskUnitDao extends BaseMapper<TyRiskUnitEntity> {
+
+}
+

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyBaseCheckRecordReqDto.java

@@ -1,6 +1,5 @@
 package com.zcloud.modules.data.dto.baotou.ty.req;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyCheckTypeEnum;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyResultStatusEnum;
@@ -17,7 +16,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("专项检查情况记录请求实体")
+@ApiModel("土右专项检查情况记录请求实体")
 public class TyBaseCheckRecordReqDto extends TyBaseReqDto{
 
     @ApiModelProperty(value = "企业编码,危化品登记平台登记 的 9 位企业编码", required = true)

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyCarRecordReqDto.java

@@ -14,7 +14,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("卡口车辆通行记录请求实体")
+@ApiModel("土右卡口车辆通行记录请求实体")
 public class TyCarRecordReqDto extends TyCommonReqDto {
 
     @JsonProperty("pass_id")

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyDeviceRunStatusReqDto.java

@@ -1,6 +1,5 @@
 package com.zcloud.modules.data.dto.baotou.ty.req;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyIsCommonStatusEnum;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyRunStatusEnum;
@@ -17,17 +16,13 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报承诺装置运行状态表请求实体")
+@ApiModel("土右上报承诺装置运行状态表请求实体")
 public class TyDeviceRunStatusReqDto extends TyBaseReqDto {
 
-    @JsonProperty("id")
-    @ApiModelProperty(value = "主键,36位UUID", required = true)
-    @NotBlank(message = "主键,不能为空")
-    private String id;
 
     @ApiModelProperty(value = "承诺详情ID,与企业承诺详情表的ID对应", required = true)
     @NotBlank(message = "承诺详情ID,不能为空")
-    private String promiseID;
+    private String promiseId;
 
     @ApiModelProperty(value = "危险源编码", required = true)
     @NotBlank(message = "危险源编码,不能为空")

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyEmployeeFileReqDto.java

@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报人员档案数据请求实体")
+@ApiModel("土右上报人员档案数据请求实体")
 public class TyEmployeeFileReqDto extends TyBaseReqDto {
 
     @ApiModelProperty(value = "员工姓名", required = false)

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyEmployeeRealLoactionReqDto.java

@@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报人员定位数据请求实体")
+@ApiModel("土右上报人员定位数据请求实体")
 public class TyEmployeeRealLoactionReqDto extends TyCommonReqDto {
     @ApiModelProperty(value = "经度,（cgs2000 坐标系）", required = true)
     @NotBlank(message = "经度,不能为空")

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyHiddenCheckMissionReqDto.java

@@ -1,6 +1,5 @@
 package com.zcloud.modules.data.dto.baotou.ty.req;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyWorkDayTypeEnum;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyWorkTypeEnum;
@@ -10,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * 4.1.4 上报隐患排查任务数据
@@ -17,7 +17,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报隐患排查任务数据请求实体")
+@ApiModel("土右上报隐患排查任务数据请求实体")
 public class TyHiddenCheckMissionReqDto extends TyBaseReqDto {
 
 
@@ -27,14 +27,14 @@ public class TyHiddenCheckMissionReqDto extends TyBaseReqDto {
 
     @ApiModelProperty(value = "管控措施id,在上报时会校验该 ID是否存在,请先上传安全风险管控措施数据", required = true)
     @NotBlank(message = "管控措施id,不能为空")
-    private String riskMeasureID;
+    private String riskMeasureId;
 
     @ApiModelProperty(value = "隐患排查内容", required = true)
     @NotBlank(message = "隐患排查内容,不能为空")
     private String troubleshootContent;
 
     @ApiModelProperty(value = "巡检周期,排查周期,本次生成排查任务到下次生成排查任务的时间跨度,需大于 0", required = true)
-    @NotBlank(message = "巡检周期,不能为空")
+    @NotNull(message = "巡检周期,不能为空")
     private Integer checkCycle;
 
     @ApiModelProperty(value = "巡检周期单位,排查周期单位（小时、天、月、年）,本次生成排查任务到下次生成排查任务的时间跨度的单位", required = true)

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyHiddenCheckRecordReqDto.java

@@ -1,6 +1,5 @@
 package com.zcloud.modules.data.dto.baotou.ty.req;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyCheckStatusEnum;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyIsDefendEnum;
@@ -17,7 +16,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报隐患排查记录数据请求实体")
+@ApiModel("土右上报隐患排查记录数据请求实体")
 public class TyHiddenCheckRecordReqDto extends TyBaseReqDto {
 
 
@@ -27,7 +26,7 @@ public class TyHiddenCheckRecordReqDto extends TyBaseReqDto {
 
     @ApiModelProperty(value = "隐患排查任务 ID,在上报时会校验该 ID是否存在,请先上传安全风险管控措施数据", required = true)
     @NotBlank(message = "隐患排查任务 ID,不能为空")
-    private String checkTaskID;
+    private String checkTaskId;
 
     @ApiModelProperty(value = "排查时间,时间格式yyyyMMddHHmmss", required = true)
     @NotBlank(message = "排查时间,不能为空")

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyHiddenDangerInfoCheckReqDto.java

@@ -1,6 +1,5 @@
 package com.zcloud.modules.data.dto.baotou.ty.req;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyCheckTypeEnum;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyHarmTypeEnum;
@@ -17,17 +16,17 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("专项检查隐患信息请求实体")
+@ApiModel("土右专项检查隐患信息请求实体")
 public class TyHiddenDangerInfoCheckReqDto extends TyBaseReqDto{
 
 
     @ApiModelProperty(value = "隐患 ID", required = true)
     @NotBlank(message = "隐患 ID 不能为空")
-    private String dangerID;
+    private String dangerId;
 
     @ApiModelProperty(value = "任务 ID", required = true)
     @NotBlank(message = "任务 ID 不能为空")
-    private String taskID;
+    private String taskId;
 
     /**
      * 关联枚举：{@link TyCheckTypeEnum}
@@ -38,11 +37,11 @@ public class TyHiddenDangerInfoCheckReqDto extends TyBaseReqDto{
 
     @ApiModelProperty(value = "检查项ID", required = true)
     @NotBlank(message = "检查项ID,不能为空")
-    private String checkItemID;
+    private String checkItemId;
 
     @ApiModelProperty(value = "检查项评分细则ID", required = true)
     @NotBlank(message = "检查项评分细则ID,不能为空")
-    private String checkScoreID;
+    private String checkScoreId;
 
     @ApiModelProperty(value = "检查时间,日期格式：yyyyMMdd", required = true)
     @NotBlank(message = "检查时间,不能为空")

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyHiddenDangerInfoReqDto.java

@@ -14,7 +14,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报隐患信息数据请求实体")
+@ApiModel("土右上报隐患信息数据请求实体")
 public class TyHiddenDangerInfoReqDto extends TyBaseReqDto {
 
     @ApiModelProperty(value = "企业编码,危化品登记平台登记 的 9 位企业编码", required = true)
@@ -27,11 +27,11 @@ public class TyHiddenDangerInfoReqDto extends TyBaseReqDto {
 
     @ApiModelProperty(value = "管控措施主键ID,管控措施主键ID,所有隐患排查任务产生的隐患必须绑定管控措施。不为空则会校验该ID是否存在", required = true)
     @NotBlank(message = "管控措施主键ID,不能为空")
-    private String riskMeasureID;
+    private String riskMeasureId;
 
     @ApiModelProperty(value = "隐患排查记录ID,隐患排查记录ID所有由隐患排查时产生的隐患必须提供关联的隐患排查记录ID。不为空则会校验该ID是否存在", required = true)
     @NotBlank(message = "隐患排查记录ID,不能为空")
-    private String checkRecordID;
+    private String checkRecordId;
 
     @ApiModelProperty(value = "隐患名称", required = true)
     @NotBlank(message = "隐患名称,不能为空")

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyJobTicketApprovalReqDto.java

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报特殊作业审批记录请求实体")
+@ApiModel("土右上报特殊作业审批记录请求实体")
 public class TyJobTicketApprovalReqDto extends TyBaseReqDto{
 
     @ApiModelProperty(value = "作业票id", required = true)

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyJobTicketGasAnalysisReqDto.java

@@ -17,7 +17,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报特殊作业气体分析请求实体")
+@ApiModel("土右上报特殊作业气体分析请求实体")
 public class TyJobTicketGasAnalysisReqDto extends TyBaseReqDto {
 
     @ApiModelProperty(value = "作业票id", required = true)

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyJobTicketInfoReqDto.java

@@ -18,7 +18,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报特殊作业票证信息请求实体")
+@ApiModel("土右上报特殊作业票证信息请求实体")
 public class TyJobTicketInfoReqDto extends TyBaseReqDto{
 
     @ApiModelProperty(value = "企业编码,企业组织机构代码", required = true)

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyJobTicketSafetyReqDto.java

@@ -16,7 +16,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报特殊作业安全措施请求实体")
+@ApiModel("土右上报特殊作业安全措施请求实体")
 public class TyJobTicketSafetyReqDto extends TyBaseReqDto{
 
     @ApiModelProperty(value = "作业票id", required = true)

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyMaintenanceRecordReqDto.java

@@ -1,6 +1,5 @@
 package com.zcloud.modules.data.dto.baotou.ty.req;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +14,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报停用/检修记录请求实体")
+@ApiModel("土右上报停用/检修记录请求实体")
 public class TyMaintenanceRecordReqDto extends TyBaseReqDto{
 
 
@@ -29,7 +28,7 @@ public class TyMaintenanceRecordReqDto extends TyBaseReqDto{
 
     @ApiModelProperty(value = "所属风险单元 ID", required = true)
     @NotBlank(message = "所属风险单元 ID,不能为空")
-    private String riskUnitID;
+    private String riskUnitId;
 
     @ApiModelProperty(value = "停用/检修开始时间ID,yyyyMMddHHmmss", required = true)
     @NotBlank(message = "停用/检修开始时间ID,不能为空")

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyPersonRecordReqDto.java

@@ -13,7 +13,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("卡口人员通行记录请求实体")
+@ApiModel("土右卡口人员通行记录请求实体")
 public class TyPersonRecordReqDto extends TyCommonReqDto {
 
     @ApiModelProperty(value = "通行方向：入场,出场 ，透传汉字", required = true)

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyProductionPromiseReqDto.java

@@ -1,6 +1,5 @@
 package com.zcloud.modules.data.dto.baotou.ty.req;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyIsCommonStatusEnum;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyRiskGradEnum;
@@ -10,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * 4.3.1 上报安全承诺数据
@@ -17,92 +17,88 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报安全承诺数据请求实体")
+@ApiModel("土右上报安全承诺数据请求实体")
 public class TyProductionPromiseReqDto extends TyBaseReqDto {
 
-    @JsonProperty("id")
-    @ApiModelProperty(value = "主键,36位 UUID", required = true)
-    @NotBlank(message = "主键,不能为空")
-    private String id;
 
     @ApiModelProperty(value = "企业编码,危化品登记平台登记 的 9 位企业编码", required = true)
     @NotBlank(message = "企业编码,不能为空")
     private String companyCode;
 
     @ApiModelProperty(value = "生产装置套数", required = true)
-    @NotBlank(message = "生产装置套数,不能为空")
+    @NotNull(message = "生产装置套数,不能为空")
     private Integer unitsNumber;
 
     @ApiModelProperty(value = "运行套数", required = true)
-    @NotBlank(message = "运行套数,不能为空")
+    @NotNull(message = "运行套数,不能为空")
     private Integer runNumber;
 
     @ApiModelProperty(value = "停车套数", required = true)
-    @NotBlank(message = "停车套数,不能为空")
+    @NotNull(message = "停车套数,不能为空")
     private Integer parkNumber;
 
     @ApiModelProperty(value = "特级动火作业数量", required = true)
-    @NotBlank(message = "特级动火作业数量,不能为空")
+    @NotNull(message = "特级动火作业数量,不能为空")
     private Integer firesNumber;
 
     @ApiModelProperty(value = "一级动火作业数量", required = true)
-    @NotBlank(message = "一级动火作业数量,不能为空")
+    @NotNull(message = "一级动火作业数量,不能为空")
     private Integer fire1Number;
 
     @ApiModelProperty(value = "二级动火作业数量", required = true)
-    @NotBlank(message = "二级动火作业数量,不能为空")
+    @NotNull(message = "二级动火作业数量,不能为空")
     private Integer fire2Number;
 
     @ApiModelProperty(value = "断路作业数量", required = true)
-    @NotBlank(message = "断路作业数量,不能为空")
+    @NotNull(message = "断路作业数量,不能为空")
     private Integer roadworkNumber;
 
     @ApiModelProperty(value = "动土作业数量", required = true)
-    @NotBlank(message = "动土作业数量,不能为空")
+    @NotNull(message = "动土作业数量,不能为空")
     private Integer soilworkNumber;
 
     @ApiModelProperty(value = "高处作业数量", required = true)
-    @NotBlank(message = "高处作业数量,不能为空")
+    @NotNull(message = "高处作业数量,不能为空")
     private Integer highworkNumber;
 
     @ApiModelProperty(value = "临时用电作业数量", required = true)
-    @NotBlank(message = "临时用电作业数量,不能为空")
+    @NotNull(message = "临时用电作业数量,不能为空")
     private Integer electricityworkNumber;
 
     @ApiModelProperty(value = "吊装作业数量", required = true)
-    @NotBlank(message = "吊装作业数量,不能为空")
+    @NotNull(message = "吊装作业数量,不能为空")
     private Integer liftingworkNumber;
 
     @ApiModelProperty(value = "盲板作业数量", required = true)
-    @NotBlank(message = "盲板作业数量,不能为空")
+    @NotNull(message = "盲板作业数量,不能为空")
     private Integer blindplateNumber;
 
     @ApiModelProperty(value = "受限空间作业数量", required = true)
-    @NotBlank(message = "受限空间作业数量,不能为空")
+    @NotNull(message = "受限空间作业数量,不能为空")
     private Integer spaceworkNumber;
 
     @ApiModelProperty(value = "检维修作业数量", required = true)
-    @NotBlank(message = "检维修作业数量,不能为空")
+    @NotNull(message = "检维修作业数量,不能为空")
     private Integer inspectionNumber;
 
     @ApiModelProperty(value = "倒罐作业数量", required = true)
-    @NotBlank(message = "倒罐作业数量,不能为空")
+    @NotNull(message = "倒罐作业数量,不能为空")
     private Integer pourOutNumber;
 
     @ApiModelProperty(value = "清罐作业数量", required = true)
-    @NotBlank(message = "清罐作业数量,不能为空")
+    @NotNull(message = "清罐作业数量,不能为空")
     private Integer cleanTankNumber;
 
     @ApiModelProperty(value = "切水作业数量", required = true)
-    @NotBlank(message = "切水作业数量,不能为空")
+    @NotNull(message = "切水作业数量,不能为空")
     private Integer drainingNumber;
 
     @ApiModelProperty(value = "承包商作业数量", required = true)
-    @NotBlank(message = "承包商作业数量,不能为空")
+    @NotNull(message = "承包商作业数量,不能为空")
     private Integer contractorNumber;
 
     @ApiModelProperty(value = "变更作业数量", required = true)
-    @NotBlank(message = "变更作业数量,不能为空")
+    @NotNull(message = "变更作业数量,不能为空")
     private Integer changedTaskNumber;
 
     /**
@@ -123,19 +119,19 @@ public class TyProductionPromiseReqDto extends TyBaseReqDto {
      *  关联枚举：{@link TyIsCommonStatusEnum}
      */
     @ApiModelProperty(value = "是否处于开停车状态,参考枚举TyIsCommonStatusEnum", required = true)
-    @NotBlank(message = "是否处于开停车状态,不能为空")
+    @NotNull(message = "是否处于开停车状态,不能为空")
     private Integer openParking;
 
     @ApiModelProperty(value = "正在开停车装置数", required = true)
-    @NotBlank(message = "正在开停车装置数,不能为空")
+    @NotNull(message = "正在开停车装置数,不能为空")
     private Integer openParkingNumber;
 
     @ApiModelProperty(value = "开车装置数", required = true)
-    @NotBlank(message = "开车装置数,不能为空")
+    @NotNull(message = "开车装置数,不能为空")
     private Integer workNumber;
 
     @ApiModelProperty(value = "停车装置数", required = true)
-    @NotBlank(message = "停车装置数,不能为空")
+    @NotNull(message = "停车装置数,不能为空")
     private Integer notWorkNumber;
 
     /**
@@ -146,15 +142,15 @@ public class TyProductionPromiseReqDto extends TyBaseReqDto {
     private String test;
 
     @ApiModelProperty(value = "试生产装置数", required = true)
-    @NotBlank(message = "试生产装置数,不能为空")
+    @NotNull(message = "试生产装置数,不能为空")
     private Integer testNumber;
 
     @ApiModelProperty(value = "检维修套数", required = true)
-    @NotBlank(message = "检维修套数,不能为空")
+    @NotNull(message = "检维修套数,不能为空")
     private Integer overhaulWorkNumber;
 
     @ApiModelProperty(value = "重点监管危险工艺数量", required = true)
-    @NotBlank(message = "重点监管危险工艺数量,不能为空")
+    @NotNull(message = "重点监管危险工艺数量,不能为空")
     private Integer dangerProcessNumber;
 
     /**

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyPromiseTicketReqDto.java

@@ -14,7 +14,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报承诺作业票详情表请求实体")
+@ApiModel("土右上报承诺作业票详情表请求实体")
 public class TyPromiseTicketReqDto extends TyBaseReqDto{
 
     @ApiModelProperty(value = "承诺详情ID,与企业承诺详情表的ID对应", required = true)

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyRiskControlMeasuresReqDto.java

@@ -17,7 +17,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报安全风险控制措施数据请求实体")
+@ApiModel("土右上报安全风险控制措施数据请求实体")
 public class TyRiskControlMeasuresReqDto extends TyBaseReqDto {
 
 
@@ -27,7 +27,7 @@ public class TyRiskControlMeasuresReqDto extends TyBaseReqDto {
 
     @ApiModelProperty(value = "风险事件ID,在上报时会校验该 ID是否存在,请先上传安全风险事件数据", required = true)
     @NotBlank(message = "风险事件ID,不能为空")
-    private String riskEventID;
+    private String riskEventId;
 
     /**
      * 关联枚举：{@link TyDataSrcEnum}

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyRiskEventsReqDto.java

@@ -1,6 +1,5 @@
 package com.zcloud.modules.data.dto.baotou.ty.req;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,7 +14,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报安全风险事件数据请求实体")
+@ApiModel("土右上报安全风险事件数据请求实体")
 public class TyRiskEventsReqDto extends TyBaseReqDto {
 
 
@@ -25,7 +24,7 @@ public class TyRiskEventsReqDto extends TyBaseReqDto {
 
     @ApiModelProperty(value = "风险分析单元 ID,在上报时会校验该 ID是否存在,请先上传安全风险单元数据", required = true)
     @NotBlank(message = "风险分析单元 ID,不能为空")
-    private String riskUnitID;
+    private String riskUnitId;
 
     @ApiModelProperty(value = "风险事件名称", required = true)
     @NotBlank(message = "风险事件名称 不能为空")

src/main/java/com/zcloud/modules/data/dto/baotou/ty/req/TyRiskUnitReqDto.java

@@ -1,6 +1,5 @@
 package com.zcloud.modules.data.dto.baotou.ty.req;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
 import com.zcloud.modules.data.enums.baotou.ty.enums.TyRiskLeveEnum;
 import io.swagger.annotations.ApiModel;
@@ -16,13 +15,9 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("上报安全风险分析单元数据请求实体")
+@ApiModel("土右上报安全风险分析单元数据请求实体")
 public class TyRiskUnitReqDto extends TyBaseReqDto {
 
-    @JsonProperty("id")
-    @ApiModelProperty(value = "主键,36位 UUID", required = true)
-    @NotBlank(message = "主键,36位 UUID 不能为空")
-    private String id;
 
     @ApiModelProperty(value = "企业编码,危化品登记平台登记 的 9 位企业编码", required = true)
     @NotBlank(message = "企业编码,危化品登记平台登记 的 9 位企业编码 不能为空")

src/main/java/com/zcloud/modules/data/dto/beanmapper/TyBeanMapper.java

@@ -0,0 +1,53 @@
+package com.zcloud.modules.data.dto.beanmapper;
+
+import cn.hutool.json.JSONUtil;
+import com.zcloud.modules.data.dto.baotou.ty.req.*;
+import com.zcloud.modules.data.entity.ty.*;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+@Mapper
+public interface TyBeanMapper {
+
+    TyBeanMapper INSTANCE = Mappers.getMapper(TyBeanMapper.class);
+
+    //使用示例： @Mapping(target = "jsonData", expression = "java(listToJson(source.getItems()))")
+    default String listToJson(List<?> list) {
+        try {
+            return JSONUtil.toJsonStr(list);
+            // return objectMapper.writeValueAsString(list);
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to convert list to JSON", e);
+        }
+    }
+
+    List<TyRiskUnitEntity> toTyRiskUnitEntityList(List<TyRiskUnitReqDto> dtoList);
+
+
+
+    List<TyRiskEventsEntity> toTyRiskEventsEntityList(List<TyRiskEventsReqDto> dtoList);
+
+    List<TyRiskControlMeasuresEntity> toTyRiskControlMeasuresEntityList(List<TyRiskControlMeasuresReqDto> dtoList);
+
+    List<TyHiddenCheckMissionEntity> toTyHiddenCheckMissionEntityList(List<TyHiddenCheckMissionReqDto> dtoList);
+
+    List<TyHiddenCheckRecordEntity> toTyHiddenCheckRecordEntityList(List<TyHiddenCheckRecordReqDto> dtoList);
+
+    List<TyHiddenDangerInfoEntity> toTyHiddenDangerInfoEntityList(List<TyHiddenDangerInfoReqDto> dtoList);
+
+    List<TyMaintenanceRecordEntity> toTyMaintenanceRecordEntityList(List<TyMaintenanceRecordReqDto> dtoList);
+
+    List<TyHiddenDangerInfoCheckEntity> toTyHiddenDangerInfoCheckEntityList(List<TyHiddenDangerInfoCheckReqDto> dtoList);
+
+    List<TyProductionPromiseEntity> toTyProductionPromiseEntityList(List<TyProductionPromiseReqDto> dtoList);
+
+    List<TyDeviceRunStatusEntity> toTyDeviceRunStatusEntityList(List<TyDeviceRunStatusReqDto> dtoList);
+
+    List<TyPromiseTicketEntity> toTyPromiseTicketEntityList(List<TyPromiseTicketReqDto> dtoList);
+
+    List<TyEmployeeFileEntity> toTyEmployeeFileEntityList(List<TyEmployeeFileReqDto> dtoList);
+
+    List<TyEmployeeRealLocationEntity> toTyEmployeeRealLoactionEntityList(List<TyEmployeeRealLoactionReqDto> dtoList);
+}

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjBlindPlateWorkReqDto.java

@@ -1,15 +1,17 @@
 package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.zcloud.modules.data.dto.tangshan.dj.req.info.*;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjIsCommonStatusEnum;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjRecordDeletedEnum;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjWorkCategoryEnum;
-import com.zcloud.modules.data.dto.tangshan.dj.req.info.*;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -19,7 +21,7 @@ import java.util.List;
  */
 @NoArgsConstructor
 @Data
-
+@ApiModel("唐山东江盲板抽堵作业请求实体")
 public class DjBlindPlateWorkReqDto extends DjBaseReqDto{
 
     /**
@@ -88,7 +90,7 @@ public class DjBlindPlateWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "设备管道具体参数", required = true)
     @JsonProperty("pipelineParam")
-    @NotBlank(message = "设备管道具体参数不能为空")
+    @NotNull(message = "设备管道具体参数不能为空")
     private DjPipelineParamDto pipelineParam;
 
     @ApiModelProperty(value = "涉及的其他特殊作业 ID 集,特殊作业主键列表", required = false)
@@ -111,7 +113,7 @@ public class DjBlindPlateWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "盲板位置图及编号的编制人", required = true)
     @JsonProperty("preparedUser")
-    @NotBlank(message = "盲板位置图及编号的编制人不能为空")
+    @NotNull(message = "盲板位置图及编号的编制人不能为空")
     private DjPreparedUserDto preparedUser;
 
     @ApiModelProperty(value = "风险识别", required = true)
@@ -121,7 +123,7 @@ public class DjBlindPlateWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "作业人员列表", required = true)
     @JsonProperty("workUser")
-    @NotBlank(message = "作业人员列表不能为空")
+    @NotNull(message = "作业人员列表不能为空")
     private List<DjWorkUserDto> workUser;
     /**
      *  关联枚举：{@link DjIsCommonStatusEnum}
@@ -133,17 +135,17 @@ public class DjBlindPlateWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
     @JsonProperty("mapCenter")
-    @NotBlank(message = "地图位置-中心点不能为空")
+    @NotNull(message = "地图位置-中心点不能为空")
     private DjMapCenterDto mapCenter;
 
     @ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
     @JsonProperty("mapBorder")
-    @NotBlank(message = "地图位置-边界不能为空")
+    @NotNull(message = "地图位置-边界不能为空")
     private List<DjMapBorderDto> mapBorder;
 
     @ApiModelProperty(value = "安全措施列表",required = true)
     @JsonProperty("securityMeasure")
-    @NotBlank(message = "安全措施列表不能为空")
+    @NotNull(message = "安全措施列表不能为空")
     private List<DjSecurityMeasureDto> securityMeasure;
 
     @ApiModelProperty(value = "其他措施")
@@ -156,7 +158,7 @@ public class DjBlindPlateWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "措施确认人", required = true)
     @JsonProperty("measureUser")
-    @NotBlank(message = "措施确认人不能为空")
+    @NotNull(message = "措施确认人不能为空")
     private DjMeasureUserDto measureUser;
 
     @ApiModelProperty(value = "交底内容",required = true)
@@ -166,32 +168,32 @@ public class DjBlindPlateWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "安全交底人",required = true)
     @JsonProperty("discloseUser")
-    @NotBlank(message = "安全交底人不能为空")
+    @NotNull(message = "安全交底人不能为空")
     private DjDiscloseUserDto discloseUser;
 
     @ApiModelProperty(value = "接受交底人",required = true)
     @JsonProperty("acceptUser")
-    @NotBlank(message = "接受交底人不能为空")
+    @NotNull(message = "接受交底人不能为空")
     private DjAcceptUserDto acceptUser;
 
     @ApiModelProperty(value = "作业负责人",required = true)
     @JsonProperty("workHeadUser")
-    @NotBlank(message = "作业负责人不能为空")
+    @NotNull(message = "作业负责人不能为空")
     private DjWorkHeadUserDto workHeadUser;
 
     @ApiModelProperty(value = "单位审批人",required = true)
     @JsonProperty("unitApprovalUser")
-    @NotBlank(message = "单位审批人不能为空")
+    @NotNull(message = "单位审批人不能为空")
     private DjApprovalUserDto unitApprovalUser;
 
     @ApiModelProperty(value = "监护人", required = true)
     @JsonProperty("guardianUser")
-    @NotBlank(message = "监护人不能为空")
+    @NotNull(message = "监护人不能为空")
     private DjGuardianUserDto guardianUser;
 
     @ApiModelProperty(value = "完工验收人",required = true)
     @JsonProperty("finishedUser")
-    @NotBlank(message = "完工验收人不能为空")
+    @NotNull(message = "完工验收人不能为空")
     private DjFinishedUserDto finishedUser;
 
     @ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjCheckAcceptReqDto.java

@@ -16,7 +16,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("特殊作业验收信息请求实体")
+@ApiModel("唐山东江特殊作业验收信息请求实体")
 public class DjCheckAcceptReqDto extends DjBaseReqDto{
 
     /**

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjConfinedSpaceWorkReqDto.java

@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -19,7 +20,7 @@ import java.util.List;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("受限空间作业请求实体")
+@ApiModel("唐山东江受限空间作业请求实体")
 public class DjConfinedSpaceWorkReqDto extends DjBaseReqDto {
 
     /**
@@ -118,7 +119,7 @@ public class DjConfinedSpaceWorkReqDto extends DjBaseReqDto {
 
     @ApiModelProperty(value = "作业人员列表", required = true)
     @JsonProperty("workUser")
-    @NotBlank(message = "作业人员列表不能为空")
+    @NotNull(message = "作业人员列表不能为空")
     private List<DjWorkUserDto> workUser;
     /**
      *  关联枚举：{@link DjIsCommonStatusEnum}
@@ -130,12 +131,12 @@ public class DjConfinedSpaceWorkReqDto extends DjBaseReqDto {
 
     @ApiModelProperty(value = "地图位置-中心点，WGS-84 坐标系", required = true)
     @JsonProperty("mapCenter")
-    @NotBlank(message = "地图位置-中心点，WGS-84 坐标系不能为空")
+    @NotNull(message = "地图位置-中心点，WGS-84 坐标系不能为空")
     private DjMapCenterDto mapCenter;
 
     @ApiModelProperty(value = "地图位置-边界，WGS-84 坐标系", required = true)
     @JsonProperty("mapBorder")
-    @NotBlank(message = "地图位置-边界，WGS-84 坐标系不能为空")
+    @NotNull(message = "地图位置-边界，WGS-84 坐标系不能为空")
     private List<DjMapBorderDto> mapBorder;
 
     @ApiModelProperty(value = "气体分析-有毒气体",required = false)
@@ -152,12 +153,12 @@ public class DjConfinedSpaceWorkReqDto extends DjBaseReqDto {
 
     @ApiModelProperty(value = "分析人员",required = true)
     @JsonProperty("analysisUser")
-    @NotBlank(message = "分析人员不能为空")
+    @NotNull(message = "分析人员不能为空")
     private DjAnalysisUserDto analysisUser;
 
     @ApiModelProperty(value = "安全措施列表",required = true)
     @JsonProperty("securityMeasure")
-    @NotBlank(message = "安全措施列表不能为空")
+    @NotNull(message = "安全措施列表不能为空")
     private List<DjSecurityMeasureDto> securityMeasure;
 
     @ApiModelProperty(value = "其他措施")
@@ -170,7 +171,7 @@ public class DjConfinedSpaceWorkReqDto extends DjBaseReqDto {
 
     @ApiModelProperty(value = "措施确认人", required = true)
     @JsonProperty("measureUser")
-    @NotBlank(message = "措施确认人不能为空")
+    @NotNull(message = "措施确认人不能为空")
     private DjMeasureUserDto measureUser;
 
     @ApiModelProperty(value = "交底内容",required = true)
@@ -180,33 +181,33 @@ public class DjConfinedSpaceWorkReqDto extends DjBaseReqDto {
 
     @ApiModelProperty(value = "安全交底人",required = true)
     @JsonProperty("discloseUser")
-    @NotBlank(message = "安全交底人不能为空")
+    @NotNull(message = "安全交底人不能为空")
     private DjDiscloseUserDto discloseUser;
 
     @ApiModelProperty(value = "接受交底人",required = true)
     @JsonProperty("acceptUser")
-    @NotBlank(message = "接受交底人不能为空")
+    @NotNull(message = "接受交底人不能为空")
     private DjAcceptUserDto acceptUser;
 
     @ApiModelProperty(value = "作业负责人",required = true)
     @JsonProperty("workHeadUser")
-    @NotBlank(message = "作业负责人不能为空")
+    @NotNull(message = "作业负责人不能为空")
     private DjWorkHeadUserDto workHeadUser;
 
     @ApiModelProperty(value = "单位审批人",required = true)
     @JsonProperty("unitApprovalUser")
-    @NotBlank(message = "单位审批人不能为空")
+    @NotNull(message = "单位审批人不能为空")
     private DjApprovalUserDto unitApprovalUser;
 
     @ApiModelProperty(value = "监护人", required = true)
     @JsonProperty("guardianUser")
-    @NotBlank(message = "监护人不能为空")
+    @NotNull(message = "监护人不能为空")
     private DjGuardianUserDto guardianUser;
 
 
     @ApiModelProperty(value = "完工验收人",required = true)
     @JsonProperty("finishedUser")
-    @NotBlank(message = "完工验收人不能为空")
+    @NotNull(message = "完工验收人不能为空")
     private DjFinishedUserDto finishedUser;
 
     @ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjDangerCheckRecordReqDto.java

@@ -19,7 +19,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("隐患排查任务请求实体")
+@ApiModel("唐山东江隐患排查任务请求实体")
 public class DjDangerCheckRecordReqDto extends DjBaseReqDto {
 
     /**

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjDangerCheckTaskReqDto.java

@@ -16,7 +16,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("隐患排查任务请求实体")
+@ApiModel("唐山东江隐患排查任务请求实体")
 public class DjDangerCheckTaskReqDto extends DjBaseReqDto {
 
     /**

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjDangerInfoReqDto.java

@@ -16,7 +16,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("隐患信息请求实体")
+@ApiModel("唐山东江隐患信息请求实体")
 public class DjDangerInfoReqDto extends DjBaseReqDto {
 
     /**

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjElectricityWorkReqDto.java

@@ -1,15 +1,16 @@
 package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.zcloud.modules.data.dto.tangshan.dj.req.info.*;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjIsCommonStatusEnum;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjRecordDeletedEnum;
-import com.zcloud.modules.data.dto.tangshan.dj.req.info.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -19,7 +20,7 @@ import java.util.List;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("临时用电作业请求实体")
+@ApiModel("唐山东江临时用电作业请求实体")
 public class DjElectricityWorkReqDto extends DjBaseReqDto{
 
     /**
@@ -126,7 +127,7 @@ public class DjElectricityWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "作业人员列表", required = true)
     @JsonProperty("workUser")
-    @NotBlank(message = "作业人员列表不能为空")
+    @NotNull(message = "作业人员列表不能为空")
     private List<DjWorkUserInfoDto> workUser;
 
     /**
@@ -139,12 +140,12 @@ public class DjElectricityWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
     @JsonProperty("mapCenter")
-    @NotBlank(message = "地图位置-中心点,WGS-84 坐标系不能为空")
+    @NotNull(message = "地图位置-中心点,WGS-84 坐标系不能为空")
     private DjMapCenterDto mapCenter;
 
     @ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
     @JsonProperty("mapBorder")
-    @NotBlank(message = "地图位置-边界,WGS-84 坐标系不能为空")
+    @NotNull(message = "地图位置-边界,WGS-84 坐标系不能为空")
     private List<DjMapBorderDto> mapBorder;
 
     @ApiModelProperty(value = "气体分析-有毒气体",required = false)
@@ -161,12 +162,12 @@ public class DjElectricityWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "分析人员",required = true)
     @JsonProperty("analysisUser")
-    @NotBlank(message = "分析人员不能为空")
+    @NotNull(message = "分析人员不能为空")
     private DjAnalysisUserDto analysisUser;
 
     @ApiModelProperty(value = "安全措施",required = true)
     @JsonProperty("securityMeasure")
-    @NotBlank(message = "安全措施不能为空")
+    @NotNull(message = "安全措施不能为空")
     private List<DjSecurityMeasureDto> securityMeasure;
 
     @ApiModelProperty(value = "其他措施")
@@ -179,7 +180,7 @@ public class DjElectricityWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "措施确认人", required = true)
     @JsonProperty("measureUser")
-    @NotBlank(message = "措施确认人不能为空")
+    @NotNull(message = "措施确认人不能为空")
     private DjMeasureUserDto measureUser;
 
     @ApiModelProperty(value = "交底内容",required = true)
@@ -189,37 +190,37 @@ public class DjElectricityWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "安全交底人",required = true)
     @JsonProperty("discloseUser")
-    @NotBlank(message = "安全交底人不能为空")
+    @NotNull(message = "安全交底人不能为空")
     private DjDiscloseUserDto discloseUser;
 
     @ApiModelProperty(value = "接受交底人",required = true)
     @JsonProperty("acceptUser")
-    @NotBlank(message = "接受交底人不能为空")
+    @NotNull(message = "接受交底人不能为空")
     private DjAcceptUserDto acceptUser;
 
     @ApiModelProperty(value = "作业负责人",required = true)
     @JsonProperty("workHeadUser")
-    @NotBlank(message = "作业负责人不能为空")
+    @NotNull(message = "作业负责人不能为空")
     private DjElecWorkHeadUserDto workHeadUser;
 
     @ApiModelProperty(value = "用电单位审批人",required = true)
     @JsonProperty("electricityApprovalUser")
-    @NotBlank(message = "用电单位审批人不能为空")
+    @NotNull(message = "用电单位审批人不能为空")
     private DjApprovalUserDto electricityApprovalUser;
 
     @ApiModelProperty(value = "配送电单位审批人",required = true)
     @JsonProperty("deliveryApprovalUser")
-    @NotBlank(message = "配送电单位审批人不能为空")
+    @NotNull(message = "配送电单位审批人不能为空")
     private DjApprovalUserDto deliveryApprovalUser;
 
     @ApiModelProperty(value = "监护人", required = true)
     @JsonProperty("guardianUser")
-    @NotBlank(message = "监护人不能为空")
+    @NotNull(message = "监护人不能为空")
     private DjGuardianUserDto guardianUser;
 
     @ApiModelProperty(value = "完工验收人",required = true)
     @JsonProperty("finishedUser")
-    @NotBlank(message = "完工验收人不能为空")
+    @NotNull(message = "完工验收人不能为空")
     private DjFinishedUserDto finishedUser;
 
     @ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjGasAnalysisDataReqDto.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -18,7 +19,7 @@ import java.util.List;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("特殊作业气体分析数据请求实体")
+@ApiModel("唐山东江特殊作业气体分析数据请求实体")
 public class DjGasAnalysisDataReqDto extends DjBaseReqDto{
 
     /**
@@ -71,7 +72,7 @@ public class DjGasAnalysisDataReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "气体检测信息", required = true)
     @JsonProperty("detectInfo")
-    @NotBlank(message = "气体检测信息不能为空")
+    @NotNull(message = "气体检测信息不能为空")
     private List<DjDetectInfoDto> detectInfo;
 
     @ApiModelProperty(value = "确认人签字图片.字符串，必传，格式：data:image/png;base64,.", required = true)

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjGroundBreakWorkReqDto.java

@@ -1,15 +1,16 @@
 package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.zcloud.modules.data.dto.tangshan.dj.req.info.*;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjIsCommonStatusEnum;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjRecordDeletedEnum;
-import com.zcloud.modules.data.dto.tangshan.dj.req.info.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -19,7 +20,7 @@ import java.util.List;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("动土作业请求实体")
+@ApiModel("唐山东江动土作业请求实体")
 public class DjGroundBreakWorkReqDto extends DjBaseReqDto{
 
     /**
@@ -126,7 +127,7 @@ public class DjGroundBreakWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "作业人员列表", required = true)
     @JsonProperty("workUser")
-    @NotBlank(message = "作业人员列表不能为空")
+    @NotNull(message = "作业人员列表不能为空")
     private List<DjWorkUserDto> workUser;
 
     /**
@@ -139,17 +140,17 @@ public class DjGroundBreakWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
     @JsonProperty("mapCenter")
-    @NotBlank(message = "地图位置-中心点,WGS-84 坐标系不能为空")
+    @NotNull(message = "地图位置-中心点,WGS-84 坐标系不能为空")
     private DjMapCenterDto mapCenter;
 
     @ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
     @JsonProperty("mapBorder")
-    @NotBlank(message = "地图位置-边界,WGS-84 坐标系不能为空")
+    @NotNull(message = "地图位置-边界,WGS-84 坐标系不能为空")
     private List<DjMapBorderDto> mapBorder;
 
     @ApiModelProperty(value = "安全措施",required = true)
     @JsonProperty("securityMeasure")
-    @NotBlank(message = "安全措施不能为空")
+    @NotNull(message = "安全措施不能为空")
     private List<DjSecurityMeasureDto> securityMeasure;
 
     @ApiModelProperty(value = "其他措施")
@@ -162,7 +163,7 @@ public class DjGroundBreakWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "措施确认人", required = true)
     @JsonProperty("measureUser")
-    @NotBlank(message = "措施确认人不能为空")
+    @NotNull(message = "措施确认人不能为空")
     private DjMeasureUserDto measureUser;
 
     @ApiModelProperty(value = "交底内容",required = true)
@@ -172,42 +173,42 @@ public class DjGroundBreakWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "安全交底人",required = true)
     @JsonProperty("discloseUser")
-    @NotBlank(message = "安全交底人不能为空")
+    @NotNull(message = "安全交底人不能为空")
     private DjDiscloseUserDto discloseUser;
 
     @ApiModelProperty(value = "接受交底人",required = true)
     @JsonProperty("acceptUser")
-    @NotBlank(message = "接受交底人不能为空")
+    @NotNull(message = "接受交底人不能为空")
     private DjAcceptUserDto acceptUser;
 
     @ApiModelProperty(value = "作业负责人",required = true)
     @JsonProperty("workHeadUser")
-    @NotBlank(message = "作业负责人不能为空")
+    @NotNull(message = "作业负责人不能为空")
     private DjWorkHeadUserDto workHeadUser;
 
     @ApiModelProperty(value = "单位审批人",required = true)
     @JsonProperty("unitApprovalUser")
-    @NotBlank(message = "单位审批人不能为空")
+    @NotNull(message = "单位审批人不能为空")
     private DjApprovalUserDto unitApprovalUser;
 
     @ApiModelProperty(value = "相关部门负责人", required = true)
     @JsonProperty("relatedHeadUser")
-    @NotBlank(message = "相关部门负责人不能为空")
+    @NotNull(message = "相关部门负责人不能为空")
     private DjApprovalUserDto relatedHeadUser;
 
     @ApiModelProperty(value = "审批部门负责人", required = true)
     @JsonProperty("approvalUser")
-    @NotBlank(message = "审批部门负责人不能为空")
+    @NotNull(message = "审批部门负责人不能为空")
     private DjApprovalUserDto approvalUser;
 
     @ApiModelProperty(value = "监护人", required = true)
     @JsonProperty("guardianUser")
-    @NotBlank(message = "监护人不能为空")
+    @NotNull(message = "监护人不能为空")
     private DjGuardianUserDto guardianUser;
 
     @ApiModelProperty(value = "完工验收人",required = true)
     @JsonProperty("finishedUser")
-    @NotBlank(message = "完工验收人不能为空")
+    @NotNull(message = "完工验收人不能为空")
     private DjFinishedUserDto finishedUser;
 
     @ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjHighWorkReqDto.java

@@ -1,16 +1,17 @@
 package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.zcloud.modules.data.dto.tangshan.dj.req.info.*;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjHeightWorkLevelEnum;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjIsCommonStatusEnum;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjRecordDeletedEnum;
-import com.zcloud.modules.data.dto.tangshan.dj.req.info.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -20,7 +21,7 @@ import java.util.List;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("高处作业请求实体")
+@ApiModel("唐山东江高处作业请求实体")
 public class DjHighWorkReqDto extends DjBaseReqDto{
 
     /**
@@ -119,7 +120,7 @@ public class DjHighWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "作业人员列表", required = true)
     @JsonProperty("workUser")
-    @NotBlank(message = "作业人员列表不能为空")
+    @NotNull(message = "作业人员列表不能为空")
     private List<DjWorkUserDto> workUser;
 
     /**
@@ -132,17 +133,17 @@ public class DjHighWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
     @JsonProperty("mapCenter")
-    @NotBlank(message = "地图位置-中心点不能为空")
+    @NotNull(message = "地图位置-中心点不能为空")
     private DjMapCenterDto mapCenter;
 
     @ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
     @JsonProperty("mapBorder")
-    @NotBlank(message = "地图位置-边界不能为空")
+    @NotNull(message = "地图位置-边界不能为空")
     private List<DjMapBorderDto> mapBorder;
 
     @ApiModelProperty(value = "安全措施",required = true)
     @JsonProperty("securityMeasure")
-    @NotBlank(message = "安全措施不能为空")
+    @NotNull(message = "安全措施不能为空")
     private List<DjSecurityMeasureDto> securityMeasure;
 
     @ApiModelProperty(value = "其他措施")
@@ -155,7 +156,7 @@ public class DjHighWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "措施确认人", required = true)
     @JsonProperty("measureUser")
-    @NotBlank(message = "措施确认人不能为空")
+    @NotNull(message = "措施确认人不能为空")
     private DjMeasureUserDto measureUser;
 
     @ApiModelProperty(value = "交底内容",required = true)
@@ -165,42 +166,42 @@ public class DjHighWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "安全交底人",required = true)
     @JsonProperty("discloseUser")
-    @NotBlank(message = "安全交底人不能为空")
+    @NotNull(message = "安全交底人不能为空")
     private DjDiscloseUserDto discloseUser;
 
     @ApiModelProperty(value = "接受交底人",required = true)
     @JsonProperty("acceptUser")
-    @NotBlank(message = "接受交底人不能为空")
+    @NotNull(message = "接受交底人不能为空")
     private DjAcceptUserDto acceptUser;
 
     @ApiModelProperty(value = "作业负责人",required = true)
     @JsonProperty("workHeadUser")
-    @NotBlank(message = "作业负责人不能为空")
+    @NotNull(message = "作业负责人不能为空")
     private DjWorkHeadUserDto workHeadUser;
 
     @ApiModelProperty(value = "单位审批人",required = true)
     @JsonProperty("unitApprovalUser")
-    @NotBlank(message = "单位审批人不能为空")
+    @NotNull(message = "单位审批人不能为空")
     private DjApprovalUserDto unitApprovalUser;
 
     @ApiModelProperty(value = "审核部门负责人",required = true)
     @JsonProperty("auditUser")
-    @NotBlank(message = "审核部门负责人不能为空")
+    @NotNull(message = "审核部门负责人不能为空")
     private DjApprovalUserDto auditUser;
 
     @ApiModelProperty(value = "审批部门负责人", required = true)
     @JsonProperty("approvalUser")
-    @NotBlank(message = "审批部门负责人不能为空")
+    @NotNull(message = "审批部门负责人不能为空")
     private DjApprovalUserDto approvalUser;
 
     @ApiModelProperty(value = "监护人", required = true)
     @JsonProperty("guardianUser")
-    @NotBlank(message = "监护人不能为空")
+    @NotNull(message = "监护人不能为空")
     private DjGuardianUserDto guardianUser;
 
     @ApiModelProperty(value = "完工验收人",required = true)
     @JsonProperty("finishedUser")
-    @NotBlank(message = "完工验收人不能为空")
+    @NotNull(message = "完工验收人不能为空")
     private DjFinishedUserDto finishedUser;
 
     @ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjHoistWorkReqDto.java

@@ -1,16 +1,17 @@
 package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.zcloud.modules.data.dto.tangshan.dj.req.info.*;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjHoistWorkLevelEnum;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjIsCommonStatusEnum;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjRecordDeletedEnum;
-import com.zcloud.modules.data.dto.tangshan.dj.req.info.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -20,7 +21,7 @@ import java.util.List;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("吊装作业请求实体")
+@ApiModel("唐山东江吊装作业请求实体")
 public class DjHoistWorkReqDto extends DjBaseReqDto{
 
     /**
@@ -129,7 +130,7 @@ public class DjHoistWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "作业人员列表", required = true)
     @JsonProperty("workUser")
-    @NotBlank(message = "作业人员列表不能为空")
+    @NotNull(message = "作业人员列表不能为空")
     private List<DjWorkUserInfoDto> workUser;
 
     /**
@@ -142,17 +143,17 @@ public class DjHoistWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
     @JsonProperty("mapCenter")
-    @NotBlank(message = "地图位置-中心点,WGS-84 坐标系不能为空")
+    @NotNull(message = "地图位置-中心点,WGS-84 坐标系不能为空")
     private DjMapCenterDto mapCenter;
 
     @ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
     @JsonProperty("mapBorder")
-    @NotBlank(message = "地图位置-边界,WGS-84 坐标系不能为空")
+    @NotNull(message = "地图位置-边界,WGS-84 坐标系不能为空")
     private List<DjMapBorderDto> mapBorder;
 
     @ApiModelProperty(value = "安全措施",required = true)
     @JsonProperty("securityMeasure")
-    @NotBlank(message = "安全措施不能为空")
+    @NotNull(message = "安全措施不能为空")
     private List<DjSecurityMeasureDto> securityMeasure;
 
     @ApiModelProperty(value = "其他措施")
@@ -165,7 +166,7 @@ public class DjHoistWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "措施确认人", required = true)
     @JsonProperty("measureUser")
-    @NotBlank(message = "措施确认人不能为空")
+    @NotNull(message = "措施确认人不能为空")
     private DjMeasureUserDto measureUser;
 
     @ApiModelProperty(value = "交底内容",required = true)
@@ -175,42 +176,42 @@ public class DjHoistWorkReqDto extends DjBaseReqDto{
 
     @ApiModelProperty(value = "安全交底人",required = true)
     @JsonProperty("discloseUser")
-    @NotBlank(message = "安全交底人不能为空")
+    @NotNull(message = "安全交底人不能为空")
     private DjDiscloseUserDto discloseUser;
 
     @ApiModelProperty(value = "接受交底人",required = true)
     @JsonProperty("acceptUser")
-    @NotBlank(message = "接受交底人不能为空")
+    @NotNull(message = "接受交底人不能为空")
     private DjAcceptUserDto acceptUser;
 
     @ApiModelProperty(value = "作业指挥人",required = true)
     @JsonProperty("workHeadUser")
-    @NotBlank(message = "作业指挥人不能为空")
+    @NotNull(message = "作业指挥人不能为空")
     private DjWorkHeadUserDto workHeadUser;
 
     @ApiModelProperty(value = "单位审批人",required = true)
     @JsonProperty("unitApprovalUser")
-    @NotBlank(message = "单位审批人不能为空")
+    @NotNull(message = "单位审批人不能为空")
     private DjApprovalUserDto unitApprovalUser;
 
     @ApiModelProperty(value = "审核部门负责人",required = true)
     @JsonProperty("auditUser")
-    @NotBlank(message = "审核部门负责人不能为空")
+    @NotNull(message = "审核部门负责人不能为空")
     private DjApprovalUserDto auditUser;
 
     @ApiModelProperty(value = "审批部门负责人", required = true)
     @JsonProperty("approvalUser")
-    @NotBlank(message = "审批部门负责人不能为空")
+    @NotNull(message = "审批部门负责人不能为空")
     private DjApprovalUserDto approvalUser;
 
     @ApiModelProperty(value = "监护人", required = true)
     @JsonProperty("guardianUser")
-    @NotBlank(message = "监护人不能为空")
+    @NotNull(message = "监护人不能为空")
     private DjGuardianUserDto guardianUser;
 
     @ApiModelProperty(value = "完工验收人",required = true)
     @JsonProperty("finishedUser")
-    @NotBlank(message = "完工验收人不能为空")
+    @NotNull(message = "完工验收人不能为空")
     private DjFinishedUserDto finishedUser;
 
     @ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjHotWorkReqDto.java

@@ -1,16 +1,17 @@
 package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.zcloud.modules.data.dto.tangshan.dj.req.info.*;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjHotWorkLevelEnum;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjIsCommonStatusEnum;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjRecordDeletedEnum;
-import com.zcloud.modules.data.dto.tangshan.dj.req.info.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -20,7 +21,7 @@ import java.util.List;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("动火作业请求实体")
+@ApiModel("唐山东江动火作业请求实体")
 public class DjHotWorkReqDto extends DjBaseReqDto {
 
     /**
@@ -95,7 +96,7 @@ public class DjHotWorkReqDto extends DjBaseReqDto {
 
     @ApiModelProperty(value = "涉及的其他特殊作业 ID 集，特殊作业主键列表", required = false)
     @JsonProperty("relatedWorkId")
-    @NotBlank(message = "涉及的其他特殊作业 ID 集，特殊作业主键列表不能为空")
+    @NotNull(message = "涉及的其他特殊作业 ID 集，特殊作业主键列表不能为空")
     private List<String> relatedWorkId;
 
     @ApiModelProperty(value = "动火开始时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
@@ -120,7 +121,7 @@ public class DjHotWorkReqDto extends DjBaseReqDto {
 
     @ApiModelProperty(value = "作业人员列表", required = true)
     @JsonProperty("workUser")
-    @NotBlank(message = "作业人员列表不能为空")
+    @NotNull(message = "作业人员列表不能为空")
     private List<DjWorkUserInfoDto> workUser;
     /**
      * 关联枚举：{@link DjIsCommonStatusEnum}
@@ -132,12 +133,12 @@ public class DjHotWorkReqDto extends DjBaseReqDto {
 
     @ApiModelProperty(value = "地图位置-中心点，WGS-84 坐标系", required = true)
     @JsonProperty("mapCenter")
-    @NotBlank(message = "地图位置-中心点，WGS-84 坐标系不能为空")
+    @NotNull(message = "地图位置-中心点，WGS-84 坐标系不能为空")
     private DjMapCenterDto mapCenter;
 
     @ApiModelProperty(value = "地图位置-边界，WGS-84 坐标系", required = true)
     @JsonProperty("mapBorder")
-    @NotBlank(message = "地图位置-边界，WGS-84 坐标系不能为空")
+    @NotNull(message = "地图位置-边界，WGS-84 坐标系不能为空")
     private List<DjMapBorderDto> mapBorder;
 
     @ApiModelProperty(value = "气体分析-有毒气体", required = false)
@@ -154,12 +155,12 @@ public class DjHotWorkReqDto extends DjBaseReqDto {
 
     @ApiModelProperty(value = "分析人员", required = true)
     @JsonProperty("analysisUser")
-    @NotBlank(message = "分析人员不能为空")
+    @NotNull(message = "分析人员不能为空")
     private DjAnalysisUserDto analysisUser;
 
     @ApiModelProperty(value = "安全措施列表", required = true)
     @JsonProperty("securityMeasure")
-    @NotBlank(message = "安全措施列表不能为空")
+    @NotNull(message = "安全措施列表不能为空")
     private List<DjSecurityMeasureDto> securityMeasure;
 
     @ApiModelProperty(value = "其他措施")
@@ -172,7 +173,7 @@ public class DjHotWorkReqDto extends DjBaseReqDto {
 
     @ApiModelProperty(value = "措施确认人", required = true)
     @JsonProperty("measureUser")
-    @NotBlank(message = "措施确认人不能为空")
+    @NotNull(message = "措施确认人不能为空")
     private DjMeasureUserDto measureUser;
 
     @ApiModelProperty(value = "交底内容", required = true)
@@ -182,47 +183,47 @@ public class DjHotWorkReqDto extends DjBaseReqDto {
 
     @ApiModelProperty(value = "安全交底人", required = true)
     @JsonProperty("discloseUser")
-    @NotBlank(message = "安全交底人不能为空")
+    @NotNull(message = "安全交底人不能为空")
     private DjDiscloseUserDto discloseUser;
 
     @ApiModelProperty(value = "接受交底人", required = true)
     @JsonProperty("acceptUser")
-    @NotBlank(message = "接受交底人不能为空")
+    @NotNull(message = "接受交底人不能为空")
     private DjAcceptUserDto acceptUser;
 
     @ApiModelProperty(value = "作业负责人", required = true)
     @JsonProperty("workHeadUser")
-    @NotBlank(message = "作业负责人不能为空")
+    @NotNull(message = "作业负责人不能为空")
     private DjWorkHeadUserDto workHeadUser;
 
     @ApiModelProperty(value = "单位审批人", required = true)
     @JsonProperty("unitApprovalUser")
-    @NotBlank(message = "单位审批人不能为空")
+    @NotNull(message = "单位审批人不能为空")
     private DjApprovalUserDto unitApprovalUser;
 
     @ApiModelProperty(value = "安全部门审批人", required = true)
     @JsonProperty("securityApprovalUser")
-    @NotBlank(message = "安全部门审批人不能为空")
+    @NotNull(message = "安全部门审批人不能为空")
     private DjApprovalUserDto securityApprovalUser;
 
     @ApiModelProperty(value = "动火审批人", required = true)
     @JsonProperty("workApprovalUser")
-    @NotBlank(message = "动火审批人不能为空")
+    @NotNull(message = "动火审批人不能为空")
     private DjApprovalUserDto workApprovalUser;
 
     @ApiModelProperty(value = "监护人", required = true)
     @JsonProperty("guardianUser")
-    @NotBlank(message = "监护人不能为空")
+    @NotNull(message = "监护人不能为空")
     private DjApprovalUserDto guardianUser;
 
     @ApiModelProperty(value = "作业前验票人", required = true)
     @JsonProperty("inspectUser")
-    @NotBlank(message = "作业前验票人不能为空")
+    @NotNull(message = "作业前验票人不能为空")
     private DjApprovalUserDto inspectUser;
 
     @ApiModelProperty(value = "完工验收人", required = true)
     @JsonProperty("finishedUser")
-    @NotBlank(message = "完工验收人不能为空")
+    @NotNull(message = "完工验收人不能为空")
     private DjFinishedUserDto finishedUser;
 
     @ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjOpenCircuitWorkReqDto.java

@@ -1,15 +1,16 @@
 package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.zcloud.modules.data.dto.tangshan.dj.req.info.*;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjIsCommonStatusEnum;
 import com.zcloud.modules.data.enums.tangshan.dj.enums.DjRecordDeletedEnum;
-import com.zcloud.modules.data.dto.tangshan.dj.req.info.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -19,7 +20,7 @@ import java.util.List;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("断路作业作业请求实体")
+@ApiModel("唐山东江断路作业作业请求实体")
 public class DjOpenCircuitWorkReqDto extends DjBaseReqDto {
 
     /**
@@ -138,22 +139,22 @@ public class DjOpenCircuitWorkReqDto extends DjBaseReqDto {
 
     @ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
     @JsonProperty("mapCenter")
-    @NotBlank(message = "地图位置-中心点不能为空")
+    @NotNull(message = "地图位置-中心点不能为空")
     private DjMapCenterDto mapCenter;
 
     @ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
     @JsonProperty("mapBorder")
-    @NotBlank(message = "地图位置-边界不能为空")
+    @NotNull(message = "地图位置-边界不能为空")
     private List<DjMapBorderDto> mapBorder;
 
     @ApiModelProperty(value = "安全措施列表", required = true)
     @JsonProperty("securityMeasure")
-    @NotBlank(message = "安全措施列表不能为空")
+    @NotNull(message = "安全措施列表不能为空")
     private List<DjSecurityMeasureDto> securityMeasure;
 
     @ApiModelProperty(value = "其他措施")
     @JsonProperty("otherMeasure")
-    @NotBlank(message = "其他措施不能为空")
+    @NotNull(message = "其他措施不能为空")
     private List<String> otherMeasure;
 
     @ApiModelProperty(value = "其他措施编制人,当其他措施不为空时此项必填")
@@ -162,7 +163,7 @@ public class DjOpenCircuitWorkReqDto extends DjBaseReqDto {
 
     @ApiModelProperty(value = "措施确认人", required = true)
     @JsonProperty("measureUser")
-    @NotBlank(message = "措施确认人不能为空")
+    @NotNull(message = "措施确认人不能为空")
     private DjMeasureUserDto measureUser;
 
     @ApiModelProperty(value = "交底内容", required = true)
@@ -172,42 +173,42 @@ public class DjOpenCircuitWorkReqDto extends DjBaseReqDto {
 
     @ApiModelProperty(value = "安全交底人", required = true)
     @JsonProperty("discloseUser")
-    @NotBlank(message = "安全交底人不能为空")
+    @NotNull(message = "安全交底人不能为空")
     private DjDiscloseUserDto discloseUser;
 
     @ApiModelProperty(value = "接受交底人", required = true)
     @JsonProperty("acceptUser")
-    @NotBlank(message = "接受交底人不能为空")
+    @NotNull(message = "接受交底人不能为空")
     private DjAcceptUserDto acceptUser;
 
     @ApiModelProperty(value = "作业负责人", required = true)
     @JsonProperty("workHeadUser")
-    @NotBlank(message = "作业负责人不能为空")
+    @NotNull(message = "作业负责人不能为空")
     private DjWorkHeadUserDto workHeadUser;
 
     @ApiModelProperty(value = "单位审批人", required = true)
     @JsonProperty("unitApprovalUser")
-    @NotBlank(message = "单位审批人不能为空")
+    @NotNull(message = "单位审批人不能为空")
     private DjApprovalUserDto unitApprovalUser;
 
     @ApiModelProperty(value = "相关部门负责人", required = true)
     @JsonProperty("relatedHeadUser")
-    @NotBlank(message = "相关部门负责人不能为空")
+    @NotNull(message = "相关部门负责人不能为空")
     private DjApprovalUserDto relatedHeadUser;
 
     @ApiModelProperty(value = "审批部门负责人", required = true)
     @JsonProperty("approvalUser")
-    @NotBlank(message = "审批部门负责人不能为空")
+    @NotNull(message = "审批部门负责人不能为空")
     private DjApprovalUserDto approvalUser;
 
     @ApiModelProperty(value = "监护人", required = true)
     @JsonProperty("guardianUser")
-    @NotBlank(message = "监护人不能为空")
+    @NotNull(message = "监护人不能为空")
     private DjGuardianUserDto guardianUser;
 
     @ApiModelProperty(value = "完工验收人", required = true)
     @JsonProperty("finishedUser")
-    @NotBlank(message = "完工验收人不能为空")
+    @NotNull(message = "完工验收人不能为空")
     private DjFinishedUserDto finishedUser;
 
     @ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjSafeRiskAnalysisUnitReqDto.java

@@ -19,10 +19,9 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("安全风险分析单元请求实体")
+@ApiModel("唐山东江安全风险分析单元请求实体")
 public class DjSafeRiskAnalysisUnitReqDto extends DjBaseReqDto {
 
-
     /**
      *  关联枚举：{@link DjRecordDeletedEnum}
      */

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjSafeRiskControlMeasureReqDto.java

@@ -16,7 +16,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("安全风险事件请求实体")
+@ApiModel("唐山东江安全风险事件请求实体")
 public class DjSafeRiskControlMeasureReqDto extends DjBaseReqDto {
 
 

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/req/DjSafeRiskEventReqDto.java

@@ -16,7 +16,7 @@ import javax.validation.constraints.NotBlank;
  */
 @NoArgsConstructor
 @Data
-@ApiModel("安全风险事件请求实体")
+@ApiModel("唐山东江安全风险事件请求实体")
 public class DjSafeRiskEventReqDto extends DjBaseReqDto {
 
 

src/main/java/com/zcloud/modules/data/entity/dj/DjBlindPlateWorkEntity.java

@@ -0,0 +1,135 @@
+package com.zcloud.modules.data.entity.dj;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 盲板抽堵作业表(唐山东江)(DjBlindPlateWork)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 13:53:59
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_blind_plate_work")
+public class DjBlindPlateWorkEntity extends Model<DjBlindPlateWorkEntity> {
+
+    @ApiModelProperty(value = "自增主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    @ApiModelProperty(value = "业务主键UUID")
+    private String recordId;
+    
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+    
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "作业名称")
+    private String workName;
+    
+    @ApiModelProperty(value = "作业编号")
+    private String workNumber;
+    
+    @ApiModelProperty(value = "作业单位")
+    private String workCompany;
+    
+    @ApiModelProperty(value = "作业申请单位")
+    private String workApplyCompany;
+    
+    @ApiModelProperty(value = "作业地点")
+    private String workPlace;
+    
+    @ApiModelProperty(value = "作业类别,参照枚举DjWorkCategoryEnum")
+    private String workCategory;
+    
+    @ApiModelProperty(value = "设备管道具体参数(JSON)")
+    private String pipelineParam;
+    
+    @ApiModelProperty(value = "涉及的其他特殊作业ID集(JSON数组)")
+    private String relatedWorkId;
+    
+    @ApiModelProperty(value = "作业开始时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String beginTime;
+    
+    @ApiModelProperty(value = "作业结束时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String endTime;
+    
+    @ApiModelProperty(value = "签发时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String issueTime;
+    
+    @ApiModelProperty(value = "盲板位置图及编号(base64编码)")
+    private String locationMap;
+    
+    @ApiModelProperty(value = "盲板位置图编制人(JSON)")
+    private String preparedUser;
+    
+    @ApiModelProperty(value = "风险识别")
+    private String riskIdentification;
+    
+    @ApiModelProperty(value = "作业人员列表(JSON数组)")
+    private String workUser;
+    
+    @ApiModelProperty(value = "是否承包商作业,参照枚举DjIsCommonStatusEnum")
+    private String contractorWork;
+    
+    @ApiModelProperty(value = "地图中心点坐标(JSON)")
+    private String mapCenter;
+    
+    @ApiModelProperty(value = "地图边界坐标(JSON数组)")
+    private String mapBorder;
+    
+    @ApiModelProperty(value = "安全措施列表(JSON数组)")
+    private String securityMeasure;
+    
+    @ApiModelProperty(value = "其他措施(JSON数组)")
+    private String otherMeasure;
+    
+    @ApiModelProperty(value = "其他措施编制人(JSON)")
+    private String otherMeasureUser;
+    
+    @ApiModelProperty(value = "措施确认人(JSON)")
+    private String measureUser;
+    
+    @ApiModelProperty(value = "交底内容")
+    private String discloseContent;
+    
+    @ApiModelProperty(value = "安全交底人(JSON)")
+    private String discloseUser;
+    
+    @ApiModelProperty(value = "接受交底人(JSON)")
+    private String acceptUser;
+    
+    @ApiModelProperty(value = "作业负责人(JSON)")
+    private String workHeadUser;
+    
+    @ApiModelProperty(value = "单位审批人(JSON)")
+    private String unitApprovalUser;
+    
+    @ApiModelProperty(value = "监护人(JSON)")
+    private String guardianUser;
+    
+    @ApiModelProperty(value = "完工验收人(JSON)")
+    private String finishedUser;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/dj/DjCheckAcceptEntity.java

@@ -0,0 +1,63 @@
+package com.zcloud.modules.data.entity.dj;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 特殊作业验收信息表(唐山东江)(DjCheckAccept)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 15:11:18
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_check_accept")
+public class DjCheckAcceptEntity extends Model<DjCheckAcceptEntity> {
+
+    @ApiModelProperty(value = "自增主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    @ApiModelProperty(value = "业务主键UUID")
+    private String recordId;
+    
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+    
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "关联特殊作业ID")
+    private String workId;
+    
+    @ApiModelProperty(value = "验收时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String acceptanceTime;
+    
+    @ApiModelProperty(value = "验收意见")
+    private String acceptanceOpinion;
+    
+    @ApiModelProperty(value = "验收签字图片(base64编码)")
+    private String acceptanceSign;
+    
+    @ApiModelProperty(value = "现场照片(base64编码)")
+    private String scenePicture;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/dj/DjConfinedSpaceWorkEntity.java

@@ -0,0 +1,144 @@
+package com.zcloud.modules.data.entity.dj;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 受限空间作业表(唐山东江)(DjConfinedSpaceWork)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 13:35:57
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_confined_space_work")
+public class DjConfinedSpaceWorkEntity extends Model<DjConfinedSpaceWorkEntity> {
+
+    @ApiModelProperty(value = "自增主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    @ApiModelProperty(value = "业务主键UUID")
+    private String recordId;
+    
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+    
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "作业名称")
+    private String workName;
+    
+    @ApiModelProperty(value = "作业编号")
+    private String workNumber;
+    
+    @ApiModelProperty(value = "作业单位")
+    private String workCompany;
+    
+    @ApiModelProperty(value = "作业申请单位")
+    private String workApplyCompany;
+    
+    @ApiModelProperty(value = "作业地点")
+    private String workPlace;
+    
+    @ApiModelProperty(value = "受限空间名称")
+    private String confinedSpaceName;
+    
+    @ApiModelProperty(value = "受限空间内原有介质名称")
+    private String confinedSpaceMedium;
+    
+    @ApiModelProperty(value = "涉及的其他特殊作业ID集(JSON数组)")
+    private String relatedWorkId;
+    
+    @ApiModelProperty(value = "作业开始时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String beginTime;
+    
+    @ApiModelProperty(value = "作业结束时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String endTime;
+    
+    @ApiModelProperty(value = "签发时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String issueTime;
+    
+    @ApiModelProperty(value = "作业内容")
+    private String workContent;
+    
+    @ApiModelProperty(value = "风险辨识")
+    private String riskIdentification;
+    
+    @ApiModelProperty(value = "作业人员列表(JSON数组)")
+    private String workUser;
+    
+    @ApiModelProperty(value = "是否承包商作业,参照枚举DjIsCommonStatusEnum")
+    private String contractorWork;
+    
+    @ApiModelProperty(value = "地图中心点坐标(JSON)")
+    private String mapCenter;
+    
+    @ApiModelProperty(value = "地图边界坐标(JSON数组)")
+    private String mapBorder;
+    
+    @ApiModelProperty(value = "有毒气体分析(JSON数组)")
+    private String hazarAnalysis;
+    
+    @ApiModelProperty(value = "可燃气体分析(JSON数组)")
+    private String combustibleAnalysis;
+    
+    @ApiModelProperty(value = "氧气分析(JSON)")
+    private String oxygenAnalysis;
+    
+    @ApiModelProperty(value = "分析人员(JSON)")
+    private String analysisUser;
+    
+    @ApiModelProperty(value = "安全措施列表(JSON数组)")
+    private String securityMeasure;
+    
+    @ApiModelProperty(value = "其他措施(JSON数组)")
+    private String otherMeasure;
+    
+    @ApiModelProperty(value = "其他措施编制人(JSON)")
+    private String otherMeasureUser;
+    
+    @ApiModelProperty(value = "措施确认人(JSON)")
+    private String measureUser;
+    
+    @ApiModelProperty(value = "交底内容")
+    private String discloseContent;
+    
+    @ApiModelProperty(value = "安全交底人(JSON)")
+    private String discloseUser;
+    
+    @ApiModelProperty(value = "接受交底人(JSON)")
+    private String acceptUser;
+    
+    @ApiModelProperty(value = "作业负责人(JSON)")
+    private String workHeadUser;
+    
+    @ApiModelProperty(value = "单位审批人(JSON)")
+    private String unitApprovalUser;
+    
+    @ApiModelProperty(value = "监护人(JSON)")
+    private String guardianUser;
+    
+    @ApiModelProperty(value = "完工验收人(JSON)")
+    private String finishedUser;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/dj/DjDangerCheckRecordEntity.java

@@ -0,0 +1,84 @@
+package com.zcloud.modules.data.entity.dj;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 隐患排查记录表(唐山东江)(DjDangerCheckRecord)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 11:37:58
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_danger_check_record")
+public class DjDangerCheckRecordEntity extends Model<DjDangerCheckRecordEntity> {
+
+    @ApiModelProperty(value = "自增主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    @ApiModelProperty(value = "业务主键UUID")
+    private String recordId;
+    
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+    
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "创建人手机号")
+    private String recordCreatorPhoneNo;
+    
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "最后修改人手机号")
+    private String recordUpdaterPhoneNo;
+    
+    @ApiModelProperty(value = "企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "关联隐患排查任务ID")
+    private String checkTaskId;
+    
+    @ApiModelProperty(value = "排查时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String checkTime;
+    
+    @ApiModelProperty(value = "IMEI码")
+    private String mobileMe;
+    
+    @ApiModelProperty(value = "是否包保责任人任务,参照枚举DjIsDefendEnum")
+    private String isDefend;
+    
+    @ApiModelProperty(value = "排查状态,参照枚举DjCheckStatusEnum")
+    private String checkStatus;
+    
+    @ApiModelProperty(value = "排查风险等级,参照枚举DjCheckRiskLevelEnum")
+    private String checkRiskLevel;
+    
+    @ApiModelProperty(value = "排查风险名称")
+    private String checkRiskName;
+    
+    @ApiModelProperty(value = "排查部门")
+    private String checkDep;
+    
+    @ApiModelProperty(value = "排查人")
+    private String checker;
+    
+    @ApiModelProperty(value = "排查人联系电话")
+    private String checkerPhoneNo;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/dj/DjDangerCheckTaskEntity.java

@@ -0,0 +1,93 @@
+package com.zcloud.modules.data.entity.dj;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 隐患排查任务表(唐山东江)(DjDangerCheckTask)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 11:19:24
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_danger_check_task")
+public class DjDangerCheckTaskEntity extends Model<DjDangerCheckTaskEntity> {
+
+    @ApiModelProperty(value = "自增主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private String recordId;
+
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+
+
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "关联风险管控措施ID")
+    private String riskMeasureId;
+    
+    @ApiModelProperty(value = "隐患排查内容")
+    private String troubleshootContent;
+    
+    @ApiModelProperty(value = "巡检周期数字值")
+    private String checkCycle;
+    
+    @ApiModelProperty(value = "巡检周期单位,参照枚举DjCheckCycleUnitEnum")
+    private String checkCycleUnit;
+    
+    @ApiModelProperty(value = "工作开始时间,格式:HH:mm:ss")
+    private String workStartTime;
+    
+    @ApiModelProperty(value = "工作结束时间,格式:HH:mm:ss")
+    private String workEndTime;
+    
+    @ApiModelProperty(value = "工作日类型,参照枚举DjWorkDayTypeEnum")
+    private String workDayType;
+    
+    @ApiModelProperty(value = "任务类型,参照枚举DjWorkTypeEnum")
+    private String workType;
+    
+    @ApiModelProperty(value = "包保任务对应项,参照枚举DjTaskNumEnum")
+    private String taskNum;
+    
+    @ApiModelProperty(value = "巡检级别,参照枚举DjCheckLevelEnum")
+    private String checkLevel;
+    
+    @ApiModelProperty(value = "巡检频次(天数/班数)")
+    private String checkTimesDay;
+    
+    @ApiModelProperty(value = "巡检频次(次数)")
+    private String checkTimesNum;
+    
+    @ApiModelProperty(value = "巡检任务类型,参照枚举DjCheckTaskTypeEnum")
+    private String checkTaskType;
+    
+    @ApiModelProperty(value = "巡检有效开始时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String checkStartDate;
+    
+    @ApiModelProperty(value = "巡检有效结束时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String checkEndDate;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/dj/DjDangerInfoEntity.java

@@ -0,0 +1,114 @@
+package com.zcloud.modules.data.entity.dj;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 隐患信息表(唐山东江)(DjDangerInfo)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 11:38:21
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_danger_info")
+public class DjDangerInfoEntity extends Model<DjDangerInfoEntity> {
+
+    @ApiModelProperty(value = "自增主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    @ApiModelProperty(value = "业务主键UUID")
+    private String recordId;
+    
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+    
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "安全风险分析对象编码")
+    private String hazardCode;
+    
+    @ApiModelProperty(value = "关联风险管控措施ID")
+    private String riskMeasureId;
+    
+    @ApiModelProperty(value = "关联隐患排查记录ID")
+    private String checkRecordId;
+    
+    @ApiModelProperty(value = "隐患名称")
+    private String dangerName;
+    
+    @ApiModelProperty(value = "隐患等级,参照枚举DjDangerLevelEnum")
+    private String dangerLevel;
+    
+    @ApiModelProperty(value = "登记时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String registerTime;
+    
+    @ApiModelProperty(value = "登记人姓名")
+    private String registrant;
+    
+    @ApiModelProperty(value = "隐患来源,参照枚举DjDangerSrcEnum")
+    private String dangerSrc;
+    
+    @ApiModelProperty(value = "执法编号")
+    private String enforcementId;
+    
+    @ApiModelProperty(value = "隐患治理类型,参照枚举DjDangerManageTypeEnum")
+    private String dangerManageType;
+    
+    @ApiModelProperty(value = "隐患类型,参照枚举DjHazardDangerTypeEnum")
+    private String hazardDangerType;
+    
+    @ApiModelProperty(value = "隐患类别,参照枚举DjHazardCategoryEnum")
+    private String hazardCategory;
+    
+    @ApiModelProperty(value = "隐患描述")
+    private String dangerDesc;
+    
+    @ApiModelProperty(value = "原因分析")
+    private String dangerReason;
+    
+    @ApiModelProperty(value = "控制措施")
+    private String controlMeasures;
+    
+    @ApiModelProperty(value = "资金(万元)")
+    private String cost;
+    
+    @ApiModelProperty(value = "整改责任人姓名")
+    private String liablePerson;
+    
+    @ApiModelProperty(value = "隐患治理期限,格式:yyyy-MM-dd HH:mm:ss")
+    private String dangerManageDeadline;
+    
+    @ApiModelProperty(value = "验收人姓名")
+    private String checkAcceptPerson;
+    
+    @ApiModelProperty(value = "验收时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String checkAcceptTime;
+    
+    @ApiModelProperty(value = "验收情况")
+    private String checkAcceptComment;
+    
+    @ApiModelProperty(value = "隐患状态,参照枚举DjDangerStateEnum")
+    private String dangerState;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/dj/DjElectricityWorkEntity.java

@@ -0,0 +1,153 @@
+package com.zcloud.modules.data.entity.dj;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 临时用电作业表(唐山东江)(DjElectricityWork)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 14:48:55
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_electricity_work")
+public class DjElectricityWorkEntity extends Model<DjElectricityWorkEntity> {
+
+    @ApiModelProperty(value = "自增主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    @ApiModelProperty(value = "业务主键UUID")
+    private String recordId;
+    
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+    
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "作业名称")
+    private String workName;
+    
+    @ApiModelProperty(value = "作业编号")
+    private String workNumber;
+    
+    @ApiModelProperty(value = "作业单位")
+    private String workCompany;
+    
+    @ApiModelProperty(value = "作业申请单位")
+    private String workApplyCompany;
+    
+    @ApiModelProperty(value = "作业地点")
+    private String workPlace;
+    
+    @ApiModelProperty(value = "电源接入点及许可用电功率")
+    private String powerAccessPoint;
+    
+    @ApiModelProperty(value = "工作电压")
+    private String workingVoltage;
+    
+    @ApiModelProperty(value = "用电设备名称及额定功率")
+    private String electricalEquipment;
+    
+    @ApiModelProperty(value = "用电人姓名")
+    private String electricityUserName;
+    
+    @ApiModelProperty(value = "涉及的其他特殊作业ID集(JSON数组)")
+    private String relatedWorkId;
+    
+    @ApiModelProperty(value = "作业开始时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String beginTime;
+    
+    @ApiModelProperty(value = "作业结束时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String endTime;
+    
+    @ApiModelProperty(value = "签发时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String issueTime;
+    
+    @ApiModelProperty(value = "工作内容")
+    private String workContent;
+    
+    @ApiModelProperty(value = "风险辨识")
+    private String riskIdentification;
+    
+    @ApiModelProperty(value = "作业人员列表(JSON数组)")
+    private String workUser;
+    
+    @ApiModelProperty(value = "是否承包商作业,参照枚举DjIsCommonStatusEnum")
+    private String contractorWork;
+    
+    @ApiModelProperty(value = "地图中心点坐标(JSON)")
+    private String mapCenter;
+    
+    @ApiModelProperty(value = "地图边界坐标(JSON数组)")
+    private String mapBorder;
+    
+    @ApiModelProperty(value = "有毒气体分析(JSON数组)")
+    private String hazarAnalysis;
+    
+    @ApiModelProperty(value = "可燃气体分析(JSON数组)")
+    private String combustibleAnalysis;
+    
+    @ApiModelProperty(value = "氧气分析(JSON)")
+    private String oxygenAnalysis;
+    
+    @ApiModelProperty(value = "分析人员(JSON)")
+    private String analysisUser;
+    
+    @ApiModelProperty(value = "安全措施列表(JSON数组)")
+    private String securityMeasure;
+    
+    @ApiModelProperty(value = "其他措施(JSON数组)")
+    private String otherMeasure;
+    
+    @ApiModelProperty(value = "其他措施编制人(JSON)")
+    private String otherMeasureUser;
+    
+    @ApiModelProperty(value = "措施确认人(JSON)")
+    private String measureUser;
+    
+    @ApiModelProperty(value = "交底内容")
+    private String discloseContent;
+    
+    @ApiModelProperty(value = "安全交底人(JSON)")
+    private String discloseUser;
+    
+    @ApiModelProperty(value = "接受交底人(JSON)")
+    private String acceptUser;
+    
+    @ApiModelProperty(value = "作业负责人(JSON)")
+    private String workHeadUser;
+    
+    @ApiModelProperty(value = "用电单位审批人(JSON)")
+    private String electricityApprovalUser;
+    
+    @ApiModelProperty(value = "配送电单位审批人(JSON)")
+    private String deliveryApprovalUser;
+    
+    @ApiModelProperty(value = "监护人(JSON)")
+    private String guardianUser;
+    
+    @ApiModelProperty(value = "完工验收人(JSON)")
+    private String finishedUser;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/dj/DjGasAnalysisDataEntity.java

@@ -0,0 +1,63 @@
+package com.zcloud.modules.data.entity.dj;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 特殊作业气体分析数据表(唐山东江)(DjGasAnalysisData)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 15:07:41
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_gas_analysis_data")
+public class DjGasAnalysisDataEntity extends Model<DjGasAnalysisDataEntity> {
+
+    @ApiModelProperty(value = "自增主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    @ApiModelProperty(value = "业务主键UUID")
+    private String recordId;
+    
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+    
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "关联特殊作业ID")
+    private String workId;
+    
+    @ApiModelProperty(value = "取样时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String samplingTime;
+    
+    @ApiModelProperty(value = "取样地点")
+    private String samplingAddress;
+    
+    @ApiModelProperty(value = "气体检测信息(JSON数组)")
+    private String detectInfo;
+    
+    @ApiModelProperty(value = "确认人签字图片(base64编码)")
+    private String confirmSign;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/dj/DjGroundBreakWorkEntity.java

@@ -0,0 +1,144 @@
+package com.zcloud.modules.data.entity.dj;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 动土作业表(唐山东江)(DjGroundBreakWork)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 14:27:42
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_ground_break_work")
+public class DjGroundBreakWorkEntity extends Model<DjGroundBreakWorkEntity> {
+
+    @ApiModelProperty(value = "自增主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    @ApiModelProperty(value = "业务主键UUID")
+    private String recordId;
+    
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+    
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "作业名称")
+    private String workName;
+    
+    @ApiModelProperty(value = "作业编号")
+    private String workNumber;
+    
+    @ApiModelProperty(value = "作业单位")
+    private String workCompany;
+    
+    @ApiModelProperty(value = "作业申请单位")
+    private String workApplyCompany;
+    
+    @ApiModelProperty(value = "作业地点")
+    private String workPlace;
+    
+    @ApiModelProperty(value = "涉及的其他特殊作业ID集(JSON数组)")
+    private String relatedWorkId;
+    
+    @ApiModelProperty(value = "作业开始时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String beginTime;
+    
+    @ApiModelProperty(value = "作业结束时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String endTime;
+    
+    @ApiModelProperty(value = "签发时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String issueTime;
+    
+    @ApiModelProperty(value = "作业范围简图(base64编码)")
+    private String workImg;
+    
+    @ApiModelProperty(value = "作业范围描述")
+    private String workDesc;
+    
+    @ApiModelProperty(value = "作业范围签字图片(base64编码)")
+    private String workSign;
+    
+    @ApiModelProperty(value = "作业范围签字时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String workSignTime;
+    
+    @ApiModelProperty(value = "工作内容")
+    private String workContent;
+    
+    @ApiModelProperty(value = "风险识别")
+    private String riskIdentification;
+    
+    @ApiModelProperty(value = "作业人员列表(JSON数组)")
+    private String workUser;
+    
+    @ApiModelProperty(value = "是否承包商作业,参照枚举DjIsCommonStatusEnum")
+    private String contractorWork;
+    
+    @ApiModelProperty(value = "地图中心点坐标(JSON)")
+    private String mapCenter;
+    
+    @ApiModelProperty(value = "地图边界坐标(JSON数组)")
+    private String mapBorder;
+    
+    @ApiModelProperty(value = "安全措施列表(JSON数组)")
+    private String securityMeasure;
+    
+    @ApiModelProperty(value = "其他措施(JSON数组)")
+    private String otherMeasure;
+    
+    @ApiModelProperty(value = "其他措施编制人(JSON)")
+    private String otherMeasureUser;
+    
+    @ApiModelProperty(value = "措施确认人(JSON)")
+    private String measureUser;
+    
+    @ApiModelProperty(value = "交底内容")
+    private String discloseContent;
+    
+    @ApiModelProperty(value = "安全交底人(JSON)")
+    private String discloseUser;
+    
+    @ApiModelProperty(value = "接受交底人(JSON)")
+    private String acceptUser;
+    
+    @ApiModelProperty(value = "作业负责人(JSON)")
+    private String workHeadUser;
+    
+    @ApiModelProperty(value = "单位审批人(JSON)")
+    private String unitApprovalUser;
+    
+    @ApiModelProperty(value = "相关部门负责人(JSON)")
+    private String relatedHeadUser;
+    
+    @ApiModelProperty(value = "审批部门负责人(JSON)")
+    private String approvalUser;
+    
+    @ApiModelProperty(value = "监护人(JSON)")
+    private String guardianUser;
+    
+    @ApiModelProperty(value = "完工验收人(JSON)")
+    private String finishedUser;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/dj/DjHighWorkEntity.java

@@ -0,0 +1,138 @@
+package com.zcloud.modules.data.entity.dj;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 高处作业表(唐山东江)(DjHighWork)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 14:41:09
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_high_work")
+public class DjHighWorkEntity extends Model<DjHighWorkEntity> {
+
+    @ApiModelProperty(value = "自增主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    @ApiModelProperty(value = "业务主键UUID")
+    private String recordId;
+    
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+    
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "作业名称")
+    private String workName;
+    
+    @ApiModelProperty(value = "作业编号")
+    private String workNumber;
+    
+    @ApiModelProperty(value = "作业单位")
+    private String workCompany;
+    
+    @ApiModelProperty(value = "作业申请单位")
+    private String workApplyCompany;
+    
+    @ApiModelProperty(value = "作业地点")
+    private String workPlace;
+    
+    @ApiModelProperty(value = "作业高度(米)")
+    private String workHeight;
+    
+    @ApiModelProperty(value = "高处作业等级,参照枚举DjHeightWorkLevelEnum")
+    private String heightWorkLevel;
+    
+    @ApiModelProperty(value = "涉及的其他特殊作业ID集(JSON数组)")
+    private String relatedWorkId;
+    
+    @ApiModelProperty(value = "作业开始时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String beginTime;
+    
+    @ApiModelProperty(value = "作业结束时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String endTime;
+    
+    @ApiModelProperty(value = "签发时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String issueTime;
+    
+    @ApiModelProperty(value = "工作内容")
+    private String workContent;
+    
+    @ApiModelProperty(value = "风险辨识")
+    private String riskIdentification;
+    
+    @ApiModelProperty(value = "作业人员列表(JSON数组)")
+    private String workUser;
+    
+    @ApiModelProperty(value = "是否承包商作业,参照枚举DjIsCommonStatusEnum")
+    private String contractorWork;
+    
+    @ApiModelProperty(value = "地图中心点坐标(JSON)")
+    private String mapCenter;
+    
+    @ApiModelProperty(value = "地图边界坐标(JSON数组)")
+    private String mapBorder;
+    
+    @ApiModelProperty(value = "安全措施列表(JSON数组)")
+    private String securityMeasure;
+    
+    @ApiModelProperty(value = "其他措施(JSON数组)")
+    private String otherMeasure;
+    
+    @ApiModelProperty(value = "其他措施编制人(JSON)")
+    private String otherMeasureUser;
+    
+    @ApiModelProperty(value = "措施确认人(JSON)")
+    private String measureUser;
+    
+    @ApiModelProperty(value = "交底内容")
+    private String discloseContent;
+    
+    @ApiModelProperty(value = "安全交底人(JSON)")
+    private String discloseUser;
+    
+    @ApiModelProperty(value = "接受交底人(JSON)")
+    private String acceptUser;
+    
+    @ApiModelProperty(value = "作业负责人(JSON)")
+    private String workHeadUser;
+    
+    @ApiModelProperty(value = "单位审批人(JSON)")
+    private String unitApprovalUser;
+    
+    @ApiModelProperty(value = "审核部门负责人(JSON)")
+    private String auditUser;
+    
+    @ApiModelProperty(value = "审批部门负责人(JSON)")
+    private String approvalUser;
+    
+    @ApiModelProperty(value = "监护人(JSON)")
+    private String guardianUser;
+    
+    @ApiModelProperty(value = "完工验收人(JSON)")
+    private String finishedUser;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/dj/DjHoistWorkEntity.java

@@ -0,0 +1,144 @@
+package com.zcloud.modules.data.entity.dj;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 吊装作业表（唐山东江）(DjHoistWork)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 15:01:25
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_hoist_work")
+public class DjHoistWorkEntity extends Model<DjHoistWorkEntity> {
+
+    @ApiModelProperty(value = "自增主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    @ApiModelProperty(value = "业务主键UUID")
+    private String recordId;
+    
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+    
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "作业名称")
+    private String workName;
+    
+    @ApiModelProperty(value = "作业编号")
+    private String workNumber;
+    
+    @ApiModelProperty(value = "作业单位")
+    private String workCompany;
+    
+    @ApiModelProperty(value = "作业申请单位")
+    private String workApplyCompany;
+    
+    @ApiModelProperty(value = "吊装地点")
+    private String workPlace;
+    
+    @ApiModelProperty(value = "吊具名称")
+    private String spreaderName;
+    
+    @ApiModelProperty(value = "吊物质量(吨)")
+    private String spreaderWeight;
+    
+    @ApiModelProperty(value = "作业级别,参照枚举DjHoistWorkLevelEnum")
+    private String workLevel;
+    
+    @ApiModelProperty(value = "司索人姓名")
+    private String slingUser;
+    
+    @ApiModelProperty(value = "涉及的其他特殊作业ID集(JSON数组)")
+    private String relatedWorkId;
+    
+    @ApiModelProperty(value = "作业开始时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String beginTime;
+    
+    @ApiModelProperty(value = "作业结束时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String endTime;
+    
+    @ApiModelProperty(value = "签发时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String issueTime;
+    
+    @ApiModelProperty(value = "工作内容")
+    private String workContent;
+    
+    @ApiModelProperty(value = "风险辨识")
+    private String riskIdentification;
+    
+    @ApiModelProperty(value = "作业人员列表(JSON数组)")
+    private String workUser;
+    
+    @ApiModelProperty(value = "是否承包商作业,参照枚举DjIsCommonStatusEnum")
+    private String contractorWork;
+    
+    @ApiModelProperty(value = "地图中心点坐标(JSON)")
+    private String mapCenter;
+    
+    @ApiModelProperty(value = "地图边界坐标(JSON数组)")
+    private String mapBorder;
+    
+    @ApiModelProperty(value = "安全措施列表(JSON数组)")
+    private String securityMeasure;
+    
+    @ApiModelProperty(value = "其他措施(JSON数组)")
+    private String otherMeasure;
+    
+    @ApiModelProperty(value = "其他措施编制人(JSON)")
+    private String otherMeasureUser;
+    
+    @ApiModelProperty(value = "措施确认人(JSON)")
+    private String measureUser;
+    
+    @ApiModelProperty(value = "交底内容")
+    private String discloseContent;
+    
+    @ApiModelProperty(value = "安全交底人(JSON)")
+    private String discloseUser;
+    
+    @ApiModelProperty(value = "接受交底人(JSON)")
+    private String acceptUser;
+    
+    @ApiModelProperty(value = "作业指挥人(JSON)")
+    private String workHeadUser;
+    
+    @ApiModelProperty(value = "单位审批人(JSON)")
+    private String unitApprovalUser;
+    
+    @ApiModelProperty(value = "审核部门负责人(JSON)")
+    private String auditUser;
+    
+    @ApiModelProperty(value = "审批部门负责人(JSON)")
+    private String approvalUser;
+    
+    @ApiModelProperty(value = "监护人(JSON)")
+    private String guardianUser;
+    
+    @ApiModelProperty(value = "完工验收人(JSON)")
+    private String finishedUser;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/dj/DjHotWorkEntity.java

@@ -0,0 +1,153 @@
+package com.zcloud.modules.data.entity.dj;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 动火作业表(唐山东江)(DjHotWork)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 11:51:03
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_hot_work")
+public class DjHotWorkEntity extends Model<DjHotWorkEntity> {
+
+    @ApiModelProperty(value = "自增主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    @ApiModelProperty(value = "业务主键UUID")
+    private String recordId;
+    
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+    
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "作业名称")
+    private String workName;
+    
+    @ApiModelProperty(value = "作业编号")
+    private String workNumber;
+    
+    @ApiModelProperty(value = "作业单位")
+    private String workCompany;
+    
+    @ApiModelProperty(value = "作业申请单位")
+    private String workApplyCompany;
+    
+    @ApiModelProperty(value = "作业地点")
+    private String workPlace;
+    
+    @ApiModelProperty(value = "动火方式")
+    private String hotWorkMethod;
+    
+    @ApiModelProperty(value = "动火等级,参照枚举DjHotWorkLevelEnum")
+    private String hotWorkLevel;
+    
+    @ApiModelProperty(value = "涉及的其他特殊作业ID集(JSON数组)")
+    private String relatedWorkId;
+    
+    @ApiModelProperty(value = "动火开始时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String beginTime;
+    
+    @ApiModelProperty(value = "动火结束时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String endTime;
+    
+    @ApiModelProperty(value = "签发时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String issueTime;
+    
+    @ApiModelProperty(value = "作业内容")
+    private String workContent;
+    
+    @ApiModelProperty(value = "风险辨识")
+    private String riskIdentification;
+    
+    @ApiModelProperty(value = "作业人员列表(JSON数组)")
+    private String workUser;
+    
+    @ApiModelProperty(value = "是否承包商作业,参照枚举DjIsCommonStatusEnum")
+    private String contractorWork;
+    
+    @ApiModelProperty(value = "地图中心点坐标(JSON)")
+    private String mapCenter;
+    
+    @ApiModelProperty(value = "地图边界坐标(JSON数组)")
+    private String mapBorder;
+    
+    @ApiModelProperty(value = "有毒气体分析(JSON数组)")
+    private String hazarAnalysis;
+    
+    @ApiModelProperty(value = "可燃气体分析(JSON数组)")
+    private String combustibleAnalysis;
+    
+    @ApiModelProperty(value = "氧气分析(JSON)")
+    private String oxygenAnalysis;
+    
+    @ApiModelProperty(value = "分析人员(JSON)")
+    private String analysisUser;
+    
+    @ApiModelProperty(value = "安全措施列表(JSON数组)")
+    private String securityMeasure;
+    
+    @ApiModelProperty(value = "其他措施(JSON数组)")
+    private String otherMeasure;
+    
+    @ApiModelProperty(value = "其他措施编制人(JSON)")
+    private String otherMeasureUser;
+    
+    @ApiModelProperty(value = "措施确认人(JSON)")
+    private String measureUser;
+    
+    @ApiModelProperty(value = "交底内容")
+    private String discloseContent;
+    
+    @ApiModelProperty(value = "安全交底人(JSON)")
+    private String discloseUser;
+    
+    @ApiModelProperty(value = "接受交底人(JSON)")
+    private String acceptUser;
+    
+    @ApiModelProperty(value = "作业负责人(JSON)")
+    private String workHeadUser;
+    
+    @ApiModelProperty(value = "单位审批人(JSON)")
+    private String unitApprovalUser;
+    
+    @ApiModelProperty(value = "安全部门审批人(JSON)")
+    private String securityApprovalUser;
+    
+    @ApiModelProperty(value = "动火审批人(JSON)")
+    private String workApprovalUser;
+    
+    @ApiModelProperty(value = "监护人(JSON)")
+    private String guardianUser;
+    
+    @ApiModelProperty(value = "作业前验票人(JSON)")
+    private String inspectUser;
+    
+    @ApiModelProperty(value = "完工验收人(JSON)")
+    private String finishedUser;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/dj/DjOpenCircuitWorkEntity.java

@@ -0,0 +1,144 @@
+package com.zcloud.modules.data.entity.dj;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 断路作业表(唐山东江)(DjOpenCircuitWork)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 14:01:33
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_open_circuit_work")
+public class DjOpenCircuitWorkEntity extends Model<DjOpenCircuitWorkEntity> {
+
+    @ApiModelProperty(value = "自增主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    @ApiModelProperty(value = "业务主键UUID")
+    private String recordId;
+    
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+    
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "作业名称")
+    private String workName;
+    
+    @ApiModelProperty(value = "作业编号")
+    private String workNumber;
+    
+    @ApiModelProperty(value = "作业单位")
+    private String workCompany;
+    
+    @ApiModelProperty(value = "作业申请单位")
+    private String workApplyCompany;
+    
+    @ApiModelProperty(value = "涉及相关单位/部门")
+    private String relatedCompany;
+    
+    @ApiModelProperty(value = "涉及的其他特殊作业ID集(JSON数组)")
+    private String relatedWorkId;
+    
+    @ApiModelProperty(value = "作业开始时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String beginTime;
+    
+    @ApiModelProperty(value = "作业结束时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String endTime;
+    
+    @ApiModelProperty(value = "签发时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String issueTime;
+    
+    @ApiModelProperty(value = "断路原因")
+    private String roadClosureReason;
+    
+    @ApiModelProperty(value = "断路地段示意图(base64编码)")
+    private String circuitBreakImg;
+    
+    @ApiModelProperty(value = "断路地段相关说明")
+    private String circuitBreakDesc;
+    
+    @ApiModelProperty(value = "断路地段签字图片(base64编码)")
+    private String circuitBreakSign;
+    
+    @ApiModelProperty(value = "断路地段签字时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String circuitBreakSignTime;
+    
+    @ApiModelProperty(value = "工作内容")
+    private String workContent;
+    
+    @ApiModelProperty(value = "风险辨识")
+    private String riskIdentification;
+    
+    @ApiModelProperty(value = "是否承包商作业,参照枚举DjIsCommonStatusEnum")
+    private String contractorWork;
+    
+    @ApiModelProperty(value = "地图中心点坐标(JSON)")
+    private String mapCenter;
+    
+    @ApiModelProperty(value = "地图边界坐标(JSON数组)")
+    private String mapBorder;
+    
+    @ApiModelProperty(value = "安全措施列表(JSON数组)")
+    private String securityMeasure;
+    
+    @ApiModelProperty(value = "其他措施(JSON数组)")
+    private String otherMeasure;
+    
+    @ApiModelProperty(value = "其他措施编制人(JSON)")
+    private String otherMeasureUser;
+    
+    @ApiModelProperty(value = "措施确认人(JSON)")
+    private String measureUser;
+    
+    @ApiModelProperty(value = "交底内容")
+    private String discloseContent;
+    
+    @ApiModelProperty(value = "安全交底人(JSON)")
+    private String discloseUser;
+    
+    @ApiModelProperty(value = "接受交底人(JSON)")
+    private String acceptUser;
+    
+    @ApiModelProperty(value = "作业负责人(JSON)")
+    private String workHeadUser;
+    
+    @ApiModelProperty(value = "单位审批人(JSON)")
+    private String unitApprovalUser;
+    
+    @ApiModelProperty(value = "相关部门负责人(JSON)")
+    private String relatedHeadUser;
+    
+    @ApiModelProperty(value = "审批部门负责人(JSON)")
+    private String approvalUser;
+    
+    @ApiModelProperty(value = "监护人(JSON)")
+    private String guardianUser;
+    
+    @ApiModelProperty(value = "完工验收人(JSON)")
+    private String finishedUser;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/dj/DjSafeRiskAnalysisUnitEntity.java

@@ -0,0 +1,89 @@
+package com.zcloud.modules.data.entity.dj;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 唐山东升安全风险分析单元表(DjSafeRiskAnalysisUnit)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 10:21:16
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_safe_risk_analysis_unit")
+public class DjSafeRiskAnalysisUnitEntity extends Model<DjSafeRiskAnalysisUnitEntity> {
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    @ApiModelProperty(value = "主键,字符串（36）,必传")
+    private String recordId;
+    
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+    
+    @ApiModelProperty(value = "记录创建时间")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "最后修改时间")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "风险分析对象编码,安全风险分析对象编码即危险化学品登记综合服务系统中的危险源编码")
+    private String hazardCode;
+    
+    @ApiModelProperty(value = "安全风险分析单元名称")
+    private String riskUnitName;
+    
+    @ApiModelProperty(value = "责任部门,安全风险分析对象所属部门名称")
+    private String hazardDep;
+    
+    @ApiModelProperty(value = "责任人,安全风险分析对象所属部门负责人姓名")
+    private String hazardLiablePerson;
+    
+    @ApiModelProperty(value = "是否为风险分析对象,参照枚举DjIsHazardEnum")
+    private String isHazard;
+    
+    @ApiModelProperty(value = "风险分析对象名称")
+    private String hazardName;
+    
+    @ApiModelProperty(value = "风险分析单元分类,参照枚举DjHazardTypeEnum")
+    private String hazardType;
+    
+    @ApiModelProperty(value = "风险点位置坐标,WGS-84坐标系")
+    private String hazardPoint;
+    
+    @ApiModelProperty(value = "风险分析单元投用日期")
+    private String establishDate;
+    
+    @ApiModelProperty(value = "风险分析单元等级,参照枚举DjHazardRankEnum")
+    private String hazardRank;
+    
+    @ApiModelProperty(value = "风险分析单元 R 值")
+    private String rValue;
+    
+    @ApiModelProperty(value = "风险分析单元描述")
+    private String hazardDesc;
+    
+    @ApiModelProperty(value = "潜在隐患情况")
+    private String hiddenDanger;
+    
+    @ApiModelProperty(value = "应急处置措施")
+    private String emerDeal;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/dj/DjSafeRiskAnalysisUnitReqDto.java

@@ -1,134 +0,0 @@
-package com.zcloud.modules.data.entity.dj;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.yulichang.annotation.Table;
-import com.zcloud.modules.data.enums.tangshan.dj.enums.DjHazardRankEnum;
-import com.zcloud.modules.data.enums.tangshan.dj.enums.DjHazardTypeEnum;
-import com.zcloud.modules.data.enums.tangshan.dj.enums.DjIsHazardEnum;
-import com.zcloud.modules.data.enums.tangshan.dj.enums.DjRecordDeletedEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * [唐山-园区对接-双控.pdf]:<a href="http://47.92.113.182:3000/docking/doc/src/branch/main/%E5%9B%AD%E5%8C%BA%E7%BA%A7%E5%AF%B9%E6%8E%A5%E6%96%87%E4%BB%B6/%E5%94%90%E5%B1%B1-%E5%9B%AD%E5%8C%BA%E5%AF%B9%E6%8E%A5-%E5%8F%8C%E6%8E%A7.pdf">git地址</a>
- * 安全风险分析单元
- * 接口地址 ：/SafeRiskAnalysisUnit
- */
-@NoArgsConstructor
-@Data
-//@TableName("yqDjV1SafeRiskAnalysisUnit")
-@Table("yqDjV1SafeRiskAnalysisUnit")
-public class DjSafeRiskAnalysisUnitReqDto {
-
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
-    /**
-     *  关联枚举：{@link DjRecordDeletedEnum}
-     */
-    @JsonProperty("recordDeleted")
-    @ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
-    private String recordDeleted;
-
-    @JsonProperty("recordCreateTime")
-    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
-    private String recordCreateTime;
-
-    @JsonProperty("recordCreateBy")
-    @ApiModelProperty(value = "创建人姓名", required = true)
-    private String recordCreateBy;
-
-    @JsonProperty("recordUpdateTime")
-    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
-    private String recordUpdateTime;
-
-    @JsonProperty("recordUpdateBy")
-    @ApiModelProperty(value = "最后修改人姓名", required = true)
-    private String recordUpdateBy;
-
-    @JsonProperty("companyCode")
-    @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码", required = true)
-    private String companyCode;
-
-    @JsonProperty("hazardCode")
-    @ApiModelProperty(value = "风险分析对象编码,安全风险分析对象编码即危险化学品登记综合服务系统中的危险源编码", required = true)
-    private String hazardCode;
-
-    @JsonProperty("riskUnitName")
-    @ApiModelProperty(value = "安全风险分析单元名称", required = true)
-    private String riskUnitName;
-
-    @JsonProperty("hazardDep")
-    @ApiModelProperty(value = "责任部门,安全风险分析对象所属部门名称", required = true)
-    private String hazardDep;
-
-    @JsonProperty("hazardLiablePerson")
-    @ApiModelProperty(value = "责任人,安全风险分析对象所属部门负责人姓名", required = true)
-    private String hazardLiablePerson;
-
-    /**
-     *  关联枚举：{@link DjIsHazardEnum}
-     */
-    @JsonProperty("isHazard")
-    @ApiModelProperty(value = "是否为风险分析对象,参照枚举TsIsHazardEnum", required = true)
-    private String isHazard;
-
-    @JsonProperty("hazardName")
-    @ApiModelProperty(value = "风险分析对象名称", required = true)
-    private String hazardName;
-
-    /**
-     * 关联枚举：{@link DjHazardTypeEnum}
-     */
-    @JsonProperty("hazardType")
-    @ApiModelProperty(value = "风险分析单元分类,参照枚举TsHazardTypeEnum", required = true)
-    private String hazardType;
-
-    @JsonProperty("hazardPoint")
-    @ApiModelProperty(value = "风险点位置,WGS-84 坐标系", required = false)
-    private HazardPoint hazardPoint;
-
-    @JsonProperty("establishDate")
-    @ApiModelProperty(value = "风险分析单元投用日期,风险点或设备的投用日期,格式:yyyy-MM-dd", required = false)
-    private String establishDate;
-
-    /**
-     *  关联枚举：{@link DjHazardRankEnum}
-     */
-    @JsonProperty("hazardRank")
-    @ApiModelProperty(value = "风险分析单元等级,参照枚举TsHazardRankEnum", required = false)
-    private String hazardRank;
-
-    @JsonProperty("rValue")
-    @ApiModelProperty(value = "风险分析单元 R 值", required = false)
-    private String rValue;
-
-    @JsonProperty("hazardDesc")
-    @ApiModelProperty(value = "风险分析单元描述", required = false)
-    private String hazardDesc;
-
-    @JsonProperty("hiddenDanger")
-    @ApiModelProperty(value = "潜在隐患情况", required = false)
-    private String hiddenDanger;
-
-    @JsonProperty("emerDeal")
-    @ApiModelProperty(value = "应急处置措施", required = false)
-    private String emerDeal;
-
-
-    @Data
-    @NoArgsConstructor
-    @ApiModel("风险点位置坐标点")
-    public static class HazardPoint {
-        @JsonProperty("lng")
-        @ApiModelProperty(value = "经度", required = true)
-        private String lng;
-
-        @JsonProperty("lat")
-        @ApiModelProperty(value = "纬度", required = true)
-        private String lat;
-    }
-
-}

src/main/java/com/zcloud/modules/data/entity/dj/DjSafeRiskControlMeasureEntity.java

@@ -0,0 +1,79 @@
+package com.zcloud.modules.data.entity.dj;
+
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 安全风险管控措施表(唐山东江)(DjSafeRiskControlMeasure)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 11:10:26
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_safe_risk_control_measure")
+public class DjSafeRiskControlMeasureEntity extends Model<DjSafeRiskControlMeasureEntity> {
+
+    @ApiModelProperty(value = "自增主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    @ApiModelProperty(value = "业务主键UUID")
+    private String recordId;
+    
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+    
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "关联风险事件ID")
+    private String riskEventId;
+    
+    @ApiModelProperty(value = "管控方式,参照枚举DjDataSrcEnum")
+    private String dataSrc;
+    
+    @ApiModelProperty(value = "安全风险管控措施描述")
+    private String riskMeasureDesc;
+    
+    @ApiModelProperty(value = "管控措施分类1,参照枚举DjClassify1Enum")
+    private String classify1;
+    
+    @ApiModelProperty(value = "管控措施分类2,参照枚举DjClassify2Enum")
+    private String classify2;
+    
+    @ApiModelProperty(value = "管控措施分类3,企业自定义")
+    private String classify3;
+    
+    @ApiModelProperty(value = "隐患排查内容")
+    private String troubleshootContent;
+    
+    @ApiModelProperty(value = "管控级别,参照枚举DjRiskMeasureLevelEnum")
+    private String riskMeasureLevel;
+    
+    @ApiModelProperty(value = "管控责任部门")
+    private String riskMeasureDep;
+    
+    @ApiModelProperty(value = "管控责任人")
+    private String riskMeasurer;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/dj/DjSafeRiskEventEntity.java

@@ -0,0 +1,74 @@
+package com.zcloud.modules.data.entity.dj;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 东江安全风险事件表(DjSafeRiskEvent)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 10:55:06
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("dj_safe_risk_event")
+public class DjSafeRiskEventEntity extends Model<DjSafeRiskEventEntity> {
+
+    @ApiModelProperty(value = "自增主键ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    
+    @ApiModelProperty(value = "业务主键UUID")
+    private String recordId;
+    
+    @ApiModelProperty(value = "记录删除状态,参照枚举DjRecordDeletedEnum")
+    private String recordDeleted;
+    
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordCreateTime;
+    
+    @ApiModelProperty(value = "创建人姓名")
+    private String recordCreateBy;
+    
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss")
+    private String recordUpdateTime;
+    
+    @ApiModelProperty(value = "最后修改人姓名")
+    private String recordUpdateBy;
+    
+    @ApiModelProperty(value = "企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "安全风险分析单元ID")
+    private String riskUnitId;
+    
+    @ApiModelProperty(value = "安全风险事件名称")
+    private String riskEventName;
+    
+    @ApiModelProperty(value = "风险事件内容")
+    private String riskEventContent;
+    
+    @ApiModelProperty(value = "风险事件因素")
+    private String riskEventFactor;
+    
+    @ApiModelProperty(value = "可能发生的事故")
+    private String possibleAccident;
+    
+    @ApiModelProperty(value = "影响范围")
+    private String affectRange;
+    
+    @ApiModelProperty(value = "潜在的后果")
+    private String affectResult;
+    
+    @ApiModelProperty(value = "责任部门")
+    private String riskEventDep;
+    
+    @ApiModelProperty(value = "责任人姓名")
+    private String riskEventPerson;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/ty/TyDeviceRunStatusEntity.java

@@ -0,0 +1,69 @@
+package com.zcloud.modules.data.entity.ty;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 土右上报承诺装置运行状态表(TyDeviceRunStatus)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 17:58:00
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("ty_device_run_status")
+public class TyDeviceRunStatusEntity extends Model<TyDeviceRunStatusEntity> {
+
+    @ApiModelProperty(value = "36位字符串ID(主键)")
+    private String id;
+    
+    @ApiModelProperty(value = "承诺详情ID,与企业承诺详情表的ID对应")
+    private String promiseId;
+    
+    @ApiModelProperty(value = "危险源编码")
+    private String hazardCode;
+    
+    @ApiModelProperty(value = "是否处于试生产,参考枚举TyIsCommonStatusEnum")
+    private String isTesting;
+    
+    @ApiModelProperty(value = "运行状态,参考枚举TyRunStatusEnum")
+    private String runStatus;
+    
+    @ApiModelProperty(value = "运行状态开始时间")
+    private String runStatusBeginTime;
+    
+    @ApiModelProperty(value = "运行状态结束时间")
+    private String runStatusEndTime;
+    
+    @ApiModelProperty(value = "处于该运行状态的原因")
+    private String runStatusReason;
+    
+    @ApiModelProperty(value = "是否变更过,参考枚举TyIsCommonStatusEnum")
+    private String isChanged;
+    
+    @ApiModelProperty(value = "变更时间")
+    private String changedTime;
+    
+    @ApiModelProperty(value = "变更原因")
+    private String changedReason;
+    
+    @ApiModelProperty(value = "删除状态,参考枚举TyDeleteStatusEnum,正常:0;已删除:1")
+    private String deleted;
+    
+    @ApiModelProperty(value = "创建时间,时间格式yyyyMMddHHmmss")
+    private String createDate;
+    
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    
+    @ApiModelProperty(value = "修改时间,时间格式yyyyMMddHHmmss")
+    private String updateDate;
+    
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/ty/TyEmployeeFileEntity.java

@@ -0,0 +1,57 @@
+package com.zcloud.modules.data.entity.ty;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 人员档案信息表(TyEmployeeFile)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 18:10:40
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("ty_employee_file")
+public class TyEmployeeFileEntity extends Model<TyEmployeeFileEntity> {
+
+    @ApiModelProperty(value = "36位字符串ID(业务标识)")
+    private String id;
+    
+    @ApiModelProperty(value = "员工姓名")
+    private String employeeName;
+    
+    @ApiModelProperty(value = "性别(0-女 1-男)")
+    private Integer sex;
+    
+    @ApiModelProperty(value = "定位卡号")
+    private String imei;
+    
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+    
+    @ApiModelProperty(value = "岗位")
+    private String post;
+    
+    @ApiModelProperty(value = "企业社会信用代码")
+    private String orgCode;
+    
+    @ApiModelProperty(value = "企业名称")
+    private String enterpriseName;
+    
+    @ApiModelProperty(value = "创建时间(yyyyMMddHHmmss)")
+    private String createDate;
+    
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    
+    @ApiModelProperty(value = "修改时间(yyyyMMddHHmmss)")
+    private String updateDate;
+    
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/ty/TyEmployeeRealLocationEntity.java

@@ -0,0 +1,34 @@
+package com.zcloud.modules.data.entity.ty;
+
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 人员实时定位数据表(TyEmployeeRealLocation)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 18:10:51
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("ty_employee_real_location")
+public class TyEmployeeRealLocationEntity extends Model<TyEmployeeRealLocationEntity> {
+
+    @ApiModelProperty(value = "经度(cgs2000坐标系)")
+    private String lon;
+    
+    @ApiModelProperty(value = "纬度(cgs2000坐标系)")
+    private String lat;
+    
+    @ApiModelProperty(value = "定位卡号")
+    private String imei;
+    
+    @ApiModelProperty(value = "定位时间(yyyy-MM-dd HH:mm:ss)")
+    private String time;
+    
+
+}
+

src/main/java/com/zcloud/modules/data/entity/ty/TyHiddenCheckMissionEntity.java

@@ -0,0 +1,72 @@
+package com.zcloud.modules.data.entity.ty;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 土右上报隐患排查任务数据表(TyHiddenCheckMission)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 16:48:15
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("ty_hidden_check_mission")
+public class TyHiddenCheckMissionEntity extends Model<TyHiddenCheckMissionEntity> {
+
+    @ApiModelProperty(value = "36位字符串ID(主键)")
+    private String id;
+    
+    @ApiModelProperty(value = "企业编码,危化品登记平台登记的9位企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "管控措施id,在上报时会校验该ID是否存在,请先上传安全风险管控措施数据")
+    private String riskMeasureId;
+    
+    @ApiModelProperty(value = "隐患排查内容")
+    private String troubleshootContent;
+    
+    @ApiModelProperty(value = "巡检周期,排查周期,本次生成排查任务到下次生成排查任务的时间跨度,需大于0")
+    private Integer checkCycle;
+    
+    @ApiModelProperty(value = "巡检周期单位,排查周期单位(小时、天、月、年)")
+    private String checkCycleUnit;
+    
+    @ApiModelProperty(value = "任务开始时间,指该任务首次开始执行的时间,时间格式yyyyMMddHHmmss")
+    private String taskStartTime;
+    
+    @ApiModelProperty(value = "工作开始时间,当排查周期是小时的时候为必填,时间格式例如:8:00:00")
+    private String workStartTime;
+    
+    @ApiModelProperty(value = "工作结束时间,当排查周期是小时的时候为必填,时间格式例如:8:00:00")
+    private String workEndTime;
+    
+    @ApiModelProperty(value = "工作日类型,参考枚举TyWorkDayTypeEnum")
+    private String workDayType;
+    
+    @ApiModelProperty(value = "任务类型,参考枚举TyWorkTypeEnum")
+    private String workType;
+    
+    @ApiModelProperty(value = "包保任务对应项,当任务类型为主要负责人任务、技术负责人任务、操作负责人任务时,此项为必填")
+    private String taskNum;
+    
+    @ApiModelProperty(value = "删除状态,参考枚举TyDeleteStatusEnum,正常:0;已删除:1")
+    private String deleted;
+    
+    @ApiModelProperty(value = "创建时间,时间格式yyyyMMddHHmmss")
+    private String createDate;
+    
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    
+    @ApiModelProperty(value = "修改时间,时间格式yyyyMMddHHmmss")
+    private String updateDate;
+    
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/ty/TyHiddenCheckRecordEntity.java

@@ -0,0 +1,63 @@
+package com.zcloud.modules.data.entity.ty;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 土右上报隐患排查记录数据表(TyHiddenCheckRecord)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 16:48:28
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("ty_hidden_check_record")
+public class TyHiddenCheckRecordEntity extends Model<TyHiddenCheckRecordEntity> {
+
+    @ApiModelProperty(value = "36位字符串ID(主键)")
+    private String id;
+    
+    @ApiModelProperty(value = "企业编码,危化品登记平台登记的9位企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "隐患排查任务ID,在上报时会校验该ID是否存在,请先上传安全风险管控措施数据")
+    private String checkTaskId;
+    
+    @ApiModelProperty(value = "排查时间,时间格式yyyyMMddHHmmss")
+    private String checkTime;
+    
+    @ApiModelProperty(value = "IMEI码,国际移动设备识别码IMEI。当设备存在多个IMEI码时,只上传第一个")
+    private String mobileMe;
+    
+    @ApiModelProperty(value = "是否包保责任人任务,参考枚举TyIsDefendEnum")
+    private String isDefend;
+    
+    @ApiModelProperty(value = "排查结果,参考枚举TyCheckStatusEnum")
+    private String checkStatus;
+    
+    @ApiModelProperty(value = "创建人手机号")
+    private String createByMobile;
+    
+    @ApiModelProperty(value = "更新人手机号")
+    private String updateByMobile;
+    
+    @ApiModelProperty(value = "删除状态,参考枚举TyDeleteStatusEnum,正常:0;已删除:1")
+    private String deleted;
+    
+    @ApiModelProperty(value = "创建时间,时间格式yyyyMMddHHmmss")
+    private String createDate;
+    
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    
+    @ApiModelProperty(value = "修改时间,时间格式yyyyMMddHHmmss")
+    private String updateDate;
+    
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/ty/TyHiddenDangerInfoCheckEntity.java

@@ -0,0 +1,63 @@
+package com.zcloud.modules.data.entity.ty;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 土右专项检查隐患信息表(TyHiddenDangerInfoCheck)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 17:27:29
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("ty_hidden_danger_info_check")
+public class TyHiddenDangerInfoCheckEntity extends Model<TyHiddenDangerInfoCheckEntity> {
+
+    @ApiModelProperty(value = "36位字符串ID(主键)")
+    private String id;
+    
+    @ApiModelProperty(value = "隐患ID")
+    private String dangerId;
+    
+    @ApiModelProperty(value = "任务ID")
+    private String taskId;
+    
+    @ApiModelProperty(value = "检查类型,参考枚举TyCheckTypeEnum")
+    private String checkType;
+    
+    @ApiModelProperty(value = "检查项ID")
+    private String checkItemId;
+    
+    @ApiModelProperty(value = "检查项评分细则ID")
+    private String checkScoreId;
+    
+    @ApiModelProperty(value = "检查时间,日期格式yyyyMMdd")
+    private String checkDate;
+    
+    @ApiModelProperty(value = "罚款金额,单位:元")
+    private Double checkPay;
+    
+    @ApiModelProperty(value = "危害类型,参考枚举TyHarmTypeEnum")
+    private String harmType;
+    
+    @ApiModelProperty(value = "删除状态,参考枚举TyDeleteStatusEnum,正常:0;已删除:1")
+    private String deleted;
+    
+    @ApiModelProperty(value = "创建时间,时间格式yyyyMMddHHmmss")
+    private String createDate;
+    
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    
+    @ApiModelProperty(value = "修改时间,时间格式yyyyMMddHHmmss")
+    private String updateDate;
+    
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/ty/TyHiddenDangerInfoEntity.java

@@ -0,0 +1,108 @@
+package com.zcloud.modules.data.entity.ty;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 土右上报隐患信息数据表(TyHiddenDangerInfo)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 16:48:40
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("ty_hidden_danger_info")
+public class TyHiddenDangerInfoEntity extends Model<TyHiddenDangerInfoEntity> {
+
+    @ApiModelProperty(value = "36位字符串ID(主键)")
+    private String id;
+    
+    @ApiModelProperty(value = "企业编码,危化品登记平台登记的9位企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "风险分析对象编码,所有隐患必须绑定风险分析对象")
+    private String hazardCode;
+    
+    @ApiModelProperty(value = "管控措施主键ID,所有隐患排查任务产生的隐患必须绑定管控措施")
+    private String riskMeasureId;
+    
+    @ApiModelProperty(value = "隐患排查记录ID,所有由隐患排查时产生的隐患必须提供关联的隐患排查记录ID")
+    private String checkRecordId;
+    
+    @ApiModelProperty(value = "隐患名称")
+    private String dangerName;
+    
+    @ApiModelProperty(value = "隐患等级,参考枚举TyDangerLevelEnum")
+    private String dangerLevel;
+    
+    @ApiModelProperty(value = "登记时间,时间格式yyyyMMddHHmmss")
+    private String registTime;
+    
+    @ApiModelProperty(value = "登记人姓名")
+    private String registrant;
+    
+    @ApiModelProperty(value = "隐患来源,参考枚举TyDangerSrcEnum")
+    private String dangerSrc;
+    
+    @ApiModelProperty(value = "执法编号,执法检查计划管理信息表主键ID")
+    private String enforcementId;
+    
+    @ApiModelProperty(value = "治理类型,参考枚举TyDangerManageTypeEnum")
+    private String dangerManageType;
+    
+    @ApiModelProperty(value = "隐患类型,参考枚举TyHazardDangerTypeEnum")
+    private String hazardDangerType;
+    
+    @ApiModelProperty(value = "隐患类别,参考枚举TyHazardCategoryEnum")
+    private String hazardCategory;
+    
+    @ApiModelProperty(value = "隐患描述")
+    private String dangerDesc;
+    
+    @ApiModelProperty(value = "原因分析")
+    private String dangerReason;
+    
+    @ApiModelProperty(value = "控制措施")
+    private String controlMeasures;
+    
+    @ApiModelProperty(value = "资金,单位(万元)")
+    private Double cost;
+    
+    @ApiModelProperty(value = "整改责任人")
+    private String liablePerson;
+    
+    @ApiModelProperty(value = "隐患治理期限,时间格式yyyyMMddHHmmss")
+    private String dangerManageDeadline;
+    
+    @ApiModelProperty(value = "验收人姓名")
+    private String checkAcceptPerson;
+    
+    @ApiModelProperty(value = "验收时间")
+    private String checkAcceptTime;
+    
+    @ApiModelProperty(value = "验收情况")
+    private String checkAcceptComment;
+    
+    @ApiModelProperty(value = "隐患状态,参考枚举TyDangerStatusEnum")
+    private String dangerState;
+    
+    @ApiModelProperty(value = "删除状态,参考枚举TyDeleteStatusEnum,正常:0;已删除:1")
+    private String deleted;
+    
+    @ApiModelProperty(value = "创建时间,时间格式yyyyMMddHHmmss")
+    private String createDate;
+    
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    
+    @ApiModelProperty(value = "修改时间,时间格式yyyyMMddHHmmss")
+    private String updateDate;
+    
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/ty/TyMaintenanceRecordEntity.java

@@ -0,0 +1,57 @@
+package com.zcloud.modules.data.entity.ty;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 土右上报停用/检修记录表(TyMaintenanceRecord)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 17:27:44
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("ty_maintenance_record")
+public class TyMaintenanceRecordEntity extends Model<TyMaintenanceRecordEntity> {
+
+    @ApiModelProperty(value = "36位字符串ID(主键)")
+    private String id;
+    
+    @ApiModelProperty(value = "企业编码,危化品登记平台登记的9位企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "风险分析对象编码即危险化学品登记信息管理系统中的危险源编码")
+    private String hazardCode;
+    
+    @ApiModelProperty(value = "所属风险单元ID")
+    private String riskUnitId;
+    
+    @ApiModelProperty(value = "停用/检修开始时间,时间格式yyyyMMddHHmmss")
+    private String stopStartTime;
+    
+    @ApiModelProperty(value = "停用/检修结束时间,时间格式yyyyMMddHHmmss")
+    private String stopEndTime;
+    
+    @ApiModelProperty(value = "停用/检修原因")
+    private String stopReason;
+    
+    @ApiModelProperty(value = "删除状态,参考枚举TyDeleteStatusEnum,正常:0;已删除:1")
+    private String deleted;
+    
+    @ApiModelProperty(value = "创建时间,时间格式yyyyMMddHHmmss")
+    private String createDate;
+    
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    
+    @ApiModelProperty(value = "修改时间,时间格式yyyyMMddHHmmss")
+    private String updateDate;
+    
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    
+}
+

src/main/java/com/zcloud/modules/data/entity/ty/TyProductionPromiseEntity.java

@@ -0,0 +1,144 @@
+package com.zcloud.modules.data.entity.ty;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 土右上报安全承诺数据表(TyProductionPromise)表实体类
+ *
+ * @author makejava
+ * @since 2025-06-30 17:48:33
+ */
+@SuppressWarnings("serial")
+@Data
+@TableName("ty_production_promise")
+public class TyProductionPromiseEntity extends Model<TyProductionPromiseEntity> {
+
+    @ApiModelProperty(value = "36位字符串ID(主键)")
+    private String id;
+    
+    @ApiModelProperty(value = "企业编码,危化品登记平台登记的9位企业编码")
+    private String companyCode;
+    
+    @ApiModelProperty(value = "生产装置套数")
+    private Integer unitsNumber;
+    
+    @ApiModelProperty(value = "运行套数")
+    private Integer runNumber;
+    
+    @ApiModelProperty(value = "停车套数")
+    private Integer parkNumber;
+    
+    @ApiModelProperty(value = "特级动火作业数量")
+    private Integer firesNumber;
+    
+    @ApiModelProperty(value = "一级动火作业数量")
+    private Integer fire1Number;
+    
+    @ApiModelProperty(value = "二级动火作业数量")
+    private Integer fire2Number;
+    
+    @ApiModelProperty(value = "断路作业数量")
+    private Integer roadworkNumber;
+    
+    @ApiModelProperty(value = "动土作业数量")
+    private Integer soilworkNumber;
+    
+    @ApiModelProperty(value = "高处作业数量")
+    private Integer highworkNumber;
+    
+    @ApiModelProperty(value = "临时用电作业数量")
+    private Integer electricityworkNumber;
+    
+    @ApiModelProperty(value = "吊装作业数量")
+    private Integer liftingworkNumber;
+    
+    @ApiModelProperty(value = "盲板作业数量")
+    private Integer blindplateNumber;
+    
+    @ApiModelProperty(value = "受限空间作业数量")
+    private Integer spaceworkNumber;
+    
+    @ApiModelProperty(value = "检维修作业数量")
+    private Integer inspectionNumber;
+    
+    @ApiModelProperty(value = "倒罐作业数量")
+    private Integer pourOutNumber;
+    
+    @ApiModelProperty(value = "清罐作业数量")
+    private Integer cleanTankNumber;
+    
+    @ApiModelProperty(value = "切水作业数量")
+    private Integer drainingNumber;
+    
+    @ApiModelProperty(value = "承包商作业数量")
+    private Integer contractorNumber;
+    
+    @ApiModelProperty(value = "变更作业数量")
+    private Integer changedTaskNumber;
+    
+    @ApiModelProperty(value = "是否有承包商作业,参考枚举TyIsCommonStatusEnum")
+    private String contractor;
+    
+    @ApiModelProperty(value = "是否处于试生产期,参考枚举TyIsCommonStatusEnum")
+    private String trialProduction;
+    
+    @ApiModelProperty(value = "是否处于开停车状态,参考枚举TyIsCommonStatusEnum")
+    private Integer openParking;
+    
+    @ApiModelProperty(value = "正在开停车装置数")
+    private Integer openParkingNumber;
+    
+    @ApiModelProperty(value = "开车装置数")
+    private Integer workNumber;
+    
+    @ApiModelProperty(value = "停车装置数")
+    private Integer notWorkNumber;
+    
+    @ApiModelProperty(value = "是否开展中(扩)试,参考枚举TyIsCommonStatusEnum")
+    private String test;
+    
+    @ApiModelProperty(value = "试生产装置数")
+    private Integer testNumber;
+    
+    @ApiModelProperty(value = "检维修套数")
+    private Integer overhaulWorkNumber;
+    
+    @ApiModelProperty(value = "重点监管危险工艺数量")
+    private Integer dangerProcessNumber;
+    
+    @ApiModelProperty(value = "有无重大隐患,参考枚举TyIsCommonStatusEnum")
+    private String mHazards;
+    
+    @ApiModelProperty(value = "风险级别,参考枚举TyRiskGradEnum")
+    private String riskGrade;
+    
+    @ApiModelProperty(value = "承诺时间")
+    private String commitDate;
+    
+    @ApiModelProperty(value = "承诺人")
+    private String commitment;
+    
+    @ApiModelProperty(value = "承诺内容")
+    private String commitContent;
+    
+    @ApiModelProperty(value = "删除状态,参考枚举TyDeleteStatusEnum,正常:0;已删除:1")
+    private String deleted;
+    
+    @ApiModelProperty(value = "创建时间,时间格式yyyyMMddHHmmss")
+    private String createDate;
+    
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    
+    @ApiModelProperty(value = "修改时间,时间格式yyyyMMddHHmmss")
+    private String updateDate;
+    
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    
+}
+