From 0eef93d798137ae66ec9d0c78f98777daad5074f Mon Sep 17 00:00:00 2001 From: ljf Date: Sat, 21 Dec 2024 18:24:34 +0800 Subject: [PATCH] =?UTF-8?q?=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 | 176 ++++++++++++++++-- .../com/kms/yg/df/domain/BsSgcDfGcxy.java | 26 +++ .../com/kms/yg/df/domain/BsSgcDfJyjl.java | 4 +- .../com/kms/yg/df/domain/BsSgcDfSafeJbxx.java | 3 + .../com/kms/yg/sz/domain/BsSgcSzCxjl.java | 4 + .../com/kms/yg/sz/domain/BsSgcSzGcjg.java | 7 + .../com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java | 13 ++ .../com/kms/yg/sz/domain/BsSgcSzSwtz.java | 10 + 8 files changed, 229 insertions(+), 14 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 16f485ee..67ac1033 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 @@ -7,15 +7,13 @@ import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; 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.*; 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.df.service.*; import com.kms.yg.ly.domain.AttBasBase; import com.kms.yg.ly.service.AttBasBaseService; import com.kms.yg.rv.domain.AttRvBase; @@ -24,10 +22,17 @@ 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.BsSgcSzCxjl; +import com.kms.yg.sz.domain.BsSgcSzGcjg; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.domain.BsSgcSzSwtz; +import com.kms.yg.sz.service.BsSgcSzCxjlService; +import com.kms.yg.sz.service.BsSgcSzGcjgService; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; +import com.kms.yg.sz.service.BsSgcSzSwtzService; import com.kms.yg.xgxd.domain.AttDpdsBase; import com.kms.yg.xgxd.service.AttDpdsBaseService; +import com.shuili.common.utils.password.MD5Util; import io.swagger.models.auth.In; import lombok.Data; import org.apache.commons.lang.SerializationUtils; @@ -41,6 +46,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.concurrent.*; @@ -101,21 +107,36 @@ 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"; + + + //水闸编码*** + static final String dawc = "http://19.25.35.205:31190/ZHSL_ZY/dws_att_waga_code"; + //水闸基础信息 + static final String dawb= "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_waga_base"; + //水闸水文特征*** + static final String daws = "http://19.25.35.205:31190/ZHSL_ZY/jck/ytjgx/dws_att_waga_slhypr"; + //水闸工程结构*** + static final String dawsl= "http://19.25.35.205:31190/ZHSL_ZY/dws_att_waga_sligvl"; + //水闸出险记录*** + static final String dawst= "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_waga_sldnnt"; + //堤防基础信息 + static final String dadb= "http://19.25.35.205:31190/ZHSL_ZY/jck/yggx/dws_att_dike_base"; + //堤防历史决溢记录*** + static final String dadd = "http://19.25.35.205:31190/ZHSL_ZY/jck/ytjgx/dws_att_dike_dkhos"; + //堤防主要效益指标*** + static final String daddt = "http://19.25.35.205:31190/ZHSL_ZY/jck/ytjgx/dws_att_dike_dbiabt"; + /** * 同步 */ - @GetMapping("sktz1") - public void synchronous() throws ExecutionException, InterruptedException { + public void synchronous() { int pageNum = 1; int pageSize = 1000; Boolean f = true; @@ -368,10 +389,139 @@ public class YgSynchronous { List attRvBases = JSONObject.parseArray(data, AttBasBase.class); attRvBases.forEach(attResRspp -> { attResRspp.preInsert(); -// attResRspp.setId(attResRspp.getBasCode()); + attResRspp.setId(attResRspp.getBasCode()); attBasBaseService.saveOrUpdate(attResRspp); }); } + /** + * 水闸编码 + */ + @GetMapping("dawc") + @Scheduled(cron = "0 0 0 * * ?") + public void dawc(){ + int pageNum = 1; + int pageSize = 99999; + String s = sendRequest( dawc+ "?pageNum=" + pageNum + "&pageSize=" + pageSize); + String data = JSONObject.parseObject(s).getString("data"); + + } + + @Autowired + BsSgcSzSwtzService bsSgcSzSwtzService; + @Autowired + BsSgcSzGcjgService bsSgcSzGcjgService; + @Autowired + BsSgcSzCxjlService bsSgcSzCxjlService; + @Autowired + BsSgcDfJyjlService bsSgcDfJyjlService; + @Autowired + BsSgcDfGcxyService bsSgcDfGcxyService; + + /** + * 水闸水文特征 + */ + @GetMapping("水闸水文特征") + @Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE) + public void daws(){ + int pageNum = 1; + int pageSize = 9999999; + String s = sendRequest( daws+ "?pageNum=" + pageNum + "&pageSize=" + pageSize); + String data = JSONObject.parseObject(s).getString("data"); + List bsSgcSzSwtzs = JSONObject.parseArray(data, BsSgcSzSwtz.class); + for (BsSgcSzSwtz bsSgcSzSwtz : bsSgcSzSwtzs) { + bsSgcSzSwtz.preInsert(); + bsSgcSzSwtz.setId(bsSgcSzSwtz.getWagaCode()); + bsSgcSzSwtzService.saveOrUpdate(bsSgcSzSwtz); + } + + } + + + /** + * 水闸工程结构 + */ + @GetMapping("dawsl") + @Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE) + public void dawsl(){ + int pageNum = 1; + int pageSize = 9999999; + String s = sendRequest( dawsl+ "?pageNum=" + pageNum + "&pageSize=" + pageSize); + String data = JSONObject.parseObject(s).getString("data"); + List bsSgcSzGcjgs = JSONObject.parseArray(data, BsSgcSzGcjg.class); + for (BsSgcSzGcjg bsSgcSzGcjg : bsSgcSzGcjgs) { + bsSgcSzGcjg.preInsert(); + bsSgcSzGcjg.setId(bsSgcSzGcjg.getWagaCode()); + bsSgcSzGcjgService.saveOrUpdate(bsSgcSzGcjg); + } + } + + + /** + * 水闸出险记录 + */ + @GetMapping("dawst") + @Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE) + public void dawst(){ + System.out.println("执行了00000000000"); + int pageNum = 1; + int pageSize = 9999999; + String s = sendRequest( dawst+ "?pageNum=" + pageNum + "&pageSize=" + pageSize); + String data = JSONObject.parseObject(s).getString("data"); + List bsSgcSzCxjls = JSONObject.parseArray(data, BsSgcSzCxjl.class); + for (BsSgcSzCxjl bsSgcSzCxjl : bsSgcSzCxjls) { + bsSgcSzCxjl.preInsert(); + Date fntm = bsSgcSzCxjl.getDNTM(); + String u = bsSgcSzCxjl.getWagaCode()+fntm.getTime(); + String id = MD5Util.MD5Encode(u, "utf-8"); + bsSgcSzCxjl.setId(id); + bsSgcSzCxjlService.saveOrUpdate(bsSgcSzCxjl); + } + } + + + + /** + * 堤防历史决溢记录 + */ + @GetMapping("dadd") + @Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE) + public void dadd(){ + int pageNum = 1; + int pageSize = 9999999; + String s = sendRequest( dadd+ "?pageNum=" + pageNum + "&pageSize=" + pageSize); + String data = JSONObject.parseObject(s).getString("data"); + List bsSgcSzCxjls = JSONObject.parseArray(data, BsSgcDfJyjl.class); + for (BsSgcDfJyjl bsSgcSzCxjl : bsSgcSzCxjls) { + bsSgcSzCxjl.preInsert(); + Date brspTime = bsSgcSzCxjl.getBrspDateTime(); + String dikeCode = bsSgcSzCxjl.getDikeCode(); + String u = brspTime.getTime() + dikeCode; + String id = MD5Util.MD5Encode(u, "utf-8"); + bsSgcSzCxjl.setId(id); + bsSgcDfJyjlService.saveOrUpdate(bsSgcSzCxjl); + } + } + + + /** + * 堤防历史决溢记录 + */ + @GetMapping("daddt") + @Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE) + public void daddt(){ + int pageNum = 1; + int pageSize = 9999999; + String s = sendRequest( daddt+ "?pageNum=" + pageNum + "&pageSize=" + pageSize); + String data = JSONObject.parseObject(s).getString("data"); + List bsSgcDfGcxies = JSONObject.parseArray(data, BsSgcDfGcxy.class); + bsSgcDfGcxyService.remove(new QueryWrapper<>()); + for (BsSgcDfGcxy bsSgcDfGcxy : bsSgcDfGcxies) { + bsSgcDfGcxy.preInsert(); + bsSgcDfGcxyService.saveOrUpdate(bsSgcDfGcxy); + } + } + + } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java index be58f857..73f6d4f3 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfGcxy.java @@ -94,6 +94,30 @@ public class BsSgcDfGcxy extends BaseEntity @ApiModelProperty("保护工矿") private String prfcMn; + + /** 保护城镇 */ + @Excel(name = "保护城镇") + @ApiModelProperty("保护城镇") + private String dikePrtwam; + + @Excel(name = "'保护耕地面积'") + @ApiModelProperty("'保护耕地面积'") + private String dikePrflar; + + @Excel(name = "'保护总人口数'") + @ApiModelProperty("'保护总人口数'") + private String diekPrpp; + + @Excel(name = "'是否保护铁路'") + @ApiModelProperty("'是否保护铁路'") + private String diekPrrw; + + @Excel(name = "'是否保护公路'") + @ApiModelProperty("'是否保护公路'") + private String dikePrrd; + + + /** 保护城镇 */ @Excel(name = "保护城镇") @ApiModelProperty("保护城镇") @@ -131,4 +155,6 @@ public class BsSgcDfGcxy extends BaseEntity @ApiModelProperty("记录失效时间") private Date exprDate; + + } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJyjl.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJyjl.java index c5ea17cd..d0dfbe61 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJyjl.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfJyjl.java @@ -33,7 +33,7 @@ public class BsSgcDfJyjl extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "决溢时间", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("决溢时间") - private Date brspTime; + private Date brspDateTime; /** 决溢地点与形式 */ @Excel(name = "决溢地点与形式") @@ -98,4 +98,6 @@ public class BsSgcDfJyjl extends BaseEntity @ApiModelProperty("记录失效时间") private Date exprDate; + + private String brspForm; } 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 bda1454c..42627180 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 @@ -355,4 +355,7 @@ public class BsSgcDfSafeJbxx extends BaseEntity @TableField(value = "EXPR_DATE", updateStrategy= FieldStrategy.IGNORED) private Date exprDate; + private String elevSysConver; + + private String mnun; } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzCxjl.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzCxjl.java index 16fa67f3..7e100df3 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzCxjl.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzCxjl.java @@ -98,4 +98,8 @@ public class BsSgcSzCxjl extends BaseEntity @ApiModelProperty("记录失效时间") private String relation; + private String WAGA_DNSTGR; + + @JsonFormat(pattern = "yyyy-MM-dd") + private Date DNTM; } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcjg.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcjg.java index 7a8564d2..83128b28 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcjg.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGcjg.java @@ -232,4 +232,11 @@ public class BsSgcSzGcjg extends BaseEntity { @Excel(name = "记录失效时间") @ApiModelProperty("记录失效时间") private String relation; + + private Integer gaorNum; + private Integer aGaorNum; + private String elevSys; + private String elevSysConver; + private String hset; + private Integer hsgram; } 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 f9ef1b98..4935198e 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 @@ -294,4 +294,17 @@ public class BsSgcSzSafeJbxx extends BaseEntity { @TableField(value = "EXPR_DATE", updateStrategy= FieldStrategy.IGNORED) private Date exprDate; + private String wagaCenLat; + private String ifCeb; + private String ifHyj; + private String ifGse; + private String ifSge; + private String freqin; + private String wagaOv; + + @JsonFormat(pattern = "yyyy-MM-dd") + private Date checkDate; + + + } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSwtz.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSwtz.java index de400f15..e57debde 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSwtz.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzSwtz.java @@ -1,5 +1,6 @@ package com.kms.yg.sz.domain; +import com.fasterxml.jackson.annotation.JsonFormat; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -8,6 +9,7 @@ import com.shuili.common.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; /** @@ -138,4 +140,12 @@ public class BsSgcSzSwtz extends BaseEntity @ApiModelProperty("水闸id") private String wagaCode; + + private String normWatLev; + private String dslklv; + private String dsfllv; + private String chhllv; + private String note; +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") +// private Date updateDate; }