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

# Conflicts:
#	src/main/java/com/zksy/szpt/controller/IndexController.java

src/main/java/com/zksy/szpt/config/MybatisConfig.java

@@ -2,6 +2,7 @@ package com.zksy.szpt.config;
 
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
@@ -52,7 +53,6 @@ public class MybatisConfig {
         //自动填充设置
         GlobalConfig globalConfig = GlobalConfigUtils.defaults();
         globalConfig.setMetaObjectHandler(szptMetaObjectHandler);
-
         MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
         bean.setGlobalConfig(globalConfig);
         bean.setDataSource(datasource);

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

@@ -29,6 +29,60 @@ public class IndexController {
         return indexService.addXxRwwcqk(xxRwwcqkDTO);
     }
 
+    @ApiOperation(value="新增szpt_clock_in数据")
+    @PostMapping("/addSzptClockIn")
+    public Integer addSzptClockIn(@RequestBody @Validated SzptClockInDTO szptClockInDTO){
+        return indexService.addSzptClockIn(szptClockInDTO);
+    }
+
+    @ApiOperation(value="新增szpt_clock_in_rules数据")
+    @PostMapping("/addSzptClockInRules")
+    public Integer addSzptClockInRules(@RequestBody @Validated SzptClockInRulesDTO szptClockInRulesDTO){
+        return indexService.addSzptClockInRules(szptClockInRulesDTO);
+    }
+
+    @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);
+    }
+
+    @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/controller/XxShxxyController.java

+package com.zksy.szpt.controller;
+
+import com.zksy.szpt.domain.dto.XxShxxyDTO;
+import com.zksy.szpt.domain.dto.XxShxxyDwDTO;
+import com.zksy.szpt.domain.dto.XxYjrwDTO;
+import com.zksy.szpt.service.XxShxxyDwService;
+import com.zksy.szpt.service.XxShxxyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "社会信息员服务")
+@RequestMapping("/rest/xxShxxy")
+@RestController
+@Validated
+public class XxShxxyController {
+    private final XxShxxyService service;
+
+    public XxShxxyController(XxShxxyService service) {
+        this.service = service;
+    }
+
+
+    @ApiOperation(value = "新增社会信息员信息数据")
+    @PostMapping("/add")
+    public Integer addXxShxxy(@RequestBody @Validated XxShxxyDTO dto) {
+        return service.addXxShxxy(dto);
+    }
+
+
+    @ApiOperation(value = "修改社会信息员数据")
+    @PostMapping("/update")
+    public Integer update(@RequestBody @Validated XxShxxyDTO dto) {
+        return service.update(dto);
+    }
+
+    @ApiOperation(value = "删除社会信息员数据")
+    @GetMapping("/delete")
+    public Integer delete(@RequestParam(name = "xxyid") String xxyid) {
+        return service.delete(xxyid);
+    }
+
+}

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

+package com.zksy.szpt.controller;
+
+import com.zksy.szpt.domain.dto.XxShxxyDwDTO;
+import com.zksy.szpt.domain.dto.XxYjrwDTO;
+import com.zksy.szpt.service.XxShxxyDwService;
+import com.zksy.szpt.service.XxYjrwService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "社会信息员队伍服务")
+@RequestMapping("/rest/xxShxxydw")
+@RestController
+@Validated
+public class XxShxxyDwController {
+    private final XxShxxyDwService service;
+
+    public XxShxxyDwController(XxShxxyDwService service) {
+        this.service = service;
+    }
+
+
+    @ApiOperation(value = "新增社会信息员队伍数据")
+    @PostMapping("/add")
+    public Integer XxShxxyDw(@RequestBody @Validated XxShxxyDwDTO dto) {
+        return service.addXxShxxyDw(dto);
+    }
+
+    @ApiOperation(value = "修改社会信息员队伍数据")
+    @PostMapping("/update")
+    public Integer update(@RequestBody @Validated XxShxxyDwDTO dto) {
+        return service.update(dto);
+    }
+
+    @ApiOperation(value = "删除社会信息员队伍数据")
+    @GetMapping("/delete")
+    public Integer delete(@RequestParam(name = "id") String id) {
+        return service.delete(id);
+    }
+
+}

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

+package com.zksy.szpt.controller;
+
+import com.zksy.szpt.domain.dto.XxYjdwdmDTO;
+import com.zksy.szpt.service.XxYjdwdmService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "义警队伍代码服务")
+@RequestMapping("/rest/xxYjrdwdm")
+@RestController
+@Validated
+public class XxYjdwdmController {
+    private final XxYjdwdmService service;
+
+    public XxYjdwdmController(XxYjdwdmService service) {
+        this.service = service;
+    }
+
+    @ApiOperation(value = "新增义警队伍代码数据")
+    @PostMapping("/add")
+    public Integer addXxYjdwdm(@RequestBody @Validated XxYjdwdmDTO dto) {
+        return service.addXxYjdwdm(dto);
+    }
+
+    @ApiOperation(value = "修改义警队伍数据")
+    @PostMapping("/update")
+    public Integer update(@RequestBody @Validated XxYjdwdmDTO dto) {
+        return service.update(dto);
+    }
+
+    @ApiOperation(value = "删除义警队伍数据")
+    @GetMapping("/delete")
+    public Integer delete(@RequestParam(name = "id") String id) {
+        return service.delete(id);
+    }
+
+}

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

