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

rest.http

@@ -281,3 +281,58 @@ x-szpt-sign: cf9292d20f20c3705cabe1f08d07bec7
   "createGajgjgdm": "20",
   "createGajgmc": "21"
 }
+
+
+######工地预警流水表
+######9
+POST http://localhost:8086/rest/index/addSzptGdYj
+Content-Type: application/json
+x-szpt-appid: 1
+x-szpt-timestamp: 21
+x-szpt-nonce: nonce
+x-szpt-sign: cf9292d20f20c3705cabe1f08d07bec7
+
+{
+  "csid":"1",
+  "yjrq":"2024-12-27 00:00:01",
+  "yjlx": "3",
+  "yjzlx": "4",
+  "yjnr": "5",
+  "ywid": "6",
+  "ywcs": "7",
+  "yjzt":"8",
+  "clsj":"2024-12-27 00:00:01",
+  "cljg": "2024-12-27 00:00:01",
+  "clrid": "2024-12-27 00:00:01",
+  "clrxm": "12"
+}
+
+
+######区域信息表
+######10
+POST http://localhost:8086/rest/index/addSzptQyxx
+Content-Type: application/json
+x-szpt-appid: 1
+x-szpt-timestamp: 21
+x-szpt-nonce: nonce
+x-szpt-sign: cf9292d20f20c3705cabe1f08d07bec7
+
+{
+  "csid":"1",
+  "qymc":"2",
+  "qyjc": "3",
+  "qyqc": "4",
+  "qylx": "5",
+  "level": "6",
+  "fqyid": "7",
+  "xssx":"8",
+  "lng":"2024-12-27 00:00:01",
+  "lat": "2024-12-27 00:00:01",
+  "customlng": "2024-12-27 00:00:01",
+  "customlat": "12",
+  "zt":"1",
+  "sjgsdwdm":"2",
+  "sjgsdwmc": "3",
+  "createGajgjgdm": "4",
+  "createGajgmc": "5"
+}
\ No newline at end of file

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

@@ -71,6 +71,18 @@ public class IndexController {
         return indexService.addSzptGdXx(szptGdXxDTO);
     }
 
