merge zhongj

shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java

@@ -9,6 +9,13 @@ import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.kms.yg.dd.domain.AttDiscBase;
 import com.kms.yg.dd.service.AttDiscBaseService;
+import com.kms.yg.df.domain.BsSgcDfJbxx;
+import com.kms.yg.df.domain.BsSgcDfSafeJbxx;
+import com.kms.yg.df.domain.BsSgcDfSwtz;
+import com.kms.yg.df.domain.dto.BsSgcDfSwtzDto;
+import com.kms.yg.df.service.BsSgcDfJbxxService;
+import com.kms.yg.df.service.BsSgcDfSafeJbxxService;
+import com.kms.yg.df.service.BsSgcDfSwtzService;
 import com.kms.yg.ly.domain.AttBasBase;
 import com.kms.yg.ly.service.AttBasBaseService;
 import com.kms.yg.rv.domain.AttRvBase;
@@ -17,6 +24,8 @@ import com.kms.yg.sk.domain.AttResBase;
 import com.kms.yg.sk.domain.AttResRspp;
 import com.kms.yg.sk.service.AttResBaseService;
 import com.kms.yg.sk.service.AttResRsppService;
+import com.kms.yg.sz.domain.BsSgcSzSafeJbxx;
+import com.kms.yg.sz.service.BsSgcSzSafeJbxxService;
 import com.kms.yg.xgxd.domain.AttDpdsBase;
 import com.kms.yg.xgxd.service.AttDpdsBaseService;
 import io.swagger.models.auth.In;