+package com.zksy.szpt.controller;
+
+import com.zksy.szpt.domain.dto.XxYjrwDTO;
+import com.zksy.szpt.service.XxYjrwService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "义警任务服务")
+@RequestMapping("/rest/xxYjrw")
+@RestController
+@Validated
+public class XxYjrwController {
+    private final XxYjrwService service;
+
+    public XxYjrwController(XxYjrwService service) {
+        this.service = service;
+    }
+
+    @ApiOperation(value = "新增义警任务信息数据")
+    @PostMapping("/add")
+    public Integer add(@RequestBody @Validated XxYjrwDTO dto) {
+        return service.addXxYjrw(dto);
+    }
+
+    @ApiOperation(value = "修改义警任务数据")
+    @PostMapping("/update")
+    public Integer update(@RequestBody @Validated XxYjrwDTO dto) {
+        return service.update(dto);
+    }
+
+    @ApiOperation(value = "删除义警任务信息数据")
+    @GetMapping("/delete")
+    public Integer delete(@RequestParam(name = "rwid") String rwid) {
+        return service.delete(rwid);
+    }
+
+}

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

+package com.zksy.szpt.controller;
+
+import com.zksy.szpt.domain.dto.XxZhjfbgDTO;
+import com.zksy.szpt.service.XxZhjfbgService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "账户积分变更信息服务")
+@RequestMapping("/rest/xxZhjfbg")
+@RestController
+@Validated
+public class XxZhjfbgController {
+    private final XxZhjfbgService service;
+
+    public XxZhjfbgController(XxZhjfbgService service) {
+        this.service = service;
+    }
+
+    @ApiOperation(value = "新增账户积分变更数据")
+    @PostMapping("/add")
+    public Integer addXxZhjfbg(@RequestBody @Validated XxZhjfbgDTO dto) {
+        return service.addXxZhjfbg(dto);
+    }
+
+    @ApiOperation(value = "修改账户积分变更数据")
+    @PostMapping("/update")
+    public Integer update(@RequestBody @Validated XxZhjfbgDTO dto) {
+        return service.update(dto);
+    }
+
+
+    @ApiOperation(value = "删除账户积分变更数据")
+    @GetMapping("/delete")
+    public Integer delete(@RequestParam(name = "dhid") String dhid) {
+        return service.delete(dhid);
+    }
+
+}

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

+package com.zksy.szpt.controller;
+
+import com.zksy.szpt.domain.dto.*;
+import com.zksy.szpt.service.XxZhxxService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "账号信息服务")
+@RequestMapping("/rest/xxZhxx")
+@RestController
+@Validated
+public class XxZhxxController {
+    private final XxZhxxService service;
+
+    public XxZhxxController(XxZhxxService service) {
+        this.service = service;
+    }
+
+    @ApiOperation(value = "新增账号信息数据")
+    @PostMapping("/add")
+    public Integer addXxZhxx(@RequestBody @Validated XxZhxxDTO xxZhxxDTO) {
+        return service.addXxZhxx(xxZhxxDTO);
+    }
+
+    @ApiOperation(value = "修改账号信息数据")
+    @PostMapping("/update")
+    public Integer update(@RequestBody @Validated XxZhxxDTO dto) {
+        return service.update(dto);
+    }
+
+
+    @ApiOperation(value = "删除账号信息数据")
+    @GetMapping("/delete")
+    public Integer delete(@RequestParam(name = "zhid") String zhid) {
+        return service.delete(zhid);
+    }
+
+}

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

