From c7355cabec2f644bb291ba7a524f05748b6bba37 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 Jan 2024 15:30:25 +0800
Subject: [PATCH] 接口修改
---
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/RulesCondition.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java | 7 +++++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/QualityManageServiceImpl.java | 2 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.xml | 3 ++-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/RulesCondition.java b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/RulesCondition.java
index c3aac95..533b423 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/RulesCondition.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/resDataCheck/entity/RulesCondition.java
@@ -64,5 +64,5 @@
* 固定值
*/
@ApiModelProperty("固定值")
- private Double fixValue;
+ private String fixValue;
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java
index b2533db..e9cef93 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/feign/RulesClient.java
@@ -50,7 +50,7 @@
String retStr = "-1";
switch (key) {
case "EQUAL": //等于
- retStr = " is null OR = '' ";
+ retStr = " is null";
break;
case "UNEQUAL": //不等于
retStr = " is not null ";
@@ -273,7 +273,10 @@
varStr = "concat(" + varStr +") AS val";
if (StringUtil.isNotBlank(rules.getIsGate())) {
- sqlStr += " and a.\"is_gate\" = " + rules.getIsGate();
+
+ String gateStr = rules.getIsGate().equals("1") ?"'有闸水库'":"'无闸水库'";
+
+ sqlStr += " and a.\"is_gate\" = " + gateStr;
}
// 拼接条件有问题，不操作
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.xml
index 0c41cb5..8cb763f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.xml
@@ -10,7 +10,7 @@
(
res_id,rule_id,rule_name,rule_description,create_time,update_time,val,
is_gate,eng_scal,is_danger,town_code,town_name,county_code,county_name,city_code,city_name,
- res_reg_code,res_name,rz,tb_weir_top_elevation,tb_norm_pool_stag,tb_control_z,tb_des_fl_stag,tb_dam_top_elevation,tb_dead_stag,remark
+ res_reg_code,res_name,rz,tb_weir_top_elevation,tb_flse_lim_stag,tb_norm_pool_stag,tb_control_z,tb_des_fl_stag,tb_dam_top_elevation,tb_dead_stag,remark
)
select
distinct
@@ -46,6 +46,7 @@
a."name" as res_name,
f."rz" as rz,
g."tb_weir_top_elevation",
+ d2."tb_flse_lim_stag",
c."tb_norm_pool_stag",
b."tb_control_z",
c."tb_des_fl_stag",
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/QualityManageServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/QualityManageServiceImpl.java
index 5abe4cb..7310147 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/QualityManageServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/QualityManageServiceImpl.java
@@ -9,6 +9,7 @@
import lombok.AllArgsConstructor;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
@Service
@AllArgsConstructor
@@ -27,6 +28,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public Integer addQualityManage(Long ruleId, String varStr, String whereStr) {
qualityManageDetailService.saveQualityManageDetail(ruleId,varStr,whereStr);
--
Gitblit v1.9.3