修改openapi接口

9fd21782 · zhangyingbin · c5ac8065 · 9fd21782 · 9fd21782 · 9fd21782
Commit 9fd21782 authored Apr 06, 2023 by zhangyingbin
10 changed files
--- a/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/ConstructionInfoService.java
+++ b/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/ConstructionInfoService.java
@@ -49,33 +49,33 @@ public class ConstructionInfoService extends AppBaseService<ConstructionInfoMode
     *
     * @param models
     */
-    private static void checkModel(ConstructionInfo models) {
+//    private static void checkModel(ConstructionInfo models) {
-        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+//        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
-            throw new BadRequest("设备唯一标识码不能为空！");
+//            throw new BadRequest("设备唯一标识码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+//        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getUscUnitCreditCode())) {
+//        if(ValidationUtil.isEmpty(models.getUscUnitCreditCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"施工单位统一社会信用代码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"施工单位统一社会信用代码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getUscUnitName())) {
+//        if(ValidationUtil.isEmpty(models.getUscUnitName())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"施工单位名称不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"施工单位名称不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getConstructionType())) {
+//        if(ValidationUtil.isEmpty(models.getConstructionType())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"施工类型(安装、改造、移装)不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"施工类型(安装、改造、移装)不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getUscInformId())) {
+//        if(ValidationUtil.isEmpty(models.getUscInformId())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"安装/改造/移装告知ID不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"安装/改造/移装告知ID不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getUscDate())) {
+//        if(ValidationUtil.isEmpty(models.getUscDate())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"施工时间不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"施工时间不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+//        if(ValidationUtil.isEmpty(models.getSyncDate())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncState())) {
+//        if(ValidationUtil.isEmpty(models.getSyncState())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
-        }
+//        }
-    }
+//    }
 }
--- a/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/DesignInfoService.java
+++ b/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/DesignInfoService.java
@@ -95,27 +95,27 @@ public class DesignInfoService extends AppBaseService<DesignInfoModel, DesignInf
     *
     * @param models
     */
-    private static void checkModel(DesignInfoModel models) {
+//    private static void checkModel(DesignInfoModel models) {
-        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+//        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
-            throw new BadRequest("设备唯一标识码不能为空！");
+//            throw new BadRequest("设备唯一标识码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+//        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getDesignUnitCreditCode())) {
+//        if(ValidationUtil.isEmpty(models.getDesignUnitCreditCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设计单位统一社会信用代码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设计单位统一社会信用代码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getDesignUnitName())) {
+//        if(ValidationUtil.isEmpty(models.getDesignUnitName())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设计单位名称不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设计单位名称不能为空！");
-        }
+//        }
-        if (ValidationUtil.isEmpty(models.getDesignUseDate())) {
+//        if (ValidationUtil.isEmpty(models.getDesignUseDate())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设计使用年限不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设计使用年限不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+//        if(ValidationUtil.isEmpty(models.getSyncDate())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncState())) {
+//        if(ValidationUtil.isEmpty(models.getSyncState())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
-        }
+//        }
-    }
+//    }
 }
--- a/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/MaintenanceInfoService.java
+++ b/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/MaintenanceInfoService.java
@@ -80,45 +80,45 @@ public class MaintenanceInfoService extends AppBaseService<MaintenanceInfoModel,
     *
     * @param models
     */
-    private static void checkModel(MaintenanceInfoModel models) {
+//    private static void checkModel(MaintenanceInfoModel models) {
-        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+//        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
-            throw new BadRequest("设备唯一标识码不能为空！");
+//            throw new BadRequest("设备唯一标识码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+//        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getMeUnitCreditCode())) {
+//        if(ValidationUtil.isEmpty(models.getMeUnitCreditCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保单位统一社会信用代码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保单位统一社会信用代码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getMeUnitName())) {
+//        if(ValidationUtil.isEmpty(models.getMeUnitName())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保单位名称不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保单位名称不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getRepairInformId())) {
+//        if(ValidationUtil.isEmpty(models.getRepairInformId())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保合同备案ID不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保合同备案ID不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getInformStart())) {
+//        if(ValidationUtil.isEmpty(models.getInformStart())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保合同开始日期不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保合同开始日期不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getInformEnd())) {
+//        if(ValidationUtil.isEmpty(models.getInformEnd())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保合同结束日期不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保合同结束日期不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getMeMaster())) {
+//        if(ValidationUtil.isEmpty(models.getMeMaster())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保负责人姓名不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保负责人姓名不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getEmergencycall())) {
+//        if(ValidationUtil.isEmpty(models.getEmergencycall())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"紧急救援电话不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"紧急救援电话不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getMeCycle())) {
+//        if(ValidationUtil.isEmpty(models.getMeCycle())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保周期(单位：月)不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"维保周期(单位：月)不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getMe24Telephone())) {
+//        if(ValidationUtil.isEmpty(models.getMe24Telephone())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"24小时维保电话不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"24小时维保电话不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+//        if(ValidationUtil.isEmpty(models.getSyncDate())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncState())) {
+//        if(ValidationUtil.isEmpty(models.getSyncState())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
-        }
+//        }
-    }
+//    }
 }
