新增义警任务，义警队伍代码服务

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

@@ -82,4 +82,16 @@ public class IndexController {
     public Integer addXxZhjfbg(@RequestBody @Validated XxZhjfbgDTO dto){
         return indexService.addXxZhjfbg(dto);
     }
+
+    @ApiOperation(value="新增义警任务信息数据")
+    @PostMapping("/addXxYjrw")
+    public Integer addXxYjrw(@RequestBody @Validated XxYjrwDTO dto){
+        return indexService.addXxYjrw(dto);
+    }
+
+    @ApiOperation(value="新增义警队伍代码信息数据")
+    @PostMapping("/addXxYjdwdm")
+    public Integer addXxYjdwdm(@RequestBody @Validated XxYjdwdmDTO dto){
+        return indexService.addXxYjdwdm(dto);
+    }
 }

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

+package com.zksy.szpt.domain.dto;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+public class XxYjdwdmDTO {
+
+
+    /**
+     * 义警队伍代码ID
+     */
+    @NotBlank(message = "义警队伍代码不能为空")
+    private String id;
+
+    /**
+     * 运营单位ID
+     */
+    @NotBlank(message = "运营单位ID不能为空")
+    private String mchid;
+
+    /**
+     * 队伍名称
+     */
+    @NotBlank(message = "队伍名称不能为空")
+    private String yjdwmc;
+
+    /**
+     * 队伍介绍
+     */
+    private String yjdwjs;
+
+    /**
+     * 父分类代码ID
+     */
+    private String fid;
+
+    /**
+     * 状态;cslb=3101
+     */
+    @NotBlank(message = "状态不能为空")
+    private String zt;
+
+    /**
+     * 队伍类型（0:外部队伍；1:内部队伍）
+     */
+    @NotNull(message = "队伍类型不能为空")
+    private Integer dwlx;
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    public String getMchid() {
+        return mchid;
+    }
+
+    public void setMchid(String mchid) {
+        this.mchid = mchid == null ? null : mchid.trim();
+    }
+
+    public String getYjdwmc() {
+        return yjdwmc;
+    }
+
+    public void setYjdwmc(String yjdwmc) {
+        this.yjdwmc = yjdwmc == null ? null : yjdwmc.trim();
+    }
+
+    public String getYjdwjs() {
+        return yjdwjs;
+    }
+
+    public void setYjdwjs(String yjdwjs) {
+        this.yjdwjs = yjdwjs == null ? null : yjdwjs.trim();
+    }
+
+    public String getFid() {
+        return fid;
+    }
+
+    public void setFid(String fid) {
+        this.fid = fid == null ? null : fid.trim();
+    }
+
+    public String getZt() {
+        return zt;
+    }
+
+    public void setZt(String zt) {
+        this.zt = zt == null ? null : zt.trim();
+    }
+
+    public Integer getDwlx() {
+        return dwlx;
+    }
+
+    public void setDwlx(Integer dwlx) {
+        this.dwlx = dwlx;
+    }
+
+}
\ No newline at end of file

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