+package com.zksy.szpt.domain.dto;
+
+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 javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+public class XxShxxyDTO {
+
+
+    /**
+     * 社会信息员ID;l
+     */
+    @NotBlank(message = "社会信息员ID不能为空")
+    private String xxyid;
+
+    /**
+     * 信息员编号;l,q
+     */
+    private String xxybh;
+
+    /**
+     * 信息员类型;cslb=1021,l,q
+     */
+    private String xxylx;
+
+    /**
+     * 姓名;l,q
+     */
+    private String xm;
+
+    /**
+     * 身份证号;l,q
+     */
+    private String sfzh;
+
+    /**
+     * 等级;cslb=1031,l,q
+     */
+    private String dj;
+
+    /**
+     * 发送情报总数;l
+     */
+    private String fsqbzs;
+
+    /**
+     * 联系电话;l,q
+     */
+    private String lxdh;
+
+    /**
+     * 联系电话2
+     */
+    private String lxdh2;
+
+    /**
+     * 联系电话3
+     */
+    private String lxdh3;
+
+    /**
+     * 职业类型;cslb=1022,l
+     */
+    private String zylx;
+
+    /**
+     * 其他职业类型
+     */
+    private String qtzylx;
+
+    /**
+     * 户籍地址
+     */
+    private String hjdz;
+
+    /**
+     * 暂住地址
+     */
+    private String zzdz;
+
+    /**
+     * 服务处所
+     */
+    private String fwcs;
+
+    /**
+     * 物建人ID
+     */
+    private String wjrid;
+
+    /**
+     * 物建人姓名;l,q
+     */
+    private String wjrxm;
+
+    /**
+     * 物建时间;l,q
+     */
+    private Date wjsj;
+
+    /**
+     * 所属部门编码;l,q
+     */
+    private String ssbmbm;
+
+    /**
+     * 原物件民警
+     */
+    private String ywjrxm;
+
+    /**
+     * 上报发送状态;cslb=1037
+     */
+    @NotBlank(message = "上报发送状态不能为空")
+    private String sbfszt;
+
+    /**
+     * 上报发送时间
+     */
+    private Date sbfssj;
+
+    /**
+     * 上报发送结果
+     */
+
+    private String sbfsjg;
+
+    /**
+     * 回访标志;cslb=1152,l,q
+     */
+    private String hfbz;
+
+    /**
+     * 情报分类ID
+     */
+    private String qbflid;
+
+    /**
+     * 运营单位ID
+     */
+    private String mchid;
+
+    /**
+     * 座右铭
+     */
+    private String zym;
+
+    /**
+     * 状态;cslb=1008,l,q
+     */
+    @NotBlank(message = "状态不能为空")
+    private String zt;
+
+    /**
+     * 义警队伍;cslb=3210
+     */
+    private String yjdw;
+
+    /**
+     * 审核时间
+     */
+    private Date shsj;
+
+    /**
+     * 审核人姓名
+     */
+    private String shrxm;
+
+    /**
+     * 审核人id
+     */
+    @NotBlank(message = "审核人ID不能为空")
+    private String shrid;
+
+    /**
+     * 审核说明
+     */
+    private String shsm;
+
+    /**
+     * 审核标志;cslb=3209
+     */
+    private String shbz;
+
+
+
+    public String getXxyid() {
+        return xxyid;
+    }
+
+    public void setXxyid(String xxyid) {
+        this.xxyid = xxyid == null ? null : xxyid.trim();
+    }
+
+    public String getXxybh() {
+        return xxybh;
+    }
+
+    public void setXxybh(String xxybh) {
+        this.xxybh = xxybh == null ? null : xxybh.trim();
+    }
+
+    public String getXxylx() {
+        return xxylx;
+    }
+
+    public void setXxylx(String xxylx) {
+        this.xxylx = xxylx == null ? null : xxylx.trim();
+    }
+
+    public String getXm() {
+        return xm;
+    }
+
+    public void setXm(String xm) {
+        this.xm = xm == null ? null : xm.trim();
+    }
+
+    public String getSfzh() {
+        return sfzh;
+    }
+
+    public void setSfzh(String sfzh) {
+        this.sfzh = sfzh == null ? null : sfzh.trim();
+    }
+
+    public String getDj() {
+        return dj;
+    }
+
+    public void setDj(String dj) {
+        this.dj = dj == null ? null : dj.trim();
+    }
+
+    public String getFsqbzs() {
+        return fsqbzs;
+    }
+
+    public void setFsqbzs(String fsqbzs) {
+        this.fsqbzs = fsqbzs == null ? null : fsqbzs.trim();
+    }
+
+    public String getLxdh() {
+        return lxdh;
+    }
+
+    public void setLxdh(String lxdh) {
+        this.lxdh = lxdh == null ? null : lxdh.trim();
+    }
+
+    public String getLxdh2() {
+        return lxdh2;
+    }
+
+    public void setLxdh2(String lxdh2) {
+        this.lxdh2 = lxdh2 == null ? null : lxdh2.trim();
+    }
+
+    public String getLxdh3() {
+        return lxdh3;
+    }
+
+    public void setLxdh3(String lxdh3) {
+        this.lxdh3 = lxdh3 == null ? null : lxdh3.trim();
+    }
+
+    public String getZylx() {
+        return zylx;
+    }
+
+    public void setZylx(String zylx) {
+        this.zylx = zylx == null ? null : zylx.trim();
+    }
+
+    public String getQtzylx() {
+        return qtzylx;
+    }
+
+    public void setQtzylx(String qtzylx) {
+        this.qtzylx = qtzylx == null ? null : qtzylx.trim();
+    }
+
+    public String getHjdz() {
+        return hjdz;
+    }
+
+    public void setHjdz(String hjdz) {
+        this.hjdz = hjdz == null ? null : hjdz.trim();
+    }
+
+    public String getZzdz() {
+        return zzdz;
+    }
+
+    public void setZzdz(String zzdz) {
+        this.zzdz = zzdz == null ? null : zzdz.trim();
+    }
+
+    public String getFwcs() {
+        return fwcs;
+    }
+
+    public void setFwcs(String fwcs) {
+        this.fwcs = fwcs == null ? null : fwcs.trim();
+    }
+
+    public String getWjrid() {
+        return wjrid;
+    }
+
+    public void setWjrid(String wjrid) {
+        this.wjrid = wjrid == null ? null : wjrid.trim();
+    }
+
+    public String getWjrxm() {
+        return wjrxm;
+    }
+
+    public void setWjrxm(String wjrxm) {
+        this.wjrxm = wjrxm == null ? null : wjrxm.trim();
+    }
+
+    public Date getWjsj() {
+        return wjsj;
+    }
+
+    public void setWjsj(Date wjsj) {
+        this.wjsj = wjsj;
+    }
+
+    public String getSsbmbm() {
+        return ssbmbm;
+    }
+
+    public void setSsbmbm(String ssbmbm) {
+        this.ssbmbm = ssbmbm == null ? null : ssbmbm.trim();
+    }
+
+    public String getYwjrxm() {
+        return ywjrxm;
+    }
+
+    public void setYwjrxm(String ywjrxm) {
+        this.ywjrxm = ywjrxm == null ? null : ywjrxm.trim();
+    }
+
+    public String getSbfszt() {
+        return sbfszt;
+    }
+
+    public void setSbfszt(String sbfszt) {
+        this.sbfszt = sbfszt == null ? null : sbfszt.trim();
+    }
+
+    public Date getSbfssj() {
+        return sbfssj;
+    }
+
+    public void setSbfssj(Date sbfssj) {
+        this.sbfssj = sbfssj;
+    }
+
+    public String getSbfsjg() {
+        return sbfsjg;
+    }
+
+    public void setSbfsjg(String sbfsjg) {
+        this.sbfsjg = sbfsjg == null ? null : sbfsjg.trim();
+    }
+
+    public String getHfbz() {
+        return hfbz;
+    }
+
+    public void setHfbz(String hfbz) {
+        this.hfbz = hfbz == null ? null : hfbz.trim();
+    }
+
+    public String getQbflid() {
+        return qbflid;
+    }
+
+    public void setQbflid(String qbflid) {
+        this.qbflid = qbflid == null ? null : qbflid.trim();
+    }
+
+    public String getMchid() {
+        return mchid;
+    }
+
+    public void setMchid(String mchid) {
+        this.mchid = mchid == null ? null : mchid.trim();
+    }
+
+    public String getZym() {
+        return zym;
+    }
+
+    public void setZym(String zym) {
+        this.zym = zym == null ? null : zym.trim();
+    }
+
+    public String getZt() {
+        return zt;
+    }
+
+    public void setZt(String zt) {
+        this.zt = zt == null ? null : zt.trim();
+    }
+
+    public String getYjdw() {
+        return yjdw;
+    }
+
+    public void setYjdw(String yjdw) {
+        this.yjdw = yjdw == null ? null : yjdw.trim();
+    }
+
+    public Date getShsj() {
+        return shsj;
+    }
+
+    public void setShsj(Date shsj) {
+        this.shsj = shsj;
+    }
+
+    public String getShrxm() {
+        return shrxm;
+    }
+
+    public void setShrxm(String shrxm) {
+        this.shrxm = shrxm == null ? null : shrxm.trim();
+    }
+
+    public String getShrid() {
+        return shrid;
+    }
+
+    public void setShrid(String shrid) {
+        this.shrid = shrid == null ? null : shrid.trim();
+    }
+
+    public String getShsm() {
+        return shsm;
+    }
+
+    public void setShsm(String shsm) {
+        this.shsm = shsm == null ? null : shsm.trim();
+    }
+
+    public String getShbz() {
+        return shbz;
+    }
+
+    public void setShbz(String shbz) {
+        this.shbz = shbz == null ? null : shbz.trim();
+    }
+
+
+}
\ No newline at end of file

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