--- a/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/OtherInfoService.java
+++ b/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/OtherInfoService.java
@@ -48,18 +48,18 @@ public class OtherInfoService extends AppBaseService<OtherInfoModel, OtherInfo, 
     *
     * @param models
     */
-    private static void checkModel(OtherInfo models) {
+//    private static void checkModel(OtherInfo models) {
-        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+//        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
-            throw new BadRequest("设备唯一标识码不能为空！");
+//            throw new BadRequest("设备唯一标识码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+//        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+//        if(ValidationUtil.isEmpty(models.getSyncDate())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncState())) {
+//        if(ValidationUtil.isEmpty(models.getSyncState())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
-        }
+//        }
-    }
+//    }
 }
--- a/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/ProduceInfoService.java
+++ b/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/ProduceInfoService.java
@@ -136,43 +136,43 @@ public class ProduceInfoService extends AppBaseService<ProduceInfoModel, Produce
     *
     * @param models
     */
-    private static void checkModel(ProduceInfoModel models) {
+//    private static void checkModel(ProduceInfoModel models) {
+//
-        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+//        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
-            throw new BadRequest("设备唯一标识码不能为空！");
+//            throw new BadRequest("设备唯一标识码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+//        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getProduceUnitCreditCode())) {
+//        if(ValidationUtil.isEmpty(models.getProduceUnitCreditCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"制造单位统一社会信用代码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"制造单位统一社会信用代码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getProduceUnitName())) {
+//        if(ValidationUtil.isEmpty(models.getProduceUnitName())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"制造单位名称不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"制造单位名称不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getFactoryNum())) {
+//        if(ValidationUtil.isEmpty(models.getFactoryNum())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"出厂编号不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"出厂编号不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getProduceDate())) {
+//        if(ValidationUtil.isEmpty(models.getProduceDate())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"制造日期不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"制造日期不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getInspectionId())) {
+//        if(ValidationUtil.isEmpty(models.getInspectionId())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监督检验ID不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监督检验ID不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getProductCertificate())) {
+//        if(ValidationUtil.isEmpty(models.getProductCertificate())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"产品质量合格证明附件不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"产品质量合格证明附件不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getIumInstructions())) {
+//        if(ValidationUtil.isEmpty(models.getIumInstructions())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"安装及使用维护保养说明附件不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"安装及使用维护保养说明附件不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSupervisionCert())) {
+//        if(ValidationUtil.isEmpty(models.getSupervisionCert())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监督检验证书附件不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监督检验证书附件不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+//        if(ValidationUtil.isEmpty(models.getSyncDate())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncState())) {
+//        if(ValidationUtil.isEmpty(models.getSyncState())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
-        }
+//        }
-    }
+//    }
 }
--- a/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/RegistrationInfoService.java
+++ b/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/RegistrationInfoService.java
@@ -78,51 +78,51 @@ public class RegistrationInfoService extends AppBaseService<RegistrationInfoMode
     *
     * @param models
     */
-    private static void checkModel(RegistrationInfoModel models) {
+//    private static void checkModel(RegistrationInfoModel models) {
-        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+//        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
-            throw new BadRequest("设备唯一标识码不能为空！");
+//            throw new BadRequest("设备唯一标识码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+//        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getUseOrgCode())) {
+//        if(ValidationUtil.isEmpty(models.getUseOrgCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用登记证编号不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用登记证编号不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getEquCode())) {
+//        if(ValidationUtil.isEmpty(models.getEquCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备代码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备代码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getOrganizationCode())) {
+//        if(ValidationUtil.isEmpty(models.getOrganizationCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"登记机关组织机构代码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"登记机关组织机构代码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getOrganizationName())) {
+//        if(ValidationUtil.isEmpty(models.getOrganizationName())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"登记机关名称不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"登记机关名称不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getUseOrgId())) {
+//        if(ValidationUtil.isEmpty(models.getUseOrgId())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用登记ID不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用登记ID不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getEquList())) {
+//        if(ValidationUtil.isEmpty(models.getEquList())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备种类不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备种类不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getEquCategory())) {
+//        if(ValidationUtil.isEmpty(models.getEquCategory())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备类别不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备类别不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getEquDefine())) {
+//        if(ValidationUtil.isEmpty(models.getEquDefine())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备品种不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备品种不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getProductName())) {
+//        if(ValidationUtil.isEmpty(models.getProductName())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"产品名称不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"产品名称不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getEquType())) {
+//        if(ValidationUtil.isEmpty(models.getEquType())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备型号不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备型号不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getUseRegistCertificate())) {
+//        if(ValidationUtil.isEmpty(models.getUseRegistCertificate())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用登记证附件不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用登记证附件不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+//        if(ValidationUtil.isEmpty(models.getSyncDate())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncState())) {
+//        if(ValidationUtil.isEmpty(models.getSyncState())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
-        }
+//        }
-    }
+//    }
 }
