Merge branch 'dev' of http://47.92.113.182:3000/docking/docking into dev

# Conflicts:
#	pom.xml
#	src/main/java/com/zcloud/modules/data/controller/test/TestController.java
#	src/main/java/com/zcloud/modules/data/dto/tangshan/ds/EncryptionDto.java
#	src/main/java/com/zcloud/modules/data/dto/tangshan/ds/EncryptionReqDto.java
#	src/main/java/com/zcloud/modules/data/service/hebei/ds/DsReportUtilService.java
#	src/main/resources/application-dev.yml

pom.xml

@@ -40,7 +40,8 @@
         <qiniu.version>7.2.23</qiniu.version>
         <aliyun.oss.version>2.8.3</aliyun.oss.version>
         <qcloud.cos.version>4.4</qcloud.cos.version>
-        <swagger.version>2.7.0</swagger.version>
+       <!-- <swagger.version>2.7.0</swagger.version>-->
+        <swagger.version>3.0.0</swagger.version>
         <joda.time.version>2.9.9</joda.time.version>
         <gson.version>2.8.5</gson.version>
         <fastjson.version>1.2.79</fastjson.version>
@@ -193,6 +194,17 @@
             <artifactId>springfox-swagger-ui</artifactId>
             <version>${swagger.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>3.0.3</version>
+        </dependency>
+       <!-- <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
+            <version>4.3.0</version>
+        </dependency>-->
         <dependency>
             <groupId>com.qiniu</groupId>
             <artifactId>qiniu-java-sdk</artifactId>
@@ -262,6 +274,17 @@
             <version>3.16</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.31</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-client-java</artifactId>

src/main/java/com/zcloud/MainApplication.java

@@ -1,9 +1,12 @@
 package com.zcloud;
 
+import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 
-
+@MapperScan({"com.zcloud.**.dao"})
 @SpringBootApplication
 public class MainApplication {
 

src/main/java/com/zcloud/common/exception/ZExceptionHandler.java

@@ -1,14 +1,20 @@
 package com.zcloud.common.exception;
 
+import cn.hutool.json.JSONUtil;
 import com.zcloud.common.utils.R;
 import org.apache.shiro.authz.AuthorizationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DuplicateKeyException;
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.NoHandlerFoundException;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 异常处理器
  *
@@ -46,6 +52,17 @@ public class ZExceptionHandler {
 		logger.error(e.getMessage(), e);
 		return R.error("没有权限，请联系管理员授权");
 	}
+	@ExceptionHandler(MethodArgumentNotValidException.class)
+	public R handleValidationExceptions(
+			MethodArgumentNotValidException ex) {
+		Map<String, String> errors = new HashMap<>();
+		ex.getBindingResult().getAllErrors().forEach(error -> {
+			String fieldName = ((FieldError) error).getField();
+			String errorMessage = error.getDefaultMessage();
+			errors.put(fieldName, errorMessage);
+		});
+		return R.error(JSONUtil.toJsonStr(errors));
+	}
 
 	@ExceptionHandler(Exception.class)
 	public R handleException(Exception e){

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

@@ -57,6 +57,18 @@ public class ShiroConfig {
         filterMap.put("/busVisitor/**", "anon");
         filterMap.put("/captcha.jpg", "anon");
         filterMap.put("/data/**", "anon");
+        //swagger相关放行
+        filterMap.put("/swagger-ui.html", "anon");
+        filterMap.put("/swagger/**", "anon");
+        filterMap.put("/swagger-ui/**", "anon");
+        filterMap.put("/swagger-resources/**", "anon");
+        filterMap.put("/v2/api-docs", "anon");
+        filterMap.put("/v3/api-docs", "anon");
+        filterMap.put("/webjars/**", "anon");
+        filterMap.put("/doc.html*", "anon");
+
+        filterMap.put("/tangshan/**", "anon");
+
         filterMap.put("/**", "oauth2");
         return filterMap;
     }

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

@@ -4,9 +4,12 @@ package com.zcloud.config;
 
 import com.google.common.base.Predicates;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
@@ -14,14 +17,23 @@ import springfox.documentation.service.ApiInfo;
 import springfox.documentation.service.ApiKey;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider;
+import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.ReflectionUtils;
+
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.google.common.collect.Lists.newArrayList;
 
 @Configuration
-//@EnableSwagger2
+@EnableSwagger2
 public class SwaggerConfig implements WebMvcConfigurer {
 
     @Bean
@@ -33,12 +45,12 @@ public class SwaggerConfig implements WebMvcConfigurer {
             .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
             //包下的类，才生成接口文档
 //            .apis(Predicates.or(
-//                    RequestHandlerSelectors.basePackage("com.zcloud.modules.app.controller"),
-//                    RequestHandlerSelectors.basePackage("com.zcloud.modules.sys.controller")
+////                    RequestHandlerSelectors.basePackage("com.zcloud.modules.app.controller"),
+//                    RequestHandlerSelectors.basePackage("com.zcloud.modules.data.controller")
 //            ))
             .paths(PathSelectors.any())
-            .build()
-            .securitySchemes(security());
+            .build();
+       //     .securitySchemes(security());
     }
 
     private ApiInfo apiInfo() {
@@ -54,6 +66,20 @@ public class SwaggerConfig implements WebMvcConfigurer {
             new ApiKey("token", "token", "header")
         );
     }
+    @Bean
+    public Docket tangshan_dj_app() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.any())
+                .apis(
+                        RequestHandlerSelectors.basePackage("com.zcloud.modules.data.controller")
+                )
+                .paths(PathSelectors.any())
+                .build()
+                .groupName("data")
+                .pathMapping("/");
+    }
 
     @Bean
     public Docket web_api_app() {
@@ -67,4 +93,7 @@ public class SwaggerConfig implements WebMvcConfigurer {
                 .pathMapping("/");
     }
 
+
+
+
 }

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

@@ -0,0 +1,28 @@
+package com.zcloud.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.ThreadPoolExecutor;
+
+@Configuration
+public class ThreadPoolConfig {
+
+
+    @Bean(name = "tangshanDjThreadPool")
+    public ThreadPoolTaskExecutor TangshanDjThreadPool() {
+        int availableProcessors = Runtime.getRuntime().availableProcessors();
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(availableProcessors *2);
+        executor.setMaxPoolSize(availableProcessors *4);
+        executor.setQueueCapacity(100);
+        executor.setThreadNamePrefix("tangshan-dj-");
+        //拒绝策略，降级处理,让提交任务的线程（调用者）自己执行该任务，而不是交给线程池
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        executor.initialize();
+        return executor;
+    }
+
+}

src/main/java/com/zcloud/modules/corp/service/impl/BusCorpinfoServiceImpl.java

@@ -77,7 +77,7 @@ public class BusCorpinfoServiceImpl extends ServiceImpl<BusCorpinfoDao, BusCorpi
         user.setUsername(param.getCorpName());
         user.setName(param.getCorpName());
         user.setCorpinfoId(param.getCorpinfoId());
-        user.setStatus(1);
+        user.setUserStatus(1);
         user.setIsDelete(0);
         user.setRoleIdList(Collections.singletonList("bb9a5994be28e485695dc56c3d2bf83d"));
         //sha256加密

src/main/java/com/zcloud/modules/data/config/tangshan/DjConfiguration.java

@@ -0,0 +1,31 @@
+package com.zcloud.modules.data.config.tangshan;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 唐山东江园区推送配置信息
+ * [唐山-园区对接-双控.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>
+ */
+@Component
+@ConfigurationProperties(prefix = "tangshan.dj")
+@Data
+public class DjConfiguration {
+    /**
+     * 请求url
+     */
+    private String url;
+    /**
+     * 平台分配的 UUID
+     */
+    private String accessKey;
+    /**
+     * RSA 公钥
+     */
+    private String rsaPublicKey;
+    /**
+     * 本地加密密钥，非三方提供
+     */
+    private String charKey;
+}

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

@@ -0,0 +1,36 @@
+package com.zcloud.modules.data.controller.baotou.ty.v16;
+
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping("/tangshan/dj/v1")
+@Api(tags = "内蒙古包头土右园区对接V1.6版本")
+public class TyPullDataController {
+
+    @Autowired
+    private DjPullDataService djPullDataService;
+
+    /**
+     * 上报安全风险分析单元数据
+     */
+//    @EncryptionMapping("/secSecurityRiskUnit")
+    @PostMapping("/secSecurityRiskUnit")
+    @ApiOperation("上报安全风险分析单元信息")
+    public R secSecurityRiskUnit(@RequestBody DjSafeRiskAnalysisUnitReqReqDto dto) {
+       // djPullDataService.secSecurityRiskUnit(dto);
+        return R.ok();
+    }
+
+
+}

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

@@ -0,0 +1,210 @@
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ * 文档
+ * [唐山-园区对接-特殊作业.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-%E7%89%B9%E6%AE%8A%E4%BD%9C%E4%B8%9A.pdf">git地址</a>
+ * [唐山-园区对接-双控.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>
+ */
+@Slf4j
+@RestController
+@RequestMapping("/tangshan/dj/v2")
+@Api(tags = "唐山东江园区对接V2版本")
+@Validated
+public class DjPullDataController {
+
+    @Autowired
+    private DjPullDataService djPullDataService;
+
+    /**
+     * 上报安全风险分析单元信息上报
+     */
+//    @EncryptionMapping("/safeRiskAnalysisUnit")
+    @PostMapping("/safeRiskAnalysisUnit")
+    @ApiOperation("上报安全风险分析单元信息")
+    public R safeRiskAnalysisUnit(@RequestBody @Valid DjSafeRiskAnalysisUnitReqReqDto dto) {
+        djPullDataService.safeRiskAnalysisUnit(dto);
+        return R.ok();
+    }
+
+    /**
+     * 上报安全风险事件上报
+     */
+//    @EncryptionMapping("/safeRiskEvent")
+    @PostMapping("/safeRiskEvent")
+    @ApiOperation("上报安全风险事件信息")
+    public R safeRiskEvent(@RequestBody @Valid DjSafeRiskEventReqReqDto dto) {
+        djPullDataService.safeRiskEvent(dto);
+        return R.ok();
+    }
+
+    /**
+     * 上报安全风险管控措施
+     */
+//    @EncryptionMapping("/safeRiskControlMeasure")
+    @PostMapping("/safeRiskControlMeasure")
+    @ApiOperation("上报安全风险管控措施信息")
+    public R safeRiskControlMeasure(@RequestBody @Valid DjSafeRiskControlMeasureReqReqDto dto) {
+        djPullDataService.safeRiskControlMeasure(dto);
+        return R.ok();
+    }
+
+    /**
+     * 上报隐患排查任务
+     */
+//    @EncryptionMapping("/dangerCheckTask")
+    @PostMapping("/dangerCheckTask")
+    @ApiOperation("上报隐患排查任务信息")
+    public R safeRiskControlMeasure(@RequestBody @Valid DjDangerCheckTaskReqDto dto) {
+        djPullDataService.dangerCheckTask(dto);
+        return R.ok();
+    }
+
+    /**
+     * 上报隐患排查记录
+     */
+//    @EncryptionMapping("/dangerCheckRecord")
+    @PostMapping("/dangerCheckRecord")
+    @ApiOperation("上报隐患排查记录信息")
+    public R dangerCheckRecord(@RequestBody @Valid DjDangerCheckRecordReqDto dto) {
+        djPullDataService.dangerCheckRecord(dto);
+        return R.ok();
+    }
+
+    /**
+     * 上报隐患信息
+     */
+//    @EncryptionMapping("/dangerInfo")
+    @PostMapping("/dangerInfo")
+    @ApiOperation("上报隐患信息")
+    public R dangerInfo(@RequestBody @Valid DjDangerInfoReqDto dto) {
+        djPullDataService.dangerInfo(dto);
+        return R.ok();
+    }
+
+    /**
+     * 上报动火作业信息
+     */
+//    @EncryptionMapping("/hotWork")
+    @PostMapping("/hotWork")
+    @ApiOperation("上报动火作业信息")
+    public R specialWorkTicketHotWork(@RequestBody @Valid DjHotWorkReqDto dto) {
+        djPullDataService.specialWorkTicketHotWork(dto);
+        return R.ok();
+    }
+
+    /**
+     * 上报受限空间作业信息
+     */
+//    @EncryptionMapping("/confinedSpaceWork")
+    @PostMapping("/confinedSpaceWork")
+    @ApiOperation("上报受限空间作业信息")
+    public R confinedSpaceWork(@RequestBody @Valid DjConfinedSpaceWorkReqDto dto) {
+        djPullDataService.confinedSpaceWork(dto);
+        return R.ok();
+    }
+
+    /**
+     * 上报盲板抽堵作业
+     */
+//    @EncryptionMapping("/blindPlateWork")
+    @PostMapping("/blindPlateWork")
+    @ApiOperation("上报盲板抽堵作业")
+    public R blindPlateWork(@RequestBody @Valid DjBlindPlateWorkReqDto dto) {
+        djPullDataService.blindPlateWork(dto);
+        return R.ok();
+    }
+
+    /**
+     * 上报断路作业
+     */
+//    @EncryptionMapping("/openCircuitWork")
+    @PostMapping("/openCircuitWork")
+    @ApiOperation("上报断路作业")
+    public R openCircuitWork(@RequestBody @Valid DjOpenCircuitWorkReqDto dto) {
+        djPullDataService.openCircuitWork(dto);
+        return R.ok();
+    }
+
+    /**
+     * 上报动土作业
+     */
+//    @EncryptionMapping("/groundBreakWork")
+    @PostMapping("/groundBreakWork")
+    @ApiOperation("上报动土作业")
+    public R groundBreakWork(@RequestBody @Valid DjGroundBreakWorkReqDto dto) {
+        djPullDataService.groundBreakWork(dto);
+        return R.ok();
+    }
+
+    /**
+     * 上报高处作业
+     */
+//    @EncryptionMapping("/highWork")
+    @PostMapping("/highWork")
+    @ApiOperation("上报高处作业")
+    public R highWork(@RequestBody @Valid DjHighWorkReqDto dto) {
+        djPullDataService.highWork(dto);
+        return R.ok();
+    }
+
+    /**
+     * 上报临时用电作业
+     */
+//    @EncryptionMapping("/electricityWork")
+    @PostMapping("/electricityWork")
+    @ApiOperation("上报临时用电作业")
+    public R electricityWork(@RequestBody @Valid DjElectricityWorkReqDto dto) {
+        djPullDataService.electricityWork(dto);
+        return R.ok();
+    }
+
+    /**
+     * 上报吊装作业
+     */
+//    @EncryptionMapping("/hoistWork")
+    @PostMapping("/hoistWork")
+    @ApiOperation("上报吊装作业")
+    public R hoistWork(@RequestBody @Valid DjHoistWorkReqDto dto) {
+        djPullDataService.hoistWork(dto);
+        return R.ok();
+    }
+
+    /**
+     * 上报特殊作业气体分析数据
+     */
+//    @EncryptionMapping("/gasAnalysisData")
+    @PostMapping("/gasAnalysisData")
+    @ApiOperation("上报特殊作业气体分析数据")
+    public R gasAnalysisData(@RequestBody @Valid DjGasAnalysisDataReqDto dto) {
+        djPullDataService.gasAnalysisData(dto);
+        return R.ok();
+    }
+
+    /**
+     * 上报特殊作业验收信息
+     */
+//    @EncryptionMapping("/checkAccept")
+    @PostMapping("/checkAccept")
+    @ApiOperation("上报特殊作业验收信息")
+    public R checkAccept(@RequestBody @Valid DjCheckAcceptReqDto dto) {
+        djPullDataService.checkAccept(dto);
+        return R.ok();
+    }
+
+
+}

src/main/java/com/zcloud/modules/data/controller/test/TestController.java

@@ -1,33 +0,0 @@
-package com.zcloud.modules.data.controller.test;
-
-import com.alibaba.fastjson.JSONObject;
-import com.zcloud.modules.data.aop.EncryptionMapping;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@Slf4j
-@RestController
-@RequestMapping("/data")
-public class TestController {
-
-    @Resource
-    private KafkaTemplate<String,String> kafkaTemplate;
-
-    @EncryptionMapping("/test")
-    public String test(@RequestBody TestDto dto) {
-        System.out.println(JSONObject.toJSONString(dto));
-        return "test";
-    }
-
-    @PostMapping("/kafka")
-    public String kafka(@RequestBody String msg) {
-        kafkaTemplate.send("test", msg);
-        return "success";
-    }
-}

src/main/java/com/zcloud/modules/data/controller/test/TestDto.java

@@ -1,8 +0,0 @@
-package com.zcloud.modules.data.controller.test;
-
-import lombok.Data;
-
-@Data
-public class TestDto {
-    private String id;
-}

src/main/java/com/zcloud/modules/data/dao/LogInfoYearDao.java

@@ -0,0 +1,15 @@
+package com.zcloud.modules.data.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zcloud.modules.data.entity.LogInfoYearEntity;
+
+/**
+ * 记录调用日志信息(LogInfoYear)表数据库访问层
+ *
+ * @author makejava
+ * @since 2025-06-27 09:25:14
+ */
+public interface LogInfoYearDao extends BaseMapper<LogInfoYearEntity> {
+
+}
+

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty;
+package com.zcloud.modules.data.dto.baotou.ty;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty;
+package com.zcloud.modules.data.dto.baotou.ty;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import lombok.Data;
 

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

@@ -1,9 +1,9 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyCheckTypeEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDeleteStatusEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyResultStatusEnum;
+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;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,7 +1,7 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyPassDirectionEnum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyPassDirectionEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,9 +1,9 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDeleteStatusEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyIsCommonStatusEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyRunStatusEnum;
+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;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,7 +1,7 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TySexEnum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TySexEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

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

@@ -1,9 +1,9 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDeleteStatusEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyWorkDayTypeEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyWorkTypeEnum;
+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;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,9 +1,9 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyCheckStatusEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDeleteStatusEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyIsDefendEnum;
+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;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,9 +1,9 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyCheckTypeEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDeleteStatusEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyHarmTypeEnum;
+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;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,7 +1,7 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.*;
+import com.zcloud.modules.data.enums.baotou.ty.enums.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,7 +1,7 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDeleteStatusEnum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,10 +1,10 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDeleteStatusEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyGasTypeEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyResultsUnitEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyTicketBigTypeEnum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyGasTypeEnum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyResultsUnitEnum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyTicketBigTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,10 +1,10 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDeleteStatusEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyIsCommonStatusEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyTicketStatusEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyTicketTypeEnum;
+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.TyTicketStatusEnum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyTicketTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,8 +1,8 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDeleteStatusEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyIsInvolveEnum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyIsInvolveEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,7 +1,7 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDeleteStatusEnum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,9 +1,9 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDeleteStatusEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyIsCommonStatusEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyRiskGradEnum;
+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;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,7 +1,7 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDeleteStatusEnum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,10 +1,10 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyClassify1Enum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyClassify2Enum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDataSrcEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDeleteStatusEnum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyClassify1Enum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyClassify2Enum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyDataSrcEnum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,7 +1,7 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDeleteStatusEnum;
+import com.zcloud.modules.data.enums.baotou.ty.enums.TyDeleteStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,8 +1,8 @@
-package com.zcloud.modules.data.dto.NeiMengGu.ty.req;
+package com.zcloud.modules.data.dto.baotou.ty.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyDeleteStatusEnum;
-import com.zcloud.modules.data.base.neiMengGu.ty.enums.TyRiskLeveEnum;
+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;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.HeBei.dj;
+package com.zcloud.modules.data.dto.tangshan.dj;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.HeBei.dj;
+package com.zcloud.modules.data.dto.tangshan.dj;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -0,0 +1,16 @@
+package com.zcloud.modules.data.dto.tangshan.dj.req;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class DjBaseReqDto {
+
+    @JsonProperty("recordId")
+    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
+    @NotBlank(message = "主键不能为空")
+    private String recordId;
+}

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

@@ -1,14 +1,15 @@
-package com.zcloud.modules.data.dto.hebei.dj.req;
+package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjWorkCategoryEnum;
-import com.zcloud.modules.data.dto.hebei.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.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -19,141 +20,183 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 
-public class DjBlindPlateWorkReqDto {
+public class DjBlindPlateWorkReqDto extends DjBaseReqDto{
 
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
     /**
      *  关联枚举：{@link DjRecordDeletedEnum}
      */
     @JsonProperty("recordDeleted")
     @ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
+    @NotBlank(message = "记录删除状态不能为空")
     private String recordDeleted;
 
     @JsonProperty("recordCreateTime")
     @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "记录创建时间不能为空")
     private String recordCreateTime;
 
     @JsonProperty("recordCreateBy")
     @ApiModelProperty(value = "创建人姓名", required = true)
+    @NotBlank(message = "创建人姓名不能为空")
     private String recordCreateBy;
     @JsonProperty("recordUpdateTime")
     @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "最后修改时间不能为空")
     private String recordUpdateTime;
 
     @JsonProperty("recordUpdateBy")
     @ApiModelProperty(value = "最后修改人姓名", required = true)
+    @NotBlank(message = "最后修改人姓名不能为空")
     private String recordUpdateBy;
 
     @JsonProperty("companyCode")
     @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码", required = true)
+    @NotBlank(message = "企业编码不能为空")
     private String companyCode;
 
     @ApiModelProperty(value = "作业名称", required = true)
+    @NotBlank(message = "作业名称不能为空")
     @JsonProperty("workName")
     private String workName;
 
     @ApiModelProperty(value = "作业编号", required = true)
+    @NotBlank(message = "作业编号不能为空")
     @JsonProperty("workNumber")
     private String workNumber;
 
     @ApiModelProperty(value = "作业单位", required = true)
+    @NotBlank(message = "作业单位不能为空")
     @JsonProperty("workCompany")
     private String workCompany;
 
     @ApiModelProperty(value = "作业申请单位", required = true)
+    @NotBlank(message = "作业申请单位不能为空")
     @JsonProperty("workApplyCompany")
     private String workApplyCompany;
 
     @ApiModelProperty(value = "作业地点", required = true)
     @JsonProperty("workPlace")
+    @NotBlank(message = "作业地点不能为空")
     private String workPlace;
     /**
      *  关联枚举：{@link DjWorkCategoryEnum}
      */
     @ApiModelProperty(value = "作业类别,参考枚举DjWorkCategoryEnum", required = true)
     @JsonProperty("workCategory")
+    @NotBlank(message = "作业类别不能为空")
     private String workCategory;
+
     @ApiModelProperty(value = "设备管道具体参数", required = true)
     @JsonProperty("pipelineParam")
+    @NotBlank(message = "设备管道具体参数不能为空")
     private DjPipelineParamDto pipelineParam;
+
     @ApiModelProperty(value = "涉及的其他特殊作业 ID 集,特殊作业主键列表", required = false)
     @JsonProperty("relatedWorkId")
+
     private List<String> relatedWorkId;
     @ApiModelProperty(value = "动火开始时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("beginTime")
+    @NotBlank(message = "动火开始时间不能为空")
     private String beginTime;
 
     @ApiModelProperty(value = "动火结束时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("endTime")
+    @NotBlank(message = "动火结束时间不能为空")
     private String endTime;
+
     @ApiModelProperty(value = "盲板位置图及编号,格式：data:image/png;base64,..", required = true)
     @JsonProperty("locationMap")
     private String locationMap;
+
     @ApiModelProperty(value = "盲板位置图及编号的编制人", required = true)
     @JsonProperty("preparedUser")
+    @NotBlank(message = "盲板位置图及编号的编制人不能为空")
     private DjPreparedUserDto preparedUser;
+
     @ApiModelProperty(value = "风险识别", required = true)
     @JsonProperty("riskIdentification")
+    @NotBlank(message = "风险识别不能为空")
     private String riskIdentification;
 
     @ApiModelProperty(value = "作业人员列表", required = true)
     @JsonProperty("workUser")
+    @NotBlank(message = "作业人员列表不能为空")
     private List<DjWorkUserDto> workUser;
     /**
      *  关联枚举：{@link DjIsCommonStatusEnum}
      */
     @ApiModelProperty(value = "是否承包商作业,参照枚举TsIsCommonStatusEnum",required = true)
     @JsonProperty("contractorWork")
+    @NotBlank(message = "是否承包商作业不能为空")
     private String contractorWork;
+
     @ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
     @JsonProperty("mapCenter")
+    @NotBlank(message = "地图位置-中心点不能为空")
     private DjMapCenterDto mapCenter;
 
     @ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
     @JsonProperty("mapBorder")
+    @NotBlank(message = "地图位置-边界不能为空")
     private List<DjMapBorderDto> mapBorder;
+
     @ApiModelProperty(value = "安全措施列表",required = true)
     @JsonProperty("securityMeasure")
+    @NotBlank(message = "安全措施列表不能为空")
     private List<DjSecurityMeasureDto> securityMeasure;
 
     @ApiModelProperty(value = "其他措施")
     @JsonProperty("otherMeasure")
     private List<String> otherMeasure;
+
     @ApiModelProperty(value = "其他措施编制人,当其他措施不为空时此项必填")
     @JsonProperty("otherMeasureUser")
     private DjOtherMeasureUserDto otherMeasureUser;
+
     @ApiModelProperty(value = "措施确认人", required = true)
     @JsonProperty("measureUser")
+    @NotBlank(message = "措施确认人不能为空")
     private DjMeasureUserDto measureUser;
 
     @ApiModelProperty(value = "交底内容",required = true)
     @JsonProperty("discloseContent")
+    @NotBlank(message = "交底内容不能为空")
     private String discloseContent;
 
     @ApiModelProperty(value = "安全交底人",required = true)
     @JsonProperty("discloseUser")
+    @NotBlank(message = "安全交底人不能为空")
     private DjDiscloseUserDto discloseUser;
+
     @ApiModelProperty(value = "接受交底人",required = true)
     @JsonProperty("acceptUser")
+    @NotBlank(message = "接受交底人不能为空")
     private DjAcceptUserDto acceptUser;
+
     @ApiModelProperty(value = "作业负责人",required = true)
     @JsonProperty("workHeadUser")
+    @NotBlank(message = "作业负责人不能为空")
     private DjWorkHeadUserDto workHeadUser;
 
     @ApiModelProperty(value = "单位审批人",required = true)
     @JsonProperty("unitApprovalUser")
+    @NotBlank(message = "单位审批人不能为空")
     private DjApprovalUserDto unitApprovalUser;
+
     @ApiModelProperty(value = "监护人", required = true)
     @JsonProperty("guardianUser")
+    @NotBlank(message = "监护人不能为空")
     private DjGuardianUserDto guardianUser;
+
     @ApiModelProperty(value = "完工验收人",required = true)
     @JsonProperty("finishedUser")
+    @NotBlank(message = "完工验收人不能为空")
     private DjFinishedUserDto finishedUser;
 
     @ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("issueTime")
+    @NotBlank(message = "签发时间不能为空")
     private String issueTime;
 
 

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

@@ -1,7 +1,7 @@
-package com.zcloud.modules.data.dto.hebei.dj.req;
+package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
+import com.zcloud.modules.data.enums.tangshan.dj.enums.DjRecordDeletedEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,10 +15,8 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Data
 @ApiModel("特殊作业验收信息请求实体")
-public class DjCheckAcceptReqDto {
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
+public class DjCheckAcceptReqDto extends DjBaseReqDto{
+
     /**
      *  关联枚举：{@link DjRecordDeletedEnum}
      */

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

@@ -1,14 +1,15 @@
-package com.zcloud.modules.data.dto.hebei.dj.req;
+package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
-import com.zcloud.modules.data.dto.hebei.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 java.util.List;
 
 /**
@@ -19,63 +20,75 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 @ApiModel("受限空间作业请求实体")
-public class DjConfinedSpaceWorkReqDto {
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
+public class DjConfinedSpaceWorkReqDto extends DjBaseReqDto {
+
     /**
      *  关联枚举：{@link DjRecordDeletedEnum}
      */
     @JsonProperty("recordDeleted")
     @ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
+    @NotBlank(message = "记录删除状态不能为空")
     private String recordDeleted;
 
     @JsonProperty("recordCreateTime")
     @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "记录创建时间不能为空")
     private String recordCreateTime;
 
     @JsonProperty("recordCreateBy")
     @ApiModelProperty(value = "创建人姓名", required = true)
+    @NotBlank(message = "创建人姓名不能为空")
     private String recordCreateBy;
+
     @JsonProperty("recordUpdateTime")
     @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "最后修改时间不能为空")
     private String recordUpdateTime;
 
     @JsonProperty("recordUpdateBy")
     @ApiModelProperty(value = "最后修改人姓名", required = true)
+    @NotBlank(message = "最后修改人姓名不能为空")
     private String recordUpdateBy;
 
     @JsonProperty("companyCode")
     @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码", required = true)
+    @NotBlank(message = "企业编码不能为空")
     private String companyCode;
 
     @ApiModelProperty(value = "作业名称", required = true)
     @JsonProperty("workName")
+    @NotBlank(message = "作业名称不能为空")
     private String workName;
 
     @ApiModelProperty(value = "作业编号", required = true)
     @JsonProperty("workNumber")
+    @NotBlank(message = "作业编号不能为空")
     private String workNumber;
 
     @ApiModelProperty(value = "作业单位", required = true)
     @JsonProperty("workCompany")
+    @NotBlank(message = "作业单位不能为空")
     private String workCompany;
 
     @ApiModelProperty(value = "作业申请单位", required = true)
     @JsonProperty("workApplyCompany")
+    @NotBlank(message = "作业申请单位不能为空")
     private String workApplyCompany;
 
     @ApiModelProperty(value = "作业地点", required = true)
     @JsonProperty("workPlace")
+    @NotBlank(message = "作业地点不能为空")
     private String workPlace;
 
 
     @ApiModelProperty(value = "受限空间名称", required = true)
     @JsonProperty("confinedSpaceName")
+    @NotBlank(message = "受限空间名称不能为空")
     private String confinedSpaceName;
 
     @ApiModelProperty(value = "受限空间内原有介质名称", required = true)
     @JsonProperty("confinedSpaceMedium")
+    @NotBlank(message = "受限空间内原有介质名称不能为空")
     private String confinedSpaceMedium;
 
     @ApiModelProperty(value = "涉及的其他特殊作业 ID 集，特殊作业主键列表", required = false)
@@ -84,37 +97,45 @@ public class DjConfinedSpaceWorkReqDto {
 
     @ApiModelProperty(value = "动火开始时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("beginTime")
+    @NotBlank(message = "动火开始时间不能为空")
     private String beginTime;
 
     @ApiModelProperty(value = "动火结束时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("endTime")
+    @NotBlank(message = "动火结束时间不能为空")
     private String endTime;
 
     @ApiModelProperty(value = "作业内容", required = true)
     @JsonProperty("workContent")
+    @NotBlank(message = "作业内容不能为空")
     private String workContent;
 
     @ApiModelProperty(value = "风险辨识", required = true)
     @JsonProperty("riskIdentification")
+    @NotBlank(message = "风险辨识不能为空")
     private String riskIdentification;
 
 
     @ApiModelProperty(value = "作业人员列表", required = true)
     @JsonProperty("workUser")
+    @NotBlank(message = "作业人员列表不能为空")
     private List<DjWorkUserDto> workUser;
     /**
      *  关联枚举：{@link DjIsCommonStatusEnum}
      */
     @ApiModelProperty(value = "是否承包商作业",required = true)
     @JsonProperty("contractorWork")
+    @NotBlank(message = "是否承包商作业不能为空")
     private String contractorWork;
 
     @ApiModelProperty(value = "地图位置-中心点，WGS-84 坐标系", required = true)
     @JsonProperty("mapCenter")
+    @NotBlank(message = "地图位置-中心点，WGS-84 坐标系不能为空")
     private DjMapCenterDto mapCenter;
 
     @ApiModelProperty(value = "地图位置-边界，WGS-84 坐标系", required = true)
     @JsonProperty("mapBorder")
+    @NotBlank(message = "地图位置-边界，WGS-84 坐标系不能为空")
     private List<DjMapBorderDto> mapBorder;
 
     @ApiModelProperty(value = "气体分析-有毒气体",required = false)
@@ -131,10 +152,12 @@ public class DjConfinedSpaceWorkReqDto {
 
     @ApiModelProperty(value = "分析人员",required = true)
     @JsonProperty("analysisUser")
+    @NotBlank(message = "分析人员不能为空")
     private DjAnalysisUserDto analysisUser;
 
     @ApiModelProperty(value = "安全措施列表",required = true)
     @JsonProperty("securityMeasure")
+    @NotBlank(message = "安全措施列表不能为空")
     private List<DjSecurityMeasureDto> securityMeasure;
 
     @ApiModelProperty(value = "其他措施")
@@ -147,39 +170,48 @@ public class DjConfinedSpaceWorkReqDto {
 
     @ApiModelProperty(value = "措施确认人", required = true)
     @JsonProperty("measureUser")
+    @NotBlank(message = "措施确认人不能为空")
     private DjMeasureUserDto measureUser;
 
     @ApiModelProperty(value = "交底内容",required = true)
     @JsonProperty("discloseContent")
+    @NotBlank(message = "交底内容不能为空")
     private String discloseContent;
 
     @ApiModelProperty(value = "安全交底人",required = true)
     @JsonProperty("discloseUser")
+    @NotBlank(message = "安全交底人不能为空")
     private DjDiscloseUserDto discloseUser;
 
     @ApiModelProperty(value = "接受交底人",required = true)
     @JsonProperty("acceptUser")
+    @NotBlank(message = "接受交底人不能为空")
     private DjAcceptUserDto acceptUser;
 
     @ApiModelProperty(value = "作业负责人",required = true)
     @JsonProperty("workHeadUser")
+    @NotBlank(message = "作业负责人不能为空")
     private DjWorkHeadUserDto workHeadUser;
 
     @ApiModelProperty(value = "单位审批人",required = true)
     @JsonProperty("unitApprovalUser")
+    @NotBlank(message = "单位审批人不能为空")
     private DjApprovalUserDto unitApprovalUser;
 
     @ApiModelProperty(value = "监护人", required = true)
     @JsonProperty("guardianUser")
+    @NotBlank(message = "监护人不能为空")
     private DjGuardianUserDto guardianUser;
 
 
     @ApiModelProperty(value = "完工验收人",required = true)
     @JsonProperty("finishedUser")
+    @NotBlank(message = "完工验收人不能为空")
     private DjFinishedUserDto finishedUser;
 
     @ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("issueTime")
+    @NotBlank(message = "签发时间不能为空")
     private String issueTime;
 
 }

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

@@ -1,15 +1,17 @@
-package com.zcloud.modules.data.dto.hebei.dj.req;
+package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjCheckRiskLevelEnum;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjCheckStatusEnum;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjIsDefendEnum;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
+import com.zcloud.modules.data.enums.tangshan.dj.enums.DjCheckRiskLevelEnum;
+import com.zcloud.modules.data.enums.tangshan.dj.enums.DjCheckStatusEnum;
+import com.zcloud.modules.data.enums.tangshan.dj.enums.DjIsDefendEnum;
+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;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * [唐山-园区对接-双控.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>
  * 隐患排查记录
@@ -18,76 +20,87 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Data
 @ApiModel("隐患排查任务请求实体")
-public class DjDangerCheckRecordReqDto {
+public class DjDangerCheckRecordReqDto extends DjBaseReqDto {
 
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
     /**
-     *  关联枚举：{@link DjRecordDeletedEnum}
+     * 关联枚举：{@link DjRecordDeletedEnum}
      */
     @JsonProperty("recordDeleted")
     @ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
+    @NotBlank(message = "记录删除状态不能为空")
     private String recordDeleted;
 
     @JsonProperty("recordCreateTime")
     @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "记录创建时间不能为空")
     private String recordCreateTime;
 
     @JsonProperty("recordCreateBy")
     @ApiModelProperty(value = "创建人姓名", required = true)
+    @NotBlank(message = "创建人姓名不能为空")
     private String recordCreateBy;
     @JsonProperty("recordCreatorPhoneNo")
     @ApiModelProperty(value = "创建人手机号", required = true)
+    @NotBlank(message = "创建人手机号不能为空")
     private String recordCreatorPhoneNo;
 
     @JsonProperty("recordUpdateTime")
     @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "最后修改时间不能为空")
     private String recordUpdateTime;
 
     @JsonProperty("recordUpdateBy")
     @ApiModelProperty(value = "最后修改人姓名", required = true)
+    @NotBlank(message = "最后修改人姓名不能为空")
     private String recordUpdateBy;
     @JsonProperty("recordUpdaterPhoneNo")
     @ApiModelProperty(value = "最后修改人手机号", required = true)
+    @NotBlank(message = "最后修改人手机号不能为空")
     private String recordUpdaterPhoneNo;
 
     @JsonProperty("companyCode")
     @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码", required = true)
+    @NotBlank(message = "企业编码不能为空")
     private String companyCode;
 
     @JsonProperty("checkTaskId")
     @ApiModelProperty(value = "隐患排查任务 ID,所属隐患排查任务主键", required = true)
+    @NotBlank(message = "隐患排查任务 ID不能为空")
     private String checkTaskId;
 
     @JsonProperty("checkTime")
     @ApiModelProperty(value = "排查时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "排查时间不能为空")
     private String checkTime;
 
     @JsonProperty("mobileMe")
     @ApiModelProperty(value = "IMEI码,国际移动设备识别码 IMEI,当设备存在多个IMEI 码时,只上传第一个", required = true)
+    @NotBlank(message = "IMEI码不能为空")
     private String mobileMe;
     /**
      * 关联枚举：{@link DjIsDefendEnum}
      */
     @JsonProperty("isDefend")
     @ApiModelProperty(value = "是否包保责任人任务, 当排查任务中任务类型为主要负责人任务、技术 负责人任务、操作负责人任务时,此项为 1,参考枚举DjIsDefendEnum", required = true)
+    @NotBlank(message = "是否包保责任人任务不能为空")
     private String isDefend;
     /**
-     *  关联枚举：{@link DjCheckStatusEnum}
+     * 关联枚举：{@link DjCheckStatusEnum}
      */
     @JsonProperty("checkStatus")
     @ApiModelProperty(value = "排查风险名称,参考枚举DjCheckStatusEnum", required = true)
+    @NotBlank(message = "排查风险名称不能为空")
     private String checkStatus;
 
     @JsonProperty("checkRiskName")
     @ApiModelProperty(value = "排查风险名称", required = false)
     private String checkRiskName;
     /**
-     *  关联枚举：{@link DjCheckRiskLevelEnum}
+     * 关联枚举：{@link DjCheckRiskLevelEnum}
      */
     @JsonProperty("checkRiskLevel")
     @ApiModelProperty(value = "排查风险等级,参考枚举DjCheckRiskLevelEnum", required = true)
+    @NotBlank(message = "排查风险等级不能为空")
     private String checkRiskLevel;
 
     @JsonProperty("checkDep")

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

@@ -1,12 +1,14 @@
-package com.zcloud.modules.data.dto.hebei.dj.req;
+package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.*;
+import com.zcloud.modules.data.enums.tangshan.dj.enums.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * [唐山-园区对接-双控.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>
  * 隐患排查任务
@@ -15,55 +17,61 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Data
 @ApiModel("隐患排查任务请求实体")
-public class DjDangerCheckTaskReqDto {
-
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
+public class DjDangerCheckTaskReqDto extends DjBaseReqDto {
 
     /**
-     *  关联枚举：{@link DjRecordDeletedEnum}
+     * 关联枚举：{@link DjRecordDeletedEnum}
      */
     @JsonProperty("recordDeleted")
     @ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
+    @NotBlank(message = "记录删除状态不能为空")
     private String recordDeleted;
 
     @JsonProperty("recordCreateTime")
     @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "记录创建时间不能为空")
     private String recordCreateTime;
 
     @JsonProperty("recordCreateBy")
     @ApiModelProperty(value = "创建人姓名", required = true)
+    @NotBlank(message = "创建人姓名不能为空")
     private String recordCreateBy;
 
     @JsonProperty("recordUpdateTime")
     @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "最后修改时间不能为空")
     private String recordUpdateTime;
 
     @JsonProperty("recordUpdateBy")
     @ApiModelProperty(value = "最后修改人姓名", required = true)
+    @NotBlank(message = "最后修改人姓名不能为空")
     private String recordUpdateBy;
 
     @JsonProperty("companyCode")
     @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码", required = true)
+    @NotBlank(message = "企业编码不能为空")
     private String companyCode;
 
     @JsonProperty("riskMeasureId")
     @ApiModelProperty(value = "安全风险管控措施 ID,所属风险管控措施主键", required = true)
+    @NotBlank(message = "安全风险管控措施 ID不能为空")
     private String riskMeasureId;
 
     @JsonProperty("troubleshootContent")
     @ApiModelProperty(value = "隐患排查内容", required = true)
+    @NotBlank(message = "隐患排查内容不能为空")
     private String troubleshootContent;
 
     @JsonProperty("checkCycle")
     @ApiModelProperty(value = "巡检周期,本次生成排查任务到下次生成排查任务的时间跨度,填写数字值", required = true)
+    @NotBlank(message = "巡检周期不能为空")
     private String checkCycle;
     /**
-     *    关联枚举：{@link DjCheckCycleUnitEnum}
+     * 关联枚举：{@link DjCheckCycleUnitEnum}
      */
     @JsonProperty("checkCycleUnit")
     @ApiModelProperty(value = "巡检周期单位,本次生成排查任务到下次生成排查任务的时间跨度的单位,参照枚举TsCheckCycleUnitEnum", required = true)
+    @NotBlank(message = "巡检周期单位不能为空")
     private String checkCycleUnit;
 
     @JsonProperty("workStartTime")
@@ -74,32 +82,35 @@ public class DjDangerCheckTaskReqDto {
     @ApiModelProperty(value = "工作结束时间,当排查周期是小时的时候必传,字符串,格式:HH:mm:ss", required = false)
     private String workEndTime;
     /**
-     *    关联枚举：{@link DjWorkDayTypeEnum}
+     * 关联枚举：{@link DjWorkDayTypeEnum}
      */
     @JsonProperty("workDayType")
     @ApiModelProperty(value = "工作日类型,参照枚举TsWorkDayTypeEnum", required = false)
     private String workDayType;
 
     /**
-     *    关联枚举：{@link DjWorkTypeEnum}
+     * 关联枚举：{@link DjWorkTypeEnum}
      */
     @JsonProperty("workType")
     @ApiModelProperty(value = "任务类型,参照枚举TsWorkTypeEnum", required = true)
+    @NotBlank(message = "任务类型不能为空")
     private String workType;
 
     /**
-     *    关联枚举：{@link DjTaskNumEnum}
+     * 关联枚举：{@link DjTaskNumEnum}
      */
     @JsonProperty("taskNum")
     @ApiModelProperty(value = "包保任务对应项, 当任务类型为 2(主要负责人任务)、3(技术负责人任 务)、4(操作负责人任务)、时此项必填。数字应与《危险化学品企业重大 危险源安全包保责任人隐患排查任务清单》各项标号对应。\n" +
             "字符串,填写数字枚举值,参考枚举DjTaskNumEnum", required = true)
+    @NotBlank(message = "包保任务对应项不能为空")
     private String taskNum;
 
     /**
-     *    关联枚举：{@link DjCheckLevelEnum}
+     * 关联枚举：{@link DjCheckLevelEnum}
      */
     @JsonProperty("checkLevel")
     @ApiModelProperty(value = "巡检级别,参考枚举DjCheckLevelEnum", required = true)
+    @NotBlank(message = "巡检级别不能为空")
     private String checkLevel;
 
     @JsonProperty("checkTimesDay")
@@ -110,7 +121,7 @@ public class DjDangerCheckTaskReqDto {
     @ApiModelProperty(value = "巡检频次(次数),非必传,填写数字值", required = false)
     private String checkTimesNum;
     /**
-     *    关联枚举：{@link DjCheckTaskTypeEnum}
+     * 关联枚举：{@link DjCheckTaskTypeEnum}
      */
     @JsonProperty("checkTaskType")
     @ApiModelProperty(value = "巡检任务类型,参考枚举DjCheckTaskTypeEnum,非必填", required = false)

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

@@ -1,12 +1,14 @@
-package com.zcloud.modules.data.dto.hebei.dj.req;
+package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.*;
+import com.zcloud.modules.data.enums.tangshan.dj.enums.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * [唐山-园区对接-双控.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>
  * 隐患信息
@@ -15,105 +17,122 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Data
 @ApiModel("隐患信息请求实体")
-public class DjDangerInfoReqDto {
+public class DjDangerInfoReqDto extends DjBaseReqDto {
 
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
     /**
-     *  关联枚举：{@link DjRecordDeletedEnum}
+     * 关联枚举：{@link DjRecordDeletedEnum}
      */
     @JsonProperty("recordDeleted")
     @ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
+    @NotBlank(message = "记录删除状态不能为空")
     private String recordDeleted;
 
     @JsonProperty("recordCreateTime")
     @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "记录创建时间不能为空")
     private String recordCreateTime;
 
     @JsonProperty("recordCreateBy")
     @ApiModelProperty(value = "创建人姓名", required = true)
+    @NotBlank(message = "创建人姓名不能为空")
     private String recordCreateBy;
+
     @JsonProperty("recordUpdateTime")
     @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "最后修改时间不能为空")
     private String recordUpdateTime;
 
     @JsonProperty("recordUpdateBy")
     @ApiModelProperty(value = "最后修改人姓名", required = true)
+    @NotBlank(message = "最后修改人姓名不能为空")
     private String recordUpdateBy;
 
     @JsonProperty("companyCode")
     @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码", required = true)
+    @NotBlank(message = "企业编码不能为空")
     private String companyCode;
 
-
     @JsonProperty("hazardCode")
     @ApiModelProperty(value = "安全风险分析对象编码,安全风险分析对象编码即危险化学品登记综合服务系统中的危险源编码", required = true)
+    @NotBlank(message = "安全风险分析对象编码不能为空")
     private String hazardCode;
 
     @JsonProperty("riskMeasureId")
     @ApiModelProperty(value = "安全风险管控措施 ID,管控措施主键,所有隐患排查任务产生的隐患必 须绑定管控措施", required = true)
+    @NotBlank(message = "安全风险管控措施 ID不能为空")
     private String riskMeasureId;
 
     @JsonProperty("checkRecordId")
     @ApiModelProperty(value = "隐患排查记录ID,隐患排查记录主键,所有由隐患排查时产生的隐患必须提供关联的隐患排查记录 ID", required = true)
+    @NotBlank(message = "隐患排查记录ID不能为空")
     private String checkRecordId;
 
     @JsonProperty("dangerName")
     @ApiModelProperty(value = "隐患名称", required = true)
+    @NotBlank(message = "隐患名称不能为空")
     private String dangerName;
     /**
-     *  关联枚举：{@link DjDangerLevelEnum}
+     * 关联枚举：{@link DjDangerLevelEnum}
      */
     @JsonProperty("dangerLevel")
     @ApiModelProperty(value = "隐患等级,参考枚举DjDangerLevelEnum", required = true)
+    @NotBlank(message = "隐患等级不能为空")
     private String dangerLevel;
 
     @JsonProperty("registerTime")
     @ApiModelProperty(value = "登记时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "登记时间不能为空")
     private String registerTime;
 
     @JsonProperty("registrant")
     @ApiModelProperty(value = "登记人姓名", required = true)
+    @NotBlank(message = "登记人姓名不能为空")
     private String registrant;
     /**
-     *  关联枚举：{@link DjDangerSrcEnum}
+     * 关联枚举：{@link DjDangerSrcEnum}
      */
     @JsonProperty("dangerSrc")
     @ApiModelProperty(value = "隐患来源,参考枚举DjDangerSrcEnum", required = true)
+    @NotBlank(message = "隐患来源不能为空")
     private String dangerSrc;
     @JsonProperty("enforcementId")
     @ApiModelProperty(value = "执法编号,当隐患来源类型为 11(执法检查)时此项必填", required = false)
     private String enforcementId;
     /**
-     *  关联枚举：{@link DjDangerManageTypeEnum}
+     * 关联枚举：{@link DjDangerManageTypeEnum}
      */
     @JsonProperty("dangerManageType")
     @ApiModelProperty(value = "隐患治理类型,参考枚举DjDangerManageTypeEnum", required = true)
+    @NotBlank(message = "隐患治理类型不能为空")
     private String dangerManageType;
     /**
-     *  关联枚举：{@link DjHazardDangerTypeEnum}
+     * 关联枚举：{@link DjHazardDangerTypeEnum}
      */
     @JsonProperty("hazardDangerType")
     @ApiModelProperty(value = "隐患类型,参考枚举DjHazardDangerTypeEnum", required = true)
+    @NotBlank(message = "隐患类型不能为空")
     private String hazardDangerType;
     /**
-     *  关联枚举：{@link DjHazardCategoryEnum}
+     * 关联枚举：{@link DjHazardCategoryEnum}
      */
     @JsonProperty("hazardCategory")
     @ApiModelProperty(value = "隐患类别,参考枚举DjHazardCategoryEnum", required = true)
+    @NotBlank(message = "隐患类别不能为空")
     private String hazardCategory;
 
     @JsonProperty("dangerDesc")
     @ApiModelProperty(value = "隐患描述", required = true)
+    @NotBlank(message = "隐患描述不能为空")
     private String dangerDesc;
 
     @JsonProperty("dangerReason")
     @ApiModelProperty(value = "原因分析", required = true)
+    @NotBlank(message = "原因分析不能为空")
     private String dangerReason;
 
     @JsonProperty("controlMeasures")
     @ApiModelProperty(value = "控制措施", required = true)
+    @NotBlank(message = "控制措施不能为空")
     private String controlMeasures;
 
     @JsonProperty("cost")
@@ -122,17 +141,22 @@ public class DjDangerInfoReqDto {
 
     @JsonProperty("liablePerson")
     @ApiModelProperty(value = "整改责任人姓名", required = true)
+    @NotBlank(message = "整改责任人姓名不能为空")
     private String liablePerson;
 
     @JsonProperty("dangerManageDeadline")
     @ApiModelProperty(value = "隐患治理期限,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "隐患治理期限不能为空")
     private String dangerManageDeadline;
 
     @JsonProperty("checkAcceptPerson")
     @ApiModelProperty(value = "验收人姓名,当隐患状态为 3(已验收)时此项必填", required = true)
+    @NotBlank(message = "验收人姓名不能为空")
     private String checkAcceptPerson;
+
     @JsonProperty("checkAcceptTime")
     @ApiModelProperty(value = "验收时间,当隐患状态为 3(已验收)时此项必填,格式：yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "验收时间不能为空")
     private String checkAcceptTime;
 
     @JsonProperty("checkAcceptComment")
@@ -140,10 +164,11 @@ public class DjDangerInfoReqDto {
     private String checkAcceptComment;
 
     /**
-     *  关联枚举：{@link DjDangerStateEnum}
+     * 关联枚举：{@link DjDangerStateEnum}
      */
     @JsonProperty("dangerState")
     @ApiModelProperty(value = "隐患状态,参考枚举DjDangerStateEnum", required = true)
+    @NotBlank(message = "隐患状态不能为空")
     private String dangerState;
 
 

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

@@ -1,14 +1,15 @@
-package com.zcloud.modules.data.dto.hebei.dj.req;
+package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
-import com.zcloud.modules.data.dto.hebei.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 java.util.List;
 
 /**
@@ -19,72 +20,84 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 @ApiModel("临时用电作业请求实体")
-public class DjElectricityWorkReqDto {
+public class DjElectricityWorkReqDto extends DjBaseReqDto{
 
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
     /**
      *  关联枚举：{@link DjRecordDeletedEnum}
      */
     @JsonProperty("recordDeleted")
     @ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
+    @NotBlank(message = "记录删除状态不能为空")
     private String recordDeleted;
 
     @JsonProperty("recordCreateTime")
     @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "记录创建时间不能为空")
     private String recordCreateTime;
 
     @JsonProperty("recordCreateBy")
     @ApiModelProperty(value = "创建人姓名", required = true)
+    @NotBlank(message = "创建人姓名不能为空")
     private String recordCreateBy;
 
     @JsonProperty("recordUpdateTime")
     @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "最后修改时间不能为空")
     private String recordUpdateTime;
 
     @JsonProperty("recordUpdateBy")
     @ApiModelProperty(value = "最后修改人姓名", required = true)
+    @NotBlank(message = "最后修改人姓名不能为空")
     private String recordUpdateBy;
 
     @JsonProperty("companyCode")
     @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码", required = true)
+    @NotBlank(message = "企业编码不能为空")
     private String companyCode;
 
     @ApiModelProperty(value = "作业名称", required = true)
+    @NotBlank(message = "作业名称不能为空")
     @JsonProperty("workName")
     private String workName;
 
     @ApiModelProperty(value = "作业编号", required = true)
+    @NotBlank(message = "作业编号不能为空")
     @JsonProperty("workNumber")
     private String workNumber;
 
     @ApiModelProperty(value = "作业单位", required = true)
     @JsonProperty("workCompany")
+    @NotBlank(message = "作业单位不能为空")
     private String workCompany;
 
     @ApiModelProperty(value = "作业申请单位", required = true)
     @JsonProperty("workApplyCompany")
+    @NotBlank(message = "作业申请单位不能为空")
     private String workApplyCompany;
 
     @ApiModelProperty(value = "作业地点", required = true)
     @JsonProperty("workPlace")
+    @NotBlank(message = "作业地点不能为空")
     private String workPlace;
 
     @ApiModelProperty(value = "电源接入点及许可用电功率", required = true)
     @JsonProperty("powerAccessPoint")
+    @NotBlank(message = "电源接入点及许可用电功率不能为空")
     private String powerAccessPoint;
 
     @ApiModelProperty(value = "工作电压", required = true)
     @JsonProperty("workingVoltage")
+    @NotBlank(message = "工作电压不能为空")
     private String workingVoltage;
 
     @ApiModelProperty(value = "用电设备名称及额定功率", required = true)
     @JsonProperty("electricalEquipment")
+    @NotBlank(message = "用电设备名称及额定功率不能为空")
     private String electricalEquipment;
 
     @ApiModelProperty(value = "用电人姓名", required = true)
     @JsonProperty("electricityUserName")
+    @NotBlank(message = "用电人姓名不能为空")
     private String electricityUserName;
 
     @ApiModelProperty(value = "涉及的其他特殊作业 ID 集,特殊作业主键列表", required = false)
@@ -93,22 +106,27 @@ public class DjElectricityWorkReqDto {
 
     @ApiModelProperty(value = "作业开始时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("beginTime")
+    @NotBlank(message = "作业开始时间不能为空")
     private String beginTime;
 
     @ApiModelProperty(value = "作业结束时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("endTime")
+    @NotBlank(message = "作业结束时间不能为空")
     private String endTime;
 
     @ApiModelProperty(value = "工作内容", required = true)
     @JsonProperty("workContent")
+    @NotBlank(message = "工作内容不能为空")
     private String workContent;
 
     @ApiModelProperty(value = "风险辨识", required = true)
     @JsonProperty("riskIdentification")
+    @NotBlank(message = "风险辨识不能为空")
     private String riskIdentification;
 
     @ApiModelProperty(value = "作业人员列表", required = true)
     @JsonProperty("workUser")
+    @NotBlank(message = "作业人员列表不能为空")
     private List<DjWorkUserInfoDto> workUser;
 
     /**
@@ -116,14 +134,17 @@ public class DjElectricityWorkReqDto {
      */
     @ApiModelProperty(value = "是否承包商作业,参照枚举TsIsCommonStatusEnum",required = true)
     @JsonProperty("contractorWork")
+    @NotBlank(message = "是否承包商作业不能为空")
     private String contractorWork;
 
     @ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
     @JsonProperty("mapCenter")
+    @NotBlank(message = "地图位置-中心点,WGS-84 坐标系不能为空")
     private DjMapCenterDto mapCenter;
 
     @ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
     @JsonProperty("mapBorder")
+    @NotBlank(message = "地图位置-边界,WGS-84 坐标系不能为空")
     private List<DjMapBorderDto> mapBorder;
 
     @ApiModelProperty(value = "气体分析-有毒气体",required = false)
@@ -140,10 +161,12 @@ public class DjElectricityWorkReqDto {
 
     @ApiModelProperty(value = "分析人员",required = true)
     @JsonProperty("analysisUser")
+    @NotBlank(message = "分析人员不能为空")
     private DjAnalysisUserDto analysisUser;
 
     @ApiModelProperty(value = "安全措施",required = true)
     @JsonProperty("securityMeasure")
+    @NotBlank(message = "安全措施不能为空")
     private List<DjSecurityMeasureDto> securityMeasure;
 
     @ApiModelProperty(value = "其他措施")
@@ -156,42 +179,52 @@ public class DjElectricityWorkReqDto {
 
     @ApiModelProperty(value = "措施确认人", required = true)
     @JsonProperty("measureUser")
+    @NotBlank(message = "措施确认人不能为空")
     private DjMeasureUserDto measureUser;
 
     @ApiModelProperty(value = "交底内容",required = true)
     @JsonProperty("discloseContent")
+    @NotBlank(message = "交底内容不能为空")
     private String discloseContent;
 
     @ApiModelProperty(value = "安全交底人",required = true)
     @JsonProperty("discloseUser")
+    @NotBlank(message = "安全交底人不能为空")
     private DjDiscloseUserDto discloseUser;
 
     @ApiModelProperty(value = "接受交底人",required = true)
     @JsonProperty("acceptUser")
+    @NotBlank(message = "接受交底人不能为空")
     private DjAcceptUserDto acceptUser;
 
     @ApiModelProperty(value = "作业负责人",required = true)
     @JsonProperty("workHeadUser")
+    @NotBlank(message = "作业负责人不能为空")
     private DjElecWorkHeadUserDto workHeadUser;
 
     @ApiModelProperty(value = "用电单位审批人",required = true)
     @JsonProperty("electricityApprovalUser")
+    @NotBlank(message = "用电单位审批人不能为空")
     private DjApprovalUserDto electricityApprovalUser;
 
     @ApiModelProperty(value = "配送电单位审批人",required = true)
     @JsonProperty("deliveryApprovalUser")
+    @NotBlank(message = "配送电单位审批人不能为空")
     private DjApprovalUserDto deliveryApprovalUser;
 
     @ApiModelProperty(value = "监护人", required = true)
     @JsonProperty("guardianUser")
+    @NotBlank(message = "监护人不能为空")
     private DjGuardianUserDto guardianUser;
 
     @ApiModelProperty(value = "完工验收人",required = true)
     @JsonProperty("finishedUser")
+    @NotBlank(message = "完工验收人不能为空")
     private DjFinishedUserDto finishedUser;
 
     @ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("issueTime")
+    @NotBlank(message = "签发时间不能为空")
     private String issueTime;
 
 }

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

@@ -1,8 +1,8 @@
-package com.zcloud.modules.data.dto.hebei.dj.req;
+package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
-import com.zcloud.modules.data.dto.hebei.dj.req.info.DjDetectInfoDto;
+import com.zcloud.modules.data.enums.tangshan.dj.enums.DjRecordDeletedEnum;
+import com.zcloud.modules.data.dto.tangshan.dj.req.info.DjDetectInfoDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,10 +18,8 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 @ApiModel("特殊作业气体分析数据请求实体")
-public class DjGasAnalysisDataReqDto {
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
+public class DjGasAnalysisDataReqDto extends DjBaseReqDto{
+
     /**
      *  关联枚举：{@link DjRecordDeletedEnum}
      */

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

@@ -1,14 +1,15 @@
-package com.zcloud.modules.data.dto.hebei.dj.req;
+package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
-import com.zcloud.modules.data.dto.hebei.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 java.util.List;
 
 /**
@@ -19,54 +20,64 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 @ApiModel("动土作业请求实体")
-public class DjGroundBreakWorkReqDto {
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
+public class DjGroundBreakWorkReqDto extends DjBaseReqDto{
+
     /**
      *  关联枚举：{@link DjRecordDeletedEnum}
      */
     @JsonProperty("recordDeleted")
     @ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
+    @NotBlank(message = "记录删除状态不能为空")
     private String recordDeleted;
 
     @JsonProperty("recordCreateTime")
     @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "记录创建时间不能为空")
     private String recordCreateTime;
 
     @JsonProperty("recordCreateBy")
     @ApiModelProperty(value = "创建人姓名", required = true)
+    @NotBlank(message = "创建人姓名不能为空")
     private String recordCreateBy;
+
     @JsonProperty("recordUpdateTime")
     @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "最后修改时间不能为空")
     private String recordUpdateTime;
 
     @JsonProperty("recordUpdateBy")
     @ApiModelProperty(value = "最后修改人姓名", required = true)
+    @NotBlank(message = "最后修改人姓名不能为空")
     private String recordUpdateBy;
 
     @JsonProperty("companyCode")
     @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码", required = true)
+    @NotBlank(message = "企业编码不能为空")
     private String companyCode;
 
     @ApiModelProperty(value = "作业名称", required = true)
     @JsonProperty("workName")
+    @NotBlank(message = "作业名称不能为空")
     private String workName;
 
     @ApiModelProperty(value = "作业编号", required = true)
     @JsonProperty("workNumber")
+    @NotBlank(message = "作业编号不能为空")
     private String workNumber;
 
     @ApiModelProperty(value = "作业单位", required = true)
     @JsonProperty("workCompany")
+    @NotBlank(message = "作业单位不能为空")
     private String workCompany;
 
     @ApiModelProperty(value = "作业申请单位", required = true)
     @JsonProperty("workApplyCompany")
+    @NotBlank(message = "作业申请单位不能为空")
     private String workApplyCompany;
 
     @ApiModelProperty(value = "作业地点", required = true)
     @JsonProperty("workPlace")
+    @NotBlank(message = "作业地点不能为空")
     private String workPlace;
 
     @ApiModelProperty(value = "涉及的其他特殊作业 ID 集,特殊作业主键列表", required = false)
@@ -75,38 +86,47 @@ public class DjGroundBreakWorkReqDto {
 
     @ApiModelProperty(value = "作业实施开始时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("beginTime")
+    @NotBlank(message = "作业实施开始时间不能为空")
     private String beginTime;
 
     @ApiModelProperty(value = "作业实施结束时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("endTime")
+    @NotBlank(message = "作业实施结束时间不能为空")
     private String endTime;
 
     @ApiModelProperty(value = "作业范围、内容、方式（包括深度面积）简图,字符串,必传,格式：data:image/png;base64,..", required = true)
     @JsonProperty("workImg")
+    @NotBlank(message = "作业范围、内容、方式（包括深度面积）简图不能为空")
     private String workImg;
 
     @ApiModelProperty(value = "作业范围、内容、方式（包括深度面积）描述", required = true)
     @JsonProperty("workDesc")
+    @NotBlank(message = "作业范围、内容、方式（包括深度面积）描述不能为空")
     private String workDesc;
 
     @ApiModelProperty(value = "作业范围、内容、方式（包括深度面积）签字图片, 格式：data:image/png;base64,.", required = true)
     @JsonProperty("workSign")
+    @NotBlank(message = "作业范围、内容、方式（包括深度面积）签字图片不能为空")
     private String workSign;
 
     @ApiModelProperty(value = "作业范围、内容、方式（包括深度面积）签字时间，必传，格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("workSignTime")
+    @NotBlank(message = "作业范围、内容、方式（包括深度面积）签字时间不能为空")
     private String workSignTime;
 
     @ApiModelProperty(value = "工作内容", required = true)
     @JsonProperty("workContent")
+    @NotBlank(message = "工作内容不能为空")
     private String workContent;
 
     @ApiModelProperty(value = "风险识别", required = true)
     @JsonProperty("riskIdentification")
+    @NotBlank(message = "风险识别不能为空")
     private String riskIdentification;
 
     @ApiModelProperty(value = "作业人员列表", required = true)
     @JsonProperty("workUser")
+    @NotBlank(message = "作业人员列表不能为空")
     private List<DjWorkUserDto> workUser;
 
     /**
@@ -114,18 +134,22 @@ public class DjGroundBreakWorkReqDto {
      */
     @ApiModelProperty(value = "是否承包商作业,参照枚举TsIsCommonStatusEnum",required = true)
     @JsonProperty("contractorWork")
+    @NotBlank(message = "是否承包商作业不能为空")
     private String contractorWork;
 
     @ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
     @JsonProperty("mapCenter")
+    @NotBlank(message = "地图位置-中心点,WGS-84 坐标系不能为空")
     private DjMapCenterDto mapCenter;
 
     @ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
     @JsonProperty("mapBorder")
+    @NotBlank(message = "地图位置-边界,WGS-84 坐标系不能为空")
     private List<DjMapBorderDto> mapBorder;
 
     @ApiModelProperty(value = "安全措施",required = true)
     @JsonProperty("securityMeasure")
+    @NotBlank(message = "安全措施不能为空")
     private List<DjSecurityMeasureDto> securityMeasure;
 
     @ApiModelProperty(value = "其他措施")
@@ -138,46 +162,57 @@ public class DjGroundBreakWorkReqDto {
 
     @ApiModelProperty(value = "措施确认人", required = true)
     @JsonProperty("measureUser")
+    @NotBlank(message = "措施确认人不能为空")
     private DjMeasureUserDto measureUser;
 
     @ApiModelProperty(value = "交底内容",required = true)
     @JsonProperty("discloseContent")
+    @NotBlank(message = "交底内容不能为空")
     private String discloseContent;
 
     @ApiModelProperty(value = "安全交底人",required = true)
     @JsonProperty("discloseUser")
+    @NotBlank(message = "安全交底人不能为空")
     private DjDiscloseUserDto discloseUser;
 
     @ApiModelProperty(value = "接受交底人",required = true)
     @JsonProperty("acceptUser")
+    @NotBlank(message = "接受交底人不能为空")
     private DjAcceptUserDto acceptUser;
 
     @ApiModelProperty(value = "作业负责人",required = true)
     @JsonProperty("workHeadUser")
+    @NotBlank(message = "作业负责人不能为空")
     private DjWorkHeadUserDto workHeadUser;
 
     @ApiModelProperty(value = "单位审批人",required = true)
     @JsonProperty("unitApprovalUser")
+    @NotBlank(message = "单位审批人不能为空")
     private DjApprovalUserDto unitApprovalUser;
 
     @ApiModelProperty(value = "相关部门负责人", required = true)
     @JsonProperty("relatedHeadUser")
+    @NotBlank(message = "相关部门负责人不能为空")
     private DjApprovalUserDto relatedHeadUser;
 
     @ApiModelProperty(value = "审批部门负责人", required = true)
     @JsonProperty("approvalUser")
+    @NotBlank(message = "审批部门负责人不能为空")
     private DjApprovalUserDto approvalUser;
 
     @ApiModelProperty(value = "监护人", required = true)
     @JsonProperty("guardianUser")
+    @NotBlank(message = "监护人不能为空")
     private DjGuardianUserDto guardianUser;
 
     @ApiModelProperty(value = "完工验收人",required = true)
     @JsonProperty("finishedUser")
+    @NotBlank(message = "完工验收人不能为空")
     private DjFinishedUserDto finishedUser;
 
     @ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("issueTime")
+    @NotBlank(message = "签发时间不能为空")
     private String issueTime;
 
 }

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

@@ -1,15 +1,16 @@
-package com.zcloud.modules.data.dto.hebei.dj.req;
+package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjHeightWorkLevelEnum;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
-import com.zcloud.modules.data.dto.hebei.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 java.util.List;
 
 /**
@@ -20,58 +21,68 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 @ApiModel("高处作业请求实体")
-public class DjHighWorkReqDto {
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
+public class DjHighWorkReqDto extends DjBaseReqDto{
+
     /**
      *  关联枚举：{@link DjRecordDeletedEnum}
      */
     @JsonProperty("recordDeleted")
     @ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
+    @NotBlank(message = "记录删除状态不能为空")
     private String recordDeleted;
 
     @JsonProperty("recordCreateTime")
     @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "记录创建时间不能为空")
     private String recordCreateTime;
 
     @JsonProperty("recordCreateBy")
     @ApiModelProperty(value = "创建人姓名", required = true)
+    @NotBlank(message = "创建人姓名不能为空")
     private String recordCreateBy;
     @JsonProperty("recordUpdateTime")
     @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "最后修改时间不能为空")
     private String recordUpdateTime;
 
     @JsonProperty("recordUpdateBy")
     @ApiModelProperty(value = "最后修改人姓名", required = true)
+    @NotBlank(message = "最后修改人姓名不能为空")
     private String recordUpdateBy;
 
     @JsonProperty("companyCode")
     @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码", required = true)
+    @NotBlank(message = "企业编码不能为空")
     private String companyCode;
 
     @ApiModelProperty(value = "作业名称", required = true)
+    @NotBlank(message = "作业名称不能为空")
     @JsonProperty("workName")
     private String workName;
 
     @ApiModelProperty(value = "作业编号", required = true)
     @JsonProperty("workNumber")
+    @NotBlank(message = "作业编号不能为空")
     private String workNumber;
 
     @ApiModelProperty(value = "作业单位", required = true)
     @JsonProperty("workCompany")
+    @NotBlank(message = "作业单位不能为空")
     private String workCompany;
 
     @ApiModelProperty(value = "作业申请单位", required = true)
     @JsonProperty("workApplyCompany")
+    @NotBlank(message = "作业申请单位不能为空")
     private String workApplyCompany;
 
     @ApiModelProperty(value = "作业地点", required = true)
     @JsonProperty("workPlace")
+    @NotBlank(message = "作业地点不能为空")
     private String workPlace;
 
     @ApiModelProperty(value = "作业高度", required = true)
     @JsonProperty("workHeight")
+    @NotBlank(message = "作业高度不能为空")
     private String workHeight;
 
     /**
@@ -79,6 +90,7 @@ public class DjHighWorkReqDto {
      */
     @ApiModelProperty(value = "高处作业等级,参考枚举DjHeightWorkLevelEnum", required = true)
     @JsonProperty("heightWorkLevel")
+    @NotBlank(message = "高处作业等级不能为空")
     private String heightWorkLevel;
 
     @ApiModelProperty(value = "涉及的其他特殊作业 ID 集,特殊作业主键列表", required = false)
@@ -87,22 +99,27 @@ public class DjHighWorkReqDto {
 
     @ApiModelProperty(value = "作业实施开始时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("beginTime")
+    @NotBlank(message = "作业实施开始时间不能为空")
     private String beginTime;
 
     @ApiModelProperty(value = "作业实施结束时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("endTime")
+    @NotBlank(message = "作业实施结束时间不能为空")
     private String endTime;
 
     @ApiModelProperty(value = "工作内容", required = true)
     @JsonProperty("workContent")
+    @NotBlank(message = "工作内容不能为空")
     private String workContent;
 
     @ApiModelProperty(value = "风险辨识", required = true)
     @JsonProperty("riskIdentification")
+    @NotBlank(message = "风险辨识不能为空")
     private String riskIdentification;
 
     @ApiModelProperty(value = "作业人员列表", required = true)
     @JsonProperty("workUser")
+    @NotBlank(message = "作业人员列表不能为空")
     private List<DjWorkUserDto> workUser;
 
     /**
@@ -110,18 +127,22 @@ public class DjHighWorkReqDto {
      */
     @ApiModelProperty(value = "是否承包商作业,参照枚举TsIsCommonStatusEnum",required = true)
     @JsonProperty("contractorWork")
+    @NotBlank(message = "是否承包商作业不能为空")
     private String contractorWork;
 
     @ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
     @JsonProperty("mapCenter")
+    @NotBlank(message = "地图位置-中心点不能为空")
     private DjMapCenterDto mapCenter;
 
     @ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
     @JsonProperty("mapBorder")
+    @NotBlank(message = "地图位置-边界不能为空")
     private List<DjMapBorderDto> mapBorder;
 
     @ApiModelProperty(value = "安全措施",required = true)
     @JsonProperty("securityMeasure")
+    @NotBlank(message = "安全措施不能为空")
     private List<DjSecurityMeasureDto> securityMeasure;
 
     @ApiModelProperty(value = "其他措施")
@@ -134,46 +155,57 @@ public class DjHighWorkReqDto {
 
     @ApiModelProperty(value = "措施确认人", required = true)
     @JsonProperty("measureUser")
+    @NotBlank(message = "措施确认人不能为空")
     private DjMeasureUserDto measureUser;
 
     @ApiModelProperty(value = "交底内容",required = true)
     @JsonProperty("discloseContent")
+    @NotBlank(message = "交底内容不能为空")
     private String discloseContent;
 
     @ApiModelProperty(value = "安全交底人",required = true)
     @JsonProperty("discloseUser")
+    @NotBlank(message = "安全交底人不能为空")
     private DjDiscloseUserDto discloseUser;
 
     @ApiModelProperty(value = "接受交底人",required = true)
     @JsonProperty("acceptUser")
+    @NotBlank(message = "接受交底人不能为空")
     private DjAcceptUserDto acceptUser;
 
     @ApiModelProperty(value = "作业负责人",required = true)
     @JsonProperty("workHeadUser")
+    @NotBlank(message = "作业负责人不能为空")
     private DjWorkHeadUserDto workHeadUser;
 
     @ApiModelProperty(value = "单位审批人",required = true)
     @JsonProperty("unitApprovalUser")
+    @NotBlank(message = "单位审批人不能为空")
     private DjApprovalUserDto unitApprovalUser;
 
     @ApiModelProperty(value = "审核部门负责人",required = true)
     @JsonProperty("auditUser")
+    @NotBlank(message = "审核部门负责人不能为空")
     private DjApprovalUserDto auditUser;
 
     @ApiModelProperty(value = "审批部门负责人", required = true)
     @JsonProperty("approvalUser")
+    @NotBlank(message = "审批部门负责人不能为空")
     private DjApprovalUserDto approvalUser;
 
     @ApiModelProperty(value = "监护人", required = true)
     @JsonProperty("guardianUser")
+    @NotBlank(message = "监护人不能为空")
     private DjGuardianUserDto guardianUser;
 
     @ApiModelProperty(value = "完工验收人",required = true)
     @JsonProperty("finishedUser")
+    @NotBlank(message = "完工验收人不能为空")
     private DjFinishedUserDto finishedUser;
 
     @ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("issueTime")
+    @NotBlank(message = "签发时间不能为空")
     private String issueTime;
 
 }

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

@@ -1,15 +1,16 @@
-package com.zcloud.modules.data.dto.hebei.dj.req;
+package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjHoistWorkLevelEnum;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
-import com.zcloud.modules.data.dto.hebei.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 java.util.List;
 
 /**
@@ -20,62 +21,73 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 @ApiModel("吊装作业请求实体")
-public class DjHoistWorkReqDto {
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
+public class DjHoistWorkReqDto extends DjBaseReqDto{
+
     /**
      *  关联枚举：{@link DjRecordDeletedEnum}
      */
     @JsonProperty("recordDeleted")
     @ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
+    @NotBlank(message = "记录删除状态不能为空")
     private String recordDeleted;
 
     @JsonProperty("recordCreateTime")
     @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "记录创建时间不能为空")
     private String recordCreateTime;
 
     @JsonProperty("recordCreateBy")
     @ApiModelProperty(value = "创建人姓名", required = true)
+    @NotBlank(message = "创建人姓名不能为空")
     private String recordCreateBy;
     @JsonProperty("recordUpdateTime")
     @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "最后修改时间不能为空")
     private String recordUpdateTime;
 
     @JsonProperty("recordUpdateBy")
     @ApiModelProperty(value = "最后修改人姓名", required = true)
+    @NotBlank(message = "最后修改人姓名不能为空")
     private String recordUpdateBy;
 
     @JsonProperty("companyCode")
     @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码", required = true)
+    @NotBlank(message = "企业编码不能为空")
     private String companyCode;
 
     @ApiModelProperty(value = "作业名称", required = true)
+    @NotBlank(message = "作业名称不能为空")
     @JsonProperty("workName")
     private String workName;
 
     @ApiModelProperty(value = "作业编号", required = true)
     @JsonProperty("workNumber")
+    @NotBlank(message = "作业编号不能为空")
     private String workNumber;
 
     @ApiModelProperty(value = "作业单位", required = true)
     @JsonProperty("workCompany")
+    @NotBlank(message = "作业单位不能为空")
     private String workCompany;
 
     @ApiModelProperty(value = "作业申请单位", required = true)
     @JsonProperty("workApplyCompany")
+    @NotBlank(message = "作业申请单位不能为空")
     private String workApplyCompany;
 
     @ApiModelProperty(value = "吊装地点", required = true)
     @JsonProperty("workPlace")
+    @NotBlank(message = "吊装地点不能为空")
     private String workPlace;
 
     @ApiModelProperty(value = "吊具名称", required = true)
     @JsonProperty("spreaderName")
+    @NotBlank(message = "吊具名称不能为空")
     private String spreaderName;
 
     @ApiModelProperty(value = "吊物质量，单位（吨）", required = true)
     @JsonProperty("spreaderWeight")
+    @NotBlank(message = "吊物质量，单位（吨）不能为空")
     private String spreaderWeight;
 
     /**
@@ -83,10 +95,12 @@ public class DjHoistWorkReqDto {
      */
     @ApiModelProperty(value = "作业级别,参考枚举DjHoistWorkLevelEnum", required = true)
     @JsonProperty("workLevel")
+    @NotBlank(message = "作业级别不能为空")
     private String workLevel;
 
     @ApiModelProperty(value = "司索人姓名", required = true)
     @JsonProperty("slingUser")
+    @NotBlank(message = "司索人姓名不能为空")
     private String slingUser;
 
     @ApiModelProperty(value = "涉及的其他特殊作业 ID 集,特殊作业主键列表", required = false)
@@ -95,6 +109,7 @@ public class DjHoistWorkReqDto {
 
     @ApiModelProperty(value = "作业实施开始时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("beginTime")
+    @NotBlank(message = "作业实施开始时间不能为空")
     private String beginTime;
 
     @ApiModelProperty(value = "作业实施结束时间,格式：yyyy-MM-dd HH:mm:ss", required = true)

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

@@ -1,15 +1,16 @@
-package com.zcloud.modules.data.dto.hebei.dj.req;
+package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjHotWorkLevelEnum;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
-import com.zcloud.modules.data.dto.hebei.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 java.util.List;
 
 /**
@@ -20,105 +21,126 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 @ApiModel("动火作业请求实体")
-public class DjHotWorkReqDto {
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
+public class DjHotWorkReqDto extends DjBaseReqDto {
+
     /**
-     *  关联枚举：{@link DjRecordDeletedEnum}
+     * 关联枚举：{@link DjRecordDeletedEnum}
      */
     @JsonProperty("recordDeleted")
     @ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
+    @NotBlank(message = "记录删除状态不能为空")
     private String recordDeleted;
 
     @JsonProperty("recordCreateTime")
     @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "记录创建时间不能为空")
     private String recordCreateTime;
 
     @JsonProperty("recordCreateBy")
     @ApiModelProperty(value = "创建人姓名", required = true)
+    @NotBlank(message = "创建人姓名不能为空")
     private String recordCreateBy;
+
     @JsonProperty("recordUpdateTime")
     @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "最后修改时间不能为空")
     private String recordUpdateTime;
 
     @JsonProperty("recordUpdateBy")
     @ApiModelProperty(value = "最后修改人姓名", required = true)
+    @NotBlank(message = "最后修改人姓名不能为空")
     private String recordUpdateBy;
 
     @JsonProperty("companyCode")
     @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码", required = true)
+    @NotBlank(message = "企业编码不能为空")
     private String companyCode;
 
     @ApiModelProperty(value = "作业名称", required = true)
     @JsonProperty("workName")
+    @NotBlank(message = "作业名称不能为空")
     private String workName;
 
     @ApiModelProperty(value = "作业编号", required = true)
     @JsonProperty("workNumber")
+    @NotBlank(message = "作业编号不能为空")
     private String workNumber;
 
     @ApiModelProperty(value = "作业单位", required = true)
     @JsonProperty("workCompany")
+    @NotBlank(message = "作业单位不能为空")
     private String workCompany;
 
     @ApiModelProperty(value = "作业申请单位", required = true)
     @JsonProperty("workApplyCompany")
+    @NotBlank(message = "作业申请单位不能为空")
     private String workApplyCompany;
 
     @ApiModelProperty(value = "作业地点", required = true)
     @JsonProperty("workPlace")
+    @NotBlank(message = "作业地点不能为空")
     private String workPlace;
 
     @ApiModelProperty(value = "动火方式", required = true)
     @JsonProperty("hotWorkMethod")
+    @NotBlank(message = "动火方式不能为空")
     private String hotWorkMethod;
     /**
-     *  关联枚举：{@link DjHotWorkLevelEnum}
+     * 关联枚举：{@link DjHotWorkLevelEnum}
      */
     @ApiModelProperty(value = "动火等级,参照枚举TsHotWorkLevelEnum", required = true)
     @JsonProperty("hotWorkLevel")
+    @NotBlank(message = "动火等级不能为空")
     private String hotWorkLevel;
 
     @ApiModelProperty(value = "涉及的其他特殊作业 ID 集，特殊作业主键列表", required = false)
     @JsonProperty("relatedWorkId")
+    @NotBlank(message = "涉及的其他特殊作业 ID 集，特殊作业主键列表不能为空")
     private List<String> relatedWorkId;
 
     @ApiModelProperty(value = "动火开始时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("beginTime")
+    @NotBlank(message = "动火开始时间不能为空")
     private String beginTime;
 
     @ApiModelProperty(value = "动火结束时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("endTime")
+    @NotBlank(message = "动火结束时间不能为空")
     private String endTime;
 
     @ApiModelProperty(value = "作业内容", required = true)
     @JsonProperty("workContent")
+    @NotBlank(message = "作业内容不能为空")
     private String workContent;
 
     @ApiModelProperty(value = "风险辨识", required = true)
     @JsonProperty("riskIdentification")
+    @NotBlank(message = "风险辨识不能为空")
     private String riskIdentification;
 
     @ApiModelProperty(value = "作业人员列表", required = true)
     @JsonProperty("workUser")
+    @NotBlank(message = "作业人员列表不能为空")
     private List<DjWorkUserInfoDto> workUser;
     /**
-     *  关联枚举：{@link DjIsCommonStatusEnum}
+     * 关联枚举：{@link DjIsCommonStatusEnum}
      */
-    @ApiModelProperty(value = "是否承包商作业",required = true)
+    @ApiModelProperty(value = "是否承包商作业", required = true)
     @JsonProperty("contractorWork")
+    @NotBlank(message = "是否承包商作业不能为空")
     private String contractorWork;
 
     @ApiModelProperty(value = "地图位置-中心点，WGS-84 坐标系", required = true)
     @JsonProperty("mapCenter")
+    @NotBlank(message = "地图位置-中心点，WGS-84 坐标系不能为空")
     private DjMapCenterDto mapCenter;
 
     @ApiModelProperty(value = "地图位置-边界，WGS-84 坐标系", required = true)
     @JsonProperty("mapBorder")
+    @NotBlank(message = "地图位置-边界，WGS-84 坐标系不能为空")
     private List<DjMapBorderDto> mapBorder;
 
-    @ApiModelProperty(value = "气体分析-有毒气体",required = false)
+    @ApiModelProperty(value = "气体分析-有毒气体", required = false)
     @JsonProperty("hazarAnalysis")
     private List<DjHazarAnalysisDto> hazarAnalysis;
 
@@ -130,12 +152,14 @@ public class DjHotWorkReqDto {
     @JsonProperty("oxygenAnalysis")
     private DjOxygenAnalysisDto oxygenAnalysis;
 
-    @ApiModelProperty(value = "分析人员",required = true)
+    @ApiModelProperty(value = "分析人员", required = true)
     @JsonProperty("analysisUser")
+    @NotBlank(message = "分析人员不能为空")
     private DjAnalysisUserDto analysisUser;
 
-    @ApiModelProperty(value = "安全措施列表",required = true)
+    @ApiModelProperty(value = "安全措施列表", required = true)
     @JsonProperty("securityMeasure")
+    @NotBlank(message = "安全措施列表不能为空")
     private List<DjSecurityMeasureDto> securityMeasure;
 
     @ApiModelProperty(value = "其他措施")
@@ -148,53 +172,63 @@ public class DjHotWorkReqDto {
 
     @ApiModelProperty(value = "措施确认人", required = true)
     @JsonProperty("measureUser")
+    @NotBlank(message = "措施确认人不能为空")
     private DjMeasureUserDto measureUser;
 
-    @ApiModelProperty(value = "交底内容",required = true)
+    @ApiModelProperty(value = "交底内容", required = true)
     @JsonProperty("discloseContent")
+    @NotBlank(message = "交底内容不能为空")
     private String discloseContent;
 
-    @ApiModelProperty(value = "安全交底人",required = true)
+    @ApiModelProperty(value = "安全交底人", required = true)
     @JsonProperty("discloseUser")
+    @NotBlank(message = "安全交底人不能为空")
     private DjDiscloseUserDto discloseUser;
 
-    @ApiModelProperty(value = "接受交底人",required = true)
+    @ApiModelProperty(value = "接受交底人", required = true)
     @JsonProperty("acceptUser")
+    @NotBlank(message = "接受交底人不能为空")
     private DjAcceptUserDto acceptUser;
 
-    @ApiModelProperty(value = "作业负责人",required = true)
+    @ApiModelProperty(value = "作业负责人", required = true)
     @JsonProperty("workHeadUser")
+    @NotBlank(message = "作业负责人不能为空")
     private DjWorkHeadUserDto workHeadUser;
 
-    @ApiModelProperty(value = "单位审批人",required = true)
+    @ApiModelProperty(value = "单位审批人", required = true)
     @JsonProperty("unitApprovalUser")
+    @NotBlank(message = "单位审批人不能为空")
     private DjApprovalUserDto unitApprovalUser;
 
-    @ApiModelProperty(value = "安全部门审批人",required = true)
+    @ApiModelProperty(value = "安全部门审批人", required = true)
     @JsonProperty("securityApprovalUser")
+    @NotBlank(message = "安全部门审批人不能为空")
     private DjApprovalUserDto securityApprovalUser;
 
-    @ApiModelProperty(value = "动火审批人",required = true)
+    @ApiModelProperty(value = "动火审批人", required = true)
     @JsonProperty("workApprovalUser")
+    @NotBlank(message = "动火审批人不能为空")
     private DjApprovalUserDto workApprovalUser;
 
-    @ApiModelProperty(value = "监护人",required = true)
+    @ApiModelProperty(value = "监护人", required = true)
     @JsonProperty("guardianUser")
+    @NotBlank(message = "监护人不能为空")
     private DjApprovalUserDto guardianUser;
 
-    @ApiModelProperty(value = "作业前验票人",required = true)
+    @ApiModelProperty(value = "作业前验票人", required = true)
     @JsonProperty("inspectUser")
+    @NotBlank(message = "作业前验票人不能为空")
     private DjApprovalUserDto inspectUser;
 
-    @ApiModelProperty(value = "完工验收人",required = true)
+    @ApiModelProperty(value = "完工验收人", required = true)
     @JsonProperty("finishedUser")
+    @NotBlank(message = "完工验收人不能为空")
     private DjFinishedUserDto finishedUser;
 
     @ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("issueTime")
+    @NotBlank(message = "签发时间不能为空")
     private String issueTime;
 
 
-
-
 }

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

@@ -1,14 +1,15 @@
-package com.zcloud.modules.data.dto.hebei.dj.req;
+package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjIsCommonStatusEnum;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
-import com.zcloud.modules.data.dto.hebei.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 java.util.List;
 
 /**
@@ -19,152 +20,199 @@ import java.util.List;
 @NoArgsConstructor
 @Data
 @ApiModel("断路作业作业请求实体")
-public class DjOpenCircuitWorkReqDto {
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
+public class DjOpenCircuitWorkReqDto extends DjBaseReqDto {
+
     /**
-     *  关联枚举：{@link DjRecordDeletedEnum}
+     * 关联枚举：{@link DjRecordDeletedEnum}
      */
     @JsonProperty("recordDeleted")
     @ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
+    @NotBlank(message = "记录删除状态不能为空")
     private String recordDeleted;
 
     @JsonProperty("recordCreateTime")
     @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "记录创建时间不能为空")
     private String recordCreateTime;
 
     @JsonProperty("recordCreateBy")
     @ApiModelProperty(value = "创建人姓名", required = true)
+    @NotBlank(message = "创建人姓名不能为空")
     private String recordCreateBy;
+
     @JsonProperty("recordUpdateTime")
     @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "最后修改时间不能为空")
     private String recordUpdateTime;
 
     @JsonProperty("recordUpdateBy")
     @ApiModelProperty(value = "最后修改人姓名", required = true)
+    @NotBlank(message = "最后修改人姓名不能为空")
     private String recordUpdateBy;
 
     @JsonProperty("companyCode")
     @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码", required = true)
+    @NotBlank(message = "企业编码不能为空")
     private String companyCode;
 
     @ApiModelProperty(value = "作业名称", required = true)
     @JsonProperty("workName")
+    @NotBlank(message = "作业名称不能为空")
     private String workName;
 
     @ApiModelProperty(value = "作业编号", required = true)
     @JsonProperty("workNumber")
+    @NotBlank(message = "作业编号不能为空")
     private String workNumber;
 
     @ApiModelProperty(value = "作业单位", required = true)
     @JsonProperty("workCompany")
+    @NotBlank(message = "作业单位不能为空")
     private String workCompany;
 
     @ApiModelProperty(value = "作业申请单位", required = true)
     @JsonProperty("workApplyCompany")
+    @NotBlank(message = "作业申请单位不能为空")
     private String workApplyCompany;
+
     @ApiModelProperty(value = "涉及相关单位/部门", required = true)
     @JsonProperty("relatedCompany")
+    @NotBlank(message = "涉及相关单位/部门不能为空")
     private String relatedCompany;
+
     @ApiModelProperty(value = "涉及的其他特殊作业 ID 集,特殊作业主键列表", required = false)
     @JsonProperty("relatedWorkId")
     private List<String> relatedWorkId;
+
     @ApiModelProperty(value = "作业实施开始时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("beginTime")
+    @NotBlank(message = "作业实施开始时间不能为空")
     private String beginTime;
 
     @ApiModelProperty(value = "作业实施结束时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("endTime")
+    @NotBlank(message = "作业实施结束时间不能为空")
     private String endTime;
+
     @ApiModelProperty(value = "断路原因", required = true)
     @JsonProperty("roadClosureReason")
+    @NotBlank(message = "断路原因不能为空")
     private String roadClosureReason;
 
     @ApiModelProperty(value = "断路地段示意图,格式：data:image/png;base64,..", required = true)
     @JsonProperty("circuitBreakImg")
+    @NotBlank(message = "断路地段示意图不能为空")
     private String circuitBreakImg;
 
     @ApiModelProperty(value = "断路地段相关说明", required = true)
     @JsonProperty("circuitBreakDesc")
+    @NotBlank(message = "断路地段相关说明不能为空")
     private String circuitBreakDesc;
 
     @ApiModelProperty(value = "断路地段签字图片,格式：data:image/png;base64,..", required = true)
     @JsonProperty("circuitBreakSign")
+    @NotBlank(message = "断路地段签字图片不能为空")
     private String circuitBreakSign;
 
     @ApiModelProperty(value = "断路地段签字时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("circuitBreakSignTime")
+    @NotBlank(message = "断路地段签字时间不能为空")
     private String circuitBreakSignTime;
 
     @ApiModelProperty(value = "工作内容", required = true)
     @JsonProperty("workContent")
+    @NotBlank(message = "工作内容不能为空")
     private String workContent;
 
     @ApiModelProperty(value = "风险辨识", required = true)
     @JsonProperty("riskIdentification")
+    @NotBlank(message = "风险辨识不能为空")
     private String riskIdentification;
     /**
-     *  关联枚举：{@link DjIsCommonStatusEnum}
+     * 关联枚举：{@link DjIsCommonStatusEnum}
      */
-    @ApiModelProperty(value = "是否承包商作业,参照枚举TsIsCommonStatusEnum",required = true)
+    @ApiModelProperty(value = "是否承包商作业,参照枚举TsIsCommonStatusEnum", required = true)
     @JsonProperty("contractorWork")
+    @NotBlank(message = "是否承包商作业不能为空")
     private String contractorWork;
+
     @ApiModelProperty(value = "地图位置-中心点,WGS-84 坐标系", required = true)
     @JsonProperty("mapCenter")
+    @NotBlank(message = "地图位置-中心点不能为空")
     private DjMapCenterDto mapCenter;
 
     @ApiModelProperty(value = "地图位置-边界,WGS-84 坐标系", required = true)
     @JsonProperty("mapBorder")
+    @NotBlank(message = "地图位置-边界不能为空")
     private List<DjMapBorderDto> mapBorder;
-    @ApiModelProperty(value = "安全措施列表",required = true)
+
+    @ApiModelProperty(value = "安全措施列表", required = true)
     @JsonProperty("securityMeasure")
+    @NotBlank(message = "安全措施列表不能为空")
     private List<DjSecurityMeasureDto> securityMeasure;
+
     @ApiModelProperty(value = "其他措施")
     @JsonProperty("otherMeasure")
+    @NotBlank(message = "其他措施不能为空")
     private List<String> otherMeasure;
+
     @ApiModelProperty(value = "其他措施编制人,当其他措施不为空时此项必填")
     @JsonProperty("otherMeasureUser")
     private DjOtherMeasureUserDto otherMeasureUser;
+
     @ApiModelProperty(value = "措施确认人", required = true)
     @JsonProperty("measureUser")
+    @NotBlank(message = "措施确认人不能为空")
     private DjMeasureUserDto measureUser;
-    @ApiModelProperty(value = "交底内容",required = true)
+
+    @ApiModelProperty(value = "交底内容", required = true)
     @JsonProperty("discloseContent")
+    @NotBlank(message = "交底内容不能为空")
     private String discloseContent;
 
-    @ApiModelProperty(value = "安全交底人",required = true)
+    @ApiModelProperty(value = "安全交底人", required = true)
     @JsonProperty("discloseUser")
+    @NotBlank(message = "安全交底人不能为空")
     private DjDiscloseUserDto discloseUser;
-    @ApiModelProperty(value = "接受交底人",required = true)
+
+    @ApiModelProperty(value = "接受交底人", required = true)
     @JsonProperty("acceptUser")
+    @NotBlank(message = "接受交底人不能为空")
     private DjAcceptUserDto acceptUser;
-    @ApiModelProperty(value = "作业负责人",required = true)
+
+    @ApiModelProperty(value = "作业负责人", required = true)
     @JsonProperty("workHeadUser")
+    @NotBlank(message = "作业负责人不能为空")
     private DjWorkHeadUserDto workHeadUser;
 
-    @ApiModelProperty(value = "单位审批人",required = true)
+    @ApiModelProperty(value = "单位审批人", required = true)
     @JsonProperty("unitApprovalUser")
+    @NotBlank(message = "单位审批人不能为空")
     private DjApprovalUserDto unitApprovalUser;
 
     @ApiModelProperty(value = "相关部门负责人", required = true)
     @JsonProperty("relatedHeadUser")
+    @NotBlank(message = "相关部门负责人不能为空")
     private DjApprovalUserDto relatedHeadUser;
 
     @ApiModelProperty(value = "审批部门负责人", required = true)
     @JsonProperty("approvalUser")
+    @NotBlank(message = "审批部门负责人不能为空")
     private DjApprovalUserDto approvalUser;
 
     @ApiModelProperty(value = "监护人", required = true)
     @JsonProperty("guardianUser")
+    @NotBlank(message = "监护人不能为空")
     private DjGuardianUserDto guardianUser;
 
-    @ApiModelProperty(value = "完工验收人",required = true)
+    @ApiModelProperty(value = "完工验收人", required = true)
     @JsonProperty("finishedUser")
+    @NotBlank(message = "完工验收人不能为空")
     private DjFinishedUserDto finishedUser;
 
     @ApiModelProperty(value = "签发时间,格式：yyyy-MM-dd HH:mm:ss", required = true)
     @JsonProperty("issueTime")
+    @NotBlank(message = "签发时间不能为空")
     private String issueTime;
 
 

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

@@ -0,0 +1,147 @@
+package com.zcloud.modules.data.dto.tangshan.dj.req;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+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;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * [唐山-园区对接-双控.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
+@ApiModel("安全风险分析单元请求实体")
+public class DjSafeRiskAnalysisUnitReqReqDto extends DjBaseReqDto {
+
+
+    /**
+     *  关联枚举：{@link DjRecordDeletedEnum}
+     */
+    @JsonProperty("recordDeleted")
+    @ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
+    @NotBlank(message = "记录删除状态不能为空")
+    private String recordDeleted;
+
+    @JsonProperty("recordCreateTime")
+    @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "记录创建时间不能为空")
+    private String recordCreateTime;
+
+    @JsonProperty("recordCreateBy")
+    @ApiModelProperty(value = "创建人姓名", required = true)
+    @NotBlank(message = "创建人姓名不能为空")
+    private String recordCreateBy;
+
+    @JsonProperty("recordUpdateTime")
+    @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "最后修改时间不能为空")
+    private String recordUpdateTime;
+
+    @JsonProperty("recordUpdateBy")
+    @ApiModelProperty(value = "最后修改人姓名", required = true)
+    @NotBlank(message = "最后修改人姓名不能为空")
+    private String recordUpdateBy;
+
+    @JsonProperty("companyCode")
+    @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码", required = true)
+    @NotBlank(message = "企业编码不能为空")
+    private String companyCode;
+
+    @JsonProperty("hazardCode")
+    @ApiModelProperty(value = "风险分析对象编码,安全风险分析对象编码即危险化学品登记综合服务系统中的危险源编码", required = true)
+    @NotBlank(message = "风险分析对象编码不能为空")
+    private String hazardCode;
+
+    @JsonProperty("riskUnitName")
+    @ApiModelProperty(value = "安全风险分析单元名称", required = true)
+    @NotBlank(message = "安全风险分析单元名称不能为空")
+    private String riskUnitName;
+
+    @JsonProperty("hazardDep")
+    @ApiModelProperty(value = "责任部门,安全风险分析对象所属部门名称", required = true)
+    @NotBlank(message = "责任部门不能为空")
+    private String hazardDep;
+
+    @JsonProperty("hazardLiablePerson")
+    @ApiModelProperty(value = "责任人,安全风险分析对象所属部门负责人姓名", required = true)
+    @NotBlank(message = "责任人不能为空")
+    private String hazardLiablePerson;
+
+    /**
+     *  关联枚举：{@link DjIsHazardEnum}
+     */
+    @JsonProperty("isHazard")
+    @ApiModelProperty(value = "是否为风险分析对象,参照枚举TsIsHazardEnum", required = true)
+    @NotBlank(message = "是否为风险分析对象不能为空")
+    private String isHazard;
+
+    @JsonProperty("hazardName")
+    @ApiModelProperty(value = "风险分析对象名称", required = true)
+    @NotBlank(message = "风险分析对象名称不能为空")
+    private String hazardName;
+
+    /**
+     * 关联枚举：{@link DjHazardTypeEnum}
+     */
+    @JsonProperty("hazardType")
+    @ApiModelProperty(value = "风险分析单元分类,参照枚举TsHazardTypeEnum", required = true)
+    @NotBlank(message = "风险分析单元分类不能为空")
+    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)
+        @NotBlank(message = "经度不能为空")
+        private String lng;
+
+        @JsonProperty("lat")
+        @ApiModelProperty(value = "纬度", required = true)
+        @NotBlank(message = "纬度不能为空")
+        private String lat;
+    }
+
+}

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

@@ -1,12 +1,14 @@
-package com.zcloud.modules.data.dto.hebei.dj.req;
+package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.*;
+import com.zcloud.modules.data.enums.tangshan.dj.enums.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * [唐山-园区对接-双控.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>
  * 安全风险管控措施
@@ -15,65 +17,73 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Data
 @ApiModel("安全风险事件请求实体")
-public class DjSafeRiskControlMeasureReqDto {
+public class DjSafeRiskControlMeasureReqReqDto extends DjBaseReqDto {
 
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
 
     /**
-     *  关联枚举：{@link DjRecordDeletedEnum}
+     * 关联枚举：{@link DjRecordDeletedEnum}
      */
     @JsonProperty("recordDeleted")
     @ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
+    @NotBlank(message = "记录删除状态不能为空")
     private String recordDeleted;
 
     @JsonProperty("recordCreateTime")
     @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "记录创建时间不能为空")
     private String recordCreateTime;
 
     @JsonProperty("recordCreateBy")
     @ApiModelProperty(value = "创建人姓名", required = true)
+    @NotBlank(message = "创建人姓名不能为空")
     private String recordCreateBy;
 
     @JsonProperty("recordUpdateTime")
     @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "最后修改时间不能为空")
     private String recordUpdateTime;
 
     @JsonProperty("recordUpdateBy")
     @ApiModelProperty(value = "最后修改人姓名", required = true)
+    @NotBlank(message = "最后修改人姓名不能为空")
     private String recordUpdateBy;
 
     @JsonProperty("companyCode")
     @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码", required = true)
+    @NotBlank(message = "企业编码不能为空")
     private String companyCode;
 
     @JsonProperty("riskEventId")
     @ApiModelProperty(value = "安全风险事件ID,所属风险事件主键", required = true)
+    @NotBlank(message = "安全风险事件ID不能为空")
     private String riskEventId;
 
     /**
-     *    关联枚举：{@link DjDataSrcEnum}
+     * 关联枚举：{@link DjDataSrcEnum}
      */
     @JsonProperty("dataSrc")
     @ApiModelProperty(value = "管控方式,参照枚举TsDataSrcEnum", required = true)
+    @NotBlank(message = "管控方式不能为空")
     private String dataSrc;
 
     @JsonProperty("riskMeasureDesc")
     @ApiModelProperty(value = "安全风险管控措施描述", required = true)
+    @NotBlank(message = "安全风险管控措施描述不能为空")
     private String riskMeasureDesc;
 
     /**
-     *   关联枚举：{@link DjClassify1Enum}
+     * 关联枚举：{@link DjClassify1Enum}
      */
     @JsonProperty("classify1")
     @ApiModelProperty(value = "管控措施分类 1,参照枚举TsClassify1Enum", required = true)
+    @NotBlank(message = "管控措施分类 1不能为空")
     private String classify1;
     /**
-     *   关联枚举：{@link DjClassify2Enum}
+     * 关联枚举：{@link DjClassify2Enum}
      */
     @JsonProperty("classify2")
     @ApiModelProperty(value = "管控措施分类 2,参照枚举TsClassify2Enum", required = true)
+    @NotBlank(message = "管控措施分类 2不能为空")
     private String classify2;
 
     @JsonProperty("classify3")
@@ -82,10 +92,11 @@ public class DjSafeRiskControlMeasureReqDto {
 
     @JsonProperty("troubleshootContent")
     @ApiModelProperty(value = "隐患排查内容", required = true)
+    @NotBlank(message = "隐患排查内容不能为空")
     private String troubleshootContent;
 
     /**
-     *  关联枚举：{@link DjRiskMeasureLevelEnum}
+     * 关联枚举：{@link DjRiskMeasureLevelEnum}
      */
     @JsonProperty("riskMeasureLevel")
     @ApiModelProperty(value = "管控级别,参照枚举TsRiskMeasureLevelEnum", required = false)
@@ -93,9 +104,11 @@ public class DjSafeRiskControlMeasureReqDto {
 
     @JsonProperty("riskMeasureDep")
     @ApiModelProperty(value = "管控责任部门", required = true)
+    @NotBlank(message = "管控责任部门不能为空")
     private String riskMeasureDep;
 
     @JsonProperty("riskMeasurer")
     @ApiModelProperty(value = "管控责任人", required = true)
+    @NotBlank(message = "管控责任人不能为空")
     private String riskMeasurer;
 }

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

@@ -1,12 +1,14 @@
-package com.zcloud.modules.data.dto.hebei.dj.req;
+package com.zcloud.modules.data.dto.tangshan.dj.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjRecordDeletedEnum;
+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;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * [唐山-园区对接-双控.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>
  * 安全风险事件
@@ -15,45 +17,50 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @Data
 @ApiModel("安全风险事件请求实体")
-public class DjSafeRiskEventReqDto {
+public class DjSafeRiskEventReqReqDto extends DjBaseReqDto {
 
-    @JsonProperty("recordId")
-    @ApiModelProperty(value = "主键,字符串（36）,必传", required = true)
-    private String recordId;
 
     /**
      *  关联枚举：{@link DjRecordDeletedEnum}
      */
     @JsonProperty("recordDeleted")
     @ApiModelProperty(value = "记录删除状态,参照枚举TsRecordDeletedEnum", required = true)
+    @NotBlank(message = "记录删除状态不能为空")
     private String recordDeleted;
 
     @JsonProperty("recordCreateTime")
     @ApiModelProperty(value = "记录创建时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "记录创建时间不能为空")
     private String recordCreateTime;
 
     @JsonProperty("recordCreateBy")
     @ApiModelProperty(value = "创建人姓名", required = true)
+    @NotBlank(message = "创建人姓名不能为空")
     private String recordCreateBy;
 
     @JsonProperty("recordUpdateTime")
     @ApiModelProperty(value = "最后修改时间,格式:yyyy-MM-dd HH:mm:ss", required = true)
+    @NotBlank(message = "最后修改时间不能为空")
     private String recordUpdateTime;
 
     @JsonProperty("recordUpdateBy")
     @ApiModelProperty(value = "最后修改人姓名", required = true)
+    @NotBlank(message = "最后修改人姓名不能为空")
     private String recordUpdateBy;
 
     @JsonProperty("companyCode")
     @ApiModelProperty(value = "企业编码,危险化学品登记综合服务系统中的企业编码", required = true)
+    @NotBlank(message = "企业编码不能为空")
     private String companyCode;
 
     @JsonProperty("riskUnitId")
     @ApiModelProperty(value = "安全风险分析单元 ID,所属安全风险单元主键", required = true)
+    @NotBlank(message = "安全风险分析单元 ID不能为空")
     private String riskUnitId;
 
     @JsonProperty("riskEventName")
     @ApiModelProperty(value = "安全风险事件名称", required = true)
+    @NotBlank(message = "安全风险事件名称不能为空")
     private String riskEventName;
 
     @JsonProperty("riskEventContent")

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,7 +1,7 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.heBei.dj.enums.DjIsInvolveEnum;
+import com.zcloud.modules.data.enums.tangshan.dj.enums.DjIsInvolveEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

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

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.hebei.dj.req.info;
+package com.zcloud.modules.data.dto.tangshan.dj.req.info;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;

src/main/java/com/zcloud/modules/data/dto/tangshan/dj/resp/DjCommonRespDto.java

@@ -0,0 +1,30 @@
+package com.zcloud.modules.data.dto.tangshan.dj.resp;
+
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * [唐山-园区对接-特殊作业.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-%E7%89%B9%E6%AE%8A%E4%BD%9C%E4%B8%9A.pdf">git地址</a>
+ * 盲板抽堵作业
+ * 接口地址 ：/SpecialWorkTicket_BlindPlateWork
+ */
+@NoArgsConstructor
+@Data
+public class DjCommonRespDto {
+
+    @ApiModelProperty(value = "执行结果：SUCCESS：成功；FAIL：失败。", required = true)
+    private String status;
+
+    @ApiModelProperty(value = "执行结果描述", required = true)
+    private String info;
+
+
+}

src/main/java/com/zcloud/modules/data/dto/tangshan/ds/EncryptionDto.java

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.HeBei.ds;
+package com.zcloud.modules.data.dto.tangshan.ds;
 
 import lombok.Data;
 

src/main/java/com/zcloud/modules/data/dto/tangshan/ds/EncryptionReqDto.java

@@ -1,4 +1,4 @@
-package com.zcloud.modules.data.dto.HeBei.ds;
+package com.zcloud.modules.data.dto.tangshan.ds;
 
 import lombok.Data;
 

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV11/req/EmployeeInfoReqDto.java

@@ -1,10 +1,10 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV11.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV11Enum;
-import com.zcloud.modules.data.base.wh.dictionary.GenderEnum;
-import com.zcloud.modules.data.base.wh.dictionary.PersonTypeEnum;
-import com.zcloud.modules.data.base.wh.dictionary.DeleteEnum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV11Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.GenderEnum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.PersonTypeEnum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.DeleteEnum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.DefaultResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV11/req/MaintenanceListReqDto.java

@@ -1,9 +1,9 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV11.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.dictionary.DeletedEnum;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV11Enum;
-import com.zcloud.modules.data.base.wh.dictionary.OperationStatus0Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.DeletedEnum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV11Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.OperationStatus0Enum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.DefaultResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV11/req/MeanwhileListReqDto.java

@@ -1,8 +1,8 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV11.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV11Enum;
-import com.zcloud.modules.data.base.wh.dictionary.*;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV11Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.*;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.DefaultResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV11/req/StartStopWorkListReqDto.java

@@ -1,10 +1,10 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV11.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV11Enum;
-import com.zcloud.modules.data.base.wh.dictionary.OperationStatusEnum;
-import com.zcloud.modules.data.base.wh.dictionary.StartStopTypeEnum;
-import com.zcloud.modules.data.base.wh.dictionary.DeleteEnum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV11Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.OperationStatusEnum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.StartStopTypeEnum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.DeleteEnum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.DefaultResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV11/req/WorkJobReqDto.java

@@ -1,11 +1,11 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV11.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV11Enum;
-import com.zcloud.modules.data.base.wh.dictionary.IsContractorWorkEnumDto;
-import com.zcloud.modules.data.base.wh.dictionary.TicketBigTypeEnum;
-import com.zcloud.modules.data.base.wh.dictionary.TicketTypeEnum;
-import com.zcloud.modules.data.base.wh.dictionary.DeleteEnum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV11Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.IsContractorWorkEnumDto;
+import com.zcloud.modules.data.enums.wh.hebei.enums.TicketBigTypeEnum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.TicketTypeEnum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.DeleteEnum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.DefaultResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV11/req/WorkTicketFileReqDto.java

@@ -1,8 +1,8 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV11.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV11Enum;
-import com.zcloud.modules.data.base.wh.dictionary.FileTypeEnum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV11Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.FileTypeEnum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.DefaultResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV11/req/WorkTicketReqDto.java

@@ -1,8 +1,8 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV11.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV11Enum;
-import com.zcloud.modules.data.base.wh.dictionary.*;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV11Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.*;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.DefaultResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV11/req/WorkVideoReqDto.java

@@ -1,8 +1,8 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV11.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV11Enum;
-import com.zcloud.modules.data.base.wh.dictionary.DeleteEnum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV11Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.DeleteEnum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.DefaultResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV12/req/GetCheckItemReqDto.java

@@ -1,7 +1,7 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV12.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV12Enum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV12Enum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.GetCheckItemResDto;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.GetCheckTaskResDto;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV12/req/GetCheckScoreReqDto.java

@@ -1,7 +1,7 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV12.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV12Enum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV12Enum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.GetCheckItemResDto;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.GetCheckScoreResDto;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.GetCheckTaskResDto;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV12/req/GetCheckTaskReqDto.java

@@ -1,7 +1,7 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV12.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV12Enum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV12Enum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.GetCheckTaskResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV12/req/GetLogReqDto.java

@@ -1,7 +1,7 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV12.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV12Enum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV12Enum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.getLogResDto;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV12/req/GetRequestLogReqDto.java

@@ -1,6 +1,6 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV12.req;
 
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV12Enum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV12Enum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.GetRequestLogResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV12/req/ReceiveCheckDangerListReqDto.java

@@ -1,10 +1,10 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV12.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV12Enum;
-import com.zcloud.modules.data.base.wh.dictionary.CheckType0Enum;
-import com.zcloud.modules.data.base.wh.dictionary.DeleteEnum;
-import com.zcloud.modules.data.base.wh.dictionary.HarmTypeEnum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV12Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.CheckType0Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.DeleteEnum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.HarmTypeEnum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.DefaultResDto;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.GetCheckTaskResDto;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV12/req/ReceiveControlMeasuresListReqDto.java

@@ -1,11 +1,11 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV12.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.dictionary.Classify1Enum;
-import com.zcloud.modules.data.base.wh.dictionary.Classify2Enum;
-import com.zcloud.modules.data.base.wh.dictionary.DataSrcEnum;
-import com.zcloud.modules.data.base.wh.dictionary.DeleteEnum;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV12Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.Classify1Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.Classify2Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.DataSrcEnum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.DeleteEnum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV12Enum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.DefaultResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV12/req/ReceiveDangerInvestigationListReqDto.java

@@ -1,8 +1,8 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV12.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV12Enum;
-import com.zcloud.modules.data.base.wh.dictionary.*;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV12Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.*;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.DefaultResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV12/req/ReceiveEventListReqDto.java

@@ -1,8 +1,8 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV12.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.dictionary.DeleteEnum;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV12Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.DeleteEnum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV12Enum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.DefaultResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV12/req/ReceiveMeasuresTaskListReqDto.java

@@ -1,11 +1,11 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV12.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV12Enum;
-import com.zcloud.modules.data.base.wh.dictionary.CheckCycleUnitEnum;
-import com.zcloud.modules.data.base.wh.dictionary.DeleteEnum;
-import com.zcloud.modules.data.base.wh.dictionary.WorkDayTypeEnum;
-import com.zcloud.modules.data.base.wh.dictionary.WorkTypeEnum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV12Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.CheckCycleUnitEnum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.DeleteEnum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.WorkDayTypeEnum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.WorkTypeEnum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.DefaultResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV12/req/ReceiveMeasuresTaskRecordListReqDto.java

@@ -1,7 +1,7 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV12.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV12Enum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV12Enum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.DefaultResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/zcloud/modules/data/dto/wh/HeBeiReportV12/req/ReceiveUnitListReqDto.java

@@ -1,8 +1,8 @@
 package com.zcloud.modules.data.dto.wh.HeBeiReportV12.req;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zcloud.modules.data.base.wh.dictionary.DeleteEnum;
-import com.zcloud.modules.data.base.wh.url.HeBeiReportV12Enum;
+import com.zcloud.modules.data.enums.wh.hebei.enums.DeleteEnum;
+import com.zcloud.modules.data.enums.wh.hebei.url.HeBeiReportV12Enum;
 import com.zcloud.modules.data.dto.wh.HeBeiReportV12.res.DefaultResDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;