From 086afb51e8d47574338bab8fdeee4b9af5174bc3 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Thu, 21 Mar 2024 10:05:21 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/zj/v4.0.0/增量更新v3/v3.sql | 130 ++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) create mode 100644 sql/zj/v4.0.0/增量更新v3/v3.sql diff --git a/sql/zj/v4.0.0/增量更新v3/v3.sql b/sql/zj/v4.0.0/增量更新v3/v3.sql new file mode 100644 index 00000000..1fc1afa1 --- /dev/null +++ b/sql/zj/v4.0.0/增量更新v3/v3.sql @@ -0,0 +1,130 @@ +CREATE TABLE `sgc_yg`.`bs_sgc_sz_bzh` ( + `id` varchar(255) NOT NULL, + `category` varchar(255) NULL COMMENT '类别', + `project` varchar(255) NULL COMMENT '项目', + `basic_requirements` varchar(255) NULL COMMENT '标准化基本要求', + `evaluation_content` varchar(255) NULL COMMENT '评价内容及要求', + `score` varchar(255) NULL COMMENT '标准分', + `evaluation_indicators` varchar(255) NULL COMMENT '评价指标及赋分', + `scoring_interpretation` varchar(255) NULL COMMENT '赋分解释', + `review_method` varchar(255) NULL COMMENT '评审方式', + `type` varchar(255) NULL COMMENT '类型', + `order` varchar(255) NULL COMMENT '排序', + PRIMARY KEY (`id`) +) COMMENT = '水闸标准化'; + + + +ALTER TABLE `sgc_yg`.`bs_sgc_sz_bzh` +ADD COLUMN `create_uid` varchar(255) NULL AFTER `order`, +ADD COLUMN `create_time` datetime NULL AFTER `create_uid`, +ADD COLUMN `update_uid` varchar(255) NULL AFTER `create_time`, +ADD COLUMN `update_time` datetime NULL AFTER `update_uid`, +ADD COLUMN `remark` varchar(255) NULL AFTER `update_time`; + + +ALTER TABLE `sgc_yg`.`bs_sgc_sz_bzh` +MODIFY COLUMN `category` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '类别' AFTER `id`, +MODIFY COLUMN `project` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '项目' AFTER `category`, +MODIFY COLUMN `basic_requirements` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '标准化基本要求' AFTER `project`, +MODIFY COLUMN `evaluation_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '评价内容及要求' AFTER `basic_requirements`, +MODIFY COLUMN `score` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '标准分' AFTER `evaluation_content`, +MODIFY COLUMN `evaluation_indicators` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '评价指标及赋分' AFTER `score`, +MODIFY COLUMN `scoring_interpretation` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '赋分解释' AFTER `evaluation_indicators`, +MODIFY COLUMN `review_method` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '评审方式' AFTER `scoring_interpretation`; + + +ALTER TABLE `sgc_yg`.`bs_sgc_sz_bzh` +CHANGE COLUMN `orderBy` `order_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '排序' AFTER `review_method`; + + +CREATE TABLE `sgc_yg`.`bs_sgc_sz_bzhjs` ( + `id` varchar(255) NOT NULL, + `waga_code` varchar(255) NULL COMMENT '水闸编码', + `stauts` varchar(255) NULL COMMENT '状态', + `acceptance_attachment` varchar(255) NULL COMMENT '验收申请', + `score` varchar(255) NULL COMMENT '分数', + `create_uid` varchar(255) NULL, + `create_time` datetime NULL, + `update_uid` varchar(255) NULL, + `update_time` datetime NULL, + PRIMARY KEY (`id`) +) COMMENT = '水闸标准化建设'; + + +ALTER TABLE `sgc_yg`.`bs_sgc_sz_bzh` +ADD COLUMN `parent_id` varchar(255) NULL AFTER `update_time`; + + + +ALTER TABLE `sgc_yg`.`bs_sgc_sz_bzhjs` +ADD COLUMN `remark` varchar(255) NULL AFTER `update_time`; + + + + +CREATE TABLE `bs_sgc_df_dagl` ( + `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `dike_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防编码', + `regulations_attachment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防调度规程', + `plan_attachment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度调度运用计划', + `create_uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + `update_uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `update_time` datetime(0) NULL DEFAULT NULL, + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ower_dept` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `relation` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '堤防档案管理' ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1; + + +CREATE TABLE `bs_sgc_df_jfgl` ( + `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `dike_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防编码', + `unit_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单位名称', + `people_num` int(11) NULL DEFAULT NULL COMMENT '人员数量', + `funds` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '经费', + `funds_purpose` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '经费用途', + `create_uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `update_uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `create_time` datetime(0) NULL DEFAULT NULL, + `update_time` datetime(0) NULL DEFAULT NULL, + `ower_dept` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `relation` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '经费管理' ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1; + + + +ALTER TABLE `sgc_yg`.`bs_sgc_df_aqjc` +MODIFY COLUMN `testing_results` varchar(3000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '现场检测成果' AFTER `evaluate`, +MODIFY COLUMN `calculation_results` varchar(3000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '复核计算成果' AFTER `testing_results`; + + +ALTER TABLE `sgc_yg`.`bs_sgc_sz_aqjc` +MODIFY COLUMN `testing_results` varchar(3000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '现场检测成果' AFTER `evaluate`, +MODIFY COLUMN `calculation_results` varchar(3000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '复核计算成果' AFTER `testing_results`; + + +RENAME TABLE bs_sgc_df_safe_jbxx TO ATT_DIKE_BASE; +RENAME TABLE bs_sgc_df_dfhdm TO ATT_DIKE_BNBDCRPR; +RENAME TABLE bs_sgc_df_hdmtzz TO ATT_DIKE_DKTR; +RENAME TABLE bs_sgc_df_hydrographic_features TO ATT_DIKE_BSFST; +RENAME TABLE bs_sgc_df_jyjl TO ATT_DIKE_DKHOS; +RENAME TABLE bs_sgc_df_gcxy TO ATT_DIKE_DBIABT; + + + +RENAME TABLE bs_sgc_sz_safe_jbxx TO ATT_WAGA_BASE; +RENAME TABLE bs_sgc_sz_swtz TO ATT_WAGA_SLHYPR; +RENAME TABLE bs_sgc_sz_xlnl TO ATT_WAGA_ESCPP; +RENAME TABLE bs_sgc_sz_gctx TO ATT_WAGA_SLPRCH; +RENAME TABLE bs_sgc_sz_gcjg TO ATT_WAGA_SLIGVL; +RENAME TABLE bs_sgc_sz_cxjl TO ATT_WAGA_SLDNNT; \ No newline at end of file From b499a39dc2321d40ce2451c56381933b97950045 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Thu, 28 Mar 2024 14:34:55 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/BsSgcDfSafeJbxxController.java | 14 ++++++++++---- .../java/com/kms/yg/df/domain/BsSgcDfDfhdm.java | 2 +- .../java/com/kms/yg/df/domain/BsSgcDfGcxy.java | 2 +- .../java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java | 2 +- .../java/com/kms/yg/df/domain/BsSgcDfJyjl.java | 2 +- .../java/com/kms/yg/df/domain/BsSgcDfSafeJbxx.java | 4 ++-- .../java/com/kms/yg/df/domain/BsSgcDfSwtz.java | 2 +- .../java/com/kms/yg/sz/domain/BsSgcSzCxjl.java | 2 +- .../java/com/kms/yg/sz/domain/BsSgcSzGcjg.java | 2 +- .../java/com/kms/yg/sz/domain/BsSgcSzGctx.java | 2 +- .../java/com/kms/yg/sz/domain/BsSgcSzSafeJbxx.java | 2 +- .../java/com/kms/yg/sz/domain/BsSgcSzSwtz.java | 2 +- .../java/com/kms/yg/sz/domain/BsSgcSzXlnl.java | 2 +- .../resources/mapper/yg/df/BsSgcDfAqrwMapper.xml | 2 +- .../resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml | 2 +- .../resources/mapper/yg/df/BsSgcDfDaglMapper.xml | 2 +- .../resources/mapper/yg/df/BsSgcDfFzrMapper.xml | 4 ++-- .../resources/mapper/yg/df/BsSgcDfJfglMapper.xml | 2 +- .../resources/mapper/yg/df/BsSgcDfQqhjMapper.xml | 2 +- .../mapper/yg/df/BsSgcDfSafeJbxxMapper.xml | 2 +- .../resources/mapper/yg/df/BsSgcDfYhxxMapper.xml | 2 +- .../resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml | 2 +- .../resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml | 2 +- .../resources/mapper/yg/sz/BsSgcSzDaglMapper.xml | 2 +- .../resources/mapper/yg/sz/BsSgcSzFzrMapper.xml | 4 ++-- .../resources/mapper/yg/sz/BsSgcSzJfglMapper.xml | 2 +- .../resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml | 2 +- .../mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml | 2 +- .../resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml | 2 +- sql/zj/v4.0.0/增量更新v2/v3.sql | 2 +- 30 files changed, 42 insertions(+), 36 deletions(-) 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 0f2988a8..2e59dacc 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 @@ -1,10 +1,7 @@ package com.kms.yg.df.controller; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; +import java.util.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -182,6 +179,15 @@ public class BsSgcDfSafeJbxxController extends BaseController { @PutMapping public AjaxResult edit(@RequestBody BsSgcDfSafeJbxx bsSgcSzSafeJbxx) { // bsSgcSzSafeJbxx.setStatus("4"); + if (bsSgcSzSafeJbxx.getStatus().equals("6")) { + String id = bsSgcSzSafeJbxx.getId(); + BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getById(id); + byId.setExprDate(new Date()); + byId.setId(UUID.randomUUID().toString()); + bsSgcSzSafeJbxxService.save(byId); + bsSgcSzSafeJbxx.setEffDate(new Date()); + bsSgcSzSafeJbxx.setExprDate(null); + } return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx)); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfhdm.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfhdm.java index d0a1b760..31529cc9 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfhdm.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfDfhdm.java @@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName; * @author kms * @date 2024-02-29 */ -@TableName("bs_sgc_df_dfhdm") +@TableName("att_dike_bnbdcrpr") @Data @ApiModel("堤防横断面") public class BsSgcDfDfhdm extends BaseEntity 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 c09e74ac..be58f857 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 @@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName; * @author kms * @date 2024-02-28 */ -@TableName("bs_sgc_df_gcxy") +@TableName("att_dike_dbiabt") @Data @ApiModel("工程效益") public class BsSgcDfGcxy extends BaseEntity diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java index 4df57d07..dfc8c379 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfHdmtzz.java @@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName; * @author kms * @date 2024-02-28 */ -@TableName("bs_sgc_df_hdmtzz") +@TableName("att_dike_dktr") @Data @ApiModel("横断面特征值") public class BsSgcDfHdmtzz extends BaseEntity 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 365d2f06..c5ea17cd 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 @@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName; * @author kms * @date 2024-02-29 */ -@TableName("bs_sgc_df_jyjl") +@TableName("att_dike_dkhos") @Data @ApiModel("决溢记录") public class BsSgcDfJyjl extends BaseEntity 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 dcfabc0f..a1704424 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 @@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName; * @author kms * @date 2024-02-28 */ -@TableName("bs_sgc_df_safe_jbxx") +@TableName("att_dike_base") @Data @ApiModel("堤防安全管理基本信息") public class BsSgcDfSafeJbxx extends BaseEntity @@ -76,7 +76,7 @@ public class BsSgcDfSafeJbxx extends BaseEntity /** 堤防级别 */ @Excel(name = "堤防级别") @ApiModelProperty("堤防级别") - private String engGrad; + private String dikeGrad; /** 主要建筑物级别 */ @Excel(name = "主要建筑物级别") diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java index d0a715b1..a1ea0034 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java @@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName; * @author kms * @date 2024-02-28 */ -@TableName("bs_sgc_df_swtz") +@TableName("att_dike_bsfst") @Data @ApiModel("水文特征") public class BsSgcDfSwtz extends BaseEntity 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 09dca330..16fa67f3 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 @@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName; * @author kms * @date 2024-02-28 */ -@TableName("bs_sgc_sz_cxjl") +@TableName("att_waga_sldnnt") @Data @ApiModel("出险记录") public class BsSgcSzCxjl extends BaseEntity 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 cc343a95..7a8564d2 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 @@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName; * @author kms * @date 2024-02-28 */ -@TableName("bs_sgc_sz_gcjg") +@TableName("att_waga_sligvl") @Data @ApiModel("工程结构") public class BsSgcSzGcjg extends BaseEntity { diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGctx.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGctx.java index 281fd913..2e79de22 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGctx.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzGctx.java @@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName; * @author kms * @date 2024-02-28 */ -@TableName("bs_sgc_sz_gctx") +@TableName("att_waga_slprch") @Data @ApiModel("工程特性") public class BsSgcSzGctx extends BaseEntity 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 23b8dadb..e25f1d16 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 @@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName; * @author kms * @date 2024-02-28 */ -@TableName("bs_sgc_sz_safe_jbxx") +@TableName("att_waga_base") @Data @ApiModel("水闸安全管理基本信息") public class BsSgcSzSafeJbxx extends BaseEntity { 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 ef4020ee..de400f15 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 @@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.annotation.TableName; * @author kms * @date 2024-01-17 */ -@TableName("bs_sgc_sz_swtz") +@TableName("att_waga_slhypr") @Data @ApiModel("水文特征") public class BsSgcSzSwtz extends BaseEntity diff --git a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzXlnl.java b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzXlnl.java index e6308f02..dd3d2132 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzXlnl.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/domain/BsSgcSzXlnl.java @@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.annotation.TableName; * @author kms * @date 2024-02-28 */ -@TableName("bs_sgc_sz_xlnl") +@TableName("att_waga_escpp") @Data @ApiModel("泄流能力") public class BsSgcSzXlnl extends BaseEntity { diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml index f3b54cfa..dac7ff09 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfAqrwMapper.xml @@ -8,7 +8,7 @@ SELECT sx.`NAME`, COUNT(1) num FROM bs_sgc_df_dfrw ss - LEFT JOIN bs_sgc_df_safe_jbxx sj ON sj.dike_code = ss.dike_code + LEFT JOIN att_dike_base sj ON sj.dike_code = ss.dike_code LEFT JOIN sys_xzqh sx ON sj.adcd = sx.XZQHDM 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 e435c813..22d18a83 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfBzhjsMapper.xml @@ -7,7 +7,7 @@ select * from bs_sgc_df_bzhjs sf - left join bs_sgc_df_safe_jbxx sj on sf.dike_code = sj.dike_code + left join att_dike_base sj on sf.dike_code = sj.dike_code 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 99e56c33..72bfcd79 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDaglMapper.xml @@ -7,7 +7,7 @@ select * from bs_sgc_df_dagl sd - left join bs_sgc_df_safe_jbxx sj on sd.dike_code = sj.dike_code + left join att_dike_base sj on sd.dike_code = sj.dike_code 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 ad3e62c2..78e912f4 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfFzrMapper.xml @@ -8,7 +8,7 @@ select sj.dike_name, sf.* from bs_sgc_df_fzr sf - left join bs_sgc_df_safe_jbxx sj on sf.dike_code = sj.dike_code + left join att_dike_base sj on sf.dike_code = sj.dike_code @@ -17,7 +17,7 @@ count(1) num, sf.type from bs_sgc_df_fzr sf - left join bs_sgc_df_safe_jbxx sj on sf.dike_code = sj.dike_code + left join att_dike_base sj on sf.dike_code = sj.dike_code left join sys_xzqh sx on sj.adcd=sx.xzqhdm diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml index e8ae0f5d..57b4aecd 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfJfglMapper.xml @@ -7,7 +7,7 @@ select * from bs_sgc_df_jfgl sf - left join bs_sgc_df_safe_jbxx sj on sf.dike_code = sj.dike_code + left join att_dike_base sj on sf.dike_code = sj.dike_code diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfQqhjMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfQqhjMapper.xml index 6acc58cd..b2c1e14d 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfQqhjMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfQqhjMapper.xml @@ -11,7 +11,7 @@ sj.adcd, sq.* from bs_sgc_df_qqhj sq - left join bs_sgc_df_safe_jbxx sj on sq.dike_code = sj.dike_code + left join att_dike_base sj on sq.dike_code = sj.dike_code diff --git a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfSafeJbxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfSafeJbxxMapper.xml index 8e372d02..ce50acdc 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfSafeJbxxMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfSafeJbxxMapper.xml @@ -8,7 +8,7 @@ select sx.name, count(1) num, sj.`status` - from bs_sgc_df_safe_jbxx sj + from att_dike_base sj left join sys_xzqh sx on sj.adcd=sx.xzqhdm 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 cfaf8c5b..9011d077 100644 --- a/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/df/BsSgcDfYhxxMapper.xml @@ -9,7 +9,7 @@ count(1) num, sx.`name` from bs_sgc_df_yhxx sy - left join bs_sgc_df_safe_jbxx sj on sj.dike_code=sy.dike_code + left join att_dike_base sj on sj.dike_code=sy.dike_code left join sys_xzqh sx on sj.adcd=sx.xzqhdm diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml index 473fce10..26b6fb5c 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzAqrwMapper.xml @@ -8,7 +8,7 @@ SELECT sx.`NAME`, COUNT(1) num FROM bs_sgc_sz_szrw ss - LEFT JOIN bs_sgc_sz_safe_jbxx sj ON sj.waga_code = ss.waga_code + LEFT JOIN att_waga_base sj ON sj.waga_code = ss.waga_code LEFT JOIN sys_xzqh sx ON sj.adcd = sx.XZQHDM 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 05d639f7..1056caa5 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzBzhjsMapper.xml @@ -7,7 +7,7 @@ select * from bs_sgc_sz_bzhjs sf - left join bs_sgc_sz_safe_jbxx sj on sf.waga_code = sj.waga_code + left join att_waga_base sj on sf.waga_code = sj.waga_code 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 85b9da98..1cbf29de 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDaglMapper.xml @@ -7,7 +7,7 @@ select * from bs_sgc_sz_dagl sd - left join bs_sgc_sz_safe_jbxx sj on sd.waga_code = sj.waga_code + left join att_waga_base sj on sd.waga_code = sj.waga_code 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 18873cd9..55649300 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzFzrMapper.xml @@ -8,7 +8,7 @@ select sj.waga_name, sf.* from bs_sgc_sz_fzr sf - left join bs_sgc_sz_safe_jbxx sj on sf.waga_code = sj.waga_code + left join att_waga_base sj on sf.waga_code = sj.waga_code @@ -17,7 +17,7 @@ count(1) num, sf.type from bs_sgc_sz_fzr sf - left join bs_sgc_sz_safe_jbxx sj on sf.waga_code = sj.waga_code + left join att_waga_base sj on sf.waga_code = sj.waga_code left join sys_xzqh sx on sj.adcd=sx.xzqhdm diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml index 0b70d0f7..6aef7db6 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzJfglMapper.xml @@ -7,7 +7,7 @@ select * from bs_sgc_sz_jfgl sf - left join bs_sgc_sz_safe_jbxx sj on sf.waga_code = sj.waga_code + left join att_waga_base sj on sf.waga_code = sj.waga_code diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml index 517ca51f..712780cb 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzQqhjMapper.xml @@ -12,7 +12,7 @@ sj.adcd, sq.* from bs_sgc_sz_qqhj sq - left join bs_sgc_sz_safe_jbxx sj on sq.waga_code = sj.waga_code + left join att_waga_base sj on sq.waga_code = sj.waga_code diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml index 190532a9..cc3ac87a 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzSafeJbxxMapper.xml @@ -8,7 +8,7 @@ select sx.name, count(1) num, sj.`status` - from bs_sgc_sz_safe_jbxx sj + from att_waga_base sj left join sys_xzqh sx on sj.adcd=sx.xzqhdm diff --git a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml index e211aed3..b7cff06f 100644 --- a/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzYhxxMapper.xml @@ -9,7 +9,7 @@ count(1) num, sx.`name` from bs_sgc_sz_yhxx sy - left join bs_sgc_sz_safe_jbxx sj on sj.waga_code=sy.waga_code + left join att_waga_base sj on sj.waga_code=sy.waga_code left join sys_xzqh sx on sj.adcd=sx.xzqhdm diff --git a/sql/zj/v4.0.0/增量更新v2/v3.sql b/sql/zj/v4.0.0/增量更新v2/v3.sql index d9998522..d024f2d4 100644 --- a/sql/zj/v4.0.0/增量更新v2/v3.sql +++ b/sql/zj/v4.0.0/增量更新v2/v3.sql @@ -1,4 +1,4 @@ -1. + ALTER TABLE `sgc_yg`.`bs_sgc_sz_bzbp` CHANGE COLUMN `sluice_code` `waga_code` varchar (255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水闸编码' AFTER `mark_name`, CHANGE COLUMN `sluice_name` `waga_name` varchar (255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水闸名称' AFTER `adcd`; From f6be9cdc1b94eae733d6e921a4d7fee4d2a8db8b Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Thu, 28 Mar 2024 16:29:12 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/BsSgcDfDfhdmController.java | 27 +++++++++++++- .../df/controller/BsSgcDfGcxyController.java | 18 +++++++++- .../controller/BsSgcDfHdmtzzController.java | 32 ++++++++++++++++- .../df/controller/BsSgcDfJyjlController.java | 31 ++++++++++++++-- .../controller/BsSgcDfSafeJbxxController.java | 36 +++++++++++++++---- .../df/controller/BsSgcDfSwtzController.java | 18 +++++++++- .../com/kms/yg/df/domain/BsSgcDfSwtz.java | 12 +++++++ 7 files changed, 161 insertions(+), 13 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfhdmController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfhdmController.java index ba8bd99e..2ac6cb55 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfhdmController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfDfhdmController.java @@ -1,8 +1,14 @@ package com.kms.yg.df.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; +import java.util.UUID; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.df.domain.BsSgcDfSafeJbxx; +import com.kms.yg.df.service.BsSgcDfSafeJbxxService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.utils.poi.ExcelUtil; @@ -45,6 +51,9 @@ public class BsSgcDfDfhdmController extends BaseController @Autowired private BsSgcDfDfhdmService bsSgcDfDfhdmService; + @Autowired + private BsSgcDfSafeJbxxService bsSgcDfSafeJbxxService; + /** @@ -54,7 +63,10 @@ public class BsSgcDfDfhdmController extends BaseController @ApiOperation("堤防横断面列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcDfDfhdmService.selectPage(sp); + Page page = bsSgcDfDfhdmService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), Wrappers.lambdaQuery(BsSgcDfDfhdm.class) + .eq(BsSgcDfDfhdm::getDikeCode, sp.getData().getDikeCode()) + .isNull(BsSgcDfDfhdm::getExprDate)); + return page; } /** @@ -100,6 +112,19 @@ public class BsSgcDfDfhdmController extends BaseController @PutMapping public AjaxResult edit(@RequestBody BsSgcDfDfhdm bsSgcDfDfhdm) { + + String dikeCode = bsSgcDfDfhdm.getDikeCode(); + BsSgcDfSafeJbxx byId = bsSgcDfSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class) + .eq(BsSgcDfSafeJbxx::getDikeCode, dikeCode)); + byId.setStatus("4"); + bsSgcDfSafeJbxxService.updateById(byId); + String id = bsSgcDfDfhdm.getId(); + BsSgcDfDfhdm dfhdm = bsSgcDfDfhdmService.getById(id); + dfhdm.setExprDate(new Date()); + dfhdm.setId(UUID.randomUUID().toString()); + bsSgcDfDfhdmService.save(dfhdm); + bsSgcDfDfhdm.setEffDate(new Date()); + bsSgcDfDfhdm.setExprDate(null); return toAjax(bsSgcDfDfhdmService.updateById(bsSgcDfDfhdm)); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcxyController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcxyController.java index 1d9980e6..df36d461 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcxyController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGcxyController.java @@ -1,12 +1,17 @@ package com.kms.yg.df.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; +import java.util.UUID; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfDfhdm; import com.kms.yg.df.domain.BsSgcDfGcxy; +import com.kms.yg.df.domain.BsSgcDfJyjl; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.service.BsSgcDfGcxyService; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; @@ -71,7 +76,11 @@ public class BsSgcDfGcxyController extends BaseController @ApiOperation("工程效益列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzGcxyService.selectPage(sp); + + Page page = bsSgcSzGcxyService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), Wrappers.lambdaQuery(BsSgcDfGcxy.class) + .eq(BsSgcDfGcxy::getDikeCode, sp.getData().getDikeCode()) + .isNull(BsSgcDfGcxy::getExprDate)); + return page; } /** @@ -128,6 +137,13 @@ public class BsSgcDfGcxyController extends BaseController .eq(BsSgcDfSafeJbxx::getDikeCode, dikeCode)); byId.setStatus("4"); bsSgcSzSafeJbxxService.updateById(byId); + String id = bsSgcSzGcxy.getId(); + BsSgcDfGcxy dfhdm = bsSgcSzGcxyService.getById(id); + dfhdm.setExprDate(new Date()); + dfhdm.setId(UUID.randomUUID().toString()); + bsSgcSzGcxyService.save(dfhdm); + bsSgcSzGcxy.setEffDate(new Date()); + bsSgcSzGcxy.setExprDate(null); return toAjax(bsSgcSzGcxyService.updateById(bsSgcSzGcxy)); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHdmtzzController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHdmtzzController.java index fa5d2a0d..c2e253c7 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHdmtzzController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfHdmtzzController.java @@ -1,8 +1,16 @@ package com.kms.yg.df.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; +import java.util.UUID; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.df.domain.BsSgcDfDfhdm; +import com.kms.yg.df.domain.BsSgcDfGcxy; +import com.kms.yg.df.domain.BsSgcDfSafeJbxx; +import com.kms.yg.df.service.BsSgcDfSafeJbxxService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.utils.poi.ExcelUtil; @@ -12,6 +20,7 @@ import com.kms.common.utils.BaseEntityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.ParameterResolutionDelegate; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -46,6 +55,10 @@ public class BsSgcDfHdmtzzController extends BaseController private BsSgcDfHdmtzzService bsSgcDfHdmtzzService; + @Autowired + private BsSgcDfSafeJbxxService bsSgcDfSafeJbxxService; + + /** * 查询横断面特征值列表 */ @@ -53,7 +66,10 @@ public class BsSgcDfHdmtzzController extends BaseController @ApiOperation("横断面特征值列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcDfHdmtzzService.selectPage(sp); + Page page = bsSgcDfHdmtzzService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), Wrappers.lambdaQuery(BsSgcDfHdmtzz.class) + .eq(BsSgcDfHdmtzz::getDikeCode, sp.getData().getDikeCode()) + .isNull(BsSgcDfHdmtzz::getExprDate)); + return page; } /** @@ -99,6 +115,20 @@ public class BsSgcDfHdmtzzController extends BaseController @PutMapping public AjaxResult edit(@RequestBody BsSgcDfHdmtzz bsSgcDfHdmtzz) { + + String dikeCode = bsSgcDfHdmtzz.getDikeCode(); + BsSgcDfSafeJbxx byId = bsSgcDfSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class) + .eq(BsSgcDfSafeJbxx::getDikeCode, dikeCode)); + byId.setStatus("4"); + bsSgcDfSafeJbxxService.updateById(byId); + String id = bsSgcDfHdmtzz.getId(); + BsSgcDfHdmtzz dfhdm = bsSgcDfHdmtzzService.getById(id); + dfhdm.setExprDate(new Date()); + dfhdm.setId(UUID.randomUUID().toString()); + bsSgcDfHdmtzzService.save(dfhdm); + bsSgcDfHdmtzz.setEffDate(new Date()); + bsSgcDfHdmtzz.setExprDate(null); + return toAjax(bsSgcDfHdmtzzService.updateById(bsSgcDfHdmtzz)); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJyjlController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJyjlController.java index 857d10bf..e2cf9f7a 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJyjlController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfJyjlController.java @@ -1,8 +1,16 @@ package com.kms.yg.df.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; - +import java.util.UUID; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.df.domain.BsSgcDfHdmtzz; +import com.kms.yg.df.domain.BsSgcDfSafeJbxx; +import com.kms.yg.df.domain.BsSgcDfSwtz; +import com.kms.yg.df.service.BsSgcDfSafeJbxxService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.utils.poi.ExcelUtil; @@ -46,7 +54,8 @@ public class BsSgcDfJyjlController extends BaseController private BsSgcDfJyjlService bsSgcDfJyjlService; - + @Autowired + private BsSgcDfSafeJbxxService bsSgcSzSafeJbxxService; /** * 查询决溢记录列表 */ @@ -54,7 +63,11 @@ public class BsSgcDfJyjlController extends BaseController @ApiOperation("决溢记录列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcDfJyjlService.selectPage(sp); + Page page = bsSgcDfJyjlService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), + Wrappers.lambdaQuery(BsSgcDfJyjl.class) + .eq(BsSgcDfJyjl::getDikeCode, sp.getData().getDikeCode()) + .isNull(BsSgcDfJyjl::getExprDate)); + return page; } /** @@ -100,6 +113,18 @@ public class BsSgcDfJyjlController extends BaseController @PutMapping public AjaxResult edit(@RequestBody BsSgcDfJyjl bsSgcDfJyjl) { + String dikeCode = bsSgcDfJyjl.getDikeCode(); + BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class) + .eq(BsSgcDfSafeJbxx::getDikeCode, dikeCode)); + byId.setStatus("4"); + bsSgcSzSafeJbxxService.updateById(byId); + String id = bsSgcDfJyjl.getId(); + BsSgcDfJyjl dfhdm = bsSgcDfJyjlService.getById(id); + dfhdm.setExprDate(new Date()); + dfhdm.setId(UUID.randomUUID().toString()); + bsSgcDfJyjlService.save(dfhdm); + bsSgcDfJyjl.setEffDate(new Date()); + bsSgcDfJyjl.setExprDate(null); return toAjax(bsSgcDfJyjlService.updateById(bsSgcDfJyjl)); } 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 2e59dacc..6e35a4b2 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 @@ -90,12 +90,12 @@ public class BsSgcDfSafeJbxxController extends BaseController { } @GetMapping("/getHistogram") - public HashMap> getHistogram() { + public HashMap> getHistogram() { Integer layer = sysXzqhService.getLayer(); String xzqh = sysXzqhService.getXzqh(); - HashMap> dto = bsSgcSzSafeJbxxService.getHistogram(layer, xzqh); + HashMap> dto = bsSgcSzSafeJbxxService.getHistogram(layer, xzqh); return dto; @@ -112,9 +112,10 @@ 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()) - .ne(BsSgcDfSafeJbxx::getStatus,"0") + .ne(BsSgcDfSafeJbxx::getStatus, "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())) .orderByDesc(BsSgcDfSafeJbxx::getCreateTime)); @@ -128,8 +129,8 @@ public class BsSgcDfSafeJbxxController extends BaseController { 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") + .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()) .likeRight(data.getAdcd() != null, BsSgcDfSafeJbxx::getAdcd, sysXzqhService.getSubString(data.getAdcd())) @@ -179,7 +180,7 @@ public class BsSgcDfSafeJbxxController extends BaseController { @PutMapping public AjaxResult edit(@RequestBody BsSgcDfSafeJbxx bsSgcSzSafeJbxx) { // bsSgcSzSafeJbxx.setStatus("4"); - if (bsSgcSzSafeJbxx.getStatus().equals("6")) { + /*if (bsSgcSzSafeJbxx.getStatus().equals("6")) { String id = bsSgcSzSafeJbxx.getId(); BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getById(id); byId.setExprDate(new Date()); @@ -187,6 +188,29 @@ public class BsSgcDfSafeJbxxController extends BaseController { bsSgcSzSafeJbxxService.save(byId); bsSgcSzSafeJbxx.setEffDate(new Date()); bsSgcSzSafeJbxx.setExprDate(null); + }*/ + if (bsSgcSzSafeJbxx.getStatus().equals("4")) { + String id = bsSgcSzSafeJbxx.getId(); + //获取未修改的数据 + BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getById(id); + //将未修改的数据插入数据库 + byId.setExprDate(new Date()); + byId.setId(UUID.randomUUID().toString()); + bsSgcSzSafeJbxxService.save(byId); + //生成新的数据 + bsSgcSzSafeJbxx.setEffDate(new Date()); + bsSgcSzSafeJbxx.setExprDate(null); + return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx)); + } + if (bsSgcSzSafeJbxx.getStatus().equals("5")) { + List list = bsSgcSzSafeJbxxService.list(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class) + .eq(BsSgcDfSafeJbxx::getDikeCode, bsSgcSzSafeJbxx.getDikeCode()) + .isNull(BsSgcDfSafeJbxx::getEffDate) + .orderByDesc(BsSgcDfSafeJbxx::getExprDate)); + bsSgcSzSafeJbxxService.removeById(bsSgcSzSafeJbxx.getId()); + BsSgcDfSafeJbxx bsSgcDfSafeJbxx = list.get(0); + bsSgcDfSafeJbxx.setExprDate(null); + return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcDfSafeJbxx)); } return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx)); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSwtzController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSwtzController.java index a483e4c6..2d442879 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSwtzController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSwtzController.java @@ -1,11 +1,16 @@ package com.kms.yg.df.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; +import java.util.UUID; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfHdmtzz; +import com.kms.yg.df.domain.BsSgcDfJyjl; import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.df.domain.BsSgcDfSwtz; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; @@ -71,7 +76,11 @@ public class BsSgcDfSwtzController extends BaseController @ApiOperation("水文特征列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzSwtzService.selectPage(sp); + Page page = bsSgcSzSwtzService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), + Wrappers.lambdaQuery(BsSgcDfSwtz.class) + .eq(BsSgcDfSwtz::getDikeCode, sp.getData().getDikeCode()) + .isNull(BsSgcDfSwtz::getExprDate)); + return page; } /** @@ -127,6 +136,13 @@ public class BsSgcDfSwtzController extends BaseController .eq(BsSgcDfSafeJbxx::getDikeCode, dikeCode)); byId.setStatus("4"); bsSgcSzSafeJbxxService.updateById(byId); + String id = bsSgcSzSwtz.getId(); + BsSgcDfSwtz dfhdm = bsSgcSzSwtzService.getById(id); + dfhdm.setExprDate(new Date()); + dfhdm.setId(UUID.randomUUID().toString()); + bsSgcSzSwtzService.save(dfhdm); + bsSgcSzSwtz.setEffDate(new Date()); + bsSgcSzSwtz.setExprDate(null); return toAjax(bsSgcSzSwtzService.updateById(bsSgcSzSwtz)); } diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java index a1ea0034..7f0a9066 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java @@ -206,4 +206,16 @@ public class BsSgcDfSwtz extends BaseEntity @ApiModelProperty("历史最大洪峰流量日期") private Date highestWaterFlowTime; + /** 记录生效时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "记录生效时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("记录生效时间") + private Date effDate; + + /** 记录失效时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "记录失效时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("记录失效时间") + private Date exprDate; + } From 11bbe5a4cc70473f36d64dfe53f51ad47a36947c Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Thu, 28 Mar 2024 16:42:40 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BsSgcDfSafeJbxxController.java | 17 ++++++---- .../sz/controller/BsSgcSzCxjlController.java | 26 ++++++++++++--- .../sz/controller/BsSgcSzGcjgController.java | 28 +++++++++++++--- .../sz/controller/BsSgcSzGctxController.java | 27 +++++++++++++--- .../controller/BsSgcSzSafeJbxxController.java | 32 ++++++++++++++----- .../sz/controller/BsSgcSzSjcsController.java | 17 +++++++++- .../sz/controller/BsSgcSzXlnlController.java | 17 +++++++++- 7 files changed, 132 insertions(+), 32 deletions(-) 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 6e35a4b2..8aca9a04 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 @@ -58,6 +58,9 @@ public class BsSgcDfSafeJbxxController extends BaseController { @Autowired private BsSgcDfSafeJbxxService bsSgcSzSafeJbxxService; + @Autowired + private BsSgcDfSafeJbxxService bsSgcDfSafeJbxxService; + @Autowired private SysXzqhService sysXzqhService; @@ -192,27 +195,27 @@ public class BsSgcDfSafeJbxxController extends BaseController { if (bsSgcSzSafeJbxx.getStatus().equals("4")) { String id = bsSgcSzSafeJbxx.getId(); //获取未修改的数据 - BsSgcDfSafeJbxx byId = bsSgcSzSafeJbxxService.getById(id); + BsSgcDfSafeJbxx byId = bsSgcDfSafeJbxxService.getById(id); //将未修改的数据插入数据库 byId.setExprDate(new Date()); byId.setId(UUID.randomUUID().toString()); - bsSgcSzSafeJbxxService.save(byId); + bsSgcDfSafeJbxxService.save(byId); //生成新的数据 bsSgcSzSafeJbxx.setEffDate(new Date()); bsSgcSzSafeJbxx.setExprDate(null); - return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx)); + return toAjax(bsSgcDfSafeJbxxService.updateById(bsSgcSzSafeJbxx)); } if (bsSgcSzSafeJbxx.getStatus().equals("5")) { - List list = bsSgcSzSafeJbxxService.list(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class) + List list = bsSgcDfSafeJbxxService.list(Wrappers.lambdaQuery(BsSgcDfSafeJbxx.class) .eq(BsSgcDfSafeJbxx::getDikeCode, bsSgcSzSafeJbxx.getDikeCode()) .isNull(BsSgcDfSafeJbxx::getEffDate) .orderByDesc(BsSgcDfSafeJbxx::getExprDate)); - bsSgcSzSafeJbxxService.removeById(bsSgcSzSafeJbxx.getId()); + bsSgcDfSafeJbxxService.removeById(bsSgcSzSafeJbxx.getId()); BsSgcDfSafeJbxx bsSgcDfSafeJbxx = list.get(0); bsSgcDfSafeJbxx.setExprDate(null); - return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcDfSafeJbxx)); + return toAjax(bsSgcDfSafeJbxxService.updateById(bsSgcDfSafeJbxx)); } - return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx)); + return toAjax(bsSgcDfSafeJbxxService.updateById(bsSgcSzSafeJbxx)); } /** 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 f5579aa6..ec0b4466 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 @@ -5,7 +5,11 @@ import java.util.Date; import java.util.List; import java.util.UUID; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yg.sz.domain.BsSgcSzGcjg; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.utils.poi.ExcelUtil; @@ -48,6 +52,9 @@ public class BsSgcSzCxjlController extends BaseController @Autowired private BsSgcSzCxjlService bsSgcSzCxjlService; + @Autowired + private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService; + /** * 查询出险记录列表 @@ -56,7 +63,11 @@ public class BsSgcSzCxjlController extends BaseController @ApiOperation("出险记录列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzCxjlService.selectPage(sp); + Page page = bsSgcSzCxjlService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), + Wrappers.lambdaQuery(BsSgcSzCxjl.class) + .eq(BsSgcSzCxjl::getWagaCode, sp.getData().getWagaCode()) + .isNull(BsSgcSzCxjl::getExprDate)); + return page; } /** @@ -103,11 +114,16 @@ public class BsSgcSzCxjlController extends BaseController public AjaxResult edit(@RequestBody BsSgcSzCxjl bsSgcSzCxjl) { + String wagaCode = bsSgcSzCxjl.getWagaCode(); + BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) + .eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode)); + byId.setStatus("4"); + bsSgcSzSafeJbxxService.updateById(byId); String id = bsSgcSzCxjl.getId(); - BsSgcSzCxjl byId = bsSgcSzCxjlService.getById(id); - byId.setExprDate(new Date()); - byId.setId(UUID.randomUUID().toString()); - bsSgcSzCxjlService.save(byId); + BsSgcSzCxjl dfhdm = bsSgcSzCxjlService.getById(id); + dfhdm.setExprDate(new Date()); + dfhdm.setId(UUID.randomUUID().toString()); + bsSgcSzCxjlService.save(dfhdm); bsSgcSzCxjl.setEffDate(new Date()); bsSgcSzCxjl.setExprDate(null); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcjgController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcjgController.java index febbeceb..ad6d8222 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcjgController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGcjgController.java @@ -5,7 +5,12 @@ import java.util.Date; import java.util.List; import java.util.UUID; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.sz.domain.BsSgcSzCxjl; +import com.kms.yg.sz.domain.BsSgcSzGctx; +import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.utils.poi.ExcelUtil; @@ -49,6 +54,10 @@ public class BsSgcSzGcjgController extends BaseController private BsSgcSzGcjgService bsSgcSzGcjgService; + @Autowired + private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService; + + /** * 查询工程结构列表 */ @@ -56,7 +65,11 @@ public class BsSgcSzGcjgController extends BaseController @ApiOperation("工程结构列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzGcjgService.selectPage(sp); + Page page = bsSgcSzGcjgService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), + Wrappers.lambdaQuery(BsSgcSzGcjg.class) + .eq(BsSgcSzGcjg::getWagaCode, sp.getData().getWagaCode()) + .isNull(BsSgcSzGcjg::getExprDate)); + return page; } /** @@ -103,11 +116,16 @@ public class BsSgcSzGcjgController extends BaseController public AjaxResult edit(@RequestBody BsSgcSzGcjg bsSgcSzGcjg) { + String wagaCode = bsSgcSzGcjg.getWagaCode(); + BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) + .eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode)); + byId.setStatus("4"); + bsSgcSzSafeJbxxService.updateById(byId); String id = bsSgcSzGcjg.getId(); - BsSgcSzGcjg byId = bsSgcSzGcjgService.getById(id); - byId.setExprDate(new Date()); - byId.setId(UUID.randomUUID().toString()); - bsSgcSzGcjgService.save(byId); + BsSgcSzGcjg dfhdm = bsSgcSzGcjgService.getById(id); + dfhdm.setExprDate(new Date()); + dfhdm.setId(UUID.randomUUID().toString()); + bsSgcSzGcjgService.save(dfhdm); bsSgcSzGcjg.setEffDate(new Date()); bsSgcSzGcjg.setExprDate(null); return toAjax(bsSgcSzGcjgService.updateById(bsSgcSzGcjg)); diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java index c41b6023..33510a8f 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzGctxController.java @@ -5,7 +5,12 @@ import java.util.Date; import java.util.List; import java.util.UUID; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.sz.domain.BsSgcSzGcjg; +import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.domain.BsSgcSzXlnl; +import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.utils.poi.ExcelUtil; @@ -48,6 +53,9 @@ public class BsSgcSzGctxController extends BaseController @Autowired private BsSgcSzGctxService bsSgcSzGctxService; + @Autowired + private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService; + /** * 查询工程特性列表 @@ -56,7 +64,11 @@ public class BsSgcSzGctxController extends BaseController @ApiOperation("工程特性列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzGctxService.selectPage(sp); + Page page = bsSgcSzGctxService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), + Wrappers.lambdaQuery(BsSgcSzGctx.class) + .eq(BsSgcSzGctx::getWagaCode, sp.getData().getWagaCode()) + .isNull(BsSgcSzGctx::getExprDate)); + return page; } /** @@ -102,11 +114,16 @@ public class BsSgcSzGctxController extends BaseController @PutMapping public AjaxResult edit(@RequestBody BsSgcSzGctx bsSgcSzGctx) { + String wagaCode = bsSgcSzGctx.getWagaCode(); + BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getOne(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) + .eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode)); + byId.setStatus("4"); + bsSgcSzSafeJbxxService.updateById(byId); String id = bsSgcSzGctx.getId(); - BsSgcSzGctx byId = bsSgcSzGctxService.getById(id); - byId.setExprDate(new Date()); - byId.setId(UUID.randomUUID().toString()); - bsSgcSzGctxService.save(byId); + BsSgcSzGctx dfhdm = bsSgcSzGctxService.getById(id); + dfhdm.setExprDate(new Date()); + dfhdm.setId(UUID.randomUUID().toString()); + bsSgcSzGctxService.save(dfhdm); bsSgcSzGctx.setEffDate(new Date()); bsSgcSzGctx.setExprDate(null); return toAjax(bsSgcSzGctxService.updateById(bsSgcSzGctx)); 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 729c520a..9620013c 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 @@ -10,6 +10,7 @@ import com.kms.common.utils.UserUtils; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfSafeJbxx; import com.kms.yg.sz.domain.BsSgcSzBzbp; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.domain.dto.HistogramDto; @@ -177,14 +178,29 @@ public class BsSgcSzSafeJbxxController extends BaseController { @PutMapping public AjaxResult edit(@RequestBody BsSgcSzSafeJbxx bsSgcSzSafeJbxx) { // bsSgcSzSafeJbxx.setStatus("4"); - String id = bsSgcSzSafeJbxx.getId(); - BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(id); - byId.setExprDate(new Date()); - byId.setId(UUID.randomUUID().toString()); - bsSgcSzSafeJbxxService.save(byId); - bsSgcSzSafeJbxx.setEffDate(new Date()); - bsSgcSzSafeJbxx.setExprDate(null); - + if (bsSgcSzSafeJbxx.getStatus().equals("4")) { + String id = bsSgcSzSafeJbxx.getId(); + //获取未修改的数据 + BsSgcSzSafeJbxx byId = bsSgcSzSafeJbxxService.getById(id); + //将未修改的数据插入数据库 + byId.setExprDate(new Date()); + byId.setId(UUID.randomUUID().toString()); + bsSgcSzSafeJbxxService.save(byId); + //生成新的数据 + bsSgcSzSafeJbxx.setEffDate(new Date()); + bsSgcSzSafeJbxx.setExprDate(null); + return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx)); + } + if (bsSgcSzSafeJbxx.getStatus().equals("5")) { + List list = bsSgcSzSafeJbxxService.list(Wrappers.lambdaQuery(BsSgcSzSafeJbxx.class) + .eq(BsSgcSzSafeJbxx::getWagaCode, bsSgcSzSafeJbxx.getWagaCode()) + .isNull(BsSgcSzSafeJbxx::getEffDate) + .orderByDesc(BsSgcSzSafeJbxx::getExprDate)); + bsSgcSzSafeJbxxService.removeById(bsSgcSzSafeJbxx.getId()); + BsSgcSzSafeJbxx bsSgcDfSafeJbxx = list.get(0); + bsSgcDfSafeJbxx.setExprDate(null); + return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcDfSafeJbxx)); + } return toAjax(bsSgcSzSafeJbxxService.updateById(bsSgcSzSafeJbxx)); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSjcsController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSjcsController.java index df5a5a64..27f4d980 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSjcsController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzSjcsController.java @@ -1,11 +1,15 @@ package com.kms.yg.sz.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; +import java.util.UUID; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.yg.df.domain.BsSgcDfSwtz; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; import com.kms.yg.sz.domain.BsSgcSzSjcs; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; @@ -62,7 +66,11 @@ public class BsSgcSzSjcsController extends BaseController @ApiOperation("设计参数列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzSjcsService.selectPage(sp); + Page page = bsSgcSzSjcsService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), + Wrappers.lambdaQuery(BsSgcSzSjcs.class) + .eq(BsSgcSzSjcs::getWagaCode, sp.getData().getWagaCode()) + .isNull(BsSgcSzSjcs::getExprDate)); + return page; } /** @@ -102,6 +110,13 @@ public class BsSgcSzSjcsController extends BaseController .eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode)); byId.setStatus("4"); bsSgcSzSafeJbxxService.updateById(byId); + String id = bsSgcSzSjcs.getId(); + BsSgcSzSjcs dfhdm = bsSgcSzSjcsService.getById(id); + dfhdm.setExprDate(new Date()); + dfhdm.setId(UUID.randomUUID().toString()); + bsSgcSzSjcsService.save(dfhdm); + bsSgcSzSjcs.setEffDate(new Date()); + bsSgcSzSjcs.setExprDate(null); return toAjax(bsSgcSzSjcsService.save(bsSgcSzSjcs)); } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzXlnlController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzXlnlController.java index 794152b8..08e00b37 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzXlnlController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/BsSgcSzXlnlController.java @@ -1,12 +1,16 @@ package com.kms.yg.sz.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; +import java.util.UUID; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; import com.kms.yg.sz.domain.BsSgcSzSafeJbxx; +import com.kms.yg.sz.domain.BsSgcSzSjcs; import com.kms.yg.sz.domain.BsSgcSzXlnl; import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.kms.yg.sz.service.BsSgcSzXlnlService; @@ -67,7 +71,11 @@ public class BsSgcSzXlnlController extends BaseController @ApiOperation("泄流能力列表") public IPage list(@RequestBody SearchParam sp) { - return bsSgcSzXlnlService.selectPage(sp); + Page page = bsSgcSzXlnlService.page(new Page<>(sp.getPageNum(), sp.getPageSize()), + Wrappers.lambdaQuery(BsSgcSzXlnl.class) + .eq(BsSgcSzXlnl::getWagaCode, sp.getData().getWagaCode()) + .isNull(BsSgcSzXlnl::getExprDate)); + return page; } /** @@ -123,6 +131,13 @@ public class BsSgcSzXlnlController extends BaseController .eq(BsSgcSzSafeJbxx::getWagaCode, wagaCode)); byId.setStatus("4"); bsSgcSzSafeJbxxService.updateById(byId); + String id = bsSgcSzXlnl.getId(); + BsSgcSzXlnl dfhdm = bsSgcSzXlnlService.getById(id); + dfhdm.setExprDate(new Date()); + dfhdm.setId(UUID.randomUUID().toString()); + bsSgcSzXlnlService.save(dfhdm); + bsSgcSzXlnl.setEffDate(new Date()); + bsSgcSzXlnl.setExprDate(null); return toAjax(bsSgcSzXlnlService.updateById(bsSgcSzXlnl)); } From 44354cd86277885cea7e1749aead502ea4e41f1a Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Thu, 28 Mar 2024 17:11:11 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/DfContrastController.java | 141 ++++++++++++++--- .../sz/controller/SzContrastController.java | 143 +++++++++++++++--- 2 files changed, 242 insertions(+), 42 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java index c719aaee..62b1c916 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/DfContrastController.java @@ -2,13 +2,12 @@ package com.kms.yg.df.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.kms.yg.df.domain.BsSgcDfGcgl; -import com.kms.yg.df.domain.BsSgcDfJbxx; -import com.kms.yg.df.service.BsSgcDfGcglService; -import com.kms.yg.df.service.BsSgcDfJbxxService; +import com.kms.yg.df.domain.*; +import com.kms.yg.df.service.*; import com.kms.yg.sz.controller.SzContrastController; import com.kms.yg.sz.domain.BsSgcSzGcda; import com.kms.yg.sz.domain.BsSgcSzGcgl; +import com.kms.yg.sz.service.BsSgcSzSafeJbxxService; import com.shuili.common.core.domain.AjaxResult; import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; @@ -24,10 +23,36 @@ import java.util.List; public class DfContrastController { @Autowired - private BsSgcDfGcglService bsSgcDfGcglService; + private BsSgcDfSafeJbxxService bsSgcDfGcglService; @Autowired - private BsSgcDfJbxxService bsSgcDfJbxxService; + private BsSgcDfDfhdmService bsSgcDfDfhdmService; + + @Autowired + private BsSgcDfHdmtzzService bsSgcDfHdmtzzService; + + @Autowired + private BsSgcDfSwtzService bsSgcDfSwtzService; + + @Autowired + private BsSgcDfJyjlService bsSgcDfJyjlService; + + @Autowired + private BsSgcDfGcxyService bsSgcDfGcxyService; + + + @Data + public class ContrastResult { + private List jbxx; + + private List hdm; + private List hdmtzz; + private List swtz; + private List jyjl; + private List gcxy; + + } + @GetMapping("/{embankmentCode}") @@ -36,19 +61,19 @@ public class DfContrastController { //基本信息 //查询当前使用的版本 - QueryWrapper queryWrapper = Wrappers.query(); + QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.isNull("EXPR_DATE"); queryWrapper.eq("dike_code", embankmentCode); - BsSgcDfJbxx one = bsSgcDfJbxxService.getOne(queryWrapper); + BsSgcDfSafeJbxx one = bsSgcDfGcglService.getOne(queryWrapper); //查询之前的10个版本 - QueryWrapper query = Wrappers.query(); + QueryWrapper query = Wrappers.query(); query.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE") .orderByDesc("EXPR_DATE") .last("limit 10"); - List list = bsSgcDfJbxxService.list(query); + List list = bsSgcDfGcglService.list(query); if (one != null) { list.add(0,one); @@ -58,34 +83,108 @@ public class DfContrastController { //工程管理 //查询当前版本 - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.isNull("EXPR_DATE"); wrapper.eq("dike_code", embankmentCode); - BsSgcDfGcgl one1 = bsSgcDfGcglService.getOne(wrapper); + BsSgcDfDfhdm one1 = bsSgcDfDfhdmService.getOne(wrapper); //查询之前的10个版本 - QueryWrapper query1 = Wrappers.query(); + QueryWrapper query1 = Wrappers.query(); query1.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE") .orderByDesc("EXPR_DATE") .last("limit 10"); - List list1 = bsSgcDfGcglService.list(query1); + List list1 = bsSgcDfDfhdmService.list(query1); if (one1 != null){ list1.add(0,one1); } - contrastResult.setGcgl(list1); - return AjaxResult.success(contrastResult); - } + contrastResult.setHdm(list1); - @Data - public class ContrastResult { - private List jbxx; - private List gcgl; + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.isNull("EXPR_DATE"); + wrapper1.eq("dike_code", embankmentCode); + + BsSgcDfHdmtzz one2 = bsSgcDfHdmtzzService.getOne(wrapper1); + + //查询之前的10个版本 + QueryWrapper query2 = Wrappers.query(); + query2.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list2 = bsSgcDfHdmtzzService.list(query2); + + if (one1 != null){ + list2.add(0,one2); + } + contrastResult.setHdmtzz(list2); + + QueryWrapper wrapper2 = new QueryWrapper<>(); + wrapper2.isNull("EXPR_DATE"); + wrapper2.eq("dike_code", embankmentCode); + + BsSgcDfSwtz one3 = bsSgcDfSwtzService.getOne(wrapper2); + //查询之前的10个版本 + QueryWrapper query3 = Wrappers.query(); + query3.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list3 = bsSgcDfSwtzService.list(query3); + + if (one3 != null){ + list3.add(0,one3); + } + contrastResult.setSwtz(list3); + + QueryWrapper wrapper3 = new QueryWrapper<>(); + wrapper3.isNull("EXPR_DATE"); + wrapper3.eq("dike_code", embankmentCode); + + BsSgcDfJyjl one4 = bsSgcDfJyjlService.getOne(wrapper3); + + //查询之前的10个版本 + QueryWrapper query4 = Wrappers.query(); + query4.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list4 = bsSgcDfJyjlService.list(query4); + + if (one4 != null){ + list4.add(0,one4); + } + contrastResult.setJyjl(list4); + + + + QueryWrapper wrapper4 = new QueryWrapper<>(); + wrapper4.isNull("EXPR_DATE"); + wrapper4.eq("dike_code", embankmentCode); + + BsSgcDfGcxy one5 = bsSgcDfGcxyService.getOne(wrapper4); + + //查询之前的10个版本 + QueryWrapper query5 = Wrappers.query(); + query5.eq("dike_code", embankmentCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list5 = bsSgcDfGcxyService.list(query5); + + if (one5 != null){ + list5.add(0,one5); + } + contrastResult.setGcxy(list5); + return AjaxResult.success(contrastResult); } + + + } diff --git a/shuili-system/src/main/java/com/kms/yg/sz/controller/SzContrastController.java b/shuili-system/src/main/java/com/kms/yg/sz/controller/SzContrastController.java index 41cac568..3d2715a0 100644 --- a/shuili-system/src/main/java/com/kms/yg/sz/controller/SzContrastController.java +++ b/shuili-system/src/main/java/com/kms/yg/sz/controller/SzContrastController.java @@ -2,10 +2,8 @@ package com.kms.yg.sz.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.kms.yg.sz.domain.BsSgcSzGcda; -import com.kms.yg.sz.domain.BsSgcSzGcgl; -import com.kms.yg.sz.service.BsSgcSzGcdaService; -import com.kms.yg.sz.service.BsSgcSzGcglService; +import com.kms.yg.sz.domain.*; +import com.kms.yg.sz.service.*; import com.shuili.common.core.domain.AjaxResult; import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; @@ -21,12 +19,36 @@ import java.util.List; public class SzContrastController { @Autowired - private BsSgcSzGcdaService bsSgcSzGcdaService; + private BsSgcSzSafeJbxxService bsSgcSzSafeJbxxService; @Autowired - private BsSgcSzGcglService bsSgcSzGcglService; + private BsSgcSzSjcsService bsSgcSzSjcsService; + + @Autowired + private BsSgcSzXlnlService bsSgcSzXlnlService; + + @Autowired + private BsSgcSzGctxService bsSgcSzGctxService; + + @Autowired + private BsSgcSzGcjgService bsSgcSzGcjgService; + + @Autowired + private BsSgcSzCxjlService bsSgcSzCxjlService; + @Data + public class ContrastResult { + private List jbxx; + + private List sjcs; + private List xlnl; + private List gctx; + private List gcjg; + private List cxjl; + + } + @GetMapping("/{sluiceCode}") public AjaxResult contrast(@PathVariable String sluiceCode) { @@ -34,19 +56,19 @@ public class SzContrastController { //基本信息 //查询当前使用的版本 - QueryWrapper queryWrapper = Wrappers.query(); + QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.isNull("EXPR_DATE"); queryWrapper.eq("waga_code", sluiceCode); - BsSgcSzGcda one = bsSgcSzGcdaService.getOne(queryWrapper); + BsSgcSzSafeJbxx one = bsSgcSzSafeJbxxService.getOne(queryWrapper); //查询之前的10个版本 - QueryWrapper query = Wrappers.query(); + QueryWrapper query = Wrappers.query(); query.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE") .orderByDesc("EXPR_DATE") .last("limit 10"); - List list = bsSgcSzGcdaService.list(query); + List list = bsSgcSzSafeJbxxService.list(query); if (one != null) { list.add(0,one); @@ -56,34 +78,113 @@ public class SzContrastController { //工程管理 //查询当前版本 - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.isNull("EXPR_DATE"); wrapper.eq("waga_code", sluiceCode); - BsSgcSzGcgl one1 = bsSgcSzGcglService.getOne(wrapper); + BsSgcSzSjcs one1 = bsSgcSzSjcsService.getOne(wrapper); //查询之前的10个版本 - QueryWrapper query1 = Wrappers.query(); + QueryWrapper query1 = Wrappers.query(); query1.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE") .orderByDesc("EXPR_DATE") .last("limit 10"); - List list1 = bsSgcSzGcglService.list(query1); + List list1 = bsSgcSzSjcsService.list(query1); if (one1 != null){ list1.add(0,one1); } - contrastResult.setGcgl(list1); - return AjaxResult.success(contrastResult); + contrastResult.setSjcs(list1); - } - @Data - public class ContrastResult { - private List jbxx; + QueryWrapper wrapper1 = new QueryWrapper<>(); + wrapper1.isNull("EXPR_DATE"); + wrapper1.eq("waga_code", sluiceCode); + + BsSgcSzXlnl one2 = bsSgcSzXlnlService.getOne(wrapper1); + + //查询之前的10个版本 + QueryWrapper query2 = Wrappers.query(); + query2.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list2 = bsSgcSzXlnlService.list(query2); - private List gcgl; + if (one2 != null){ + list2.add(0,one2); + + } + contrastResult.setXlnl(list2); + + + QueryWrapper wrapper2 = new QueryWrapper<>(); + wrapper2.isNull("EXPR_DATE"); + wrapper2.eq("waga_code", sluiceCode); + + BsSgcSzGctx one3 = bsSgcSzGctxService.getOne(wrapper2); + + //查询之前的10个版本 + QueryWrapper query3 = Wrappers.query(); + query3.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list3 = bsSgcSzGctxService.list(query3); + + if (one3 != null){ + list3.add(0,one3); + + } + contrastResult.setGctx(list3); + + + + QueryWrapper wrapper3 = new QueryWrapper<>(); + wrapper3.isNull("EXPR_DATE"); + wrapper3.eq("waga_code", sluiceCode); + + BsSgcSzGcjg one4 = bsSgcSzGcjgService.getOne(wrapper3); + + //查询之前的10个版本 + QueryWrapper query4 = Wrappers.query(); + query4.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list4 = bsSgcSzGcjgService.list(query4); + + if (one4 != null){ + list4.add(0,one4); + + } + contrastResult.setGcjg(list4); + + + QueryWrapper wrapper4 = new QueryWrapper<>(); + wrapper4.isNull("EXPR_DATE"); + wrapper4.eq("waga_code", sluiceCode); + + BsSgcSzCxjl one5 = bsSgcSzCxjlService.getOne(wrapper4); + + //查询之前的10个版本 + QueryWrapper query5 = Wrappers.query(); + query5.eq("waga_code", sluiceCode).isNotNull("EXPR_DATE") + .orderByDesc("EXPR_DATE") + .last("limit 10"); + + List list5 = bsSgcSzCxjlService.list(query5); + + if (one5 != null){ + list5.add(0,one5); + + } + contrastResult.setCxjl(list5); + return AjaxResult.success(contrastResult); } + + } From c7713e4bba216d4c34454e55afffe70ed62e5a48 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Fri, 29 Mar 2024 15:25:07 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yg/df/domain/BsSgcDfSwtz.java | 113 ++++++++++++------ 1 file changed, 76 insertions(+), 37 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java index 7f0a9066..b9d38501 100644 --- a/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java +++ b/shuili-system/src/main/java/com/kms/yg/df/domain/BsSgcDfSwtz.java @@ -1,6 +1,8 @@ package com.kms.yg.df.domain; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -24,187 +26,224 @@ public class BsSgcDfSwtz extends BaseEntity { private static final long serialVersionUID = 1L; - /** 河道宽度（m） */ + /* *//** 河道宽度（m） *//* @Excel(name = "河道宽度", readConverterExp = "m=") @ApiModelProperty("河道宽度") + @TableField(exist = false) private String riverWidth; - /** 河道比降 */ + *//** 河道比降 *//* @Excel(name = "河道比降") @ApiModelProperty("河道比降") private String riverGradient; - /** 多年平均径流量 */ + *//** 多年平均径流量 *//* @Excel(name = "多年平均径流量") @ApiModelProperty("多年平均径流量") private String annualAverageRunoff; - /** 多年平均输沙量 */ + *//** 多年平均输沙量 *//* @Excel(name = "多年平均输沙量") @ApiModelProperty("多年平均输沙量") private String averageSedimentTransport; - /** 多年平均最低气温 */ + *//** 多年平均最低气温 *//* @Excel(name = "多年平均最低气温") @ApiModelProperty("多年平均最低气温") private String averageMinimumTemperature; - /** 设计重现期 */ + *//** 设计重现期 *//* @Excel(name = "设计重现期") @ApiModelProperty("设计重现期") private String dsrcin; - /** 设计洪峰流量 */ + *//** 设计洪峰流量 *//* @Excel(name = "设计洪峰流量") @ApiModelProperty("设计洪峰流量") private String peakFlowRate; - /** 校核重现期 */ + *//** 校核重现期 *//* @Excel(name = "校核重现期") @ApiModelProperty("校核重现期") private String chrcin; - /** 校核洪峰流量 */ + *//** 校核洪峰流量 *//* @Excel(name = "校核洪峰流量") @ApiModelProperty("校核洪峰流量") private String verifyFlowRate; - /** 设计过闸流量 */ + *//** 设计过闸流量 *//* @Excel(name = "设计过闸流量") @ApiModelProperty("设计过闸流量") private String dslcfl; - /** 设计闸上水位 */ + *//** 设计闸上水位 *//* @Excel(name = "设计闸上水位") @ApiModelProperty("设计闸上水位") private String dsuswl; - /** 设计闸下水位 */ + *//** 设计闸下水位 *//* @Excel(name = "设计闸下水位") @ApiModelProperty("设计闸下水位") private String dsdswl; - /** 校核过闸流量 */ + *//** 校核过闸流量 *//* @Excel(name = "校核过闸流量") @ApiModelProperty("校核过闸流量") private String chlcfl; - /** 校核闸上水位 */ + *//** 校核闸上水位 *//* @Excel(name = "校核闸上水位") @ApiModelProperty("校核闸上水位") private String chuswl; - /** 校核闸下水位 */ + *//** 校核闸下水位 *//* @Excel(name = "校核闸下水位") @ApiModelProperty("校核闸下水位") private String chdswl; - /** $column.columnComment */ + *//** $column.columnComment *//* @Excel(name = "校核闸下水位") @ApiModelProperty("校核闸下水位") private String createUid; - /** $column.columnComment */ + *//** $column.columnComment *//* @Excel(name = "校核闸下水位") @ApiModelProperty("校核闸下水位") private String updateUid; - /** $column.columnComment */ + *//** $column.columnComment *//* @Excel(name = "校核闸下水位") @ApiModelProperty("校核闸下水位") private String proCode; - /** $column.columnComment */ + *//** $column.columnComment *//* @Excel(name = "校核闸下水位") @ApiModelProperty("校核闸下水位") private String proNo; - /** $column.columnComment */ + *//** $column.columnComment *//* @Excel(name = "校核闸下水位") @ApiModelProperty("校核闸下水位") private String owerDept; - /** $column.columnComment */ + *//** $column.columnComment *//* @Excel(name = "校核闸下水位") @ApiModelProperty("校核闸下水位") private String relation; - /** 堤防id */ + *//** 堤防id *//* @Excel(name = "堤防id") @ApiModelProperty("堤防id") private String dikeId; - /** $column.columnComment */ + *//** $column.columnComment *//* @Excel(name = "堤防id") @ApiModelProperty("堤防id") private String dikeCode; - /** 设计洪水标准 */ + *//** 设计洪水标准 *//* @Excel(name = "设计洪水标准") @ApiModelProperty("设计洪水标准") private String designFloodStandard; - /** 设计洪水位 */ + *//** 设计洪水位 *//* @Excel(name = "设计洪水位") @ApiModelProperty("设计洪水位") private String designFloodHigh; - /** 保证水位 */ + *//** 保证水位 *//* @Excel(name = "保证水位") @ApiModelProperty("保证水位") private String ensureLevel; - /** 警戒水位 */ + *//** 警戒水位 *//* @Excel(name = "警戒水位") @ApiModelProperty("警戒水位") private String alertLevel; - /** 设防水位 */ + *//** 设防水位 *//* @Excel(name = "设防水位") @ApiModelProperty("设防水位") private String fortificationLevel; - /** 设计流量 */ + *//** 设计流量 *//* @Excel(name = "设计流量") @ApiModelProperty("设计流量") private String designFlow; - /** 警戒流量 */ + *//** 警戒流量 *//* @Excel(name = "警戒流量") @ApiModelProperty("警戒流量") private String alertFlow; - /** 校核水位 */ + *//** 校核水位 *//* @Excel(name = "校核水位") @ApiModelProperty("校核水位") private String checkLevel; - /** 校核流量 */ + *//** 校核流量 *//* @Excel(name = "校核流量") @ApiModelProperty("校核流量") private String checkFlow; - /** 历史最高水位 */ + *//** 历史最高水位 *//* @Excel(name = "历史最高水位") @ApiModelProperty("历史最高水位") private String highestWaterLevel; - /** 最高水位日期 */ + *//** 最高水位日期 *//* @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "最高水位日期", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("最高水位日期") private Date highestWaterLevelTime; - /** 历史最大洪峰流量 */ + *//** 历史最大洪峰流量 *//* @Excel(name = "历史最大洪峰流量") @ApiModelProperty("历史最大洪峰流量") private String highestWaterFlow; - /** 历史最大洪峰流量日期 */ + */ + /** + * 历史最大洪峰流量日期 + *//* @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "历史最大洪峰流量日期", width = 30, dateFormat = "yyyy-MM-dd") @ApiModelProperty("历史最大洪峰流量日期") - private Date highestWaterFlowTime; + private Date highestWaterFlowTime;*/ + + + private String dikeCode; + //设计洪水标准 + private String dsflStd; + //设计洪水位 + private String dsflLev; + //保证水位 + private String gnwtLev; + //警戒水位 + private String alwtLev; + //设防水位 + private String frwLev; + //设计流量 + private String dsFlow; + //警戒流量 + private String alFlow; + //校核水位 + private String chwLev; + //校核流量 + private String chFlow; + //历史最高水位 + private String hshgwtLev; + //历史最高水位发生日期 + private Date hhwlTime; + //历史最大洪峰流量 + private String hmxfpFlow; + //历史最大洪峰流量发生日期 + private Date hmxflTime; + //备注 + private String note; + + /** 记录生效时间 */ @JsonFormat(pattern = "yyyy-MM-dd") From 8b5cc555c1658bdaa925404b897c80ce58e7570b Mon Sep 17 00:00:00 2001 From: ljf Date: Fri, 29 Mar 2024 15:47:30 +0800 Subject: [PATCH 7/9] mh jicheng --- shuili-admin/pom.xml | 12 +- .../main/java/com/kms/TianhuiApplication.java | 2 + .../system/CmsCallBackController.java | 265 ++++++++++++ .../controller/system/SysLoginController.java | 242 ++++++++++- .../com/kms/web/utils/CallBackRequest.java | 11 + .../main/java/com/kms/web/utils/CallType.java | 19 + .../main/java/com/kms/web/utils/SHACoder.java | 154 +++++++ .../com/kms/web/utils/WaterRequestUtil.java | 291 +++++++++++++ .../java/com/kms/web/utils/WaterResult.java | 27 ++ .../web/utils/scheduled/WaterScheduled.java | 215 ++++++++++ .../web/utils/singleDomain/SingleMenu.java | 25 ++ .../kms/web/utils/singleDomain/SingleOrg.java | 387 ++++++++++++++++++ .../web/utils/singleDomain/SingleRole.java | 25 ++ .../web/utils/singleDomain/SingleUser.java | 26 ++ .../src/main/resources/application-test.yml | 45 ++ .../src/main/resources/application.yml | 3 +- .../common/core/domain/entity/SysDept.java | 7 +- .../common/core/domain/entity/SysRole.java | 11 + .../common/core/domain/entity/SysUser.java | 8 + .../kms/system/service/SysUserService.java | 10 + 20 files changed, 1778 insertions(+), 7 deletions(-) create mode 100644 shuili-admin/src/main/java/com/kms/web/controller/system/CmsCallBackController.java create mode 100644 shuili-admin/src/main/java/com/kms/web/utils/CallBackRequest.java create mode 100644 shuili-admin/src/main/java/com/kms/web/utils/CallType.java create mode 100644 shuili-admin/src/main/java/com/kms/web/utils/SHACoder.java create mode 100644 shuili-admin/src/main/java/com/kms/web/utils/WaterRequestUtil.java create mode 100644 shuili-admin/src/main/java/com/kms/web/utils/WaterResult.java create mode 100644 shuili-admin/src/main/java/com/kms/web/utils/scheduled/WaterScheduled.java create mode 100644 shuili-admin/src/main/java/com/kms/web/utils/singleDomain/SingleMenu.java create mode 100644 shuili-admin/src/main/java/com/kms/web/utils/singleDomain/SingleOrg.java create mode 100644 shuili-admin/src/main/java/com/kms/web/utils/singleDomain/SingleRole.java create mode 100644 shuili-admin/src/main/java/com/kms/web/utils/singleDomain/SingleUser.java diff --git a/shuili-admin/pom.xml b/shuili-admin/pom.xml index aafdbf84..1532830e 100644 --- a/shuili-admin/pom.xml +++ b/shuili-admin/pom.xml @@ -27,6 +27,11 @@ 2.2.6 + + cn.hutool + hutool-all + +