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

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

 package com.zksy.szpt.controller;
 
+import com.zksy.szpt.domain.PageInfo;
+import com.zksy.szpt.domain.bo.SzptFwxxBO;
 import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptFwxxDTO;
+import com.zksy.szpt.domain.dto.SzptFwxxQueryDTO;
 import com.zksy.szpt.service.SzptFwxxService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,6 +24,11 @@ public class SzptFwxxController {
         this.szptFwxxService = szptFwxxService;
     }
 
+    @ApiOperation(value="查询房屋信息数据")
+    @PostMapping("/querySzptFwxx")
+    public PageInfo<SzptFwxxBO> querySzptFwxx(@RequestBody @Validated SzptFwxxQueryDTO szptFwxxQueryDTO){
+        return szptFwxxService.querySzptFwxx(szptFwxxQueryDTO);
+    }
 
     @ApiOperation(value="新增房屋信息数据")
     @PostMapping("/addSzptFwxx")

src/main/java/com/zksy/szpt/domain/PageInfo.java

+package com.zksy.szpt.domain;
+
+import java.util.List;
+
+public class PageInfo <T>{
+    private Long pageNum;
+    private Long pageSize;
+    private Long totalPages;
+    private Long total;
+    private List<T> record;
+
+    public PageInfo(Long total,List<T> record,Long pageNum,Long pageSize){
+        this.total = total;
+        this.record = record;
+        this.pageNum = pageNum;
+        this.pageSize = pageSize;
+    }
+
+    public PageInfo(Long total,Long pageNum,Long pageSize,List<T> record,Long totalPages) {
+        this.total = total;
+        this.record = record;
+        this.pageNum = pageNum;
+        this.pageSize = pageSize;
+        this.totalPages = totalPages;
+    }
+
+    public Long getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(Long pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public Long getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Long pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Long getTotalPages() {
+        return totalPages;
+    }
+
+    public void setTotalPages(Long totalPages) {
+        this.totalPages = totalPages;
+    }
+
+    public Long getTotal() {
+        return total;
+    }
+
+    public void setTotal(Long total) {
+        this.total = total;
+    }
+
+    public List<T> getRecord() {
+        return record;
+    }
+
+    public void setRecord(List<T> record) {
+        this.record = record;
+    }
+}

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

+package com.zksy.szpt.domain.dto;
+
+import javax.validation.constraints.Min;
+
+public class SzptFwxxQueryDTO {
+    @Min(value = 1, message = "每页数据量不能小于1")
+    private Integer pageSize = 10;
+    @Min(value = 1, message = "页码不能小于1")
+    private Integer pageNum = 1;
+    private String  qyid;
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Integer getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public String getQyid() {
+        return qyid;
+    }
+
+    public void setQyid(String qyid) {
+        this.qyid = qyid;
+    }
+}

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

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

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

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

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

 package com.zksy.szpt.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zksy.szpt.domain.PageInfo;
+import com.zksy.szpt.domain.bo.SzptFwxxBO;
 import com.zksy.szpt.domain.dto.CommonDelDTO;
 import com.zksy.szpt.domain.dto.SzptFwxxDTO;
+import com.zksy.szpt.domain.dto.SzptFwxxQueryDTO;
 import com.zksy.szpt.domain.po.SzptFwxx;
 import com.zksy.szpt.mapper.SzptFwxxMapper;
 import com.zksy.szpt.util.BeanMapperUtil;
@@ -11,6 +16,7 @@ import com.zksy.szpt.util.UserContextHolder;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 public class SzptFwxxService {
@@ -18,6 +24,26 @@ public class SzptFwxxService {
     @Resource
     private SzptFwxxMapper szptFwxxMapper;
 
+    public PageInfo<SzptFwxxBO> querySzptFwxx(SzptFwxxQueryDTO szptFwxxQueryDTO) {
+            String deptCode  = UserContextHolder.get().getDeptCode();
+            if(deptCode==null){
+                throw new IllegalArgumentException("所属单位为空");
+            }
+            LambdaQueryWrapper<SzptFwxx> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SzptFwxx::getSjgsdwdm, deptCode);
+            if (szptFwxxQueryDTO.getQyid() != null) {
+                wrapper.eq(SzptFwxx::getQyid, szptFwxxQueryDTO.getQyid());
+            }
+
+            Page<SzptFwxx> page = new Page<>(szptFwxxQueryDTO.getPageNum(),szptFwxxQueryDTO.getPageSize());
+            Page<SzptFwxx> resultPage = szptFwxxMapper.selectPage(page,wrapper);
+
+            List<SzptFwxxBO> list = BeanMapperUtil.mapList(resultPage.getRecords(), SzptFwxxBO.class);
+            PageInfo<SzptFwxxBO> pageInfoBo = new PageInfo<>(resultPage.getTotal(),list,resultPage.getCurrent(),resultPage.getSize());
+            return pageInfoBo;
+
+    }
+
     public Integer addSzptFwxx(SzptFwxxDTO szptFwxxDTO) {
         SzptFwxx szptFwxx = BeanMapperUtil.map(szptFwxxDTO, SzptFwxx.class);
         return szptFwxxMapper.insert(szptFwxx);
@@ -27,7 +53,7 @@ public class SzptFwxxService {
         SzptFwxx szptFwxx = BeanMapperUtil.map(szptFwxxDTO, SzptFwxx.class);
         LambdaUpdateWrapper<SzptFwxx> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(SzptFwxx::getQyid, szptFwxx.getQyid());
-        wrapper.eq(SzptFwxx::getSjgsdwdm, szptFwxx.getSjgsdwdm());
+        wrapper.eq(SzptFwxx::getSjgsdwdm, UserContextHolder.get().getDeptCode());
         return szptFwxxMapper.update(szptFwxx,wrapper);
     }
 

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

@@ -26,7 +26,7 @@ public class SzptGdSbxxService {
         SzptGdSbxx szptGdSbxx = BeanMapperUtil.map(szptGdSbxxDTO, SzptGdSbxx.class);
         LambdaUpdateWrapper<SzptGdSbxx> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(SzptGdSbxx::getSbbh, szptGdSbxx.getSbbh());
-        wrapper.eq(SzptGdSbxx::getSjgsdwdm, szptGdSbxx.getSjgsdwdm());
+        wrapper.eq(SzptGdSbxx::getSjgsdwdm, UserContextHolder.get().getDeptCode());
         return szptGdSbxxMapper.update(szptGdSbxx,wrapper);
     }
 

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

@@ -27,7 +27,7 @@ public class SzptGdXxService {
         SzptGdXx szptGdXx = BeanMapperUtil.map(szptGdXxDTO, SzptGdXx.class);
         LambdaUpdateWrapper<SzptGdXx> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(SzptGdXx::getId, szptGdXx.getId());
-        wrapper.eq(SzptGdXx::getSjgsdwdm, szptGdXx.getSjgsdwdm());
+        wrapper.eq(SzptGdXx::getSjgsdwdm, UserContextHolder.get().getDeptCode());
         return szptGdXxMapper.update(szptGdXx,wrapper);
     }
 

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

@@ -26,7 +26,7 @@ public class SzptQyxxService {
         SzptQyxx szptQyxx = BeanMapperUtil.map(szptQyxxDTO, SzptQyxx.class);
         LambdaUpdateWrapper<SzptQyxx> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(SzptQyxx::getId, szptQyxx.getId());
-        wrapper.eq(SzptQyxx::getSjgsdwdm, szptQyxx.getSjgsdwdm());
+        wrapper.eq(SzptQyxx::getSjgsdwdm, UserContextHolder.get().getDeptCode());
         return szptQyxxMapper.update(szptQyxx,wrapper);
     }
 

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

@@ -12,8 +12,8 @@ import reactor.core.publisher.Mono;
 
 public class TestHttpUtil {
     private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TestHttpUtil.class);
-//    final static String baseUrl = "https://demo.qmrzhz.cn:18030";
-    final static String baseUrl = "http://localhost:8086";
+    final static String baseUrl = "https://demo.qmrzhz.cn:18030/szptsjjs";
+//    final static String baseUrl = "http://localhost:8086";
 
     //请求头参数
     static String nonce = "2";