+    @ApiOperation(value="新增工地预警流水表")
+    @PostMapping("/addSzptGdYj")
+    public Integer addSzptGdYj(@RequestBody @Validated SzptGdYjDTO szptGdYjDTO){
+        return indexService.addSzptGdYj(szptGdYjDTO);
+    }
+
+    @ApiOperation(value="新增区域信息表")
+    @PostMapping("/addSzptQyxx")
+    public Integer addSzptQyxx(@RequestBody @Validated SzptQyxxDTO szptQyxxDTO){
+        return indexService.addSzptQyxx(szptQyxxDTO);
+    }
+
     @ApiOperation(value="新增账号信息数据")
     @PostMapping("/addXxZhxx")
     public Integer addXxZhxx(@RequestBody @Validated XxZhxxDTO xxZhxxDTO){

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

+package com.zksy.szpt.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.Date;
+
+public class SzptGdYjDTO {
+    /**
+     * 工地ID
+     */
+    @NotBlank(message = "工地ID不能为空")
+    private String csid;
+
+    /**
+     * 预警日期
+     */
+    @NotBlank(message = "预警日期不能为空")
+    private String yjrq;
+
+    /**
+     * 预警类型;cslb=3106
+     */
+    @NotBlank(message = "预警类型不能为空")
+    private String yjlx;
+
+    /**
+     * 预警子类型;cslb=3139
+     */
+    private String yjzlx;
+
+    /**
+     * 预警内容
+     */
+    private String yjnr;
+
+    /**
+     * 业务ID
+     */
+    private String ywid;
+
+    /**
+     * 业务参数扩展
+     */
+    private String ywcs;
+
+    /**
+     * 预警状态 cslb=3107
+     */
+    @NotBlank(message = "预警状态不能为空")
+    private String yjzt;
+
+    /**
+     * 处理时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date clsj;
+
+    /**
+     * 处理结果
+     */
+    private String cljg;
+
+    /**
+     * 处理人id
+     */
+    private String clrid;
+
+    /**
+     * 处理人姓名
+     */
+    private String clrxm;
+
+
+    public String getCsid() {
+        return csid;
+    }
+
+    public void setCsid(String csid) {
+        this.csid = csid == null ? null : csid.trim();
+    }
+
+    public String getYjrq() {
+        return yjrq;
+    }
+
+    public void setYjrq(String yjrq) {
+        this.yjrq = yjrq == null ? null : yjrq.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 getYjnr() {
+        return yjnr;
+    }
+
+    public void setYjnr(String yjnr) {
+        this.yjnr = yjnr == null ? null : yjnr.trim();
+    }
+
+    public String getYwid() {
+        return ywid;
+    }
+
+    public void setYwid(String ywid) {
+        this.ywid = ywid == null ? null : ywid.trim();
+    }
+
+    public String getYwcs() {
+        return ywcs;
+    }
+
+    public void setYwcs(String ywcs) {
+        this.ywcs = ywcs == null ? null : ywcs.trim();
+    }
+
+    public String getYjzt() {
+        return yjzt;
+    }
+
+    public void setYjzt(String yjzt) {
+        this.yjzt = yjzt == null ? null : yjzt.trim();
+    }
+
+    public Date getClsj() {
+        return clsj;
+    }
+
+    public void setClsj(Date clsj) {
+        this.clsj = clsj;
+    }
+
+    public String getCljg() {
+        return cljg;
+    }
+
+    public void setCljg(String cljg) {
+        this.cljg = cljg == null ? null : cljg.trim();
+    }
+
+    public String getClrid() {
+        return clrid;
+    }
+
+    public void setClrid(String clrid) {
+        this.clrid = clrid == null ? null : clrid.trim();
+    }
+
+    public String getClrxm() {
+        return clrxm;
+    }
+
+    public void setClrxm(String clrxm) {
+        this.clrxm = clrxm == null ? null : clrxm.trim();
+    }
+}

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

+package com.zksy.szpt.domain.dto;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+public class SzptQyxxDTO {
+
+    /**
+     * 场所ID
+     */
+    @NotBlank(message = "场所ID不能为空")
+    private String csid;
+
+    /**
+     * 区域名称
+     */
+    @NotBlank(message = "区域名称不能为空")
+    private String qymc;
+
+    /**
+     * 区域简称
+     */
+    @NotBlank(message = "场所ID区域简称不能为空")
+    private String qyjc;
+
+    /**
+     * 区域全称
+     */
+    private String qyqc;
+
+    /**
+     * 区域类型[3123]：(11-苑，12-楼幢，13-单元，14-房屋，15-房间)
+     */
+    @NotBlank(message = "区域类型不能为空")
+    private String qylx;
+
+    /**
+     * 层级
+     */
+    @NotBlank(message = "层级不能为空")
+    private String level;
+
+    /**
+     * 上级区域id
+     */
+    private String fqyid;
+
+    /**
+     * 显示顺序
+     */
+    private String xssx;
+
+    /**
+     * 经度
+     */
+    private String lng;
+
+    /**
+     * 纬度
+     */
+    private String lat;
+
+    /**
+     * 自定义经度
+     */
+    private String customlng;
+
+    /**
+     * 自定义纬度
+     */
+    private String customlat;
+
+    /**
+     * 状态[3101](1-有效，2-注销)
+     */
+    @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 getCsid() {
+        return csid;
+    }
+
+    public void setCsid(String csid) {
+        this.csid = csid == null ? null : csid.trim();
+    }
+
+    public String getQymc() {
+        return qymc;
+    }
+
+    public void setQymc(String qymc) {
+        this.qymc = qymc == null ? null : qymc.trim();
+    }
+
+    public String getQyjc() {
+        return qyjc;
+    }
+
+    public void setQyjc(String qyjc) {
+        this.qyjc = qyjc == null ? null : qyjc.trim();
+    }
+
+    public String getQyqc() {
+        return qyqc;
+    }
+
+    public void setQyqc(String qyqc) {
+        this.qyqc = qyqc == null ? null : qyqc.trim();
+    }
+
+    public String getQylx() {
+        return qylx;
+    }
+
+    public void setQylx(String qylx) {
+        this.qylx = qylx == null ? null : qylx.trim();
+    }
+
+    public String getLevel() {
+        return level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level == null ? null : level.trim();
+    }
+
+    public String getFqyid() {
+        return fqyid;
+    }
+
+    public void setFqyid(String fqyid) {
+        this.fqyid = fqyid == null ? null : fqyid.trim();
+    }
+
+    public String getXssx() {
+        return xssx;
+    }
+
+    public void setXssx(String xssx) {
+        this.xssx = xssx == null ? null : xssx.trim();
+    }
+
+    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 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/po/SzptFwxx.java

@@ -10,7 +10,6 @@ public class SzptFwxx {
     /**
      * 区域ID
      */
-    @NotBlank(message = "区域ID不能为空")
     @TableId(type = IdType.ASSIGN_ID)
     private String qyid;
 

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.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.util.Date;
 
+@TableName
 public class SzptGdXx {
     /**
      * 场所IID

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

 package com.zksy.szpt.domain.po;
 
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.util.Date;
 
+@TableName
 public class SzptGdYj {
     /**
      * 预警IID
@@ -11,6 +14,7 @@ public class SzptGdYj {
     /**
      * 预警ID
      */
+    @TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**
@@ -76,36 +80,43 @@ public class SzptGdYj {
     /**
      * 创建人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/SzptQyxx.java

 package com.zksy.szpt.domain.po;
 
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.util.Date;
 
+@TableName
 public class SzptQyxx {
     /**
      * 区域IID
@@ -11,6 +14,7 @@ public class SzptQyxx {
     /**
      * 区域ID
      */
+    @TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**
@@ -101,67 +105,80 @@ public class SzptQyxx {
     /**
      * 创建人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 String updateGajgjgdm;
 
     /**
      * 更新公安机关名称
      */
+    @TableField(fill = FieldFill.INSERT)
     private String updateGajgmc;
 
     /**
      * 更新人id
      */
+    @TableField(fill = FieldFill.INSERT)
     private String updateId;
 
     /**
      * 更新人
      */
+    @TableField(fill = FieldFill.INSERT)
     private String updateBy;
 
     /**
      * 更新日期
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date updateTime;
 
     /**
      * 更新操作终端: web,app,import
      */
+    @TableField(fill = FieldFill.INSERT)
     private String updateTerminal;
 
     /**
      * 更新操作ip
      */
+    @TableField(fill = FieldFill.INSERT)
     private String updateIp;
 
     /**
      * 删除状态(0-正常,1-删除至回收站)
      */
-    private Boolean delFlag;
+    @TableField(fill = FieldFill.INSERT)
+    private Integer delFlag;
 
     public Long getIid() {
         return iid;
@@ -411,11 +428,11 @@ public class SzptQyxx {
         this.updateIp = updateIp == null ? null : updateIp.trim();
     }
 
-    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/mapper/SzptGdYjMapper.java

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

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

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

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

@@ -75,6 +75,20 @@ public class IndexService {
         return szptGdXxMapper.insert(szptGdXx);
     }
 
+    @Resource
+    private SzptGdYjMapper szptGdYjMapper;
+    public Integer addSzptGdYj(SzptGdYjDTO szptGdYjDTO){
+        SzptGdYj szptGdYj = BeanMapperUtil.map(szptGdYjDTO,SzptGdYj.class);
+        return szptGdYjMapper.insert(szptGdYj);
+    }
+
+    @Resource
+    private SzptQyxxMapper szptQyxxMapper;
+    public Integer addSzptQyxx(SzptQyxxDTO szptQyxxDTO){
+        SzptQyxx szptQyxx = BeanMapperUtil.map(szptQyxxDTO,SzptQyxx.class);
+        return szptQyxxMapper.insert(szptQyxx);
+    }
+
     @Resource
     private XxZhxxMapper xxZhxxMapper;