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

rest.http

@@ -29,8 +29,8 @@ x-szpt-sign: cf9292d20f20c3705cabe1f08d07bec7
 }
 
 
-######
 ######打卡
+######2
 POST http://localhost:8086/rest/index/addSzptClockIn
 Content-Type: application/json
 x-szpt-appid: 1
@@ -43,11 +43,19 @@ x-szpt-sign: cf9292d20f20c3705cabe1f08d07bec7
   "sbqd":"wer",
   "xbqt": "1",
   "xcqk": "2",
-  "sbsj": "3"
+  "sbsj": "3",
+  "sbr":"23",
+  "qdr":"wer",
+  "qdrlxdh": "1",
+  "qddkdd": "2",
+  "qddkzp": "3",
+  "qtdkdd":"wer",
+  "qtdkzp": "1",
+  "gkdj": "2"
 }
 
-######
 ######打卡规则
+######3
 POST http://localhost:8086/rest/index/addSzptClockInRules
 Content-Type: application/json
 x-szpt-appid: 1
@@ -60,12 +68,13 @@ x-szpt-sign: cf9292d20f20c3705cabe1f08d07bec7
   "csid":"23",
   "chockInTime":"wer",
   "clockInScope": "1",
+  "qrCode": "1",
   "cslx": "2",
   "bz": "3"
 }
 
-######
 ######房屋信息
+######4
 POST http://localhost:8086/rest/index/addSzptFwxx
 Content-Type: application/json
 x-szpt-appid: 1
@@ -111,3 +120,164 @@ x-szpt-sign: cf9292d20f20c3705cabe1f08d07bec7
   "sjgsdwdm": "2",
   "sjgsdwmc":"1"
 }
+
+######工地场所预警忽略对象
+######5
+POST http://localhost:8086/rest/index/addSzptGdCsyjhldx
+Content-Type: application/json
+x-szpt-appid: 1
+x-szpt-timestamp: 21
+x-szpt-nonce: nonce
+x-szpt-sign: cf9292d20f20c3705cabe1f08d07bec7
+
+{
+  "csid":"1",
+  "yjlx":"2",
+  "yjzlx": "3",
+  "ywid": "4",
+  "ywms": "5",
+  "bz": "6",
+  "zt": "7"
+}
+
+
+######工地人员信息
+######6
+POST http://localhost:8086/rest/index/addSzptGdRyxx
+Content-Type: application/json
+x-szpt-appid: 1
+x-szpt-timestamp: 21
+x-szpt-nonce: nonce
+x-szpt-sign: cf9292d20f20c3705cabe1f08d07bec7
+
+{
+  "rkbm":"1",
+  "csid":"2",
+  "cjrlid": "3",
+  "xm": "4",
+  "xb": "5",
+  "lxdh": "6",
+  "cyzjdm": "7",
+  "zjhm":"8",
+  "nl":"9",
+  "url": "10",
+  "md5": "11",
+  "zjcxts": 12,
+  "zcxts": 13,
+  "ysrczjts": "14",
+  "ysrcbz":"1",
+  "ysrczts":"16",
+  "ckbz": "1",
+  "lkbz": "1",
+  "hjdzDzmc": "19",
+  "hjdzXzqhdm": "20",
+  "hjdzPcsmc": "21",
+  "hjdzPcsdm":"22",
+  "xzdDzmc":"23",
+  "xzdXzqhdm": "24",
+  "xzdPcsmc": "25",
+  "xzdPcsdm": "26",
+  "zt": "1",
+  "jcsj": "2024-12-27 00:00:01",
+  "tcsj":"2024-12-27 00:00:01",
+  "yjtcsj":"2024-12-27 00:00:01",
+  "zjzpsj": "2024-12-27 00:00:01",
+  "sfglry": "1",
+  "djzt": "1",
+  "qyid": "34",
+  "qymc": "35",
+  "rylb":"1",
+  "rylx": "37",
+  "lkbdsj": "2024-12-27 00:00:01",
+  "ckbdsj": "2024-12-27 00:00:01",
+  "datasource": "40",
+  "orderid": "41",
+  "sjrzrs": "42"
+}
+
+
+
+######工地设备信息
+######7
+POST http://localhost:8086/rest/index/addSzptGdSbxx
+Content-Type: application/json
+x-szpt-appid: 1
+x-szpt-timestamp: 21
+x-szpt-nonce: nonce
+x-szpt-sign: cf9292d20f20c3705cabe1f08d07bec7
+
+{
+  "sbsn":"1",
+  "sbmc":"2",
+  "sbbh": "3",
+  "sbms": "4",
+  "mac": "5",
+  "ip": "6",
+  "netmask": "7",
+  "gw":"8",
+  "csid":"9",
+  "yxzt": "10",
+  "ztgxsj": "2024-12-27 00:00:01",
+  "cj": 12,
+  "xh": 13,
+  "qyid": "14",
+  "qymc":"1",
+  "sbcs":"16",
+  "sblb": "1",
+  "zt": "1",
+  "sjgsdwdm": "19",
+  "sjgsdwmc": "20",
+  "createGajgjgdm": "21",
+  "createGajgmc":"22"
+}
+
+
+######工地信息
+######8
+POST http://localhost:8086/rest/index/addSzptGdXx
+Content-Type: application/json
+x-szpt-appid: 1
+x-szpt-timestamp: 21
+x-szpt-nonce: nonce
+x-szpt-sign: cf9292d20f20c3705cabe1f08d07bec7
+
+{
+  "cslx":"1",
+  "csmc":"2",
+  "csms": "3",
+  "lxdz": "4",
+  "lxr": "5",
+  "lxdh": "6",
+  "sgdw": "7",
+  "sgxkz":"8",
+  "kgrq":"2024-12-27 00:00:01",
+  "yjjgrq": "2024-12-27 00:00:01",
+  "lng": "2024-12-27 00:00:01",
+  "lat": 12,
+  "customlng": 13,
+  "customlat": "14",
+  "zrrxm":"1",
+  "zrrlxdh":"16",
+  "frxm": "1",
+  "frlxdh": "1",
+  "shxydm": "19",
+  "zcdz": "20",
+  "adminzh": "21",
+  "sfzcs":"1",
+  "fcsid": 13,
+  "bz": "14",
+  "cjsj":"2024-12-27 00:00:01",
+  "zt":"1",
+  "jhsj": "2024-12-27 00:00:01",
+  "location": "1",
+  "sjlyXtmc": "19",
+  "zxsj": "2024-12-27 00:00:01",
+  "sqdm": "21",
+  "sqmc":"22",
+  "mdlx":"1",
+  "mdjyzt": "1",
+  "sjgsdwdm": "1",
+  "sjgsdwmc": "19",
+  "createGajgjgdm": "20",
+  "createGajgmc": "21"
+}
\ No newline at end of file

src/main/java/com/zksy/szpt/controller/IndexController.java

 package com.zksy.szpt.controller;
 
