From fc0bb459ec6a1e0dafcc3f822db3bf0febaca65e Mon Sep 17 00:00:00 2001 From: ljf Date: Sat, 21 Dec 2024 19:08:36 +0800 Subject: [PATCH 1/4] =?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 | 23 +++++++++--------- .../com/kms/yg/sz/domain/AttWagaCode.java | 24 +++++++++++++++++++ .../kms/yg/sz/mapper/AttWagaCodeMapper.java | 11 +++++++++ .../kms/yg/sz/service/AttWagaCodeService.java | 11 +++++++++ 4 files changed, 58 insertions(+), 11 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/domain/AttWagaCode.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/mapper/AttWagaCodeMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yg/sz/service/AttWagaCodeService.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 67ac1033..f6265fee 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 @@ -22,14 +22,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.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.sz.domain.*; +import com.kms.yg.sz.service.*; import com.kms.yg.xgxd.domain.AttDpdsBase; import com.kms.yg.xgxd.service.AttDpdsBaseService; import com.shuili.common.utils.password.MD5Util; @@ -398,13 +392,18 @@ public class YgSynchronous { * 水闸编码 */ @GetMapping("dawc") - @Scheduled(cron = "0 0 0 * * ?") + @Scheduled(initialDelay = 0, fixedRate = Long.MAX_VALUE) public void dawc(){ int pageNum = 1; - int pageSize = 99999; + int pageSize = 99999999; String s = sendRequest( dawc+ "?pageNum=" + pageNum + "&pageSize=" + pageSize); String data = JSONObject.parseObject(s).getString("data"); - + List codeList = JSONObject.parseArray(data, AttWagaCode.class); + for (AttWagaCode attWagaCode : codeList) { + attWagaCode.preInsert(); + attWagaCode.setId(attWagaCode.getWagaCode()); + attWagaCodeService.saveOrUpdate(attWagaCode); + } } @Autowired @@ -417,6 +416,8 @@ public class YgSynchronous { BsSgcDfJyjlService bsSgcDfJyjlService; @Autowired BsSgcDfGcxyService bsSgcDfGcxyService; + @Autowired + AttWagaCodeService attWagaCodeService; /** * 水闸水文特征 diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/AttWagaCode.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/AttWagaCode.java new file mode 100644 index 00000000..669d92b5 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/AttWagaCode.java @@ -0,0 +1,24 @@ +package com.kms.yg.sz.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.core.domain.BaseEntity; +import lombok.Data; + +import java.util.Date; + +@Data +@TableName("att_waga_code") +public class AttWagaCode extends BaseEntity { + + private String wagaCode; + + private String wagaCode2; + + private String wagaCode3; + + private String note; + + @JsonFormat(pattern = "yyyy-MM-dd") + private Date updateDate; +} diff --git a/shuili-system/src/main/java/com/kms/yg/sz/mapper/AttWagaCodeMapper.java b/shuili-system/src/main/java/com/kms/yg/sz/mapper/AttWagaCodeMapper.java new file mode 100644 index 00000000..e41d6c59 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/mapper/AttWagaCodeMapper.java @@ -0,0 +1,11 @@ +package com.kms.yg.sz.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yg.sz.domain.AttWagaCode; +import com.kms.yg.sz.domain.BsSgcSzAqjc; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Repository +public interface AttWagaCodeMapper extends BaseMapper { +} diff --git a/shuili-system/src/main/java/com/kms/yg/sz/service/AttWagaCodeService.java b/shuili-system/src/main/java/com/kms/yg/sz/service/AttWagaCodeService.java new file mode 100644 index 00000000..2889b52f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/sz/service/AttWagaCodeService.java @@ -0,0 +1,11 @@ +package com.kms.yg.sz.service; + +import com.kms.yg.sz.domain.AttWagaCode; + +import com.kms.yg.sz.mapper.AttWagaCodeMapper; +import com.shuili.common.core.service.BaseService; +import org.springframework.stereotype.Service; + +@Service +public class AttWagaCodeService extends BaseService { +} From ba9aec881531f95e81e75ab7c19d7394b80ee3a0 Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Sun, 22 Dec 2024 11:53:27 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/web/controller/system/SysXzqhController.java | 2 +- shuili-common/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java index f0864c59..3b066fc4 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java @@ -82,7 +82,7 @@ public class SysXzqhController extends BaseController SysUser user = UserUtils.getUser(); String deptId = user.getDeptId(); SysDept sysDept = sysDeptService.getById(deptId); - String xzqhId = sysDept.getXzqhId(); + String xzqhId = sysDept.getXzqhId().substring(0,6); SysXzqh xzqh = sysXzqhService.getById(xzqhId); String userName = user.getUserName(); /*if (userName.equals("admin")) { diff --git a/shuili-common/pom.xml b/shuili-common/pom.xml index ec71061e..9f4139ce 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 From 5ef93208793e8db8eb1f5ae45d03a13e2b27b27d Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Sun, 22 Dec 2024 22:13:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/web/controller/system/SysXzqhController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java index 3b066fc4..f0864c59 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java @@ -82,7 +82,7 @@ public class SysXzqhController extends BaseController SysUser user = UserUtils.getUser(); String deptId = user.getDeptId(); SysDept sysDept = sysDeptService.getById(deptId); - String xzqhId = sysDept.getXzqhId().substring(0,6); + String xzqhId = sysDept.getXzqhId(); SysXzqh xzqh = sysXzqhService.getById(xzqhId); String userName = user.getUserName(); /*if (userName.equals("admin")) { From dfa9f67123f79f887f08428db3e0dc1e64265b4c Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Sun, 22 Dec 2024 22:13:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/web/controller/system/SysXzqhController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java index f0864c59..3b066fc4 100644 --- a/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java +++ b/shuili-admin/src/main/java/com/kms/web/controller/system/SysXzqhController.java @@ -82,7 +82,7 @@ public class SysXzqhController extends BaseController SysUser user = UserUtils.getUser(); String deptId = user.getDeptId(); SysDept sysDept = sysDeptService.getById(deptId); - String xzqhId = sysDept.getXzqhId(); + String xzqhId = sysDept.getXzqhId().substring(0,6); SysXzqh xzqh = sysXzqhService.getById(xzqhId); String userName = user.getUserName(); /*if (userName.equals("admin")) {