单位传参优化

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

@@ -184,16 +184,16 @@ public class SzptFwxxDTO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date jkmhysj;
 
-    /**
-     * 数据归属单位代码
-     */
-    private String sjgsdwdm;
-
-
-    /**
-     * 数据归属单位名称
-     */
-    private String sjgsdwmc;
+//    /**
+//     * 数据归属单位代码
+//     */
+//    private String sjgsdwdm;
+//
+//
+//    /**
+//     * 数据归属单位名称
+//     */
+//    private String sjgsdwmc;
 
     /**
      * 房主证件照片
@@ -480,21 +480,21 @@ public class SzptFwxxDTO {
         this.jkmhysj = jkmhysj;
     }
 
-    public String getSjgsdwmc() {
-        return sjgsdwmc;
-    }
-
-    public void setSjgsdwmc(String sjgsdwmc) {
-        this.sjgsdwmc = sjgsdwmc;
-    }
-
-    public String getSjgsdwdm() {
-        return sjgsdwdm;
-    }
-
-    public void setSjgsdwdm(String sjgsdwdm) {
-        this.sjgsdwdm = sjgsdwdm;
-    }
+//    public String getSjgsdwmc() {
+//        return sjgsdwmc;
+//    }
+//
+//    public void setSjgsdwmc(String sjgsdwmc) {
+//        this.sjgsdwmc = sjgsdwmc;
+//    }
+//
+//    public String getSjgsdwdm() {
+//        return sjgsdwdm;
+//    }
+//
+//    public void setSjgsdwdm(String sjgsdwdm) {
+//        this.sjgsdwdm = sjgsdwdm;
+//    }
 
     public String getFzzjzp() {
         return fzzjzp;

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

@@ -104,16 +104,16 @@ public class SzptGdSbxxDTO {
     private String zt;
 
 
-    /**
-     * 数据归属单位代码
-     */
-    @NotBlank(message = "数据归属单位代码不能为空")
-    private String sjgsdwdm;
-
-    /**
-     * 数据归属单位名称
-     */
-    private String sjgsdwmc;
+//    /**
+//     * 数据归属单位代码
+//     */
+//    @NotBlank(message = "数据归属单位代码不能为空")
+//    private String sjgsdwdm;
+//
+//    /**
+//     * 数据归属单位名称
+//     */
+//    private String sjgsdwmc;
 
     /**
      * 登记公安机关机构代码
@@ -271,21 +271,21 @@ public class SzptGdSbxxDTO {
         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 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;

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

@@ -195,16 +195,16 @@ public class SzptGdXxDTO {
      */
     private String mdjyzt;
 