-import com.zksy.szpt.domain.dto.SzptClockInDTO;
-import com.zksy.szpt.domain.dto.SzptClockInRulesDTO;
-import com.zksy.szpt.domain.dto.SzptFwxxDTO;
-import com.zksy.szpt.domain.dto.XxRwwcqkDTO;
+import com.zksy.szpt.domain.dto.*;
 import com.zksy.szpt.service.IndexService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -34,19 +31,43 @@ public class IndexController {
 
     @ApiOperation(value="新增szpt_clock_in数据")
     @PostMapping("/addSzptClockIn")
-    public Integer addSzptClockIn(@RequestBody @Valid SzptClockInDTO szptClockInDTO){
+    public Integer addSzptClockIn(@RequestBody @Validated SzptClockInDTO szptClockInDTO){
         return indexService.addSzptClockIn(szptClockInDTO);
     }
 
     @ApiOperation(value="新增szpt_clock_in_rules数据")
     @PostMapping("/addSzptClockInRules")
-    public Integer addSzptClockInRules(@RequestBody @Valid SzptClockInRulesDTO szptClockInRulesDTO){
+    public Integer addSzptClockInRules(@RequestBody @Validated SzptClockInRulesDTO szptClockInRulesDTO){
         return indexService.addSzptClockInRules(szptClockInRulesDTO);
     }
 
-    @ApiOperation(value="新增szpt_fwxx数据")
+    @ApiOperation(value="新增房屋信息数据")
     @PostMapping("/addSzptFwxx")
     public Integer addSzptFwxx(@RequestBody @Validated SzptFwxxDTO szptFwxxDTO){
         return indexService.addSzptFwxx(szptFwxxDTO);
     }
+
+    @ApiOperation(value="新增场所预警忽略对象数据")
+    @PostMapping("/addSzptGdCsyjhldx")
+    public Integer addSzptGdCsyjhldx(@RequestBody @Validated SzptGdCsyjhldxDTO szptGdCsyjhldxDTO){
+        return indexService.addSzptGdCsyjhldx(szptGdCsyjhldxDTO);
+    }
+
+    @ApiOperation(value="新增工地人员信息数据")
+    @PostMapping("/addSzptGdRyxx")
+    public Integer addSzptGdRyxx(@RequestBody @Validated SzptGdRyxxDTO szptGdRyxxDTO){
+        return indexService.addSzptGdRyxx(szptGdRyxxDTO);
+    }
+
+    @ApiOperation(value="新增设备信息数据")
+    @PostMapping("/addSzptGdSbxx")
+    public Integer addSzptGdSbxx(@RequestBody @Validated SzptGdSbxxDTO szptGdSbxxDTO){
+        return indexService.addSzptGdSbxx(szptGdSbxxDTO);
+    }
+
+    @ApiOperation(value="新增工地信息数据")
+    @PostMapping("/addSzptGdXx")
+    public Integer addSzptGdXx(@RequestBody @Validated SzptGdXxDTO szptGdXxDTO){
+        return indexService.addSzptGdXx(szptGdXxDTO);
+    }
 }

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

@@ -33,15 +33,15 @@ public class SzptClockInDTO {
      */
     private String sbr;
 
-    /**
-     *
-     */
-    private Date createTime;
-
-    /**
-     *
-     */
-    private Date updateTime;
+//    /**
+//     *
+//     */
+//    private Date createTime;
+//
+//    /**
+//     *
+//     */
+//    private Date updateTime;
 
     /**
      * 签到人
@@ -126,21 +126,21 @@ public class SzptClockInDTO {
         this.sbr = sbr == null ? null : sbr.trim();
     }
 
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
+//    public Date getCreateTime() {
+//        return createTime;
+//    }
+//
+//    public void setCreateTime(Date createTime) {
+//        this.createTime = createTime;
+//    }
+//
+//    public Date getUpdateTime() {
+//        return updateTime;
+//    }
+//
+//    public void setUpdateTime(Date updateTime) {
+//        this.updateTime = updateTime;
+//    }
 
     public String getQdr() {
         return qdr;

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

@@ -39,15 +39,6 @@ public class SzptClockInRulesDTO {
      */
     private String bz;
 
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
 
     public String getName() {
         return name;
@@ -105,19 +96,4 @@ public class SzptClockInRulesDTO {
         this.bz = bz == null ? null : bz.trim();
     }
 
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
 }

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

+package com.zksy.szpt.domain.dto;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+public class SzptGdCsyjhldxDTO {
+
+    /**
+     * 场所id
+     */
+    @NotBlank(message = "场所id不能为空")
+    private String csid;
+
+    /**
+     * 预警类型;cslb=3106
+     */
+    @NotBlank(message = "场所类别不能为空")
+    private String yjlx;
+
+    /**
+     * 预警子类型;cslb=3139
+     */
+    private String yjzlx;
+
+    /**
+     * 业务ID
+     */
+    private String ywid;
+
+    /**
+     * 业务描述
+     */
+    private String ywms;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空")
+    private String bz;
+
+    /**
+     * 状态;cslb=3101
+     */
+    private String zt;
+
+    public String getCsid() {
+        return csid;
+    }
+
+    public void setCsid(String csid) {
+        this.csid = csid == null ? null : csid.trim();
+    }
+
+    public String getYjlx() {
+        return yjlx;
+    }
+
+    public void setYjlx(String yjlx) {
+        this.yjlx = yjlx == null ? null : yjlx.trim();
+    }
+
+    public String getYjzlx() {
+        return yjzlx;
+    }
+
+    public void setYjzlx(String yjzlx) {
+        this.yjzlx = yjzlx == null ? null : yjzlx.trim();
+    }
+
+    public String getYwid() {
+        return ywid;
+    }
+
+    public void setYwid(String ywid) {
+        this.ywid = ywid == null ? null : ywid.trim();
+    }
+
+    public String getYwms() {
+        return ywms;
+    }
+
+    public void setYwms(String ywms) {
+        this.ywms = ywms == null ? null : ywms.trim();
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz == null ? null : bz.trim();
+    }
+
+    public String getZt() {
+        return zt;
+    }
+
+    public void setZt(String zt) {
+        this.zt = zt == null ? null : zt.trim();
+    }
+}

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

+package com.zksy.szpt.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Null;
+import java.util.Date;
+
+public class SzptGdRyxxDTO {
+
+    /**
+     * 人口编码
+     */
+    private String rkbm;
+
+    /**
+     * 场所ID
+     */
+    @NotBlank(message = "场所ID不能为空")
+    private String csid;
+
+    /**
+     * 厂家人脸id
+     */
+    private String cjrlid;
+
+    /**
+     * 姓名
+     */
+    private String xm;
+
+    /**
+     * 性别;cslb=1065
+     */
+    private String xb;
+
+    /**
+     * 联系电话
+     */
+    private String lxdh;
+
+    /**
+     * 证件种类
+     */
+    private String cyzjdm;
+
+    /**
+     * 证件号码
+     */
+    private String zjhm;
+
+    /**
+     * 年龄
+     */
+    private String nl;
+
+    /**
+     * 图片URL
+     */
+    private String url;
+
+    /**
+     * 图片MD5
+     */
+    private String md5;
+
+    /**
+     * 最近出现天数
+     */
+    @NotNull(message = "最近出现天数不能为空")
+    private Integer zjcxts;
+
+    /**
+     * 总出现天数
+     */
+    @NotNull(message = "总出现天数不能为空")
+    private Integer zcxts;
+
+    /**
+     * 疑似入场统计最近出现天数
+     */
+    @NotNull(message = "疑似入场统计最近出现天数不能为空")
+    private Integer ysrczjts;
+
+    /**
+     * 疑似入场标志 cslb=3001
+     */
+    @NotBlank(message = "疑似入场标志不能为空")
+    private String ysrcbz;
+
+    /**
+     * 疑似入场统计总出现天数
+     */
+    @NotNull(message = "疑似入场统计总出现天数不能为空")
+    private Integer ysrczts;
+
+    /**
+     * 常口标志0、否，1、是
+     */
+    @NotBlank(message = "常口标志不能为空")
+    private String ckbz;
+
+    /**
+     * 流动人口标志0、否，1、是
+     */
+    @NotBlank(message = "流动人口标志不能为空")
+    private String lkbz;
+
+    /**
+     * 户籍地地址名称
+     */
+    private String hjdzDzmc;
+
+    /**
+     * 户籍地址行政区划代码
+     */
+    private String hjdzXzqhdm;
+
+    /**
+     * 户籍地派出所名称
+     */
+    private String hjdzPcsmc;
+
+    /**
+     * 户籍地址派出所代码
+     */
+    private String hjdzPcsdm;
+
+    /**
+     * 现住地地址名称
+     */
+    private String xzdDzmc;
+
+    /**
+     * 现住地址行政区划代码
+     */
+    private String xzdXzqhdm;
+
+    /**
+     * 现住地派出所名称
+     */
+    private String xzdPcsmc;
+
+    /**
+     * 现住地派出所代码
+     */
+    private String xzdPcsdm;
+
+    /**
+     * 状态;cslb=3101
+     */
+    @NotBlank(message = "状态不能为空")
+    private String zt;
+
+    /**
+     * 进场时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jcsj;
+
+    /**
+     * 退场时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date tcsj;
+
+    /**
+     * 预计退场时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjtcsj;
+
+    /**
+     * 最近抓拍时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zjzpsj;
+
+    /**
+     * 是否关联已经登记人员 cslb=3001
+     */
+    private String sfglry;
+
+    /**
+     * 登记状态, 0-未登记，1-登记
+     */
+    private Integer djzt;
+
+    /**
+     * 区域ID
+     */
+    private String qyid;
+
+    /**
+     * 区域名称
+     */
+    private String qymc;
+
+    /**
+     * 人员类别 cslb=3110：1-用户，2-访客，3-房东及实际管理人，8-员工
+     */
+    private String rylb;
+
+    /**
+     * 人员类型 cslb=3111：1111-工人，1121-住户，2121-普通访客，8121-物管，...
+     */
+    private String rylx;
+
+    /**
+     * 流口比对时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date lkbdsj;
+
+    /**
+     * 常口比对时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ckbdsj;
+
+    /**
+     * 数据来源
+     */
+    private String datasource;
+
+    /**
+     * 订单编号
+     */
+    private String orderid;
+
+    /**
+     * 实际入住人数
+     */
+    private String sjrzrs;
+
+
+    public String getRkbm() {
+        return rkbm;
+    }
+
+    public void setRkbm(String rkbm) {
+        this.rkbm = rkbm == null ? null : rkbm.trim();
+    }
+
+    public String getCsid() {
+        return csid;
+    }
+
+    public void setCsid(String csid) {
+        this.csid = csid == null ? null : csid.trim();
+    }
+
+    public String getCjrlid() {
+        return cjrlid;
+    }
+
+    public void setCjrlid(String cjrlid) {
+        this.cjrlid = cjrlid == null ? null : cjrlid.trim();
+    }
+
+    public String getXm() {
+        return xm;
+    }
+
+    public void setXm(String xm) {
+        this.xm = xm == null ? null : xm.trim();
+    }
+
+    public String getXb() {
+        return xb;
+    }
+
+    public void setXb(String xb) {
+        this.xb = xb == null ? null : xb.trim();
+    }
+
+    public String getLxdh() {
+        return lxdh;
+    }
+
+    public void setLxdh(String lxdh) {
+        this.lxdh = lxdh == null ? null : lxdh.trim();
+    }
+
+    public String getCyzjdm() {
+        return cyzjdm;
+    }
+
+    public void setCyzjdm(String cyzjdm) {
+        this.cyzjdm = cyzjdm == null ? null : cyzjdm.trim();
+    }
+
+    public String getZjhm() {
+        return zjhm;
+    }
+
+    public void setZjhm(String zjhm) {
+        this.zjhm = zjhm == null ? null : zjhm.trim();
+    }
+
+    public String getNl() {
+        return nl;
+    }
+
+    public void setNl(String nl) {
+        this.nl = nl == null ? null : nl.trim();
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url == null ? null : url.trim();
+    }
+
+    public String getMd5() {
+        return md5;
+    }
+
+    public void setMd5(String md5) {
+        this.md5 = md5 == null ? null : md5.trim();
+    }
+
+    public Integer getZjcxts() {
+        return zjcxts;
+    }
+
+    public void setZjcxts(Integer zjcxts) {
+        this.zjcxts = zjcxts;
+    }
+
+    public Integer getZcxts() {
+        return zcxts;
+    }
+
+    public void setZcxts(Integer zcxts) {
+        this.zcxts = zcxts;
+    }
+
+    public Integer getYsrczjts() {
+        return ysrczjts;
+    }
+
+    public void setYsrczjts(Integer ysrczjts) {
+        this.ysrczjts = ysrczjts;
+    }
+
+    public String getYsrcbz() {
+        return ysrcbz;
+    }
+
+    public void setYsrcbz(String ysrcbz) {
+        this.ysrcbz = ysrcbz == null ? null : ysrcbz.trim();
+    }
+
+    public Integer getYsrczts() {
+        return ysrczts;
+    }
+
+    public void setYsrczts(Integer ysrczts) {
+        this.ysrczts = ysrczts;
+    }
+
+    public String getCkbz() {
+        return ckbz;
+    }
+
+    public void setCkbz(String ckbz) {
+        this.ckbz = ckbz == null ? null : ckbz.trim();
+    }
+
+    public String getLkbz() {
+        return lkbz;
+    }
+
+    public void setLkbz(String lkbz) {
+        this.lkbz = lkbz == null ? null : lkbz.trim();
+    }
+
+    public String getHjdzDzmc() {
+        return hjdzDzmc;
+    }
+
+    public void setHjdzDzmc(String hjdzDzmc) {
+        this.hjdzDzmc = hjdzDzmc == null ? null : hjdzDzmc.trim();
+    }
+
+    public String getHjdzXzqhdm() {
+        return hjdzXzqhdm;
+    }
+
+    public void setHjdzXzqhdm(String hjdzXzqhdm) {
+        this.hjdzXzqhdm = hjdzXzqhdm == null ? null : hjdzXzqhdm.trim();
+    }
+
+    public String getHjdzPcsmc() {
+        return hjdzPcsmc;
+    }
+
+    public void setHjdzPcsmc(String hjdzPcsmc) {
+        this.hjdzPcsmc = hjdzPcsmc == null ? null : hjdzPcsmc.trim();
+    }
+
+    public String getHjdzPcsdm() {
+        return hjdzPcsdm;
+    }
+
+    public void setHjdzPcsdm(String hjdzPcsdm) {
+        this.hjdzPcsdm = hjdzPcsdm == null ? null : hjdzPcsdm.trim();
+    }
+
+    public String getXzdDzmc() {
+        return xzdDzmc;
+    }
+
+    public void setXzdDzmc(String xzdDzmc) {
+        this.xzdDzmc = xzdDzmc == null ? null : xzdDzmc.trim();
+    }
+
+    public String getXzdXzqhdm() {
+        return xzdXzqhdm;
+    }
+
+    public void setXzdXzqhdm(String xzdXzqhdm) {
+        this.xzdXzqhdm = xzdXzqhdm == null ? null : xzdXzqhdm.trim();
+    }
+
+    public String getXzdPcsmc() {
+        return xzdPcsmc;
+    }
+
+    public void setXzdPcsmc(String xzdPcsmc) {
+        this.xzdPcsmc = xzdPcsmc == null ? null : xzdPcsmc.trim();
+    }
+
+    public String getXzdPcsdm() {
+        return xzdPcsdm;
+    }
+
+    public void setXzdPcsdm(String xzdPcsdm) {
+        this.xzdPcsdm = xzdPcsdm == null ? null : xzdPcsdm.trim();
+    }
+
+    public String getZt() {
+        return zt;
+    }
+
+    public void setZt(String zt) {
+        this.zt = zt == null ? null : zt.trim();
+    }
+
+    public Date getJcsj() {
+        return jcsj;
+    }
+
+    public void setJcsj(Date jcsj) {
+        this.jcsj = jcsj;
+    }
+
+    public Date getTcsj() {
+        return tcsj;
+    }
+
+    public void setTcsj(Date tcsj) {
+        this.tcsj = tcsj;
+    }
+
+    public Date getYjtcsj() {
+        return yjtcsj;
+    }
+
+    public void setYjtcsj(Date yjtcsj) {
+        this.yjtcsj = yjtcsj;
+    }
+
+    public Date getZjzpsj() {
+        return zjzpsj;
+    }
+
+    public void setZjzpsj(Date zjzpsj) {
+        this.zjzpsj = zjzpsj;
+    }
+
+    public String getSfglry() {
+        return sfglry;
+    }
+
+    public void setSfglry(String sfglry) {
+        this.sfglry = sfglry == null ? null : sfglry.trim();
+    }
+
+    public Integer getDjzt() {
+        return djzt;
+    }
+
+    public void setDjzt(Integer djzt) {
+        this.djzt = djzt;
+    }
+
+    public String getQyid() {
+        return qyid;
+    }
+
+    public void setQyid(String qyid) {
+        this.qyid = qyid == null ? null : qyid.trim();
+    }
+
+    public String getQymc() {
+        return qymc;
+    }
+
+    public void setQymc(String qymc) {
+        this.qymc = qymc == null ? null : qymc.trim();
+    }
+
+    public String getRylb() {
+        return rylb;
+    }
+
+    public void setRylb(String rylb) {
+        this.rylb = rylb == null ? null : rylb.trim();
+    }
+
+    public String getRylx() {
+        return rylx;
+    }
+
+    public void setRylx(String rylx) {
+        this.rylx = rylx == null ? null : rylx.trim();
+    }
+
+    public Date getLkbdsj() {
+        return lkbdsj;
+    }
+
+    public void setLkbdsj(Date lkbdsj) {
+        this.lkbdsj = lkbdsj;
+    }
+
+    public Date getCkbdsj() {
+        return ckbdsj;
+    }
+
+    public void setCkbdsj(Date ckbdsj) {
+        this.ckbdsj = ckbdsj;
+    }
+
+    public String getDatasource() {
+        return datasource;
+    }
+
+    public void setDatasource(String datasource) {
+        this.datasource = datasource == null ? null : datasource.trim();
+    }
+
+    public String getOrderid() {
+        return orderid;
+    }
+
+    public void setOrderid(String orderid) {
+        this.orderid = orderid == null ? null : orderid.trim();
+    }
+
+    public String getSjrzrs() {
+        return sjrzrs;
+    }
+
+    public void setSjrzrs(String sjrzrs) {
+        this.sjrzrs = sjrzrs == null ? null : sjrzrs.trim();
+    }
+}

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

+package com.zksy.szpt.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+public class SzptGdSbxxDTO {
+    /**
+     * 设备序列号
+     */
+    private String sbsn;
+
+    /**
+     * 设备名称
+     */
+    private String sbmc;
+
+    /**
+     * 设备编号
+     */
+    private String sbbh;
+
+    /**
+     * 设备描述
+     */
+    private String sbms;
+
+    /**
+     * mac地址
+     */
+    private String mac;
+
+    /**
+     * ip地址
+     */
+    private String ip;
+
+    /**
+     * 子网掩码
+     */
+    private String netmask;
+
+    /**
+     * 网关
+     */
+    private String gw;
+
+    /**
+     * 场所id
+     */
+    private String csid;
+
+    /**
+     * 运行状态 cslb=1053
+     */
+    @NotBlank(message = "运行状态不能为空")
+    private String yxzt;
+
+    /**
+     * 状态更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date ztgxsj;
+
+    /**
+     * 厂家
+     */
+    private String cj;
+
+    /**
+     * 型号
+     */
+    private String xh;
+
+    /**
+     * 区域ID
+     */
+    private String qyid;
+
+    /**
+     * 区域名称
+     */
+    private String qymc;
+
+    /**
+     * 设备参数，json
+     */
+    private String sbcs;
+
+    /**
+     * 设备类别;cslb=3112
+     */
+    @NotBlank(message = "设备类别不能为空")
+    private String sblb;
+
+    /**
+     * 状态;cslb=3101
+     */
+    @NotBlank(message = "状态不能为空")
+    private String zt;
+
+    /**
+     * 数据归属单位代码
+     */
+    @NotBlank(message = "数据归属单位代码不能为空")
+    private String sjgsdwdm;
+
+    /**
+     * 数据归属单位名称
+     */
+    private String sjgsdwmc;
+
+    /**
+     * 登记公安机关机构代码
+     */
+    @NotBlank(message = "登记公安机关机构代码不能为空")
+    private String createGajgjgdm;
+
+    /**
+     * 登记公安机关名称
+     */
+    @NotBlank(message = "登记公安机关名称不能为空")
+    private String createGajgmc;
+
+
+
+    public String getSbsn() {
+        return sbsn;
+    }
+
+    public void setSbsn(String sbsn) {
+        this.sbsn = sbsn == null ? null : sbsn.trim();
+    }
+
+    public String getSbmc() {
+        return sbmc;
+    }
+
+    public void setSbmc(String sbmc) {
+        this.sbmc = sbmc == null ? null : sbmc.trim();
+    }
+
+    public String getSbbh() {
+        return sbbh;
+    }
+
+    public void setSbbh(String sbbh) {
+        this.sbbh = sbbh == null ? null : sbbh.trim();
+    }
+
+    public String getSbms() {
+        return sbms;
+    }
+
+    public void setSbms(String sbms) {
+        this.sbms = sbms == null ? null : sbms.trim();
+    }
+
+    public String getMac() {
+        return mac;
+    }
+
+    public void setMac(String mac) {
+        this.mac = mac == null ? null : mac.trim();
+    }
+
+    public String getIp() {
+        return ip;
+    }
+
+    public void setIp(String ip) {
+        this.ip = ip == null ? null : ip.trim();
+    }
+
+    public String getNetmask() {
+        return netmask;
+    }
+
+    public void setNetmask(String netmask) {
+        this.netmask = netmask == null ? null : netmask.trim();
+    }
+
+    public String getGw() {
+        return gw;
+    }
+
+    public void setGw(String gw) {
+        this.gw = gw == null ? null : gw.trim();
+    }
+
+    public String getCsid() {
+        return csid;
+    }
+
+    public void setCsid(String csid) {
+        this.csid = csid == null ? null : csid.trim();
+    }
+
+    public String getYxzt() {
+        return yxzt;
+    }
+
+    public void setYxzt(String yxzt) {
+        this.yxzt = yxzt == null ? null : yxzt.trim();
+    }
+
+    public Date getZtgxsj() {
+        return ztgxsj;
+    }
+
+    public void setZtgxsj(Date ztgxsj) {
+        this.ztgxsj = ztgxsj;
+    }
+
+    public String getCj() {
+        return cj;
+    }
+
+    public void setCj(String cj) {
+        this.cj = cj == null ? null : cj.trim();
+    }
+
+    public String getXh() {
+        return xh;
+    }
+
+    public void setXh(String xh) {
+        this.xh = xh == null ? null : xh.trim();
+    }
+
+    public String getQyid() {
+        return qyid;
+    }
+
+    public void setQyid(String qyid) {
+        this.qyid = qyid == null ? null : qyid.trim();
+    }
+
+    public String getQymc() {
+        return qymc;
+    }
+
+    public void setQymc(String qymc) {
+        this.qymc = qymc == null ? null : qymc.trim();
+    }
+
+    public String getSbcs() {
+        return sbcs;
+    }
+
+    public void setSbcs(String sbcs) {
+        this.sbcs = sbcs == null ? null : sbcs.trim();
+    }
+
+    public String getSblb() {
+        return sblb;
+    }
+
+    public void setSblb(String sblb) {
+        this.sblb = sblb == null ? null : sblb.trim();
+    }
+
+    public String getZt() {
+        return zt;
+    }
+
+    public void setZt(String zt) {
+        this.zt = zt == null ? null : zt.trim();
+    }
+
+    public String getSjgsdwdm() {
+        return sjgsdwdm;
+    }
+
+    public void setSjgsdwdm(String sjgsdwdm) {
+        this.sjgsdwdm = sjgsdwdm == null ? null : sjgsdwdm.trim();
+    }
+
+    public String getSjgsdwmc() {
+        return sjgsdwmc;
+    }
+
+    public void setSjgsdwmc(String sjgsdwmc) {
+        this.sjgsdwmc = sjgsdwmc == null ? null : sjgsdwmc.trim();
+    }
+
+    public String getCreateGajgjgdm() {
+        return createGajgjgdm;
+    }
+
+    public void setCreateGajgjgdm(String createGajgjgdm) {
+        this.createGajgjgdm = createGajgjgdm == null ? null : createGajgjgdm.trim();
+    }
+
+    public String getCreateGajgmc() {
+        return createGajgmc;
+    }
+
+    public void setCreateGajgmc(String createGajgmc) {
+        this.createGajgmc = createGajgmc == null ? null : createGajgmc.trim();
+    }
+
+}

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

+package com.zksy.szpt.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+public class SzptGdXxDTO {
+
+    /**
+     * 场所类型;cslb=3109
+     */
+    @NotBlank(message = "场所类型不能为空")
+    private String cslx;
+
+    /**
+     * 场所名称
+     */
+    @NotBlank(message = "场所名称不能为空")
+    private String csmc;
+
+    /**
+     * 场所描述
+     */
+    @NotBlank(message = "场所描述不能为空")
+    private String csms;
+
+    /**
+     * 联系地址
+     */
+    private String lxdz;
+
+    /**
+     * 联系人
+     */
+    private String lxr;
+
+    /**
+     * 联系电话
+     */
+    private String lxdh;
+
+    /**
+     * 施工单位
+     */
+    private String sgdw;
+
+    /**
+     * 施工许可证
+     */
+    private String sgxkz;
+
+    /**
+     * 开工日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date kgrq;
+
+    /**
+     * 预计竣工日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yjjgrq;
+
+    /**
+     * 经度
+     */
+    private String lng;
+
+    /**
+     * 纬度
+     */
+    private String lat;
+
+    /**
+     * 自定义经度
+     */
+    private String customlng;
+
+    /**
+     * 自定义纬度
+     */
+    private String customlat;
+
+    /**
+     * 责任人
+     */
+    private String zrrxm;
+
+    /**
+     * 责任人联系电话
+     */
+    private String zrrlxdh;
+
+    /**
+     * 法人
+     */
+    private String frxm;
+
+    /**
+     * 法人联系电话
+     */
+    private String frlxdh;
+
+    /**
+     * 社会信用代码
+     */
+    private String shxydm;
+
+    /**
+     * 注册地址
+     */
+    private String zcdz;
+
+    /**
+     * 管理员手机号
+     */
+    private String adminzh;
+
+    /**
+     * 是否子场所;cslb=3001
+     */
+    @NotBlank(message = "是否子场所不能为空")
+    private String sfzcs;
+
+    /**
+     * 父场所ID
+     */
+    private String fcsid;
+
+    /**
+     * 备注
+     */
+    private String bz;
+
+    /**
+     * 创建时间
+     */
+//    @NotBlank(message = "创建时间不能为空")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date cjsj;
+
+    /**
+     * 场所状态;cslb=3104
+     */
+    @NotBlank(message = "场所状态不能为空")
+    private String zt;
+
+    /**
+     * 激活时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date jhsj;
+
+    /**
+     * 点位坐标
+     */
+    private String location;
+
+    /**
+     * 数据来源系统名称
+     */
+    private String sjlyXtmc;
+
+    /**
+     * 转历史时间  格式：yyyy-MM-dd HH:mm:ss
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date zxsj;
+
+    /**
+     * 社区代码
+     */
+    private String sqdm;
+
+    /**
+     * 社区名称
+     */
+    private String sqmc;
+
+    /**
+     * 门店类型(4001)：0-普通住宅，1-酒店式公寓，2-自建房，9-其他
+     */
+    private String mdlx;
+
+    /**
+     * 门店经营状态(4013)：0-正常，1-歇业
+     */
+    private String mdjyzt;
+
+    /**
+     * 数据归属单位代码
+     */
+    @NotBlank(message = "数据归属单位代码不能为空")
+    private String sjgsdwdm;
+
+    /**
+     * 数据归属单位名称
+     */
+    private String sjgsdwmc;
+
+    /**
+     * 登记公安机关机构代码
+     */
+    @NotBlank(message = "登记公安机关机构代码不能为空")
+    private String createGajgjgdm;
+
+    /**
+     * 登记公安机关名称
+     */
+    @NotBlank(message = "登记公安机关名称不能为空")
+    private String createGajgmc;
+
+
+    public String getCslx() {
+        return cslx;
+    }
+
+    public void setCslx(String cslx) {
+        this.cslx = cslx == null ? null : cslx.trim();
+    }
+
+    public String getCsmc() {
+        return csmc;
+    }
+
+    public void setCsmc(String csmc) {
+        this.csmc = csmc == null ? null : csmc.trim();
+    }
+
+    public String getCsms() {
+        return csms;
+    }
+
+    public void setCsms(String csms) {
+        this.csms = csms == null ? null : csms.trim();
+    }
+
+    public String getLxdz() {
+        return lxdz;
+    }
+
+    public void setLxdz(String lxdz) {
+        this.lxdz = lxdz == null ? null : lxdz.trim();
+    }
+
+    public String getLxr() {
+        return lxr;
+    }
+
+    public void setLxr(String lxr) {
+        this.lxr = lxr == null ? null : lxr.trim();
+    }
+
+    public String getLxdh() {
+        return lxdh;
+    }
+
+    public void setLxdh(String lxdh) {
+        this.lxdh = lxdh == null ? null : lxdh.trim();
+    }
+
+    public String getSgdw() {
+        return sgdw;
+    }
+
+    public void setSgdw(String sgdw) {
+        this.sgdw = sgdw == null ? null : sgdw.trim();
+    }
+
+    public String getSgxkz() {
+        return sgxkz;
+    }
+
+    public void setSgxkz(String sgxkz) {
+        this.sgxkz = sgxkz == null ? null : sgxkz.trim();
+    }
+
+    public Date getKgrq() {
+        return kgrq;
+    }
+
+    public void setKgrq(Date kgrq) {
+        this.kgrq = kgrq;
+    }
+
+    public Date getYjjgrq() {
+        return yjjgrq;
+    }
+
+    public void setYjjgrq(Date yjjgrq) {
+        this.yjjgrq = yjjgrq;
+    }
+
+    public String getLng() {
+        return lng;
+    }
+
+    public void setLng(String lng) {
+        this.lng = lng == null ? null : lng.trim();
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat == null ? null : lat.trim();
+    }
+
+    public String getCustomlng() {
+        return customlng;
+    }
+
+    public void setCustomlng(String customlng) {
+        this.customlng = customlng == null ? null : customlng.trim();
+    }
+
+    public String getCustomlat() {
+        return customlat;
+    }
+
+    public void setCustomlat(String customlat) {
+        this.customlat = customlat == null ? null : customlat.trim();
+    }
+
+    public String getZrrxm() {
+        return zrrxm;
+    }
+
+    public void setZrrxm(String zrrxm) {
+        this.zrrxm = zrrxm == null ? null : zrrxm.trim();
+    }
+
+    public String getZrrlxdh() {
+        return zrrlxdh;
+    }
+
+    public void setZrrlxdh(String zrrlxdh) {
+        this.zrrlxdh = zrrlxdh == null ? null : zrrlxdh.trim();
+    }
+
+    public String getFrxm() {
+        return frxm;
+    }
+
+    public void setFrxm(String frxm) {
+        this.frxm = frxm == null ? null : frxm.trim();
+    }
+
+    public String getFrlxdh() {
+        return frlxdh;
+    }
+
+    public void setFrlxdh(String frlxdh) {
+        this.frlxdh = frlxdh == null ? null : frlxdh.trim();
+    }
+
+    public String getShxydm() {
+        return shxydm;
+    }
+
+    public void setShxydm(String shxydm) {
+        this.shxydm = shxydm == null ? null : shxydm.trim();
+    }
+
+    public String getZcdz() {
+        return zcdz;
+    }
+
+    public void setZcdz(String zcdz) {
+        this.zcdz = zcdz == null ? null : zcdz.trim();
+    }
+
+    public String getAdminzh() {
+        return adminzh;
+    }
+
+    public void setAdminzh(String adminzh) {
+        this.adminzh = adminzh == null ? null : adminzh.trim();
+    }
+
+    public String getSfzcs() {
+        return sfzcs;
+    }
+
+    public void setSfzcs(String sfzcs) {
+        this.sfzcs = sfzcs == null ? null : sfzcs.trim();
+    }
+
+    public String getFcsid() {
+        return fcsid;
+    }
+
+    public void setFcsid(String fcsid) {
+        this.fcsid = fcsid == null ? null : fcsid.trim();
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz == null ? null : bz.trim();
+    }
+
+    public Date getCjsj() {
+        return cjsj;
+    }
+
+    public void setCjsj(Date cjsj) {
+        this.cjsj = cjsj;
+    }
+
+    public String getZt() {
+        return zt;
+    }
+
+    public void setZt(String zt) {
+        this.zt = zt == null ? null : zt.trim();
+    }
+
+    public Date getJhsj() {
+        return jhsj;
+    }
+
+    public void setJhsj(Date jhsj) {
+        this.jhsj = jhsj;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location == null ? null : location.trim();
+    }
+
+    public String getSjlyXtmc() {
+        return sjlyXtmc;
+    }
+
+    public void setSjlyXtmc(String sjlyXtmc) {
+        this.sjlyXtmc = sjlyXtmc == null ? null : sjlyXtmc.trim();
+    }
+
+    public Date getZxsj() {
+        return zxsj;
+    }
+
+    public void setZxsj(Date zxsj) {
+        this.zxsj = zxsj;
+    }
+
+    public String getSqdm() {
+        return sqdm;
+    }
+
+    public void setSqdm(String sqdm) {
+        this.sqdm = sqdm == null ? null : sqdm.trim();
+    }
+
+    public String getSqmc() {
+        return sqmc;
+    }
+
+    public void setSqmc(String sqmc) {
+        this.sqmc = sqmc == null ? null : sqmc.trim();
+    }
+
+    public String getMdlx() {
+        return mdlx;
+    }
+
+    public void setMdlx(String mdlx) {
+        this.mdlx = mdlx == null ? null : mdlx.trim();
+    }
+
+    public String getMdjyzt() {
+        return mdjyzt;
+    }
+
+    public void setMdjyzt(String mdjyzt) {
+        this.mdjyzt = mdjyzt == null ? null : mdjyzt.trim();
+    }
+
+    public String getSjgsdwdm() {
+        return sjgsdwdm;
+    }
+
+    public void setSjgsdwdm(String sjgsdwdm) {
+        this.sjgsdwdm = sjgsdwdm == null ? null : sjgsdwdm.trim();
+    }
+
+    public String getSjgsdwmc() {
+        return sjgsdwmc;
+    }
+
+    public void setSjgsdwmc(String sjgsdwmc) {
+        this.sjgsdwmc = sjgsdwmc == null ? null : sjgsdwmc.trim();
+    }
+
+    public String getCreateGajgjgdm() {
+        return createGajgjgdm;
+    }
+
+    public void setCreateGajgjgdm(String createGajgjgdm) {
+        this.createGajgjgdm = createGajgjgdm == null ? null : createGajgjgdm.trim();
+    }
+
+    public String getCreateGajgmc() {
+        return createGajgmc;
+    }
+
+    public void setCreateGajgmc(String createGajgmc) {
+        this.createGajgmc = createGajgmc == null ? null : createGajgmc.trim();
+    }
+}

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

 package com.zksy.szpt.domain.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.util.Date;
 
@@ -47,11 +45,13 @@ public class SzptClockIn {
     /**
      * 
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
      * 
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date updateTime;
 
     /**

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

 package com.zksy.szpt.domain.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.util.Date;
 
@@ -52,11 +50,13 @@ public class SzptClockInRules {
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
      * 更新时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date updateTime;
 
     public Integer getId() {

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

 package com.zksy.szpt.domain.po;
 
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.util.Date;
 
+@TableName
 public class SzptGdCsyjhldx {
     /**
      * 流水IID
@@ -11,6 +14,7 @@ public class SzptGdCsyjhldx {
     /**
      * 流水ID
      */
+    @TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**
@@ -51,37 +55,44 @@ public class SzptGdCsyjhldx {
     /**
      * 创建人id
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createId;
 
     /**
      * 创建人
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
     /**
      * 创建日期
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
      * 创建操作终端: web,app,import
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createTerminal;
 
     /**
      * 创建操作ip
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createIp;
 
     /**
      * 更新日期
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date updateTime;
 
     /**
      * 删除状态(0-正常,1-删除至回收站)
      */
-    private Boolean delFlag;
+    @TableField(fill = FieldFill.INSERT)
+    private Integer delFlag;
 
     public Long getIid() {
         return iid;
@@ -203,11 +214,11 @@ public class SzptGdCsyjhldx {
         this.updateTime = updateTime;
     }
 
-    public Boolean getDelFlag() {
+    public Integer getDelFlag() {
         return delFlag;
     }
 
-    public void setDelFlag(Boolean delFlag) {
+    public void setDelFlag(Integer delFlag) {
         this.delFlag = delFlag;
     }
 }
\ No newline at end of file

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

 package com.zksy.szpt.domain.po;
 
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.util.Date;
 
+@TableName
 public class SzptGdRyxx {
     /**
      * IID
@@ -11,6 +14,7 @@ public class SzptGdRyxx {
     /**
      * 人员ID
      */
+    @TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**
@@ -176,7 +180,7 @@ public class SzptGdRyxx {
     /**
      * 登记状态, 0-未登记，1-登记
      */
-    private Boolean djzt;
+    private Integer djzt;
 
     /**
      * 区域ID
@@ -201,36 +205,43 @@ public class SzptGdRyxx {
     /**
      * 创建人id
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createId;
 
     /**
      * 创建人
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
     /**
      * 创建日期
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
      * 更新人id
      */
+    @TableField(fill = FieldFill.INSERT)
     private String updateId;
 
     /**
      * 更新人
      */
+    @TableField(fill = FieldFill.INSERT)
     private String updateBy;
 
     /**
      * 更新日期
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date updateTime;
 
     /**
      * 删除状态(0-正常,1-删除至回收站)
      */
+    @TableField(fill = FieldFill.INSERT)
     private Integer delFlag;
 
     /**
@@ -530,11 +541,11 @@ public class SzptGdRyxx {
         this.sfglry = sfglry == null ? null : sfglry.trim();
     }
 
-    public Boolean getDjzt() {
+    public Integer getDjzt() {
         return djzt;
     }
 
-    public void setDjzt(Boolean djzt) {
+    public void setDjzt(Integer djzt) {
         this.djzt = djzt;
     }
 

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

 package com.zksy.szpt.domain.po;
 
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.util.Date;
 
+@TableName
 public class SzptGdSbxx {
     /**
      * 设备IID
@@ -11,6 +14,7 @@ public class SzptGdSbxx {
     /**
      * 设备ID
      */
+    @TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**
@@ -96,16 +100,19 @@ public class SzptGdSbxx {
     /**
      * 设备类别;cslb=3112
      */
+    @TableField(fill = FieldFill.INSERT)
     private String sblb;
 
     /**
      * 状态;cslb=3101
      */
+    @TableField(fill = FieldFill.INSERT)
     private String zt;
 
     /**
      * 数据归属单位代码
      */
+    @TableField(fill = FieldFill.INSERT)
     private String sjgsdwdm;
 
     /**
@@ -116,46 +123,55 @@ public class SzptGdSbxx {
     /**
      * 登记公安机关机构代码
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createGajgjgdm;
 
     /**
      * 登记公安机关名称
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createGajgmc;
 
     /**
      * 创建人id
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createId;
 
     /**
      * 创建人
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
     /**
      * 创建日期
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
      * 更新人id
      */
+    @TableField(fill = FieldFill.INSERT)
     private String updateId;
 
     /**
      * 更新人
      */
+    @TableField(fill = FieldFill.INSERT)
     private String updateBy;
 
     /**
      * 更新日期
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date updateTime;
 
     /**
      * 删除状态(0-正常,1-删除至回收站)
      */
+    @TableField(fill = FieldFill.INSERT)
     private Integer delFlag;
 
     public Long getIid() {

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

 package com.zksy.szpt.domain.po;
 
+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 com.fasterxml.jackson.annotation.JsonFormat;
+
 import java.util.Date;
 
 public class SzptGdXx {
@@ -11,6 +17,7 @@ public class SzptGdXx {
     /**
      * 场所ID
      */
+    @TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**
@@ -206,36 +213,43 @@ public class SzptGdXx {
     /**
      * 创建人id
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createId;
 
     /**
      * 创建人
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
     /**
      * 创建日期
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
     /**
      * 更新人id
      */
+    @TableField(fill = FieldFill.INSERT)
     private String updateId;
 
     /**
      * 更新人
      */
+    @TableField(fill = FieldFill.INSERT)
     private String updateBy;
 
     /**
      * 更新日期
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date updateTime;
 
     /**
      * 删除状态(0-正常,1-删除至回收站)
      */
+    @TableField(fill = FieldFill.INSERT)
     private Integer delFlag;
 
     public Long getIid() {

src/main/java/com/zksy/szpt/handler/SzptMetaObjectHandler.java

@@ -22,6 +22,7 @@ public class SzptMetaObjectHandler implements MetaObjectHandler {
         List<StrictFill> fields = Arrays.asList(
                 StrictFill.of("createTime", Date.class, new Date()),
                 StrictFill.of("cjsj", Date.class, new Date()),
+                StrictFill.of("updateTime", Date.class, new Date()),
                 StrictFill.of("sjgsdwdm", String.class, "1"),
                 StrictFill.of("sjgsdwmc", String.class, "1"),
                 StrictFill.of("createGajgjgdm", String.class, "1"),

src/main/java/com/zksy/szpt/mapper/SzptGdCsyjhldxMapper.java

 package com.zksy.szpt.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zksy.szpt.domain.po.SzptGdCsyjhldx;
 import com.zksy.szpt.domain.po.SzptGdCsyjhldxExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
-public interface SzptGdCsyjhldxMapper {
+public interface SzptGdCsyjhldxMapper extends BaseMapper<SzptGdCsyjhldx> {
     long countByExample(SzptGdCsyjhldxExample example);
 
     int deleteByExample(SzptGdCsyjhldxExample example);
 
     int deleteByPrimaryKey(Long iid);
 
-    int insert(SzptGdCsyjhldx record);
+//    int insert(SzptGdCsyjhldx record);
 
     int insertSelective(SzptGdCsyjhldx record);
 

src/main/java/com/zksy/szpt/mapper/SzptGdRyxxMapper.java

 package com.zksy.szpt.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zksy.szpt.domain.po.SzptGdRyxx;
 import com.zksy.szpt.domain.po.SzptGdRyxxExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
-public interface SzptGdRyxxMapper {
+public interface SzptGdRyxxMapper extends BaseMapper<SzptGdRyxx> {
     long countByExample(SzptGdRyxxExample example);
 
     int deleteByExample(SzptGdRyxxExample example);
 
     int deleteByPrimaryKey(Long iid);
 
-    int insert(SzptGdRyxx record);
+//    int insert(SzptGdRyxx record);
 
     int insertSelective(SzptGdRyxx record);
 

src/main/java/com/zksy/szpt/mapper/SzptGdSbxxMapper.java

 package com.zksy.szpt.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zksy.szpt.domain.po.SzptGdSbxx;
 import com.zksy.szpt.domain.po.SzptGdSbxxExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
-public interface SzptGdSbxxMapper {
+public interface SzptGdSbxxMapper extends BaseMapper<SzptGdSbxx> {
     long countByExample(SzptGdSbxxExample example);
 
     int deleteByExample(SzptGdSbxxExample example);
 
     int deleteByPrimaryKey(Long iid);
 
-    int insert(SzptGdSbxx record);
+//    int insert(SzptGdSbxx record);
 
     int insertSelective(SzptGdSbxx record);
 

src/main/java/com/zksy/szpt/mapper/SzptGdXxMapper.java

 package com.zksy.szpt.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zksy.szpt.domain.po.SzptGdXx;
 import com.zksy.szpt.domain.po.SzptGdXxExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
-public interface SzptGdXxMapper {
+public interface SzptGdXxMapper extends BaseMapper<SzptGdXx> {
     long countByExample(SzptGdXxExample example);
 
     int deleteByExample(SzptGdXxExample example);
 
     int deleteByPrimaryKey(Long iid);
 
-    int insert(SzptGdXx record);
+//    int insert(SzptGdXx record);
 
     int insertSelective(SzptGdXx record);
 

src/main/java/com/zksy/szpt/service/IndexService.java

 package com.zksy.szpt.service;
 
-import com.zksy.szpt.domain.dto.SzptClockInDTO;
-import com.zksy.szpt.domain.dto.SzptClockInRulesDTO;
-import com.zksy.szpt.domain.dto.SzptFwxxDTO;
-import com.zksy.szpt.domain.dto.XxRwwcqkDTO;
-import com.zksy.szpt.domain.po.SzptClockIn;
-import com.zksy.szpt.domain.po.SzptClockInRules;
-import com.zksy.szpt.domain.po.SzptFwxx;
-import com.zksy.szpt.domain.po.XxRwwcqk;
-import com.zksy.szpt.mapper.SzptClockInMapper;
-import com.zksy.szpt.mapper.SzptClockInRulesMapper;
-import com.zksy.szpt.mapper.SzptFwxxMapper;
-import com.zksy.szpt.mapper.XxRwwcqkMapper;
+import com.zksy.szpt.domain.dto.*;
+import com.zksy.szpt.domain.po.*;
+import com.zksy.szpt.mapper.*;
 import com.zksy.szpt.util.BeanMapperUtil;
 import org.springframework.stereotype.Service;
 
@@ -48,4 +39,32 @@ public class IndexService {
         SzptFwxx szptFwxx = BeanMapperUtil.map(szptFwxxDTO,SzptFwxx.class);
         return szptFwxxMapper.insert(szptFwxx);
     }
+
+    @Resource
+    private SzptGdCsyjhldxMapper szptGdCsyjhldxMapper;
+    public Integer addSzptGdCsyjhldx(SzptGdCsyjhldxDTO szptGdCsyjhldxDTO){
+        SzptGdCsyjhldx szptGdCsyjhldx = BeanMapperUtil.map(szptGdCsyjhldxDTO,SzptGdCsyjhldx.class);
+        return szptGdCsyjhldxMapper.insert(szptGdCsyjhldx);
+    }
+
+    @Resource
+    private SzptGdRyxxMapper szptGdRyxxMapper;
+    public Integer addSzptGdRyxx(SzptGdRyxxDTO szptGdRyxxDTO){
+        SzptGdRyxx szptGdRyxx = BeanMapperUtil.map(szptGdRyxxDTO,SzptGdRyxx.class);
+        return szptGdRyxxMapper.insert(szptGdRyxx);
+    }
+
+    @Resource
+    private SzptGdSbxxMapper szptGdSbxxMapper;
+    public Integer addSzptGdSbxx(SzptGdSbxxDTO szptGdSbxxDTO){
+        SzptGdSbxx szptGdSbxx = BeanMapperUtil.map(szptGdSbxxDTO,SzptGdSbxx.class);
+        return szptGdSbxxMapper.insert(szptGdSbxx);
+    }
+
+    @Resource
+    private SzptGdXxMapper szptGdXxMapper;
+    public Integer addSzptGdXx(SzptGdXxDTO szptGdXxDTO){
+        SzptGdXx szptGdXx = BeanMapperUtil.map(szptGdXxDTO,SzptGdXx.class);
+        return szptGdXxMapper.insert(szptGdXx);
+    }
 }