+package com.zksy.szpt.domain.dto;
+
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+public class XxYjrwDTO {
+
+    /**
+     * 任务ID
+     */
+    @NotBlank(message = "任务ID不能为空")
+    private String rwid;
+
+    /**
+     * 周期任务ID
+     */
+    private String taskId;
+
+    /**
+     * 任务类型;cslb=3211
+     */
+    private String rwlx;
+
+    /**
+     * 任务标题
+     */
+    @NotBlank(message = "任务标题不能为空")
+    private String rwbt;
+
+    /**
+     * 任务内容;
+     */
+    @NotBlank(message = "任务内容不能为空")
+    private String rwnr;
+
+    /**
+     * 人均奖励积分
+     */
+    private Long rjjljf;
+
+    /**
+     * 工作人数
+     */
+    @NotNull(message = "工作人数不能为空")
+    private Long gzrs;
+
+    /**
+     * 完成人数
+     */
+    @NotNull(message = "完成人数不能为空")
+    private Long wcrs;
+
+    /**
+     * 任务起始日期
+     */
+    private Date rwqsrq;
+
+    /**
+     * 任务截止日期
+     */
+    private Date rwjzrq;
+
+    /**
+     * 时间模式（1:单次；2:周期；3:间隔；）
+     */
+    private Integer timePattern;
+
+    /**
+     * 周期任务id
+     */
+    private String scheduleId;
+
+    /**
+     * 审核模式（0:审核；1:无需审核）
+     */
+    @NotNull(message = "审核模式不能为空")
+    private Integer sfsh;
+
+    /**
+     * 发表范围
+     */
+    private String fbfw;
+
+    /**
+     * 发表范围编码
+     */
+    private String fbfwbm;
+
+    /**
+     * 发布人id
+     */
+    private String fbrid;
+
+    /**
+     * 发布人姓名
+     */
+    private String fbrxm;
+
+    /**
+     * 发布时间
+     */
+    private Date fbsj;
+
+    /**
+     * 运营单位ID
+     */
+    private String mchid;
+
+    /**
+     * 任务状态;cslb=3213
+     */
+    private String rwzt;
+
+
+
+    /**
+     * 图片
+     */
+    private String pictureUrls;
+
+    public String getRwid() {
+        return rwid;
+    }
+
+    public void setRwid(String rwid) {
+        this.rwid = rwid == null ? null : rwid.trim();
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId == null ? null : taskId.trim();
+    }
+
+    public String getRwlx() {
+        return rwlx;
+    }
+
+    public void setRwlx(String rwlx) {
+        this.rwlx = rwlx == null ? null : rwlx.trim();
+    }
+
+    public String getRwbt() {
+        return rwbt;
+    }
+
+    public void setRwbt(String rwbt) {
+        this.rwbt = rwbt == null ? null : rwbt.trim();
+    }
+
+    public String getRwnr() {
+        return rwnr;
+    }
+
+    public void setRwnr(String rwnr) {
+        this.rwnr = rwnr == null ? null : rwnr.trim();
+    }
+
+    public Long getRjjljf() {
+        return rjjljf;
+    }
+
+    public void setRjjljf(Long rjjljf) {
+        this.rjjljf = rjjljf;
+    }
+
+    public Long getGzrs() {
+        return gzrs;
+    }
+
+    public void setGzrs(Long gzrs) {
+        this.gzrs = gzrs;
+    }
+
+    public Long getWcrs() {
+        return wcrs;
+    }
+
+    public void setWcrs(Long wcrs) {
+        this.wcrs = wcrs;
+    }
+
+    public Date getRwqsrq() {
+        return rwqsrq;
+    }
+
+    public void setRwqsrq(Date rwqsrq) {
+        this.rwqsrq = rwqsrq;
+    }
+
+    public Date getRwjzrq() {
+        return rwjzrq;
+    }
+
+    public void setRwjzrq(Date rwjzrq) {
+        this.rwjzrq = rwjzrq;
+    }
+
+    public Integer getTimePattern() {
+        return timePattern;
+    }
+
+    public void setTimePattern(Integer timePattern) {
+        this.timePattern = timePattern;
+    }
+
+    public String getScheduleId() {
+        return scheduleId;
+    }
+
+    public void setScheduleId(String scheduleId) {
+        this.scheduleId = scheduleId == null ? null : scheduleId.trim();
+    }
+
+    public Integer getSfsh() {
+        return sfsh;
+    }
+
+    public void setSfsh(Integer sfsh) {
+        this.sfsh = sfsh;
+    }
+
+    public String getFbfw() {
+        return fbfw;
+    }
+
+    public void setFbfw(String fbfw) {
+        this.fbfw = fbfw == null ? null : fbfw.trim();
+    }
+
+    public String getFbfwbm() {
+        return fbfwbm;
+    }
+
+    public void setFbfwbm(String fbfwbm) {
+        this.fbfwbm = fbfwbm == null ? null : fbfwbm.trim();
+    }
+
+    public String getFbrid() {
+        return fbrid;
+    }
+
+    public void setFbrid(String fbrid) {
+        this.fbrid = fbrid == null ? null : fbrid.trim();
+    }
+
+    public String getFbrxm() {
+        return fbrxm;
+    }
+
+    public void setFbrxm(String fbrxm) {
+        this.fbrxm = fbrxm == null ? null : fbrxm.trim();
+    }
+
+    public Date getFbsj() {
+        return fbsj;
+    }
+
+    public void setFbsj(Date fbsj) {
+        this.fbsj = fbsj;
+    }
+
+    public String getMchid() {
+        return mchid;
+    }
+
+    public void setMchid(String mchid) {
+        this.mchid = mchid == null ? null : mchid.trim();
+    }
+
+    public String getRwzt() {
+        return rwzt;
+    }
+
+    public void setRwzt(String rwzt) {
+        this.rwzt = rwzt == null ? null : rwzt.trim();
+    }
+
+
+    public String getPictureUrls() {
+        return pictureUrls;
+    }
+
+    public void setPictureUrls(String pictureUrls) {
+        this.pictureUrls = pictureUrls == null ? null : pictureUrls.trim();
+    }
+}
\ No newline at end of file