+package com.zksy.szpt.domain.dto;
+
+
+import javax.validation.constraints.NotBlank;
+
+public class XxShxxyDwDTO {
+
+    /**
+     * 信息员队伍ID
+     */
+    @NotBlank(message = "信息员队伍ID不能为空")
+    private String id;
+
+    /**
+     * 社会信息员ID
+     */
+    @NotBlank(message = "社会信息员ID不能为空")
+    private String shxxyid;
+
+    /**
+     * 队伍编码
+     */
+    @NotBlank(message = "队伍编码不能为空")
+    private String dwdm;
+
+    /**
+     * 义警队伍编码
+     */
+    private String yjdwdm;
+
+    public @NotBlank(message = "信息员队伍ID不能为空") String getId() {
+        return id;
+    }
+
+    public void setId(@NotBlank(message = "信息员队伍ID不能为空") String id) {
+        this.id = id;
+    }
+
+    public @NotBlank(message = "社会信息员ID不能为空") String getShxxyid() {
+        return shxxyid;
+    }
+
+    public void setShxxyid(@NotBlank(message = "社会信息员ID不能为空") String shxxyid) {
+        this.shxxyid = shxxyid;
+    }
+
+    public @NotBlank(message = "队伍编码不能为空") String getDwdm() {
+        return dwdm;
+    }
+
+    public void setDwdm(@NotBlank(message = "队伍编码不能为空") String dwdm) {
+        this.dwdm = dwdm;
+    }
+
+    public String getYjdwdm() {
+        return yjdwdm;
+    }
+
+    public void setYjdwdm(String yjdwdm) {
+        this.yjdwdm = yjdwdm;
+    }
+}
\ No newline at end of file