--- a/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/StaffBaseInfoService.java
+++ b/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/StaffBaseInfoService.java
@@ -48,33 +48,33 @@ public class StaffBaseInfoService extends AppBaseService<StaffBaseInfoModel, Sta
     *
     * @param models
     */
-    private static void checkModel(StaffBaseInfo models) {
+//    private static void checkModel(StaffBaseInfo models) {
-        if(ValidationUtil.isEmpty(models.getOperatorId())) {
+//        if(ValidationUtil.isEmpty(models.getOperatorId())) {
-            throw new BadRequest("作业人员身份证号不能为空！");
+//            throw new BadRequest("作业人员身份证号不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getOperator())) {
+//        if(ValidationUtil.isEmpty(models.getOperator())) {
-            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"作业人员姓名不能为空！");
+//            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"作业人员姓名不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getUnitCode())) {
+//        if(ValidationUtil.isEmpty(models.getUnitCode())) {
-            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"工作单位代码不能为空！");
+//            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"工作单位代码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getUnit())) {
+//        if(ValidationUtil.isEmpty(models.getUnit())) {
-            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"工作单位名称不能为空！");
+//            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"工作单位名称不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getOperatorIdType())) {
+//        if(ValidationUtil.isEmpty(models.getOperatorIdType())) {
-            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"作业人员证件类型不能为空！");
+//            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"作业人员证件类型不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getPhone())) {
+//        if(ValidationUtil.isEmpty(models.getPhone())) {
-            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"联系电话不能为空！");
+//            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"联系电话不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getEmploymentDate())) {
+//        if(ValidationUtil.isEmpty(models.getEmploymentDate())) {
-            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"聘用时间不能为空！");
+//            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"聘用时间不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+//        if(ValidationUtil.isEmpty(models.getSyncDate())) {
-            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"同步时间不能为空！");
+//            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"同步时间不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncState())) {
+//        if(ValidationUtil.isEmpty(models.getSyncState())) {
-            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"同步状态不能为空！");
+//            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"同步状态不能为空！");
-        }
+//        }
-    }
+//    }
 }
--- a/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/StaffQualifInfoService.java
+++ b/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/StaffQualifInfoService.java
@@ -79,31 +79,31 @@ public class StaffQualifInfoService extends AppBaseService<StaffQualifInfoModel,
     *
     * @param models
     */
-    private static void checkModel(StaffQualifInfoModel models) {
+//    private static void checkModel(StaffQualifInfoModel models) {
-        if(ValidationUtil.isEmpty(models.getOperatorId())) {
+//        if(ValidationUtil.isEmpty(models.getOperatorId())) {
-            throw new BadRequest("作业人员身份证号不能为空！");
+//            throw new BadRequest("作业人员身份证号不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getOperationItem())) {
+//        if(ValidationUtil.isEmpty(models.getOperationItem())) {
-            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"作业项目名称不能为空！");
+//            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"作业项目名称不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getOperationItemCode())) {
+//        if(ValidationUtil.isEmpty(models.getOperationItemCode())) {
-            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"作业项目代号不能为空！");
+//            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"作业项目代号不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getEffectiveDate())) {
+//        if(ValidationUtil.isEmpty(models.getEffectiveDate())) {
-            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"有效日期不能为空！");
+//            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"有效日期不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getIssuingAuthor())) {
+//        if(ValidationUtil.isEmpty(models.getIssuingAuthor())) {
-            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"发证机关不能为空！");
+//            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"发证机关不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getQualificationCert())) {
+//        if(ValidationUtil.isEmpty(models.getQualificationCert())) {
-            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"资质证书附件不能为空！");
+//            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"资质证书附件不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+//        if(ValidationUtil.isEmpty(models.getSyncDate())) {
-            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"同步时间不能为空！");
+//            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"同步时间不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncState())) {
+//        if(ValidationUtil.isEmpty(models.getSyncState())) {
-            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"同步状态不能为空！");
+//            throw new BadRequest("作业人员身份证号为："+models.getOperatorId()+"的人员，"+"同步状态不能为空！");
-        }
+//        }
-    }
+//    }
 }
