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

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

@@ -2,6 +2,7 @@ package com.zksy.szpt.domain.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
 import java.util.Date;

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

@@ -3,6 +3,7 @@ package com.zksy.szpt.domain.dto;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
@@ -12,13 +13,6 @@ import java.util.Date;
 
 public class SzptGdRyxxDTO {
 
-
-
-    /**
-     * 人员ID
-     */
-    @NotBlank(message = "人员ID不能为空")
-    private String id;
     /**
      * 人口编码
      */
@@ -44,6 +38,7 @@ public class SzptGdRyxxDTO {
     /**
      * 性别;cslb=1065
      */
+    @ApiModelProperty(value = "性别(  '0':'未知的性别','1':'男性,'2':'女性','5':'女性改(变)男性', '6': '男性改(变)女性'), '9': '未说明的性别'")
     private String xb;
 
     /**
@@ -245,15 +240,6 @@ public class SzptGdRyxxDTO {
      */
     private String sjrzrs;
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-
     public String getRkbm() {
         return rkbm;
     }

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

 package com.zksy.szpt.domain.dto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 public class SzptGdSbxxDTO {
 
-
-    /**
-     * 设备ID
-     */
-    @NotBlank(message = "设备ID不能为空")
-    private String id;
     /**
      * 设备序列号
      */
@@ -64,6 +57,7 @@ public class SzptGdSbxxDTO {
      * 运行状态 cslb=1053
      */
     @NotBlank(message = "运行状态不能为空")
+    @ApiModelProperty(value = "")
     private String yxzt;
 
     /**
@@ -133,15 +127,6 @@ public class SzptGdSbxxDTO {
     @NotBlank(message = "登记公安机关名称不能为空")
     private String createGajgmc;
 
-
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
     public String getSbsn() {
         return sbsn;
     }

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

 package com.zksy.szpt.domain.dto;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 public class SzptQyxxDTO {
 
+    /**
+     * 区域ID
+     */
+    @NotBlank(message = "区域ID不能为空")
+    private String id;
     /**
      * 场所ID
      */
@@ -99,6 +107,14 @@ public class SzptQyxxDTO {
     @NotBlank(message = "登记公安机关名称不能为空")
     private String createGajgmc;
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getCsid() {
         return csid;
     }

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

@@ -3,6 +3,12 @@ package com.zksy.szpt.domain.dto;
 import javax.validation.constraints.NotBlank;
 
 public class SzptXyzhKqmbDTO {
+    /**
+     * 模板id
+     */
+    @NotBlank(message = "模板id不能为空")
+    private String id;
+
     /**
      * 模板名称
      */
@@ -15,6 +21,13 @@ public class SzptXyzhKqmbDTO {
     @NotBlank(message = "状态不能为空")
     private String zt;
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
     public String getMbmc() {
         return mbmc;
     }

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

@@ -6,6 +6,13 @@ import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 public class SzptXyzhMbdhDTO {
+
+    /**
+     * 模板itemid
+     */
+    @NotBlank(message = "模板itemid不能为空")
+    private String id;
+
     /**
      * 模板id
      */
@@ -85,6 +92,14 @@ public class SzptXyzhMbdhDTO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date gxsj;
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getMbid() {
         return mbid;
     }

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

 package com.zksy.szpt.domain.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 public class SzptXyzhXyxxDTO {
+    /**
+     *
+     */
+    @NotNull(message = "id不能为空")
+    private Integer id;
 
     /**
      * 学校名称
@@ -68,6 +73,13 @@ public class SzptXyzhXyxxDTO {
      */
     private String qrcode;
 
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
 
     public String getMc() {
         return mc;

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

 package com.zksy.szpt.domain.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
@@ -42,6 +44,7 @@ public class XxRwwcqkDTO {
      * 报名状态;cslb=1005
      */
     @NotBlank(message = "报名状态不能为空")
+    @ApiModelProperty(value = "报名状态( 1':'通过','2':'未通过'")
     private String bmzt;
 
     /**

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
@@ -25,6 +26,7 @@ public class XxShxxyDTO {
     /**
      * 信息员类型;cslb=1021,l,q
      */
+    @ApiModelProperty(value = "信息员类型('1':'普通信息员', '2': '耳目','3': '刑事特情')")
     private String xxylx;
 
     /**
@@ -40,6 +42,7 @@ public class XxShxxyDTO {
     /**
      * 等级;cslb=1031,l,q
      */
+    @ApiModelProperty(value = "等级('0':'惰性信息员', '1':'一般信息员','2':'活跃信息员', '3': '尖子信息员', '9': '僵尸信息员')")
     private String dj;
 
     /**
@@ -65,6 +68,7 @@ public class XxShxxyDTO {
     /**
      * 职业类型;cslb=1022,l
      */
+    @ApiModelProperty(value = "职业类型( '101': '小区（物业）保安', '102': '楼道小组长', '103': '环卫工人','104': '城管协管员','105': '交警协警员', '106': '报刊亭（人员）', '107':'邮递员','108': '志愿者','109': '社区工作者','110':'单位（综治）人员','111': '精卫医生', '112': '抄表员',  '113': '送奶工', '114': '巡防队员', '115':'其他人员', '116': '便衣抓捕队员', '117':'视频作战队员',  '118': '网格员',  '119': '网格员发展信息员', '120': '数字城管','123':'废旧金属回收','124': '打复誊店')")
     private String zylx;
 
     /**
@@ -116,6 +120,7 @@ public class XxShxxyDTO {
      * 上报发送状态;cslb=1037
      */
     @NotBlank(message = "上报发送状态不能为空")
+    @ApiModelProperty(value = "职业类型('0':'初始', '1':'上报成功', '2':'上报失败', '3': '处理中', '9':'待上报')")
     private String sbfszt;
 
     /**
@@ -132,6 +137,7 @@ public class XxShxxyDTO {
     /**
      * 回访标志;cslb=1152,l,q
      */
+    @ApiModelProperty(value = "回访标志( '1':'未回复','2': '不知晓', '3': '知晓')")
     private String hfbz;
 
     /**
@@ -152,6 +158,7 @@ public class XxShxxyDTO {
     /**
      * 状态;cslb=1008,l,q
      */
+    @ApiModelProperty(value = "状态('0': '注销',  '1',:'正常')")
     @NotBlank(message = "状态不能为空")
     private String zt;
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -36,6 +37,7 @@ public class XxZhjfbgDTO {
     /**
      * 变更类型;cslb=1019
      */
+    @ApiModelProperty(value = "变更类型('1':'奖励', '2': '兑换')")
     private String bglx;
 
     /**

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

 package com.zksy.szpt.domain.dto;
 
 
+import io.swagger.annotations.ApiModelProperty;
+
 import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
@@ -9,119 +11,142 @@ public class XxZhxxDTO {
      * 账户ID
      */
     @NotBlank(message = "账户ID不能为空")
+    @ApiModelProperty(value = "账户ID")
     private String zhid;
 
     /**
      * 账户类型;cslb=1004
      */
+    @ApiModelProperty(value = "账户类型('0':'微信', '1':'短信','2':'钉钉')")
     private String zhlx;
 
     /**
      * 社会信息员ID
      */
+    @ApiModelProperty(value = "社会信息员ID")
     private String xxyid;
 
     /**
      * 姓名
      */
+    @ApiModelProperty(value = "姓名")
     private String xm;
 
     /**
      * 身份证号
      */
+    @ApiModelProperty(value = "身份证号")
     private String sfzh;
 
     /**
      * 联系电话
      */
+    @ApiModelProperty(value = "联系电话")
     private String lxdh;
 
     /**
      * OPENID
      */
+    @ApiModelProperty(value = "OPENID")
     private String openid;
 
     /**
      * 昵称
      */
+    @ApiModelProperty(value = "昵称")
     private String nc;
 
     /**
      * UNIONID
      */
+    @ApiModelProperty(value = "UNIONID")
     private String unionid;
 
     /**
      * 发送情报数
      */
+    @ApiModelProperty(value = "发送情报数")
     private String fsqbs;
 
     /**
      * 小程序ID
      */
+    @ApiModelProperty(value = "小程序ID")
     private String accountid;
 
     /**
      * 前端权限,默认空,支持多个,逗号分隔
      */
+    @ApiModelProperty(value = "前端权限")
     private String roles;
 
     /**
      * 邀请码
      */
+    @ApiModelProperty(value = "邀请码")
     private String yqm;
 
     /**
      * 邀请码ID
      */
+    @ApiModelProperty(value = "邀请码ID")
     private String yqmid;
 
     /**
      * 处理标志;cslb=1017
      */
     @NotBlank(message = "处理标志不能为空")
+    @ApiModelProperty(value = "处理标志( '1':'处理成功','2':'处理失败', '3':'处理中')")
     private String clbz;
 
     /**
      * 处理时间
      */
+    @ApiModelProperty(value = "处理时间")
     private Date clsj;
 
     /**
      * 处理结果
      */
+    @ApiModelProperty(value = "处理结果")
     private String cljg;
 
     /**
      * 返回时间
      */
+    @ApiModelProperty(value = "返回时间")
     private Date fhsj;
 
     /**
      * OCUUID
      */
+    @ApiModelProperty(value = "OCUUID")
     private String ocuuid;
 
     /**
      * 帐号参数JSON
      */
+    @ApiModelProperty(value = "帐号参数JSON")
     private String zhcs;
 
     /**
      * 运营商户ID
      */
+    @ApiModelProperty(value = "运营商户ID")
     private String mchid;
 
     /**
      * 状态;cslb=1008
      */
     @NotBlank(message = "状态不能为空")
+    @ApiModelProperty(value = "状态('1':'正常', '0':'注销')")
     private String zt;
 
 
     /**
      * 头像
      */
+    @ApiModelProperty(value = "头像")
     private String avatar;
 
 

src/main/java/com/zksy/szpt/domain/po/SzptGdRyxx.java

 package com.zksy.szpt.domain.po;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
@@ -14,7 +15,7 @@ public class SzptGdRyxx {
     /**
      * 人员ID
      */
-    @TableId(type = IdType.INPUT)
+    @TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**
@@ -40,6 +41,7 @@ public class SzptGdRyxx {
     /**
      * 性别;cslb=1065
      */
+    @ApiModelProperty(value = "性别(  '0':'未知的性别','1':'男性,'2':'女性','5':'女性改(变)男性', '6': '男性改(变)女性'), '9': '未说明的性别'")
     private String xb;
 
     /**

src/main/java/com/zksy/szpt/domain/po/SzptXyzhXyxx.java

@@ -9,7 +9,7 @@ public class SzptXyzhXyxx {
     /**
      * 
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(type = IdType.INPUT)
     private Integer id;
 
     /**

src/main/java/com/zksy/szpt/domain/po/XxRwwcqk.java

 package com.zksy.szpt.domain.po;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
@@ -50,6 +51,7 @@ public class XxRwwcqk {
     /**
      * 报名状态;cslb=1005
      */
+    @ApiModelProperty(value = "报名状态(  '0':'待审核','1':'通过,'2':'未通过')")
     private String bmzt;
 
     /**

src/main/java/com/zksy/szpt/domain/po/XxShxxy.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
@@ -27,6 +28,7 @@ public class XxShxxy {
     /**
      * 信息员类型;cslb=1021,l,q
      */
+    @ApiModelProperty(value = "信息员类型('1':'普通信息员', '2': '耳目','3': '刑事特情')")
     private String xxylx;
 
     /**

src/main/java/com/zksy/szpt/domain/po/XxZhxx.java

 package com.zksy.szpt.domain.po;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
@@ -19,6 +20,7 @@ public class XxZhxx {
     /**
      * 账户类型;cslb=1004
      */
+    @ApiModelProperty(value = "账户类型('0':'微信', '1':'短信','2':'钉钉')")
     private String zhlx;
 
     /**
@@ -84,6 +86,7 @@ public class XxZhxx {
     /**
      * 处理标志;cslb=1017
      */
+    @ApiModelProperty(value = "账户类型( '0':'未处理','1':'处理成功,'2':'处理失败,'3':'处理中')")
     private String clbz;
 
     /**
@@ -119,6 +122,7 @@ public class XxZhxx {
     /**
      * 状态;cslb=1008
      */
+    @ApiModelProperty(value = "账户类型('0':'注销', '1':'正常')")
     private String zt;
 
     /**

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

@@ -49,7 +49,7 @@ public class MainTest {
         xxRwwcqkDTO.setShrid("123456785");
         xxRwwcqkDTO.setWczt("1");
         xxRwwcqkDTO.setBmzt("1");
-//        TestHttpUtil.signatureAndRequest("/rest/index/addXxRwwcqk", xxRwwcqkDTO, XxRwwcqkDTO.class);
+        TestHttpUtil.signatureAndRequest("/rest/index/addXxRwwcqk", xxRwwcqkDTO, XxRwwcqkDTO.class);
         TestHttpUtil.signatureAndRequest("/rest/index/updateXxRwwcqk", xxRwwcqkDTO, XxRwwcqkDTO.class);
     }
 
@@ -65,7 +65,7 @@ public class MainTest {
         dto.setXxyid("11");
         dto.setZt("2");
         dto.setClbz("2");
-//        TestHttpUtil.signatureAndRequest("/rest/xxZhxx/add", dto, XxZhxxDTO.class);
+        TestHttpUtil.signatureAndRequest("/rest/xxZhxx/add", dto, XxZhxxDTO.class);
         TestHttpUtil.signatureAndRequest("/rest/xxZhxx/update", dto, XxZhxxDTO.class);
     }
 
@@ -81,7 +81,7 @@ public class MainTest {
         dto.setDhid("12345678");
         dto.setQbid("2");
         dto.setBgsj(new Date());
-//        TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/add", dto, XxZhjfbgDTO.class);
+        TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/add", dto, XxZhjfbgDTO.class);
         TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/update", dto, XxZhjfbgDTO.class);
     }
 
@@ -144,7 +144,7 @@ public class MainTest {
         dto.setGzrs(1L);
         dto.setSfsh(1);
         dto.setWcrs(1L);
-//        TestHttpUtil.signatureAndRequest("/rest/xxYjrw/add", dto, XxYjrwDTO.class);
+        TestHttpUtil.signatureAndRequest("/rest/xxYjrw/add", dto, XxYjrwDTO.class);
         TestHttpUtil.signatureAndRequest("/rest/xxYjrw/update", dto, XxYjrwDTO.class);
     }
 
@@ -162,7 +162,7 @@ public class MainTest {
         dto.setMchid("11111");
         dto.setZt("1");
         dto.setYjdwmc("test");
-//        TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/add", dto, XxYjdwdmDTO.class);
+        TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/add", dto, XxYjdwdmDTO.class);
         TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/update", dto, XxYjdwdmDTO.class);
     }
 
@@ -173,7 +173,7 @@ public class MainTest {
         dto.setId("12345678");
         dto.setDwdm("12345678");
         dto.setShxxyid("12345678");
-//        TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/add", dto, XxShxxyDwDTO.class);
+        TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/add", dto, XxShxxyDwDTO.class);
         TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/update", dto, XxShxxyDwDTO.class);
     }
 
@@ -185,7 +185,7 @@ public class MainTest {
         dto.setZt("1");
         dto.setSbfszt("1");
         dto.setShrid("1");
-//        TestHttpUtil.signatureAndRequest("/rest/xxShxxy/add", dto, XxShxxyDTO.class);
+        TestHttpUtil.signatureAndRequest("/rest/xxShxxy/add", dto, XxShxxyDTO.class);
         TestHttpUtil.signatureAndRequest("/rest/xxShxxy/update", dto, XxShxxyDTO.class);
     }
 
@@ -203,8 +203,13 @@ public class MainTest {
 //        String url="xxYjdwdm/delete";
 //        String url="xxYjrw/delete";
 //        String url="xxZhjfbg/delete";
-        String url = "xxZhxx/delete";
-        TestHttpUtil.signatureAndRequest("/rest/"+url, dto, CommonDelParamDTO.class);
+//        String url = "xxZhxx/delete";
+        TestHttpUtil.signatureAndRequest("/rest/xxShxxyDw/delete", dto, CommonDelParamDTO.class);
+        TestHttpUtil.signatureAndRequest("/rest/xxShxxy/delete", dto, CommonDelParamDTO.class);
+        TestHttpUtil.signatureAndRequest("/rest/xxYjdwdm/delete", dto, CommonDelParamDTO.class);
+        TestHttpUtil.signatureAndRequest("/rest/xxYjrw/delete", dto, CommonDelParamDTO.class);
+        TestHttpUtil.signatureAndRequest("/rest/xxZhjfbg/delete", dto, CommonDelParamDTO.class);
+        TestHttpUtil.signatureAndRequest("/rest/xxZhxx/delete", dto, CommonDelParamDTO.class);
     }
 
 }