src/main/java/com/zksy/szpt/domain/po/XxYjdwdm.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 XxYjdwdm {
     /**
      * 义警队伍代码IID
      */
+    @TableId(type = IdType.ASSIGN_ID)
     private Long iid;
 
     /**
@@ -46,16 +52,19 @@ public class XxYjdwdm {
     /**
      * 创建人id
      */
+    @TableField(fill = FieldFill.INSERT)
     private String cjrid;
 
     /**
      * 创建人姓名
      */
+    @TableField(fill = FieldFill.INSERT)
     private String cjrxm;
 
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date cjsj;
 
     /**

src/main/java/com/zksy/szpt/domain/po/XxYjrw.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 XxYjrw {
     /**
      * IID
      */
+    @TableId(type = IdType.ASSIGN_ID)
     private Long iid;
 
     /**
@@ -111,16 +117,19 @@ public class XxYjrw {
     /**
      * 创建人id
      */
+    @TableField(fill = FieldFill.INSERT)
     private String cjrid;
 
     /**
      * 创建人姓名
      */
+    @TableField(fill = FieldFill.INSERT)
     private String cjrxm;
 
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date cjsj;
 
     /**

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

@@ -29,6 +29,7 @@ public class SzptMetaObjectHandler implements MetaObjectHandler {
                 StrictFill.of("createGajgjgdm", String.class, "1"),
                 StrictFill.of("createGajgmc", String.class, "1"),
                 StrictFill.of("createId", String.class, "1"),
+                StrictFill.of("cjrid", String.class, "1"),
                 StrictFill.of("createBy", String.class, "1"),
                 StrictFill.of("createTerminal", String.class, "1"),
                 StrictFill.of("createIp", String.class, "1"),

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

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

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

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

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

@@ -91,4 +91,21 @@ public class IndexService {
         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/test/java/com/zksy/szpt/MainTest.java

@@ -5,9 +5,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.zksy.szpt.domain.ListImageType;
 import com.zksy.szpt.domain.UploadImageDTO;
-import com.zksy.szpt.domain.dto.XxRwwcqkDTO;
-import com.zksy.szpt.domain.dto.XxZhjfbgDTO;
-import com.zksy.szpt.domain.dto.XxZhxxDTO;
+import com.zksy.szpt.domain.dto.*;
 import com.zksy.szpt.service.AppStoreService;
 import com.zksy.szpt.util.EncryptUtil;
 import com.zksy.szpt.util.SignatureUtil;
@@ -53,7 +51,7 @@ public class MainTest {
         xxRwwcqkDTO.setRwid("123456");
         xxRwwcqkDTO.setXxyid("123456");
         xxRwwcqkDTO.setShrid("123456");
-        xxRwwcqkDTO.setWczt("1");
+//        xxRwwcqkDTO.setWczt("1");
         xxRwwcqkDTO.setBmzt("1");
         String json = null;
         try {
@@ -216,4 +214,98 @@ public class MainTest {
                 .block();
         System.out.println(response);
     }
+
+    /**
+     * 任务完成情况
+     */
+    @Test
+    @DisplayName("任务完成情况")
+    public void test4() {
+        timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
+        nonce=String.valueOf(System.currentTimeMillis() / 1000);
+        String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
+        Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
+//        Assertions.fail(secretKey);
+        //请求参数
+        XxYjrwDTO dto = new XxYjrwDTO();
+//        dto.setZhid("123456");
+        dto.setRwid("123456");
+        dto.setRwbt("1");
+        dto.setRwnr("11111");
+        dto.setGzrs(1L);
+        dto.setSfsh(1);
+        dto.setWcrs(1L);
+        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/addXxYjrw")
+                .header(SignatureUtil.APPID, appId)
+                .header(SignatureUtil.NONCE, nonce)
+                .header(SignatureUtil.TIMESTAMP, timestampStr)
+                .header(SignatureUtil.SIGNATURE, generatedSignature)
+                .body(Mono.just(dto), XxYjrwDTO.class)
+                .retrieve()
+                .bodyToMono(String.class)
+                .block();
+        System.out.println(response);
+    }
+    /**
+     * 任务完成情况
+     */
+    @Test
+    @DisplayName("任务完成情况")
+    public void test5() {
+        timestampStr = String.valueOf(System.currentTimeMillis() / 1000);
+        nonce=String.valueOf(System.currentTimeMillis() / 1000);
+        String secretKey = this.appStoreService.getAppSecretByAppKey(appId);
+        Assertions.assertNotNull(secretKey, "appId不存在");//断言appId存在，为空直接抛出异常不进行下一步测试，提高测试效率
+//        Assertions.fail(secretKey);
+        //请求参数
+        XxYjdwdmDTO dto = new XxYjdwdmDTO();
+//        dto.setZhid("123456");
+        dto.setDwlx(Integer.valueOf(1));
+        dto.setId("1");
+        dto.setMchid("11111");
+//        dto.setZt("1");
+//        dto.setYjdwmc("test");
+        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/addXxYjdwdm")
+                .header(SignatureUtil.APPID, appId)
+                .header(SignatureUtil.NONCE, nonce)
+                .header(SignatureUtil.TIMESTAMP, timestampStr)
+                .header(SignatureUtil.SIGNATURE, generatedSignature)
+                .body(Mono.just(dto), XxYjdwdmDTO.class)
+                .retrieve()
+                .bodyToMono(String.class)
+                .block();
+        System.out.println(response);
+    }
 }