--- a/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/SuperviseInfoService.java
+++ b/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/SuperviseInfoService.java
@@ -47,24 +47,24 @@ public class SuperviseInfoService extends AppBaseService<SuperviseInfoModel, Sup
     *
     * @param models
     */
-    private static void checkModel(SuperviseInfo models) {
+//    private static void checkModel(SuperviseInfo models) {
-        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+//        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
-            throw new BadRequest("设备唯一标识码不能为空！");
+//            throw new BadRequest("设备唯一标识码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+//        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getOrgBranchCode())) {
+//        if(ValidationUtil.isEmpty(models.getOrgBranchCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"管辖分局组织机构代码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"管辖分局组织机构代码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getOrgBranchName())) {
+//        if(ValidationUtil.isEmpty(models.getOrgBranchName())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"管辖分局名称不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"管辖分局名称不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+//        if(ValidationUtil.isEmpty(models.getSyncDate())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncState())) {
+//        if(ValidationUtil.isEmpty(models.getSyncState())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
-        }
+//        }
-    }
+//    }
 }
--- a/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/UseInfoService.java
+++ b/amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/UseInfoService.java
@@ -48,61 +48,61 @@ public class UseInfoService extends AppBaseService<UseInfoModel, UseInfo, UseInf
     *
     * @param models
     */
-    private static void checkModel(UseInfo models) {
+//    private static void checkModel(UseInfo models) {
-        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
+//        if(ValidationUtil.isEmpty(models.getSequenceCode())) {
-            throw new BadRequest("设备唯一标识码不能为空！");
+//            throw new BadRequest("设备唯一标识码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
+//        if(ValidationUtil.isEmpty(models.getSuperviseCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"监管系统唯一编码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getUseUnitCreditCode())) {
+//        if(ValidationUtil.isEmpty(models.getUseUnitCreditCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用单位统一信用代码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用单位统一信用代码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getUseUnitName())) {
+//        if(ValidationUtil.isEmpty(models.getUseUnitName())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用单位名称不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用单位名称不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getUseInnerCode())) {
+//        if(ValidationUtil.isEmpty(models.getUseInnerCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用内部编号不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"使用内部编号不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getUseDate())) {
+//        if(ValidationUtil.isEmpty(models.getUseDate())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"投入使用日期不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"投入使用日期不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getAreaCode())) {
+//        if(ValidationUtil.isEmpty(models.getAreaCode())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备所在地区代码不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备所在地区代码不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getProvince())) {
+//        if(ValidationUtil.isEmpty(models.getProvince())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备使用地点_省不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备使用地点_省不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getCity())) {
+//        if(ValidationUtil.isEmpty(models.getCity())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备使用地点_市不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备使用地点_市不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getCounty())) {
+//        if(ValidationUtil.isEmpty(models.getCounty())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备使用地点_区（县）不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备使用地点_区（县）不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getStreet())) {
+//        if(ValidationUtil.isEmpty(models.getStreet())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备使用地点_街道（镇）不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备使用地点_街道（镇）不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getUsePlace())) {
+//        if(ValidationUtil.isEmpty(models.getUsePlace())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备使用场所(住宅小区、商业单位、学校、医院、政府机关、重要公共场所)不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备使用场所(住宅小区、商业单位、学校、医院、政府机关、重要公共场所)不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getAddress())) {
+//        if(ValidationUtil.isEmpty(models.getAddress())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备详细使用地址不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"设备详细使用地址不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSafetyManager())) {
+//        if(ValidationUtil.isEmpty(models.getSafetyManager())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"安全管理员不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"安全管理员不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getPhone())) {
+//        if(ValidationUtil.isEmpty(models.getPhone())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"安全管理员移动电话不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"安全管理员移动电话不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getPhone())) {
+//        if(ValidationUtil.isEmpty(models.getPhone())) {
-            throw new BadRequest("设备标识码为："+models.getEquState()+"的设备，"+"设备状态(1在用2停用3报废 4注销5迁出 6拆除 7目录外 8非法设备)不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getEquState()+"的设备，"+"设备状态(1在用2停用3报废 4注销5迁出 6拆除 7目录外 8非法设备)不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncDate())) {
+//        if(ValidationUtil.isEmpty(models.getSyncDate())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步时间不能为空！");
-        }
+//        }
-        if(ValidationUtil.isEmpty(models.getSyncState())) {
+//        if(ValidationUtil.isEmpty(models.getSyncState())) {
-            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
+//            throw new BadRequest("设备标识码为："+models.getSequenceCode()+"的设备，"+"同步状态不能为空！");
-        }
+//        }
-    }
+//    }
 }