src/main/java/com/zksy/szpt/domain/po/XxRwwcqk.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;
 
@@ -11,12 +9,12 @@ public class XxRwwcqk {
     /**
      * IID
      */
+    @TableId(type = IdType.ASSIGN_ID)
     private Long iid;
 
     /**
      * 任务完成ID
      */
-    @TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**
@@ -97,21 +95,25 @@ public class XxRwwcqk {
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date cjsj;
 
     /**
      * 更新人id
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private String gxrid;
 
     /**
      * 更新人姓名
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private String gxrxm;
 
     /**
      * 更新时间
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date gxsj;
 
     public Long getIid() {

src/main/java/com/zksy/szpt/domain/po/XxShxxy.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 java.util.Date;
 
 public class XxShxxy {
     /**
      * IID
      */
+    @TableId(type = IdType.ASSIGN_ID)
     private Long iid;
 
     /**
@@ -181,31 +187,37 @@ public class XxShxxy {
     /**
      * 创建人id
      */
+    @TableField(fill = FieldFill.INSERT)
     private String cjrid;
 
     /**
      * 创建人姓名
      */
+    @TableField(fill = FieldFill.INSERT)
     private String cjrxm;
 
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date cjsj;
 
     /**
      * 更新人id
      */
+    @TableField(fill = FieldFill.UPDATE)
     private String gxrid;
 
     /**
      * 更新人姓名
      */
+    @TableField(fill = FieldFill.UPDATE)
     private String gxrxm;
 
     /**
      * 更新时间
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date gxsj;
 
     public Long getIid() {

src/main/java/com/zksy/szpt/domain/po/XxShxxyDw.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 java.util.Date;
 
 public class XxShxxyDw {
     /**
      * IID
      */
+    @TableId(type = IdType.ASSIGN_ID)
     private Long iid;
 
     /**
@@ -31,11 +37,13 @@ public class XxShxxyDw {
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date cjsj;
 
     /**
      * 更新时间
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date gxsj;
 
     public Long getIid() {

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

@@ -70,16 +70,19 @@ public class XxYjdwdm {
     /**
      * 更新人id
      */
+    @TableField(fill = FieldFill.UPDATE)
     private String gxrid;
 
     /**
      * 更新人姓名
      */
+    @TableField(fill = FieldFill.UPDATE)
     private String gxrxm;
 
     /**
      * 更新时间
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date gxsj;
 
     public Long getIid() {

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

@@ -135,16 +135,20 @@ public class XxYjrw {
     /**
      * 更新人id
      */
+    @TableField(fill = FieldFill.UPDATE)
     private String gxrid;
 
     /**
      * 更新人姓名
      */
+    @TableField(fill = FieldFill.UPDATE)
     private String gxrxm;
 
     /**
      * 更新时间
      */
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date gxsj;
 
     /**

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

@@ -73,7 +73,7 @@ public class XxZhjfbg {
     /**
      * 更新时间
      */
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date gxsj;
 
     public Long getIid() {

src/main/java/com/zksy/szpt/domain/po/XxZhxx.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 java.util.Date;
 
@@ -133,7 +130,7 @@ public class XxZhxx {
     /**
      * 更新时间
      */
-    @TableField(fill = FieldFill.INSERT)
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date gxsj;
 
     /**

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

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

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

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

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

@@ -27,29 +27,9 @@ public class IndexService {
         return xxZhxxMapper.insert(xxZhxx);
     }
 
-    @Resource
-    private XxZhjfbgMapper xxZhjfbgMapper;
-
-    public Integer addXxZhjfbg(XxZhjfbgDTO dto) {
-        XxZhjfbg xxZhjfbg = BeanMapperUtil.map(dto, XxZhjfbg.class);
-        return xxZhjfbgMapper.insert(xxZhjfbg);
-    }
-
-    @Resource
-    private XxYjrwMapper xxYjrwMapper;
 
-    public Integer addXxYjrw(XxYjrwDTO dto) {
-        XxYjrw xxYjrw = BeanMapperUtil.map(dto, XxYjrw.class);
-        return xxYjrwMapper.insert(xxYjrw);
-    }
 
-    @Resource
-    private XxYjdwdmMapper xxYjdwdmMapper;
 
-    public Integer addXxYjdwdm(XxYjdwdmDTO dto) {
-        XxYjdwdm xxYjdwdm = BeanMapperUtil.map(dto, XxYjdwdm.class);
-        return xxYjdwdmMapper.insert(xxYjdwdm);
-    }
 
 
 }

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

+package com.zksy.szpt.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.XxShxxyDwDTO;
+import com.zksy.szpt.domain.po.XxShxxyDw;
+import com.zksy.szpt.mapper.XxShxxyDwMapper;
+import com.zksy.szpt.util.BeanMapperUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class XxShxxyDwService {
+
+
+    @Resource
+    private XxShxxyDwMapper xxShxxyDwMapper;
+
+    public Integer addXxShxxyDw(XxShxxyDwDTO dto) {
+        XxShxxyDw xxShxxyDw = BeanMapperUtil.map(dto, XxShxxyDw.class);
+        return xxShxxyDwMapper.insert(xxShxxyDw);
+    }
+
+    public Integer update(XxShxxyDwDTO dto) {
+        XxShxxyDw xxZhxx = BeanMapperUtil.map(dto, XxShxxyDw.class);
+        LambdaUpdateWrapper<XxShxxyDw> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.set(XxShxxyDw::getId, xxZhxx.getId());
+        return xxShxxyDwMapper.update(xxZhxx, wrapper);
+    }
+
+
+    public Integer delete(String id) {
+        LambdaQueryWrapper<XxShxxyDw> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(XxShxxyDw::getId, id);
+        return xxShxxyDwMapper.delete(wrapper);
+    }
+}

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

+package com.zksy.szpt.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.XxShxxyDTO;
+import com.zksy.szpt.domain.po.XxShxxy;
+import com.zksy.szpt.mapper.XxShxxyMapper;
+import com.zksy.szpt.util.BeanMapperUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class XxShxxyService {
+
+    @Resource
+    private XxShxxyMapper xxShxxyMapper;
+
+    public Integer addXxShxxy(XxShxxyDTO dto) {
+        XxShxxy xxShxxy = BeanMapperUtil.map(dto, XxShxxy.class);
+        return xxShxxyMapper.insert(xxShxxy);
+    }
+
+
+    public Integer update(XxShxxyDTO dto) {
+        XxShxxy xxZhxx = BeanMapperUtil.map(dto, XxShxxy.class);
+        LambdaUpdateWrapper<XxShxxy> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.set(XxShxxy::getXxyid, xxZhxx.getXxyid());
+        return xxShxxyMapper.update(xxZhxx,wrapper);
+    }
+
+
+    public Integer delete(String id) {
+        LambdaQueryWrapper<XxShxxy> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(XxShxxy::getXxyid, id);
+        return xxShxxyMapper.delete(wrapper);
+    }
+}

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

+package com.zksy.szpt.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.XxYjdwdmDTO;
+import com.zksy.szpt.domain.po.XxYjdwdm;
+import com.zksy.szpt.mapper.XxYjdwdmMapper;
+import com.zksy.szpt.util.BeanMapperUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class XxYjdwdmService {
+
+    @Resource
+    private XxYjdwdmMapper xxYjdwdmMapper;
+
+    public Integer addXxYjdwdm(XxYjdwdmDTO dto) {
+        XxYjdwdm xxYjdwdm = BeanMapperUtil.map(dto, XxYjdwdm.class);
+        return xxYjdwdmMapper.insert(xxYjdwdm);
+    }
+
+    public Integer update(XxYjdwdmDTO dto) {
+        XxYjdwdm xxYjdwdm = BeanMapperUtil.map(dto, XxYjdwdm.class);
+        LambdaUpdateWrapper<XxYjdwdm> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.set(XxYjdwdm::getId, xxYjdwdm.getId());
+        return xxYjdwdmMapper.update(xxYjdwdm,wrapper);
+    }
+
+
+    public Integer delete(String id) {
+        LambdaQueryWrapper<XxYjdwdm> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(XxYjdwdm::getId, id);
+        return xxYjdwdmMapper.delete(wrapper);
+    }
+}

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

+package com.zksy.szpt.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.XxYjrwDTO;
+import com.zksy.szpt.domain.po.XxYjrw;
+import com.zksy.szpt.mapper.XxYjrwMapper;
+import com.zksy.szpt.util.BeanMapperUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class XxYjrwService {
+
+    @Resource
+    private XxYjrwMapper xxYjrwMapper;
+
+    public Integer addXxYjrw(XxYjrwDTO dto) {
+        XxYjrw xxYjrw = BeanMapperUtil.map(dto, XxYjrw.class);
+        return xxYjrwMapper.insert(xxYjrw);
+    }
+
+    public Integer update(XxYjrwDTO dto) {
+        XxYjrw xxYjrw = BeanMapperUtil.map(dto, XxYjrw.class);
+        LambdaUpdateWrapper<XxYjrw> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.set(XxYjrw::getRwid, xxYjrw.getRwid());
+        return xxYjrwMapper.update(xxYjrw,wrapper);
+    }
+
+
+    public Integer delete(String id) {
+        LambdaQueryWrapper<XxYjrw> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(XxYjrw::getRwid, id);
+        return xxYjrwMapper.delete(wrapper);
+    }
+}

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

+package com.zksy.szpt.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.zksy.szpt.domain.dto.XxZhjfbgDTO;
+import com.zksy.szpt.domain.po.XxZhjfbg;
+import com.zksy.szpt.mapper.XxZhjfbgMapper;
+import com.zksy.szpt.util.BeanMapperUtil;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Service
+public class XxZhjfbgService {
+
+    @Resource
+    private XxZhjfbgMapper xxZhjfbgMapper;
+
+    public Integer addXxZhjfbg(XxZhjfbgDTO dto) {
+        XxZhjfbg xxZhjfbg = BeanMapperUtil.map(dto, XxZhjfbg.class);
+        return xxZhjfbgMapper.insert(xxZhjfbg);
+    }
+
+    public Integer update(XxZhjfbgDTO dto) {
+        XxZhjfbg xxZhjfbg = BeanMapperUtil.map(dto, XxZhjfbg.class);
+        LambdaUpdateWrapper<XxZhjfbg> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.set(XxZhjfbg::getDhid, xxZhjfbg.getDhid());
+        return xxZhjfbgMapper.update(xxZhjfbg,wrapper);
+    }
+
+
+    public Integer delete(String id) {
+        LambdaQueryWrapper<XxZhjfbg> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(XxZhjfbg::getDhid, id);
+        return xxZhjfbgMapper.delete(wrapper);
+    }
+}

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

+package com.zksy.szpt.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+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;
+
+import javax.annotation.Resource;
+
+@Service
+public class XxZhxxService {
+    @Resource
+    private XxZhxxMapper xxZhxxMapper;
+
+    public Integer addXxZhxx(XxZhxxDTO xxZhxxDTO) {
+        XxZhxx xxZhxx = BeanMapperUtil.map(xxZhxxDTO, XxZhxx.class);
+        return xxZhxxMapper.insert(xxZhxx);
+    }
+
+    public Integer update(XxZhxxDTO xxZhxxDTO) {
+        XxZhxx xxZhxx = BeanMapperUtil.map(xxZhxxDTO, XxZhxx.class);
+        LambdaUpdateWrapper<XxZhxx> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.set(XxZhxx::getZhid, xxZhxx.getZhid());
+        return xxZhxxMapper.update(xxZhxx,wrapper);
+    }
+
+
+    public Integer delete(String zhid) {
+        LambdaQueryWrapper<XxZhxx> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(XxZhxx::getZhid, zhid);
+        return xxZhxxMapper.delete(wrapper);
+    }
+}

src/main/resources/logback-spring.xml

@@ -8,9 +8,11 @@
               value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}[%L] - %msg%n"/>
     <!--文件日志-->
     <appender name="fileAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>logs/szpt_pre.log</file>
+        <append>true</append>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>logs/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>logs/szpt_pre_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>30</MaxHistory>
             <!--日志文件最大的大小-->
@@ -20,25 +22,20 @@
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
             <pattern>${LOG_PATTERN}</pattern>
         </encoder>
-        <!--输出日志级别等于此级别的日志信息-->
+        <!-- 过滤掉非info的日志.级别过滤器 -->
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <level>INFO</level>
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
-
-            <!--            onMatch="ACCEPT" 表示匹配该级别及以上-->
-            <!--            onMatch="DENY" 表示不匹配该级别及以上-->
-            <!--            onMatch="NEUTRAL" 表示该级别及以上的，由下一个filter处理，如果当前是最后一个，则表示匹配该级别及以上-->
-            <!--            onMismatch="ACCEPT" 表示匹配该级别以下-->
-            <!--            onMismatch="NEUTRAL" 表示该级别及以下的，由下一个filter处理，如果当前是最后一个，则不匹配该级别以下的-->
-            <!--            onMismatch="DENY" 表示不匹配该级别以下的-->
         </filter>
     </appender>
 
     <!--异常文件日志-->
     <appender name="errorFileAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>logs/szpt_pre_error.log</file>
+        <append>true</append>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <FileNamePattern>logs/%d{yyyy-MM-dd}-[ERROR].%i.log</FileNamePattern>
+            <FileNamePattern>logs/szpt_pre_error_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <MaxHistory>30</MaxHistory>
             <maxFileSize>100MB</maxFileSize>
         </rollingPolicy>
@@ -46,7 +43,7 @@
             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
             <pattern>${LOG_PATTERN}</pattern>
         </encoder>
-        <!--输出日志级别是大于或等于此级别的日志信息-->
+        <!--输出日志级别是大于或等于此级别的日志信息.临界值过滤器-->
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>WARN</level>
         </filter>
@@ -54,9 +51,11 @@
 
     <!--sql文件日志-->
     <appender name="sqlFileAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>logs/szpt_pre_sql.log</file>
+        <append>true</append>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>logs/%d{yyyy-MM-dd}-[SQL].%i.log</FileNamePattern>
+            <FileNamePattern>logs/szpt_pre_sql_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>30</MaxHistory>
             <!--日志文件最大的大小-->

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

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.zksy.szpt.domain.ListImageType;
 import com.zksy.szpt.domain.UploadImageDTO;
 import com.zksy.szpt.domain.dto.*;
+import com.zksy.szpt.domain.po.XxShxxyDw;
 import com.zksy.szpt.service.AppStoreService;
 import com.zksy.szpt.util.EncryptUtil;
 import com.zksy.szpt.util.SignatureUtil;
@@ -94,10 +95,10 @@ public class MainTest {
 //        Assertions.fail(secretKey);
         //请求参数
         XxZhxxDTO dto = new XxZhxxDTO();
-//        dto.setZhid("123456");
-        dto.setXxyid("123456");
-        dto.setZt("1");
-        dto.setClbz("1");
+        dto.setZhid("123456");
+        dto.setXxyid("11");
+        dto.setZt("2");
+        dto.setClbz("2");
         String json = null;
         try {
             json = objectMapper.writeValueAsString(dto);
@@ -114,7 +115,7 @@ public class MainTest {
                 .baseUrl("http://localhost:8086")
                 .defaultHeader("Content-Type", "application/json")
                 .build();
-        String response = webClient.post().uri("/rest/index/addXxZhxx")
+        String response = webClient.post().uri("/rest/xxZhxx/update")
                 .header(SignatureUtil.APPID, appId)
                 .header(SignatureUtil.NONCE, nonce)
                 .header(SignatureUtil.TIMESTAMP, timestampStr)
@@ -141,7 +142,7 @@ public class MainTest {
         XxZhjfbgDTO dto = new XxZhjfbgDTO();
 //        dto.setZhid("123456");
         dto.setDhid("123456");
-        dto.setQbid("1");
+        dto.setQbid("2");
         dto.setBgsj(new Date());
         String json = null;
         try {
@@ -159,7 +160,7 @@ public class MainTest {
                 .baseUrl("http://localhost:8086")
                 .defaultHeader("Content-Type", "application/json")
                 .build();
-        String response = webClient.post().uri("/rest/index/addXxZhjfbg")
+        String response = webClient.post().uri("/rest/xxZhjfbg/update")
                 .header(SignatureUtil.APPID, appId)
                 .header(SignatureUtil.NONCE, nonce)
                 .header(SignatureUtil.TIMESTAMP, timestampStr)
@@ -308,4 +309,85 @@ public class MainTest {
                 .block();
         System.out.println(response);
     }
+
+    @Test
+    @DisplayName("任务完成情况")
+    public void test6() {
+        timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
+        nonce=String.valueOf(System.currentTimeMillis() / 1000);
+        String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
+        Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
+        //请求参数
+        XxShxxyDwDTO dto = new XxShxxyDwDTO();
+        dto.setId("123456");
+        dto.setDwdm("123456");
+        dto.setShxxyid("123456");
+        String json = null;
+        try {
+            json = objectMapper.writeValueAsString(dto);
+        } catch (JsonProcessingException e) {
+            Assertions.fail("json序列化失败");
+        }
+        //请求体加密
+        json = EncryptUtil.getInstance().AESEncode(json, secretKey);
+        //签名appId+nonce+timestampStr+aes(body)
+        String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json);
+        String generatedSignature = DigestUtil.md5Hex(data);
+        //请求
+        WebClient webClient = WebClient.builder()
+                .baseUrl("http://localhost:8086")
+                .defaultHeader("Content-Type", "application/json")
+                .build();
+        String response = webClient.post().uri("/rest/index/addXxShxxyDw")
+                .header(SignatureUtil.APPID, appId)
+                .header(SignatureUtil.NONCE, nonce)
+                .header(SignatureUtil.TIMESTAMP, timestampStr)
+                .header(SignatureUtil.SIGNATURE, generatedSignature)
+                .body(Mono.just(dto), XxShxxyDw.class)
+                .retrieve()
+                .bodyToMono(String.class)
+                .block();
+        System.out.println(response);
+    }
+
+    @Test
+    @DisplayName("任务完成情况")
+    public void test7() {
+        timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
+        nonce=String.valueOf(System.currentTimeMillis() / 1000);
+        String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
+        Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
+        //请求参数
+        XxShxxyDTO dto = new XxShxxyDTO();
+        dto.setXxyid("123456");
+        dto.setZt("1");
+        dto.setSbfszt("1");
+        dto.setShrid("1");
+        String json = null;
+        try {
+            json = objectMapper.writeValueAsString(dto);
+        } catch (JsonProcessingException e) {
+            Assertions.fail("json序列化失败");
+        }
+        //请求体加密
+        json = EncryptUtil.getInstance().AESEncode(json, secretKey);
+        //签名appId+nonce+timestampStr+aes(body)
+        String data = String.format("%s%s%s%s", appId, nonce, timestampStr, json);
+        String generatedSignature = DigestUtil.md5Hex(data);
+        //请求
+        WebClient webClient = WebClient.builder()
+                .baseUrl("http://localhost:8086")
+                .defaultHeader("Content-Type", "application/json")
+                .build();
+        String response = webClient.post().uri("/rest/index/addXxShxxy")
+                .header(SignatureUtil.APPID, appId)
+                .header(SignatureUtil.NONCE, nonce)
+                .header(SignatureUtil.TIMESTAMP, timestampStr)
+                .header(SignatureUtil.SIGNATURE, generatedSignature)
+                .body(Mono.just(dto), XxShxxyDTO.class)
+                .retrieve()
+                .bodyToMono(String.class)
+                .block();
+        System.out.println(response);
+    }
 }