-    /**
-     * 数据归属单位代码
-     */
-    @NotBlank(message = "数据归属单位代码不能为空")
-    private String sjgsdwdm;
-
-    /**
-     * 数据归属单位名称
-     */
-    private String sjgsdwmc;
+//    /**
+//     * 数据归属单位代码
+//     */
+//    @NotBlank(message = "数据归属单位代码不能为空")
+//    private String sjgsdwdm;
+//
+//    /**
+//     * 数据归属单位名称
+//     */
+//    private String sjgsdwmc;
 
     /**
      * 登记公安机关机构代码
@@ -498,21 +498,21 @@ public class SzptGdXxDTO {
         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 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;

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

@@ -84,16 +84,16 @@ public class SzptQyxxDTO {
     @NotBlank(message = "状态不能为空")
     private String zt;
 
-    /**
-     * 数据归属单位代码
-     */
-    @NotBlank(message = "数据归属单位代码不能为空")
-    private String sjgsdwdm;
-
-    /**
-     * 数据归属单位名称
-     */
-    private String sjgsdwmc;
+//    /**
+//     * 数据归属单位代码
+//     */
+//    @NotBlank(message = "数据归属单位代码不能为空")
+//    private String sjgsdwdm;
+//
+//    /**
+//     * 数据归属单位名称
+//     */
+//    private String sjgsdwmc;
 
     /**
      * 登记公安机关机构代码
@@ -219,21 +219,21 @@ public class SzptQyxxDTO {
         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 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;

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

@@ -186,7 +186,7 @@ public class SzptFwxx {
     /**
      * 数据归属单位代码。不用更新，入库的时候就已经代表了数据归属单位
      */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    @TableField(updateStrategy = FieldStrategy.IGNORED,fill = FieldFill.INSERT)
     private String sjgsdwdm;
 
     /**

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

@@ -115,7 +115,7 @@ public class SzptGdSbxx {
     /**
      * 数据归属单位代码。不用更新，入库的时候就已经代表了数据归属单位
      */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    @TableField(updateStrategy = FieldStrategy.IGNORED,fill = FieldFill.INSERT)
     private String sjgsdwdm;
 
     /**

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

@@ -191,7 +191,7 @@ public class SzptGdXx {
     /**
      * 数据归属单位代码。不用更新，入库的时候就已经代表了数据归属单位
      */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    @TableField(updateStrategy = FieldStrategy.IGNORED,fill = FieldFill.INSERT)
     private String sjgsdwdm;
 
     /**

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

@@ -85,7 +85,7 @@ public class SzptQyxx {
     /**
      * 数据归属单位代码。不用更新，入库的时候就已经代表了数据归属单位
      */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    @TableField(updateStrategy = FieldStrategy.IGNORED,fill = FieldFill.INSERT)
     private String sjgsdwdm;
 
     /**

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

@@ -7,6 +7,7 @@ import com.zksy.szpt.domain.dto.SzptFwxxDTO;
 import com.zksy.szpt.domain.po.SzptFwxx;
 import com.zksy.szpt.mapper.SzptFwxxMapper;
 import com.zksy.szpt.util.BeanMapperUtil;
+import com.zksy.szpt.util.UserContextHolder;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -33,7 +34,8 @@ public class SzptFwxxService {
     public Integer deleteSzptFwxx(CommonDelDTO commonDelDTO) {
         LambdaQueryWrapper<SzptFwxx> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(SzptFwxx::getQyid, commonDelDTO.getIds());
-        wrapper.eq(SzptFwxx::getSjgsdwdm, commonDelDTO.getSjgsdwdm());
+        wrapper.eq(SzptFwxx::getSjgsdwdm, UserContextHolder.get().getDeptCode());
+//        wrapper.eq(SzptFwxx::getSjgsdwdm, commonDelDTO.getSjgsdwdm());
         return szptFwxxMapper.delete(wrapper);
     }
 }

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

@@ -7,6 +7,7 @@ import com.zksy.szpt.domain.dto.SzptGdSbxxDTO;
 import com.zksy.szpt.domain.po.SzptGdSbxx;
 import com.zksy.szpt.mapper.SzptGdSbxxMapper;
 import com.zksy.szpt.util.BeanMapperUtil;
+import com.zksy.szpt.util.UserContextHolder;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -32,7 +33,9 @@ public class SzptGdSbxxService {
     public Integer deleteSzptGdSbxx(CommonDelDTO commonDelDTO) {
         LambdaQueryWrapper<SzptGdSbxx> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(SzptGdSbxx::getSbbh, commonDelDTO.getIds());
-        wrapper.eq(SzptGdSbxx::getSjgsdwdm, commonDelDTO.getSjgsdwdm());
+        wrapper.eq(SzptGdSbxx::getSjgsdwdm, UserContextHolder.get().getDeptCode());
+//        wrapper.eq(SzptGdSbxx::getSjgsdwdm, commonDelDTO.getSjgsdwdm());
         return szptGdSbxxMapper.delete(wrapper);
+
     }
 }

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

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptGdXxDTO;
+import com.zksy.szpt.domain.po.SzptGdSbxx;
 import com.zksy.szpt.domain.po.SzptGdXx;
 import com.zksy.szpt.mapper.SzptGdXxMapper;
 import com.zksy.szpt.util.BeanMapperUtil;
+import com.zksy.szpt.util.UserContextHolder;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -32,7 +34,8 @@ public class SzptGdXxService {
     public Integer deleteSzptGdXx(CommonDelDTO commonDelDTO) {
         LambdaQueryWrapper<SzptGdXx> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(SzptGdXx::getId, commonDelDTO.getIds());
-        wrapper.eq(SzptGdXx::getSjgsdwdm, commonDelDTO.getSjgsdwdm());
+        wrapper.eq(SzptGdXx::getSjgsdwdm, UserContextHolder.get().getDeptCode());
+//        wrapper.eq(SzptGdXx::getSjgsdwdm, commonDelDTO.getSjgsdwdm());
         return szptGdXxMapper.delete(wrapper);
     }
 }

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

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptQyxxDTO;
+import com.zksy.szpt.domain.po.SzptGdXx;
 import com.zksy.szpt.domain.po.SzptQyxx;
 import com.zksy.szpt.mapper.SzptQyxxMapper;
 import com.zksy.szpt.util.BeanMapperUtil;
+import com.zksy.szpt.util.UserContextHolder;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -31,6 +33,8 @@ public class SzptQyxxService {
     public Integer deleteSzptQyxx(CommonDelDTO commonDelDTO) {
         LambdaQueryWrapper<SzptQyxx> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(SzptQyxx::getId, commonDelDTO.getIds());
+        wrapper.eq(SzptQyxx::getSjgsdwdm, UserContextHolder.get().getDeptCode());
+//        wrapper.eq(SzptQyxx::getSjgsdwdm, commonDelDTO.getSjgsdwdm());
         return szptQyxxMapper.delete(wrapper);
     }
 }

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

@@ -20,7 +20,7 @@ public class MainTestX {
     public void szptClockInAddTest() {
         //请求参数
         SzptClockInDTO szptClockInDTO = new SzptClockInDTO();
-        szptClockInDTO.setId(3);
+        szptClockInDTO.setId(1);
         szptClockInDTO.setCsid("123456111111111111111");
         szptClockInDTO.setSbqd("123456");
         szptClockInDTO.setXbqt("123456");
@@ -170,8 +170,8 @@ public class MainTestX {
         szptFwxxDTO.setFkdjzdsh("1");
         szptFwxxDTO.setQtfwyt("1");
         szptFwxxDTO.setJkmhysj(new Date());
-        szptFwxxDTO.setSjgsdwdm("330102");
-        szptFwxxDTO.setSjgsdwmc("1");
+//        szptFwxxDTO.setSjgsdwdm("330102");
+//        szptFwxxDTO.setSjgsdwmc("1");
         szptFwxxDTO.setFzzjzp("1");
         TestHttpUtil.signatureAndRequest("/rest/index/addSzptFwxx", szptFwxxDTO, SzptFwxxDTO.class);
     }
@@ -216,8 +216,8 @@ public class MainTestX {
         szptFwxxDTO.setFkdjzdsh("1");
         szptFwxxDTO.setQtfwyt("1");
         szptFwxxDTO.setJkmhysj(new Date());
-        szptFwxxDTO.setSjgsdwdm("330102");
-        szptFwxxDTO.setSjgsdwmc("1");
+//        szptFwxxDTO.setSjgsdwdm("330102");
+//        szptFwxxDTO.setSjgsdwmc("1");
         szptFwxxDTO.setFzzjzp("1");
         TestHttpUtil.signatureAndRequest("/rest/index/updateSzptFwxx", szptFwxxDTO, SzptFwxxDTO.class);
     }
@@ -427,8 +427,8 @@ public class MainTestX {
         szptGdSbxxDTO.setSbcs("1");
         szptGdSbxxDTO.setSblb("1");
         szptGdSbxxDTO.setZt("1");
-        szptGdSbxxDTO.setSjgsdwdm("330102");
-        szptGdSbxxDTO.setSjgsdwmc("1");
+//        szptGdSbxxDTO.setSjgsdwdm("330102");
+//        szptGdSbxxDTO.setSjgsdwmc("1");
         szptGdSbxxDTO.setCreateGajgjgdm("123");
         szptGdSbxxDTO.setCreateGajgmc("123");
         TestHttpUtil.signatureAndRequest("/rest/index/addSzptGdSbxx", szptGdSbxxDTO, SzptGdSbxxDTO.class);
@@ -457,8 +457,8 @@ public class MainTestX {
         szptGdSbxxDTO.setSbcs("1");
         szptGdSbxxDTO.setSblb("1");
         szptGdSbxxDTO.setZt("1");
-        szptGdSbxxDTO.setSjgsdwdm("330102");
-        szptGdSbxxDTO.setSjgsdwmc("1");
+//        szptGdSbxxDTO.setSjgsdwdm("330102");
+//        szptGdSbxxDTO.setSjgsdwmc("1");
         szptGdSbxxDTO.setCreateGajgjgdm("123");
         szptGdSbxxDTO.setCreateGajgmc("123");
         TestHttpUtil.signatureAndRequest("/rest/index/updateSzptGdSbxx", szptGdSbxxDTO, SzptGdSbxxDTO.class);
@@ -520,8 +520,8 @@ public class MainTestX {
         szptGdXxDTO.setSqmc("123");
         szptGdXxDTO.setMdlx("1");
         szptGdXxDTO.setMdjyzt("1");
-        szptGdXxDTO.setSjgsdwdm("330102");
-        szptGdXxDTO.setSjgsdwmc("1");
+//        szptGdXxDTO.setSjgsdwdm("330102");
+//        szptGdXxDTO.setSjgsdwmc("1");
         szptGdXxDTO.setCreateGajgjgdm("1");
         szptGdXxDTO.setCreateGajgmc("1");
         TestHttpUtil.signatureAndRequest("/rest/index/addSzptGdXx", szptGdXxDTO, SzptGdXxDTO.class);
@@ -567,8 +567,8 @@ public class MainTestX {
         szptGdXxDTO.setSqmc("123");
         szptGdXxDTO.setMdlx("1");
         szptGdXxDTO.setMdjyzt("1");
-        szptGdXxDTO.setSjgsdwdm("330102");
-        szptGdXxDTO.setSjgsdwmc("1");
+//        szptGdXxDTO.setSjgsdwdm("330102");
+//        szptGdXxDTO.setSjgsdwmc("1");
         szptGdXxDTO.setCreateGajgjgdm("1");
         szptGdXxDTO.setCreateGajgmc("1");
         TestHttpUtil.signatureAndRequest("/rest/index/updateSzptGdXx", szptGdXxDTO, SzptGdXxDTO.class);
@@ -674,8 +674,8 @@ public class MainTestX {
         szptQyxxDTO.setCustomlat("30");
 
         szptQyxxDTO.setZt("1");
-        szptQyxxDTO.setSjgsdwdm("330102");
-        szptQyxxDTO.setSjgsdwmc("123");
+//        szptQyxxDTO.setSjgsdwdm("330102");
+//        szptQyxxDTO.setSjgsdwmc("123");
         szptQyxxDTO.setCreateGajgjgdm("123");
         szptQyxxDTO.setCreateGajgmc("120.3");
         TestHttpUtil.signatureAndRequest("/rest/index/addSzptQyxx", szptQyxxDTO, SzptQyxxDTO.class);
@@ -701,8 +701,8 @@ public class MainTestX {
         szptQyxxDTO.setCustomlat("30");
 
         szptQyxxDTO.setZt("1");
-        szptQyxxDTO.setSjgsdwdm("330102");
-        szptQyxxDTO.setSjgsdwmc("123");
+//        szptQyxxDTO.setSjgsdwdm("330102");
+//        szptQyxxDTO.setSjgsdwmc("123");
         szptQyxxDTO.setCreateGajgjgdm("123");
         szptQyxxDTO.setCreateGajgmc("120.3");
         TestHttpUtil.signatureAndRequest("/rest/index/updateSzptQyxx", szptQyxxDTO, SzptQyxxDTO.class);

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

@@ -16,9 +16,9 @@ public class TestAppStore {
     @DisplayName("新增AppId")
     public void addAppId() {
         AppStoreDTO appStoreDTO = new AppStoreDTO();
-        appStoreDTO.setAppKey("us2");
-        appStoreDTO.setAppSecret(DigestUtil.md5Hex("us"));
-        appStoreDTO.setDeptCode("123456");
+        appStoreDTO.setAppKey("scale");
+        appStoreDTO.setAppSecret(DigestUtil.md5Hex("scale"));
+        appStoreDTO.setDeptCode("3302020201");
 
         TestHttpUtil.signatureAndRequest("/rest/appStore/updateAppIdSecret", appStoreDTO, AppStoreDTO.class);
         TestHttpUtil.signatureAndRequest("/rest/appStore/insertAppStore", appStoreDTO, AppStoreDTO.class);

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

@@ -14,9 +14,9 @@ public class TestHttpUtil {
     private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TestHttpUtil.class);
     static String nonce = "2";
     static String timestampStr = "21";
-    static String appId = "1872576325743943682";
-    static String appSecret = DigestUtil.md5Hex("2");;
-    static String deptCode = "330102";
+    static String appId = "scale";
+    static String appSecret = DigestUtil.md5Hex("scale");;
+    static String deptCode = "3302020201";
 
     private static final ObjectMapper objectMapper = new ObjectMapper();