@@ -57,6 +66,15 @@ public class YgSynchronous {
     @Autowired
     AttDiscBaseService attDiscBaseService;
 
+    @Autowired
+    BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService;
+
+    @Autowired
+    BsSgcDfSafeJbxxService bsSgcDfSafeJbxxService;
+
+    @Autowired
+    BsSgcDfSwtzService bsSgcDfSwtzService;
+
     private static String XH3CID = "3359137640337";
     private static String XH3CAPPKEY = "q7sli9ch";
 
@@ -83,36 +101,44 @@ public class YgSynchronous {
     static final String xgxdsj = "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_dpds_base" ;
     //流域基本数据
     static final String llsj = "http://19.25.35.205:31190/ZHSL_ZY/jck/ytjgx/dws_att_bas_base" ;
-    //
+    //水闸基础信息
-
+    static final String dawb="http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_waga_base";
+    //堤防基础信息
+    static final String dadb= "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_dike_base";
+    //水闸行政区划关系数据
+    static final String drwa="http://19.25.35.205:31190/ZHSL_ZY/dws_rel_waga_ad";
+    //堤防行政区划关系数据
+    static final String drda="http://19.25.35.205:31190/ZHSL_ZY/dws_rel_dike_ad";
+    //堤防水文特征数据
+    static final String dadt="http://19.25.35.205:31190/ZHSL_ZY/jck/ytjgx/dws_att_dike_bsfst";
     /**
      * 同步
      */
-//    @GetMapping("sktz1")
+    @GetMapping("sktz1")
-//    public void synchronous() throws ExecutionException, InterruptedException {
+    public void synchronous() throws ExecutionException, InterruptedException {
-//        int pageNum = 1;
+        int pageNum = 1;
-//        int pageSize = 1000;
+        int pageSize = 1000;
-//        Boolean f = true;
+        Boolean f = true;
-//        HashMap<String, Object> hashMap = new HashMap<>();
+        HashMap<String, Object> hashMap = new HashMap<>();
-//        int  i = 1;
+        int  i = 1;
-//        while (f) {
+        while (f) {
-//            String s = sendRequest(ddsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize);
+            String s = sendRequest(ddsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize);
-//            String data = JSONObject.parseObject(s).getString("data");
+            String data = JSONObject.parseObject(s).getString("data");
-//            List<AttDiscBase> attResRspps = JSONObject.parseArray(data, AttDiscBase.class);
+            List<AttDiscBase> attResRspps = JSONObject.parseArray(data, AttDiscBase.class);
-//            if(attResRspps.size()<pageSize){
+            if(attResRspps.size()<pageSize){
-//                f = false;
+                f = false;
-//            }
+            }
-//            for (AttDiscBase attDiscBase : attResRspps) {
+            for (AttDiscBase attDiscBase : attResRspps) {
-//                hashMap.put(attDiscBase.getDiscCode(),i++);
+                hashMap.put(attDiscBase.getDiscCode(),i++);
-//                attDiscBase.preInsert();
+                attDiscBase.preInsert();
-//                attDiscBase.setId(attDiscBase.getDiscCode());
+                attDiscBase.setId(attDiscBase.getDiscCode());
-//                attDiscBaseService.save(attDiscBase);
+                attDiscBaseService.save(attDiscBase);
-//            }
+            }
-////            CopyOnWriteArrayList<AttDiscBase> attDiscBases = CollectionUtil.newCopyOnWriteArrayList(attResRspps);
+//            CopyOnWriteArrayList<AttDiscBase> attDiscBases = CollectionUtil.newCopyOnWriteArrayList(attResRspps);
-////            executorService.execute(new sktz(attResRspps));
+//            executorService.execute(new sktz(attResRspps));
-//            pageNum++;
+            pageNum++;
-//        }
+        }
-//    }
+    }
 
     @Data
     class sktz implements Runnable{
@@ -141,6 +167,8 @@ public class YgSynchronous {
 
 
 
+
+
     /***
      * 提段线程
      * @param list
@@ -178,6 +206,79 @@ public class YgSynchronous {
             });
     }
 
+    @GetMapping("dadt")
+    @Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE)
+    public void  dadt(){
+        int pageNum=1;
+        int pageSize=999999;
+        String s=sendRequest(dadt+"?pageNum=" + pageNum + "&pageSize=" + pageSize);
+        String data=JSONObject.parseObject(s).getString("data");
+        List<BsSgcDfSwtzDto>sgcDfSwtzDtos=JSONObject.parseArray(data, BsSgcDfSwtzDto.class);
+        sgcDfSwtzDtos.forEach(bsSgcDfSwtzDto -> {
+            BsSgcDfSwtz bsSgcDfSwtz=new BsSgcDfSwtz();
+            bsSgcDfSwtz.setId(bsSgcDfSwtzDto.getDikeCode());
+            bsSgcDfSwtz.setDikeCode(bsSgcDfSwtzDto.getDikeCode());
+            bsSgcDfSwtz.setDsflStd(bsSgcDfSwtzDto.getFlcnst());
+            bsSgcDfSwtz.setDsflLev(bsSgcDfSwtzDto.getDsfllv());
+            bsSgcDfSwtz.setAlwtLev(bsSgcDfSwtzDto.getWrwl());
+            bsSgcDfSwtz.setNote(bsSgcDfSwtzDto.getNote());
+            bsSgcDfSwtz.setEffDate(bsSgcDfSwtzDto.getEffDate());
+            bsSgcDfSwtzService.saveOrUpdate(bsSgcDfSwtz);
+        });
+    }
+
+    @GetMapping("dadb")
+    @Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE)
+    public void dadb(){
+        int pageNum=1;
+        int pageSize=999999;
+        String s=sendRequest(dadb+"?pageNum=" + pageNum + "&pageSize=" + pageSize);
+        String s1=sendRequest(drda+"?pageNum=" + pageNum + "&pageSize=" + pageSize);
+        String data=JSONObject.parseObject(s).getString("data");
+        String dataAcad=JSONObject.parseObject(s1).getString("data");
+        List<BsSgcDfSafeJbxx> bsSgcDfSafeJbxxes=JSONObject.parseArray(data, BsSgcDfSafeJbxx.class);
+        List<BsSgcDfSafeJbxx> bsSgcDfSafeJbxxesAcad=JSONObject.parseArray(dataAcad, BsSgcDfSafeJbxx.class);
+        bsSgcDfSafeJbxxesAcad.forEach(bsSgcDfSafeJbxx -> {
+            bsSgcDfSafeJbxx.preInsert();
+            bsSgcDfSafeJbxx.setId(bsSgcDfSafeJbxx.getDikeCode());
+            bsSgcDfSafeJbxx.setAdcd(bsSgcDfSafeJbxx.getAdcd().substring(0, Math.min(bsSgcDfSafeJbxx.getAdcd().length(), 6)));
+            bsSgcDfSafeJbxxService.saveOrUpdate(bsSgcDfSafeJbxx);
+        });
+        bsSgcDfSafeJbxxes.forEach(bsSgcDfSafeJbxx -> {
+            bsSgcDfSafeJbxx.preInsert();
+            bsSgcDfSafeJbxx.setStatus("6");
+            bsSgcDfSafeJbxx.setId(bsSgcDfSafeJbxx.getDikeCode());
+            bsSgcDfSafeJbxxService.saveOrUpdate(bsSgcDfSafeJbxx);
+        });
+    }
+
+    @GetMapping("dawb")
+    @Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE)
+    public void dawb(){
+        int pageNum=1;
+        int pageSize=999999;
+        String s=sendRequest(dawb+"?pageNum=" + pageNum + "&pageSize=" + pageSize);
+        String s1=sendRequest(drwa+"?pageNum=" + pageNum + "&pageSize=" + pageSize);
+        String data=JSONObject.parseObject(s).getString("data");
+        String dataAcad=JSONObject.parseObject(s1).getString("data");
+        List<BsSgcSzSafeJbxx> bsSgcSzSafeJbxxes=JSONObject.parseArray(data, BsSgcSzSafeJbxx.class);
+        List<BsSgcSzSafeJbxx> bsSgcSzSafeJbxxesAcad=JSONObject.parseArray(dataAcad, BsSgcSzSafeJbxx.class);
+
+        bsSgcSzSafeJbxxesAcad.forEach(bsSgcSzSafeJbxx-> {
+            bsSgcSzSafeJbxx.preInsert();
+            bsSgcSzSafeJbxx.setId(bsSgcSzSafeJbxx.getWagaCode());
+            bsSgcSzSafeJbxx.setAdcd(bsSgcSzSafeJbxx.getAdcd().substring(0, Math.min(bsSgcSzSafeJbxx.getAdcd().length(), 6)));
+            bsSgcSzSafeJbxxService.saveOrUpdate(bsSgcSzSafeJbxx);
+        });
+                bsSgcSzSafeJbxxes.forEach(bsSgcSzSafeJbxx -> {
+            bsSgcSzSafeJbxx.preInsert();
+            bsSgcSzSafeJbxx.setStatus("6");
+            bsSgcSzSafeJbxx.setId(bsSgcSzSafeJbxx.getWagaCode());
+            bsSgcSzSafeJbxxService.saveOrUpdate(bsSgcSzSafeJbxx);
+        });
+    }
+
+
 
     /**
      * 水库基本信息

shuili-common/pom.xml

@@ -39,8 +39,6 @@
             <artifactId>poi-ooxml</artifactId>
             <version>5.2.3</version>
         </dependency>
-
-
         <dependency>
             <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>

shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java

@@ -24,7 +24,7 @@ public class FileUploadUtils
     /**
      * 默认大小 50M
      */
-    public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+    public static final long DEFAULT_MAX_SIZE = 200 * 1024 * 1024;
 
     /**
      * 默认的文件名最大长度 100

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java

@@ -3,6 +3,7 @@ package com.kms.yg.df.controller;
 import java.math.BigDecimal;
 import java.util.*;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -82,9 +83,9 @@ public class BsSgcDfSafeJbxxController extends BaseController {
         List<HashMap<String, String>> listBy = new ArrayList<>();
         HashMap<String, String> map = new HashMap<>();
         for (PieDto pieDto : list) {
-
+        if (ObjectUtil.isNotEmpty(pieDto.getName())) {
             map.put(pieDto.getName(), pieDto.getNum());
-
+        }
         }
         listBy.add(map);
         return listBy;
@@ -131,14 +132,16 @@ public class BsSgcDfSafeJbxxController extends BaseController {
         BsSgcDfSafeJbxx data = sp.getData();
 
         Page<BsSgcDfSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
-                Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class).like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName())
+                Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class).apply("1=1").like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName())
-                        .eq(BsSgcDfSafeJbxx::getStatus, "1").or().eq(BsSgcDfSafeJbxx::getStatus, "4").or().eq(BsSgcDfSafeJbxx::getHzStatus, "0")
+//                        .eq(BsSgcDfSafeJbxx::getStatus, "1").or().eq(BsSgcDfSafeJbxx::getStatus, "4").or().eq(BsSgcDfSafeJbxx::getHzStatus, "0")
-                        .or().eq(BsSgcDfSafeJbxx::getZxStatus, "0")
+//                        .or().eq(BsSgcDfSafeJbxx::getZxStatus, "0")
+
                         .eq(data.getDikeType() != null, BsSgcDfSafeJbxx::getDikeType, data.getDikeType())
                         .eq(data.getStatus() != null, BsSgcDfSafeJbxx::getStatus, data.getStatus())
+                        .isNull(BsSgcDfSafeJbxx::getExprDate)
                         .likeRight(data.getAdcd() != null, BsSgcDfSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
+                        .apply(" (status='1' || status='4' || hz_status='0' || zx_status='0')")
                         .orderByDesc(BsSgcDfSafeJbxx::getCreateTime));
-
         return page;
 
     }
@@ -212,6 +215,8 @@ public class BsSgcDfSafeJbxxController extends BaseController {
                     .orderByDesc(BsSgcDfSafeJbxx::getExprDate));
             bsSgcDfSafeJbxxService.removeById(bsSgcSzSafeJbxx.getId());
             BsSgcDfSafeJbxx bsSgcDfSafeJbxx = list.get(0);
+            bsSgcDfSafeJbxx.setStatus("5");
+            bsSgcDfSafeJbxx.setRemark(bsSgcSzSafeJbxx.getRemark());
             bsSgcDfSafeJbxx.setExprDate(null);
             return toAjax(bsSgcDfSafeJbxxService.updateById(bsSgcDfSafeJbxx));
         }

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java

@@ -79,7 +79,7 @@ public class BsSgcDfYhxxController extends BaseController
         String xzqh = sysXzqhService.getXzqh();
 
         List<PieDto> list = bsSgcSzYhxxService.getPie(layer, xzqh);
-
+        String subString = sysXzqhService.getSubString(xzqh);
         List<HashMap<String, String>> listBy = new ArrayList<>();
         HashMap<String, String> map = new HashMap<>();
         for (PieDto pieDto : list) {

shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java

@@ -34,7 +34,8 @@ public class BsSgcDfBzbp extends BaseEntity
     /** 堤防id */
     @Excel(name = "堤防编码")
     @ApiModelProperty("堤防编码")
-    private String embankmentCode;
+    @TableField("embankment_code")
+    private String dikeCode;
 
     /** 标识位置 */
     @Excel(name = "标识位置")
@@ -93,7 +94,8 @@ public class BsSgcDfBzbp extends BaseEntity
 
     private String adcd;
 
-    private String embankmentName;
+    @TableField("embankment_name")
+    private String dikeName;
 
     @TableField(exist = false)
     private String number;

shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java

@@ -1,5 +1,7 @@
 package com.kms.yg.df.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.shuili.common.annotation.Excel;
@@ -34,6 +36,7 @@ public class BsSgcDfSafeJbxx extends BaseEntity {
      * 堤防代码
      */
     @ApiModelProperty("堤防名称")
+    @TableField("dike_CODE")
     private String dikeCode;
 
     /**
@@ -466,6 +469,7 @@ public class BsSgcDfSafeJbxx extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("记录生效时间")
+    @TableField(value = "EFF_DATE", updateStrategy = FieldStrategy.IGNORED)
     private Date effDate;
 
     /**
@@ -474,6 +478,7 @@ public class BsSgcDfSafeJbxx extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "记录失效时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("记录失效时间")
+    @TableField(value = "EXPR_DATE", updateStrategy = FieldStrategy.IGNORED)
     private Date exprDate;
 
 }

shuili-system/src/main/java/com/kms/yg/df/domain/dto/BsSgcDfSwtzDto.java

@@ -0,0 +1,29 @@
+package com.kms.yg.df.domain.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Data
+public class BsSgcDfSwtzDto {
+    //堤防编码
+    private String dikeCode;
+
+    //防洪标准
+    private String Flcnst;
+
+    //设计洪水位
+    private String dsfllv;
+
+    //警戒水位
+    private String wrwl;
+
+    //备注
+    private String note;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date effDate;
+}

shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java

@@ -21,7 +21,7 @@ public interface BsSgcDfBzhjsMapper extends BaseMapper<BsSgcDfBzhjs> {
 
     List<BsSgcDfBzhjs> getList(@Param("id") String id,
                               @Param("dikeType") String dikeType,
-                              @Param("dikeName") String dikeName,
+                              @Param("dikeCode") String dikeCode,
                               @Param("adcd") String adcd,
                               @Param("orderBy") String orderBy,
                               @Param("pageNum") int pageNum,

shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java

@@ -19,9 +19,10 @@ public interface BsSgcDfDaglMapper extends BaseMapper<BsSgcDfDagl> {
 
     List<BsSgcDfDagl> getList(@Param("id") String id,
                               @Param("dikeType") String dikeType,
-                              @Param("dikeName") String dikeName,
+                              @Param("dikeCode") String dikeCode,
                               @Param("adcd") String adcd,
                               @Param("orderBy") String orderBy,
                               @Param("pageNum") int pageNum,
-                              @Param("pageSize") int pageSize);
+                              @Param("pageSize") int pageSize,
+                              @Param("unit") String unit);
 }

shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java

@@ -24,7 +24,8 @@ public interface BsSgcDfFzrMapper extends BaseMapper<BsSgcDfFzr> {
                              @Param("adcd") String adcd,
                              @Param("orderBy") String orderBy,
                              @Param("pageNum") int pageNum,
-                             @Param("pageSize") int pageSize);
+                             @Param("pageSize") int pageSize,
+                             @Param("dikeName")String dikeName);
 
     List<PieDto> getType1(@Param("layer") Integer layer,
                           @Param("adcd") String adcd);

shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java

@@ -32,11 +32,11 @@ public class BsSgcDfBzbpService extends BaseService<BsSgcDfBzbpMapper, BsSgcDfBz
         BsSgcDfBzbp projectInfo = sp.getData();
 
         if (projectInfo != null) {
-            String projectName = projectInfo.getEmbankmentName();
+           String dikeCode=projectInfo.getDikeCode();
 //            String projectType = projectInfo.getEmbankmentType();
 
             queryWrapper.eq(projectInfo.getId()!=null,"id", projectInfo.getId());
-            queryWrapper.like(projectName != null, "embankment_name", projectName);
+            queryWrapper.like(dikeCode != null, "dick_code", dikeCode);
 //            queryWrapper.like(projectType != null, "embankment_type", projectType);
             queryWrapper.likeRight(adcd != null, "ADCD", adcd);
         }
@@ -54,7 +54,7 @@ public class BsSgcDfBzbpService extends BaseService<BsSgcDfBzbpMapper, BsSgcDfBz
 
         Page<BsSgcDfBzbp> page = new Page<>(sp.getPageNum(),sp.getPageSize());
         List<BsSgcDfBzbp> infoPage = bsSgcDfBzbpMapper
-                .selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getEmbankmentName(), adcd);
+                .selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getDikeName(), adcd);
         Page<BsSgcDfBzbp> bsSgcDfBzbpPage = new Page<>();
 
         bsSgcDfBzbpPage.setRecords(infoPage);

shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java

@@ -36,7 +36,7 @@ public class BsSgcDfBzhjsService extends BaseService<BsSgcDfBzhjsMapper, BsSgcDf
 
         BsSgcDfBzhjs data = sp.getData();
 
-        List<BsSgcDfBzhjs> list= bsSgcDfBzhjsMapper.getList(data.getId(), data.getDikeType(), data.getDikeName(),
+        List<BsSgcDfBzhjs> list= bsSgcDfBzhjsMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(),
                 sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize());
 
         Page<BsSgcDfBzhjs> page = new Page<>();

shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java

@@ -35,8 +35,8 @@ public class BsSgcDfDaglService extends BaseService<BsSgcDfDaglMapper, BsSgcDfDa
         BsSgcDfDagl data = sp.getData();
 
 
-        List<BsSgcDfDagl> list = bsSgcDfDaglMapper.getList(data.getId(), data.getDikeType(), data.getDikeName(),
+        List<BsSgcDfDagl> list = bsSgcDfDaglMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(),
-                sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize());
+                sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getUnit());
 
         Page<BsSgcDfDagl> page = new Page<>();
         page.setTotal(list.size());

shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java

@@ -83,7 +83,7 @@ public class BsSgcDfFzrService extends BaseService<BsSgcDfFzrMapper, BsSgcDfFzr>
         Map<String, Object> params = sp.getParams();
 
         List<BsSgcSzFzr> list =bsSgcDfFzrMapper.getList(data.getId(), data.getDikeCode(), sysXzqhService.getSubString(data.getAdcd()),
-                (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
+                (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize(),data.getDikeName());
 
         Page<BsSgcSzFzr> page = new Page<>();
 

shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java

@@ -1,6 +1,7 @@
 package com.kms.yg.df.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -98,11 +99,13 @@ public class BsSgcDfSafeJbxxService extends BaseService<BsSgcDfSafeJbxxMapper, B
             HashMap<String, String> hashMap = new HashMap<>();
             hashMap.put(pieDtos.get(i).getStatus(), pieDtos.get(i).getNum());
             for (int j = 0; j < pieDtos.size(); j++) {
+                if (ObjectUtil.isNotEmpty(pieDtos.get(j).getName())){
                 if (pieDtos.get(j).getName().equals(pieDtos.get(i).getName()) && !pieDtos.get(j).getStatus().equals(pieDtos.get(i).getStatus())) {
 //                    hashMap.put(pieDtos.get(i).getStatus(), pieDtos.get(i).getNum());
                     hashMap.put(pieDtos.get(j).getStatus(), pieDtos.get(j).getNum());
                 }
                 }
+            }
             map.put(pieDtos.get(i).getName(), hashMap);
 
 

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java

@@ -123,7 +123,7 @@ public class BsSgcSzCxjlController extends BaseController
         BsSgcSzCxjl dfhdm = bsSgcSzCxjlService.getById(id);
         dfhdm.setExprDate(new Date());
         dfhdm.setId(UUID.randomUUID().toString());
-        bsSgcSzCxjlService.save(dfhdm);
+//        bsSgcSzCxjlService.save(dfhdm);
         bsSgcSzCxjl.setEffDate(new Date());
         bsSgcSzCxjl.setExprDate(null);
 

shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java

@@ -64,6 +64,7 @@ public class BsSgcSzSafeJbxxController extends BaseController {
     private SysDeptService sysDeptService;
 
 
+
     @GetMapping("/getPie")
     public List<HashMap<String, String>> getPie() {
 
@@ -115,6 +116,7 @@ public class BsSgcSzSafeJbxxController extends BaseController {
                         .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
                         .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
                         .likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
+                        .isNull(BsSgcSzSafeJbxx::getExprDate)
                         .orderByDesc(BsSgcSzSafeJbxx::getCreateTime));
 
         return page;
@@ -127,11 +129,12 @@ public class BsSgcSzSafeJbxxController extends BaseController {
 
         Page<BsSgcSzSafeJbxx> page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()),
                 Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class).like(data.getWagaName() != null, BsSgcSzSafeJbxx::getWagaName, data.getWagaName())
-                        .eq(BsSgcSzSafeJbxx::getStatus, "1").or().eq(BsSgcSzSafeJbxx::getStatus, "4").or().eq(BsSgcSzSafeJbxx::getHzStatus,"0")
+//                        .eq(BsSgcSzSafeJbxx::getStatus, "1").or().eq(BsSgcSzSafeJbxx::getStatus, "4").or().eq(BsSgcSzSafeJbxx::getHzStatus,"0")
-                        .or().eq(BsSgcSzSafeJbxx::getZxStatus,"0")
+//                        .or().eq(BsSgcSzSafeJbxx::getZxStatus,"0")
-                        .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
+                        .eq(data.getWagaType()!=null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType())
                         .eq(data.getStatus() != null, BsSgcSzSafeJbxx::getStatus, data.getStatus())
                         .likeRight(data.getAdcd() != null, BsSgcSzSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd()))
+                        .apply(" (status='1' || status='4' || hz_status='0' || zx_status='0')")
                         .orderByDesc(BsSgcSzSafeJbxx::getCreateTime));
 
         return page;
@@ -199,6 +202,8 @@ public class BsSgcSzSafeJbxxController extends BaseController {
             bsSgcSzSafeJbxxService.removeById(bsSgcSzSafeJbxx.getId());
             BsSgcSzSafeJbxx bsSgcDfSafeJbxx = list.get(0);
             bsSgcDfSafeJbxx.setExprDate(null);
+            bsSgcDfSafeJbxx.setStatus("5");
+            bsSgcDfSafeJbxx.setRemark(bsSgcSzSafeJbxx.getRemark());
             return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcDfSafeJbxx));
         }
         return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx));

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java

@@ -104,11 +104,12 @@ public class BsSgcSzFzr extends BaseEntity
     private String type;
 
     @TableField(exist = false)
-    private String wagaName;
+    private String wageName;
 /*
     @TableField("waga_type")
     private String wagaType;*/
 
+
     private String wagaCode;
 
     private String adcd;

shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java

@@ -2,6 +2,8 @@ package com.kms.yg.sz.domain;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -279,6 +281,7 @@ public class BsSgcSzSafeJbxx extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("记录生效时间")
+    @TableField(value = "EFF_DATE", updateStrategy= FieldStrategy.IGNORED)
     private Date effDate;
 
     /**
@@ -288,6 +291,7 @@ public class BsSgcSzSafeJbxx extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "记录失效时间", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty("记录失效时间")
+    @TableField(value = "EXPR_DATE", updateStrategy= FieldStrategy.IGNORED)
     private Date exprDate;
 
 }

shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java

@@ -25,6 +25,7 @@ public interface BsSgcSzBzhjsMapper extends BaseMapper<BsSgcSzBzhjs> {
                               @Param("adcd") String adcd,
                               @Param("orderBy") String orderBy,
                               @Param("pageNum") int pageNum,
-                              @Param("pageSize") int pageSize);
+                              @Param("pageSize") int pageSize,
+                              @Param("wagaCode")String wagaCOde);
 
 }

shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDaglMapper.java

@@ -24,5 +24,7 @@ public interface BsSgcSzDaglMapper extends BaseMapper<BsSgcSzDagl> {
                               @Param("adcd") String adcd,
                               @Param("orderBy") String orderBy,
                               @Param("pageNum") int pageNum,
-                              @Param("pageSize") int pageSize);
+                              @Param("pageSize") int pageSize,
+                              @Param("wagaCode")String wagaCode,
+                              @Param("unit")String unit);
 }

shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java

@@ -19,7 +19,7 @@ import java.util.List;
 public interface BsSgcSzFzrMapper extends BaseMapper<BsSgcSzFzr> {
 
     List<BsSgcSzFzr> getList(@Param("id") String id,
-                             @Param("wagaCode") String wagaCode,
+                             @Param("wageName") String wageName,
                              @Param("adcd") String adcd,
                              @Param("orderBy") String orderBy,
                              @Param("pageNum") int pageNum,

shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java

@@ -34,7 +34,7 @@ public class BsSgcSzBzhjsService extends BaseService<BsSgcSzBzhjsMapper, BsSgcSz
         BsSgcSzBzhjs data = sp.getData();
 
         List<BsSgcSzJfgl> list= bsSgcSzBzhjsMapper.getList(data.getId(), data.getWagaType(), data.getWagaName(),
-                sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize());
+                sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getWagaCode());
 
         Page<BsSgcSzJfgl> page = new Page<>();
         page.setRecords(list);

shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java

@@ -34,7 +34,7 @@ public class BsSgcSzDaglService extends BaseService<BsSgcSzDaglMapper, BsSgcSzDa
 
 
         List<BsSgcSzDagl> list = bsSgcSzDaglMapper.getList(data.getId(), data.getWagaType(), data.getWagaName(),
-                sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize());
+                sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getWagaCode(),data.getUnit());
 
         Page<BsSgcSzDagl> page = new Page<>();
         page.setTotal(list.size());

shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java

@@ -47,7 +47,7 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
         BsSgcSzFzr projectInfo = sp.getData();
 
         if (projectInfo != null) {
-            String projectName = projectInfo.getWagaName();
+            String projectName = projectInfo.getWageName();
 //            String projectType = projectInfo.getWagaType();
 
             queryWrapper.eq(projectInfo.getWagaCode()!=null,"waga_code", projectInfo.getWagaCode());
@@ -80,7 +80,7 @@ public class BsSgcSzFzrService extends BaseService<BsSgcSzFzrMapper, BsSgcSzFzr>
 
         Map<String, Object> params = sp.getParams();
 
-        List<BsSgcSzFzr> list =bsSgcSzFzrMapper.getList(data.getId(), data.getWagaCode(), sysXzqhService.getSubString(data.getAdcd()),
+        List<BsSgcSzFzr> list =bsSgcSzFzrMapper.getList(data.getId(), data.getWageName(), sysXzqhService.getSubString(data.getAdcd()),
                 (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize());
 
         Page<BsSgcSzFzr> page = new Page<>();

shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml

@@ -7,10 +7,10 @@
 
     <resultMap type="com.kms.yg.df.domain.BsSgcDfBzbp" id="Result">
         <id     property="id"     column="id"     />
-        <result property="embankmentName"   column="embankment_name"   />
+        <result property="dikeName"   column="embankment_name"   />
         <result property="adcd"   column="adcd"   />
         <result property="number"   column="number"   />
-        <result property="embankmentCode"   column="embankment_code"   />
+        <result property="dikeCode"   column="embankment_code"   />
 
     </resultMap>
 

shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml

@@ -30,8 +30,8 @@
             <if test="dikeType!=null and dikeType!=''">
                 and sj.dike_type = #{dikeType}
             </if>
-            <if test="dikeName!=null and dikeName!=''">
+            <if test="dikeCode!=null and dikeCode!=''">
-                and sj.dike_name LIKE concat('%',#{dikeName},'%')
+                and sj.dike_CODE LIKE concat('%',#{dikeCode},'%')
             </if>
 
             <if test="adcd!=null and adcd !=''">
@@ -40,6 +40,8 @@
             <if test="id!=null and id!=''">
                 and sf.id=#{id}
             </if>
+            and sj.EXPR_DATE is null
         </where>
+        order by sf.create_time desc LIMIT #{pageNum},#{pageSize};
     </select>
 </mapper>

shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml

@@ -32,8 +32,8 @@
             <if test="dikeType!=null and dikeType!=''">
                 and sj.dike_type = #{dikeType}
             </if>
-            <if test="dikeName!=null and dikeName!=''">
+            <if test="dikeCode!=null and dikeCode!=''">
-                and sj.dike_name LIKE concat('%',#{dikeName},'%')
+                and sj.dike_CODE =#{dikeCode}
             </if>
 
             <if test="adcd!=null and adcd !=''">
@@ -42,6 +42,11 @@
             <if test="id!=null and id!=''">
                 and sd.id=#{id}
             </if>
+            <if test="unit != null and unit != ''">
+                and sj.ADM_DEP LIKE CONCAT('%',#{unit})
+            </if>
+            and sj.EXPR_DATE is null
         </where>
+        order by sd.create_time desc LIMIT #{pageNum},#{pageSize};
     </select>
 </mapper>

shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml

@@ -64,8 +64,8 @@
         <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
         <include refid="info"></include>
         <where>
-            <if test="dikeCode!=null and dikeCode!=''">
+            <if test="dikeName!=null and dikeName!=''">
-                and sf.dike_code =#{dikeCode}
+                and sj.dike_NAME like concat('%',#{dikeName},'%')
             </if>
             <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
         </where>

shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml

@@ -74,11 +74,10 @@
     </select>
 
     <select id="getHistogram" resultMap="pieDto">
-        select * from (
         <include refid="info"></include>
         <if test="layer==1">
             WHERE
-            sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0' GROUP BY LEFT(sj.adcd,4)
+            sj.adcd LIKE concat(#{adcd},'%') and sj.status!='0'
         </if>
         <if test="layer==2">
             WHERE
@@ -87,7 +86,7 @@
         <if test="layer==3">
             WHERE
             sj.adcd = #{adcd} and sj.status!='0'
-        </if> ) t
+        </if>
-                 GROUP BY t.`status`
+                 GROUP BY sy.`status`
     </select>
 </mapper>

shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml

@@ -40,6 +40,11 @@
             <if test="id!=null and id!=''">
                 and sf.id=#{id}
             </if>
+            <if test="wagaCode != null and wagaCode != ''">
+                and sj.waga_code=#{wagaCode}
+            </if>
+            and sj.EXPR_DATE is null
         </where>
+        order by sf.create_time desc LIMIT #{pageNum},#{pageSize};
     </select>
 </mapper>

shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.kms.yg.sz.mapper.BsSgcSzDaglMapper">
 
     <sql id="info">
-        select *
+        select *,sj.ADM_DEP
         from bs_sgc_sz_dagl sd
                  left join att_waga_base sj on sd.waga_code = sj.waga_code
 
@@ -35,13 +35,20 @@
             <if test="wagaName!=null and wagaName!=''">
                 and sj.waga_name LIKE concat('%',#{wagaName},'%')
             </if>
-
+            <if test="wagaCode != null and wagaCode != ''">
+                and sj.WAGA_CODE = #{wagaCode}
+            </if>
             <if test="adcd!=null and adcd !=''">
                 and sj.adcd like concat(#{adcd},'%')
             </if>
+            <if test="unit != null and unit != ''">
+                and sj.ADM_DEP like concat(#{unit},'%')
+            </if>
             <if test="id!=null and id!=''">
                 and sd.id=#{id}
             </if>
+            and sj.EXPR_DATE is null
         </where>
+        order by sd.create_time desc LIMIT #{pageNum},#{pageSize};
     </select>
 </mapper>

shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml

@@ -31,7 +31,7 @@
 
     <resultMap type="BsSgcSzFzr" id="BsSgcSzFzr">
         <id     property="id"     column="id"     />
-        <result property="wagaName" column="waga_name"/>
+        <result property="wageName" column="waga_name"/>
         <result property="name" column="name"/>
         <result property="unit" column="unit"/>
         <result property="duties" column="duties"/>
@@ -64,8 +64,8 @@
         <bind name="pageNum" value="(pageNum-1)*pageSize"></bind>
         <include refid="info"></include>
         <where>
-            <if test="wagaCode!=null and wagaCode!=''">
+            <if test="wageName!=null and wageName!=''">
-                and sf.waga_code =#{wagaCode}
+                and sj.WAGA_NAME LIKE concat('%',#{wageName},'%')
             </if>
             <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
         </where>