Merge branch 'master' of http://192.168.168.218/wcyuee/szpt

src/main/java/com/zksy/szpt/domain/dto/CommonDelDTO.java

 package com.zksy.szpt.domain.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 public class CommonDelDTO {
     /**
-     * 账户ID
+     * ID
      */
-    @NotEmpty(message = "账户ID不能为空")
+    @NotEmpty(message = "ID不能为空")
+    @ApiModelProperty(value = "id")
     private List<String> ids;
 
-    /**
-     * 所属单位
-     */
-    @NotEmpty(message = "数据归属单位不能为空")
-    private String sjgsdwdm;
+//    /**
+//     * 所属单位
+//     */
+//    @NotEmpty(message = "数据归属单位不能为空")
+//    private String sjgsdwdm;
 
-    public @NotEmpty(message = "账户ID不能为空") List<String> getIds() {
+    public @NotEmpty(message = "ID不能为空") List<String> getIds() {
         return ids;
     }
-    public void setIds(@NotEmpty(message = "账户ID不能为空") List<String> ids) {
+    public void setIds(@NotEmpty(message = "ID不能为空") List<String> ids) {
         this.ids = ids;
     }
 
-    public String getSjgsdwdm() {
-        return sjgsdwdm;
-    }
-
-    public void setSjgsdwdm(String sjgsdwdm) {
-        this.sjgsdwdm = sjgsdwdm;
-    }
+//    public String getSjgsdwdm() {
+//        return sjgsdwdm;
+//    }
+//
+//    public void setSjgsdwdm(String sjgsdwdm) {
+//        this.sjgsdwdm = sjgsdwdm;
+//    }
 
 }
\ No newline at end of file

src/main/java/com/zksy/szpt/domain/dto/CommonDelIntDTO.java

 package com.zksy.szpt.domain.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 public class CommonDelIntDTO {
 
     /**
-     * 账户ID
+     * ID
      */
-    @NotEmpty(message = "账户ID不能为空")
+    @NotEmpty(message = "ID不能为空")
+    @ApiModelProperty(value = "ids")
     private List<Integer> ids;
 
     /**
      * 数据所属单位
      */
     @NotEmpty(message = "数据归属单位不能为空")
+    @ApiModelProperty(value = "数据归属单位")
     private String sjgsdwdm;
 
     public List<Integer> getIds() {

src/main/java/com/zksy/szpt/domain/dto/CommonDelParamDTO.java

 package com.zksy.szpt.domain.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 public class CommonDelParamDTO {
     /**
-     * 账户ID
+     * ID
      */
     @NotEmpty(message = "ID不能为空")
+    @ApiModelProperty(value = "ID")
     private List<String> ids;
 
 

src/main/java/com/zksy/szpt/domain/dto/SzptClockInRulesDTO.java

@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 
 public class SzptClockInRulesDTO {
     /**
-     *
+     * id
      */
     @ApiModelProperty(value = "id")
     private Integer id;
@@ -41,7 +41,7 @@ public class SzptClockInRulesDTO {
     /**
      * 学校类型
      */
-    @ApiModelProperty(value = "学校类型")
+    @ApiModelProperty(value = "学校类型('0':'幼儿园','1':'小学','2':'中学')")
     private String cslx;
 
     /**

src/main/java/com/zksy/szpt/domain/dto/SzptFwxxDTO.java

@@ -233,6 +233,7 @@ public class SzptFwxxDTO {
     /**
      * 房主证件照片
      */
+    @ApiModelProperty(value = "房主证件照片")
     private String fzzjzp;
 
     public String getQyid() {

src/main/java/com/zksy/szpt/domain/dto/SzptGdYjDTO.java

@@ -63,7 +63,7 @@ public class SzptGdYjDTO {
      * 预警状态 cslb=3107
      */
     @NotBlank(message = "预警状态不能为空")
-    @ApiModelProperty(value = "状态('0':'待确认','1':'已确认')")
+    @ApiModelProperty(value = "预警状态('0':'待确认','1':'已确认')")
     private String yjzt;
 
     /**

src/main/java/com/zksy/szpt/domain/dto/XxShxxyDTO.java

@@ -133,7 +133,7 @@ public class XxShxxyDTO {
      * 上报发送状态;cslb=1037
      */
     @NotBlank(message = "上报发送状态不能为空")
-    @ApiModelProperty(value = "职业类型('0':'初始', '1':'上报成功', '2':'上报失败', '3': '处理中', '9':'待上报')")
+    @ApiModelProperty(value = "上报发送状态('0':'初始', '1':'上报成功', '2':'上报失败', '3': '处理中', '9':'待上报')")
     private String sbfszt;
 
     /**

src/main/java/com/zksy/szpt/domain/dto/XxYjdwdmDTO.java

@@ -11,7 +11,7 @@ public class XxYjdwdmDTO {
     /**
      * 义警队伍代码ID
      */
-    @NotBlank(message = "义警队伍代码不能为空")
+    @NotBlank(message = "义警队伍代码ID不能为空")
     @ApiModelProperty(value = "义警队伍代码ID")
     private String id;
 

src/test/java/com/zksy/szpt/MainTestX.java

@@ -6,6 +6,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -135,7 +136,7 @@ public class MainTestX {
     public void szptFwxxAddTest() {
         //请求参数
         SzptFwxxDTO szptFwxxDTO = new SzptFwxxDTO();
-        szptFwxxDTO.setQyid("5");
+        szptFwxxDTO.setQyid("3");
         szptFwxxDTO.setCsid("123456");
         szptFwxxDTO.setFwjc("123456");
         szptFwxxDTO.setJzqk("1");
@@ -226,14 +227,11 @@ public class MainTestX {
     @DisplayName("房屋信息--删除")
     public void szptFwxxDeleteTest() {
         //请求参数
-        List<String> ids = new ArrayList<>();
-        ids.add("1");
-        ids.add("3");
-        ids.add("5");
-        ids.add("demo");
+        List<String> ids = new ArrayList<>(Arrays.asList("1","2","3"));
+//        ids.add("5");;
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
-        commonDelDTO.setSjgsdwdm("330102");
+//        commonDelDTO.setSjgsdwdm("330102");
         TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptFwxx", commonDelDTO, CommonDelDTO.class);
     }
 
@@ -281,7 +279,7 @@ public class MainTestX {
         ids.add("2");
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
-        commonDelDTO.setSjgsdwdm("330102");
+//        commonDelDTO.setSjgsdwdm("330102");
         TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptGdCsyjhldx", commonDelDTO, CommonDelDTO.class);
     }
 
@@ -397,7 +395,7 @@ public class MainTestX {
         ids.add("2");
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
-        commonDelDTO.setSjgsdwdm("330102");
+//        commonDelDTO.setSjgsdwdm("330102");
         TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptGdRyxx", commonDelDTO, CommonDelDTO.class);
     }
 
@@ -473,7 +471,7 @@ public class MainTestX {
         ids.add("5");
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
-        commonDelDTO.setSjgsdwdm("330102");
+//        commonDelDTO.setSjgsdwdm("330102");
         TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptGdSbxx", commonDelDTO, CommonDelDTO.class);
     }
 
@@ -584,7 +582,7 @@ public class MainTestX {
         ids.add("3");
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
-        commonDelDTO.setSjgsdwdm("330102");
+//        commonDelDTO.setSjgsdwdm("330102");
         TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptGdXx", commonDelDTO, CommonDelDTO.class);
     }
 
@@ -646,7 +644,7 @@ public class MainTestX {
 //        ids.add("1876887147652833281");
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
-        commonDelDTO.setSjgsdwdm("330102");
+//        commonDelDTO.setSjgsdwdm("330102");
         TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptGdYj", commonDelDTO, CommonDelDTO.class);
     }
 
@@ -717,7 +715,7 @@ public class MainTestX {
         ids.add("3");
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
-        commonDelDTO.setSjgsdwdm("330102");
+//        commonDelDTO.setSjgsdwdm("330102");
         TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptQyxx", commonDelDTO, CommonDelDTO.class);
     }
 
@@ -783,7 +781,7 @@ public class MainTestX {
         ids.add("3");
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
-        commonDelDTO.setSjgsdwdm("330102");
+//        commonDelDTO.setSjgsdwdm("330102");
         TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhDkxx", commonDelDTO, CommonDelDTO.class);
     }
 
@@ -822,7 +820,7 @@ public class MainTestX {
         ids.add("3");
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
-        commonDelDTO.setSjgsdwdm("330102");
+//        commonDelDTO.setSjgsdwdm("330102");
         TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhKqmb", commonDelDTO, CommonDelDTO.class);
     }
 
@@ -886,7 +884,7 @@ public class MainTestX {
         ids.add("3");
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
-        commonDelDTO.setSjgsdwdm("330102");
+//        commonDelDTO.setSjgsdwdm("330102");
         TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhMbdh", commonDelDTO, CommonDelDTO.class);
     }
 
@@ -944,7 +942,7 @@ public class MainTestX {
         ids.add("3");
         CommonDelDTO commonDelDTO = new CommonDelDTO();
         commonDelDTO.setIds(ids);
-        commonDelDTO.setSjgsdwdm("330102");
+//        commonDelDTO.setSjgsdwdm("330102");
         TestHttpUtil.signatureAndRequest("/rest/index/deleteSzptXyzhXyxx", commonDelDTO, CommonDelDTO.class);
     }
 }