From 8eede712bf5ccbbaf181ce6b08a719602d6ff255 Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Tue, 4 Jun 2024 09:46:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E5=92=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/web/synchronous/YgSynchronous.java | 51 ++++++++++++++++++- shuili-common/pom.xml | 4 +- .../file/InvalidExtensionException.java | 2 +- .../shuili/common/utils/FileUploadUtils.java | 2 +- .../controller/BsSgcDfSafeJbxxController.java | 12 +++-- .../df/controller/BsSgcDfYhxxController.java | 2 +- .../com/kms/yg/df/domain/BsSgcDfBzbp.java | 6 ++- .../com/kms/yg/df/domain/BsSgcDfSafeJbxx.java | 6 +++ .../kms/yg/df/mapper/BsSgcDfBzhjsMapper.java | 2 +- .../kms/yg/df/mapper/BsSgcDfDaglMapper.java | 5 +- .../kms/yg/df/mapper/BsSgcDfFzrMapper.java | 3 +- .../kms/yg/df/service/BsSgcDfBzbpService.java | 6 +-- .../yg/df/service/BsSgcDfBzhjsService.java | 2 +- .../kms/yg/df/service/BsSgcDfDaglService.java | 4 +- .../kms/yg/df/service/BsSgcDfFzrService.java | 2 +- .../sz/controller/BsSgcSzCxjlController.java | 2 +- .../controller/BsSgcSzSafeJbxxController.java | 11 ++-- .../java/com/kms/yg/sz/domain/BsSgcSzFzr.java | 3 +- .../com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java | 4 ++ .../kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java | 3 +- .../kms/yg/sz/mapper/BsSgcSzDaglMapper.java | 4 +- .../kms/yg/sz/mapper/BsSgcSzFzrMapper.java | 2 +- .../yg/sz/service/BsSgcSzBzhjsService.java | 2 +- .../kms/yg/sz/service/BsSgcSzDaglService.java | 2 +- .../kms/yg/sz/service/BsSgcSzFzrService.java | 4 +- .../yg/sz/service/BsSgcSzSafeJbxxService.java | 2 +- .../mapper/yg/df/BsSgcDfBzbpMapper.xml | 4 +- .../mapper/yg/df/BsSgcDfBzhjsMapper.xml | 6 ++- .../mapper/yg/df/BsSgcDfDaglMapper.xml | 9 +++- .../mapper/yg/df/BsSgcDfFzrMapper.xml | 4 +- .../mapper/yg/df/BsSgcDfYhxxMapper.xml | 7 ++- .../mapper/yg/sz/BsSgcSzBzhjsMapper.xml | 5 ++ .../mapper/yg/sz/BsSgcSzDaglMapper.xml | 11 +++- .../mapper/yg/sz/BsSgcSzFzrMapper.xml | 6 +-- 34 files changed, 146 insertions(+), 54 deletions(-) diff --git a/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java b/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java index e3b3c967..ad4e9e5d 100644 --- a/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java +++ b/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java @@ -9,6 +9,10 @@ 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.service.BsSgcDfJbxxService; +import com.kms.yg.df.service.BsSgcDfSafeJbxxService; import com.kms.yg.ly.domain.AttBasBase; import com.kms.yg.ly.service.AttBasBaseService; import com.kms.yg.rv.domain.AttRvBase; @@ -17,6 +21,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 +63,12 @@ public class YgSynchronous { @Autowired AttDiscBaseService attDiscBaseService; + @Autowired + BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService; + + @Autowired + BsSgcDfSafeJbxxService bsSgcDfSafeJbxxService; + private static String XH3CID = "3359137640337"; private static String XH3CAPPKEY = "q7sli9ch"; @@ -83,7 +95,10 @@ 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"; /** * 同步 @@ -179,6 +194,40 @@ public class YgSynchronous { } + @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 data=JSONObject.parseObject(s).getString("data"); + List bsSgcDfSafeJbxxes=JSONObject.parseArray(data, BsSgcDfSafeJbxx.class); + 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 data=JSONObject.parseObject(s).getString("data"); + List bsSgcSzSafeJbxxes=JSONObject.parseArray(data, BsSgcSzSafeJbxx.class); + bsSgcSzSafeJbxxes.forEach(bsSgcSzSafeJbxx -> { + bsSgcSzSafeJbxx.preInsert(); + bsSgcSzSafeJbxx.setStatus("6"); + bsSgcSzSafeJbxx.setId(bsSgcSzSafeJbxx.getWagaCode()); + bsSgcSzSafeJbxxService.saveOrUpdate(bsSgcSzSafeJbxx); + }); + } + + + /** * 水库基本信息 */ diff --git a/shuili-common/pom.xml b/shuili-common/pom.xml index 2f693563..ec71061e 100644 --- a/shuili-common/pom.xml +++ b/shuili-common/pom.xml @@ -17,7 +17,7 @@ 1.21 1.2.79 2.11.0 - 1.4 + 1. 4 3.12.0 4.0.1 UTF-8 @@ -39,8 +39,6 @@ poi-ooxml 5.2.3 - - org.dom4j dom4j diff --git a/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java b/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java index ce7b321b..4621c7e9 100644 --- a/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java +++ b/shuili-common/src/main/java/com/shuili/common/exception/file/InvalidExtensionException.java @@ -5,7 +5,7 @@ import org.apache.commons.fileupload.FileUploadException; /** * 文件上传 误异常类 - * + * * @author shuili */ public class InvalidExtensionException extends FileUploadException diff --git a/shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java b/shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java index 168ea37c..ec04f07a 100644 --- a/shuili-framework/src/main/java/com/shuili/common/utils/FileUploadUtils.java +++ b/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 diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java index 8aca9a04..9d44d3d5 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java @@ -131,14 +131,16 @@ public class BsSgcDfSafeJbxxController extends BaseController { BsSgcDfSafeJbxx data = sp.getData(); Page page = bsSgcSzSafeJbxxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), - Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class).like(data.getDikeName() != null, BsSgcDfSafeJbxx::getDikeName, data.getDikeName()) - .eq(BsSgcDfSafeJbxx::getStatus, "1").or().eq(BsSgcDfSafeJbxx::getStatus, "4").or().eq(BsSgcDfSafeJbxx::getHzStatus, "0") - .or().eq(BsSgcDfSafeJbxx::getZxStatus, "0") + 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") +// .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 +214,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)); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java index c5f3c4b3..3719cf12 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfYhxxController.java +++ b/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 list = bsSgcSzYhxxService.getPie(layer, xzqh); - + String subString = sysXzqhService.getSubString(xzqh); List> listBy = new ArrayList<>(); HashMap map = new HashMap<>(); for (PieDto pieDto : list) { diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java index 2ded9b87..4f50427f 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfBzbp.java +++ b/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; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java index a1704424..bda1454c 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java @@ -1,6 +1,9 @@ package com.kms.yg.df.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; @@ -31,6 +34,7 @@ public class BsSgcDfSafeJbxx extends BaseEntity /** 堤防代码 */ @ApiModelProperty("堤防名称") + @TableField("dike_CODE") private String dikeCode; /** 堤防型式 */ @@ -341,12 +345,14 @@ 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; /** 记录失效时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "记录失效时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("记录失效时间") + @TableField(value = "EXPR_DATE", updateStrategy= FieldStrategy.IGNORED) private Date exprDate; } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java index 85bf05d3..71777403 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfBzhjsMapper.java @@ -21,7 +21,7 @@ public interface BsSgcDfBzhjsMapper extends BaseMapper { List 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, diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java index 32b11ba8..c45b7983 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfDaglMapper.java @@ -19,9 +19,10 @@ public interface BsSgcDfDaglMapper extends BaseMapper { List 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); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java index ff7fd19c..8c5e67bc 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfFzrMapper.java @@ -24,7 +24,8 @@ public interface BsSgcDfFzrMapper extends BaseMapper { @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 getType1(@Param("layer") Integer layer, @Param("adcd") String adcd); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java index 62167061..5a050d62 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzbpService.java @@ -32,11 +32,11 @@ public class BsSgcDfBzbpService extends BaseService page = new Page<>(sp.getPageNum(),sp.getPageSize()); List infoPage = bsSgcDfBzbpMapper - .selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getEmbankmentName(), adcd); + .selectList1(sp.getPageNum(), sp.getPageSize(), projectInfo.getDikeName(), adcd); Page bsSgcDfBzbpPage = new Page<>(); bsSgcDfBzbpPage.setRecords(infoPage); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java index 42daf902..17fdc501 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfBzhjsService.java @@ -36,7 +36,7 @@ public class BsSgcDfBzhjsService extends BaseService list= bsSgcDfBzhjsMapper.getList(data.getId(), data.getDikeType(), data.getDikeName(), + List list= bsSgcDfBzhjsMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(), sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize()); Page page = new Page<>(); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java index 52483beb..ada03ef9 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfDaglService.java @@ -35,8 +35,8 @@ public class BsSgcDfDaglService extends BaseService list = bsSgcDfDaglMapper.getList(data.getId(), data.getDikeType(), data.getDikeName(), - sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize()); + List list = bsSgcDfDaglMapper.getList(data.getId(), data.getDikeType(), data.getDikeCode(), + sysXzqhService.getSubString(data.getAdcd()), "create_time", sp.getPageNum(), sp.getPageSize(),data.getUnit()); Page page = new Page<>(); page.setTotal(list.size()); diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java index 49e323de..9c2fcfb1 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfFzrService.java @@ -83,7 +83,7 @@ public class BsSgcDfFzrService extends BaseService Map params = sp.getParams(); List 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 page = new Page<>(); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java index ec0b4466..0a534387 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzCxjlController.java +++ b/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); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java index 9620013c..797bfbb3 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSafeJbxxController.java +++ b/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> 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 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") - .or().eq(BsSgcSzSafeJbxx::getZxStatus,"0") - .eq(data.getWagaType() != null, BsSgcSzSafeJbxx::getWagaType, data.getWagaType()) +// .eq(BsSgcSzSafeJbxx::getStatus, "1").or().eq(BsSgcSzSafeJbxx::getStatus, "4").or().eq(BsSgcSzSafeJbxx::getHzStatus,"0") +// .or().eq(BsSgcSzSafeJbxx::getZxStatus,"0") + .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)); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java index 7d77da99..05f4d22d 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzFzr.java +++ b/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; diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java index e25f1d16..f9ef1b98 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java +++ b/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; } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java index 1b380e32..d8cb9a47 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzBzhjsMapper.java @@ -25,6 +25,7 @@ public interface BsSgcSzBzhjsMapper extends BaseMapper { @Param("adcd") String adcd, @Param("orderBy") String orderBy, @Param("pageNum") int pageNum, - @Param("pageSize") int pageSize); + @Param("pageSize") int pageSize, + @Param("wagaCode")String wagaCOde); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDaglMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDaglMapper.java index ae4e6101..66f86add 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDaglMapper.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzDaglMapper.java @@ -24,5 +24,7 @@ public interface BsSgcSzDaglMapper extends BaseMapper { @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); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java index f7ca6faa..a2f5635c 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzFzrMapper.java +++ b/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 { List 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, diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java index ea7da8b5..5df4bdf6 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzBzhjsService.java @@ -34,7 +34,7 @@ public class BsSgcSzBzhjsService extends BaseService 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 page = new Page<>(); page.setRecords(list); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java index 47a0678a..1457e3ac 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzDaglService.java @@ -34,7 +34,7 @@ public class BsSgcSzDaglService extends BaseService 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 page = new Page<>(); page.setTotal(list.size()); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java index 7acc6713..2e017676 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzFzrService.java @@ -47,7 +47,7 @@ public class BsSgcSzFzrService extends BaseService 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 Map params = sp.getParams(); - List list =bsSgcSzFzrMapper.getList(data.getId(), data.getWagaCode(), sysXzqhService.getSubString(data.getAdcd()), + List list =bsSgcSzFzrMapper.getList(data.getId(), data.getWageName(), sysXzqhService.getSubString(data.getAdcd()), (String) params.get("orderBy"), sp.getPageNum(), sp.getPageSize()); Page page = new Page<>(); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java index a2d41dfc..15c4acd2 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/BsSgcSzSafeJbxxService.java @@ -29,7 +29,7 @@ import java.util.Map; * @date 2024-01-16 */ @Service -public class BsSgcSzSafeJbxxService extends BaseService { +public class BsSgcSzSafeJbxxService extends BaseService { @Resource private BsSgcSzSafeJbxxMapper bsSgcSzSafeJbxxMapper; diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml index 2b6c2809..47f1347c 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzbpMapper.xml @@ -7,10 +7,10 @@ - + - + diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml index 22d18a83..8989a0e4 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml @@ -30,8 +30,8 @@ and sj.dike_type = #{dikeType} - - and sj.dike_name LIKE concat('%',#{dikeName},'%') + + and sj.dike_CODE LIKE concat('%',#{dikeCode},'%') @@ -40,6 +40,8 @@ and sf.id=#{id} + and sj.EXPR_DATE is null + order by sf.create_time desc LIMIT #{pageNum},#{pageSize}; diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml index 72bfcd79..6135ed3f 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml @@ -32,8 +32,8 @@ and sj.dike_type = #{dikeType} - - and sj.dike_name LIKE concat('%',#{dikeName},'%') + + and sj.dike_CODE =#{dikeCode} @@ -42,6 +42,11 @@ and sd.id=#{id} + + and sj.ADM_DEP LIKE CONCAT('%',#{unit}) + + and sj.EXPR_DATE is null + order by sd.create_time desc LIMIT #{pageNum},#{pageSize}; diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml index 78e912f4..aa37049d 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml @@ -64,8 +64,8 @@ - - and sf.dike_code =#{dikeCode} + + and sj.dike_NAME like concat('%',#{dikeName},'%') diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml index 9011d077..70376686 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml @@ -74,11 +74,10 @@ diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml index 1056caa5..01214d3e 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml @@ -40,6 +40,11 @@ and sf.id=#{id} + + and sj.waga_code=#{wagaCode} + + and sj.EXPR_DATE is null + order by sf.create_time desc LIMIT #{pageNum},#{pageSize}; diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml index 1cbf29de..ecb771a0 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml @@ -5,7 +5,7 @@ - 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 @@ and sj.waga_name LIKE concat('%',#{wagaName},'%') - + + and sj.WAGA_CODE = #{wagaCode} + and sj.adcd like concat(#{adcd},'%') + + and sj.ADM_DEP like concat(#{unit},'%') + and sd.id=#{id} + and sj.EXPR_DATE is null + order by sd.create_time desc LIMIT #{pageNum},#{pageSize}; diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml index 55649300..aea2faff 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml @@ -31,7 +31,7 @@ - + @@ -64,8 +64,8 @@ - - and sf.waga_code =#{wagaCode} + + and sj.WAGA_NAME LIKE concat('%',#{wageName},'%') From 43594a25f594e2f15514d9dc0489288e39bab335 Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Thu, 6 Jun 2024 17:30:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=E5=92=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/web/synchronous/YgSynchronous.java | 106 +++++++++++++----- .../controller/BsSgcDfSafeJbxxController.java | 5 +- .../kms/yg/df/domain/dto/BsSgcDfSwtzDto.java | 29 +++++ .../yg/df/service/BsSgcDfSafeJbxxService.java | 3 + 4 files changed, 114 insertions(+), 29 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yg/df/domain/dto/BsSgcDfSwtzDto.java diff --git a/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java b/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java index ad4e9e5d..16f485ee 100644 --- a/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java +++ b/shuili-admin/src/main/java/com/kms/web/synchronous/YgSynchronous.java @@ -11,8 +11,11 @@ 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; @@ -69,6 +72,9 @@ public class YgSynchronous { @Autowired BsSgcDfSafeJbxxService bsSgcDfSafeJbxxService; + @Autowired + BsSgcDfSwtzService bsSgcDfSwtzService; + private static String XH3CID = "3359137640337"; private static String XH3CAPPKEY = "q7sli9ch"; @@ -99,35 +105,40 @@ public class YgSynchronous { 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") -// public void synchronous() throws ExecutionException, InterruptedException { -// int pageNum = 1; -// int pageSize = 1000; -// Boolean f = true; -// HashMap hashMap = new HashMap<>(); -// int i = 1; -// while (f) { -// String s = sendRequest(ddsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize); -// String data = JSONObject.parseObject(s).getString("data"); -// List attResRspps = JSONObject.parseArray(data, AttDiscBase.class); -// if(attResRspps.size() attDiscBases = CollectionUtil.newCopyOnWriteArrayList(attResRspps); -//// executorService.execute(new sktz(attResRspps)); -// pageNum++; -// } -// } + @GetMapping("sktz1") + public void synchronous() throws ExecutionException, InterruptedException { + int pageNum = 1; + int pageSize = 1000; + Boolean f = true; + HashMap hashMap = new HashMap<>(); + int i = 1; + while (f) { + String s = sendRequest(ddsj + "?pageNum=" + pageNum + "&pageSize=" + pageSize); + String data = JSONObject.parseObject(s).getString("data"); + List attResRspps = JSONObject.parseArray(data, AttDiscBase.class); + if(attResRspps.size() attDiscBases = CollectionUtil.newCopyOnWriteArrayList(attResRspps); +// executorService.execute(new sktz(attResRspps)); + pageNum++; + } + } @Data class sktz implements Runnable{ @@ -156,6 +167,8 @@ public class YgSynchronous { + + /*** * 提段线程 * @param list @@ -193,6 +206,26 @@ 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"); + ListsgcDfSwtzDtos=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) @@ -200,8 +233,17 @@ public class YgSynchronous { 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 bsSgcDfSafeJbxxes=JSONObject.parseArray(data, BsSgcDfSafeJbxx.class); + List 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"); @@ -216,9 +258,19 @@ public class YgSynchronous { 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 bsSgcSzSafeJbxxes=JSONObject.parseArray(data, BsSgcSzSafeJbxx.class); - bsSgcSzSafeJbxxes.forEach(bsSgcSzSafeJbxx -> { + List 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()); diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java index 9d44d3d5..bdbc36c0 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSafeJbxxController.java +++ b/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> listBy = new ArrayList<>(); HashMap map = new HashMap<>(); for (PieDto pieDto : list) { - + if (ObjectUtil.isNotEmpty(pieDto.getName())) { map.put(pieDto.getName(), pieDto.getNum()); - + } } listBy.add(map); return listBy; diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/dto/BsSgcDfSwtzDto.java b/shuili-system/src/main/java/com/kms/yg/df/domain/dto/BsSgcDfSwtzDto.java new file mode 100644 index 00000000..88f61533 --- /dev/null +++ b/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; +} diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java index aad0a093..63cee5bd 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSafeJbxxService.java @@ -1,5 +1,6 @@ package com.kms.yg.df.service; +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.extension.plugins.pagination.Page; @@ -103,10 +104,12 @@ public class BsSgcDfSafeJbxxService extends BaseService 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);