From 8ff278ea65cd6e4c649867e8c2b8da62064ab220 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 31 Jan 2024 11:43:58 +0800
Subject: [PATCH] 数据质量明细添加数据来源，添加导出接口。巡查记录返回市区镇
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/QualityManage.java | 3
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/excel/QualityManageDetailExcel.java | 112 ++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IQualityManageService.java | 2
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageController.java | 6
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/QualityManageDetailServiceImpl.java | 11 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageDetailController.java | 20 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java | 4
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/vo/QualityManageVO.java | 2
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IQualityManageDetailService.java | 5
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/QualityManageDetail.java | 3
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/excel/QualityManageExcel.java | 112 ++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml | 15 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/QualityManageServiceImpl.java | 7
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.java | 5
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml | 30 +++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.xml | 154 ++++++++++++++++
16 files changed, 477 insertions(+), 14 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
index 58aaff5..9b05996 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
@@ -31,6 +31,10 @@
<result column="update_time" property="updateTime"/>
+ <result column="city_name" property="cityName"/>
+ <result column="county_name" property="countyName"/>
+ <result column="town_name" property="townName"/>
+
</resultMap>
<select id="selectPatrolRecord" resultMap="selectPatrolRecordList">
@@ -38,11 +42,35 @@
record.id,record.patrol_type,record.device_ids,record.images,record.videos,record.content,record.status,record.item_id,record.task_id,record.patrol_route,record.create_time,record.update_time,record.solution,
task.route_coordinates taskRoute,task.title taskName,
item.items_name itemsName,item.description,
- u.real_name,res."name" resName,res."guid" resGuid,res."res_reg_code" resRegCode,res."res_loc" resLoc
+ u.real_name,res."name" resName,res."guid" resGuid,
+ res."res_reg_code" resRegCode,res."res_loc" resLoc,
+
+ case when town."ad_grad" = 4 THEN town."ad_code" ELSE NULL END AS town_code,
+ case when town."ad_grad" = 4 THEN town."ad_name" ELSE NULL END AS town_name,
+
+ case when town."ad_grad" = 3 THEN town."ad_code"
+ when county."ad_grad" = 3 THEN county."ad_code" END AS county_code,
+
+ case when town."ad_grad" = 3 THEN town."ad_name"
+ when county."ad_grad" = 3 THEN county."ad_name" END AS county_name,
+
+ case when town."ad_grad" = 2 THEN town."ad_code"
+ when county."ad_grad" = 2 THEN county."ad_code"
+ ELSE city."ad_code" END AS city_code,
+
+ case when town."ad_grad" = 2 THEN town."ad_name"
+ when county."ad_grad" = 2 THEN county."ad_name"
+ ELSE city."ad_name" END AS city_name
+
FROM SM_PATROL_RECORD record
LEFT JOIN sm_patrol_type type ON type.id = record.patrol_type
LEFT JOIN sm_patrol_task task ON task.id = record.task_id
LEFT JOIN sjzt_md."att_res_base" res ON task.project_id = res."guid"
+
+ LEFT JOIN SJZT_MD."att_ad_base" town ON town."guid" = res."interior_ad_guid"
+ LEFT JOIN SJZT_MD."att_ad_base" county ON county."guid" = town."p_ad_code"
+ LEFT JOIN SJZT_MD."att_ad_base" city ON city."guid" = county."p_ad_code"
+
LEFT JOIN sm_patrol_group_item item ON item.id = record.item_id
LEFT JOIN BLADE_USER u ON u.id = record.create_user
WHERE record.is_deleted = 0
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java
index 722397e..b931896 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/vo/PatrolRecordVO.java
@@ -70,4 +70,8 @@
* 水库所在位置
*/
private String resLoc;
+
+ private String cityName;
+ private String countyName;
+ private String townName;
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageController.java
index ccdf985..2141906 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageController.java
@@ -37,10 +37,8 @@
*/
@ApiOperation(value = "数据规则校验-分页列表查询", notes = "数据规则校验-分页列表查询")
@GetMapping(value = "/list")
- public R<IPage<QualityManageVO>> queryPageList(Query query,QualityManageVO qualityManageVO) {
-
-
- IPage<QualityManageVO> pageList = qualityManageService.selectCustomizePage(Condition.getPage(query), qualityManageVO);
+ public R queryPageList(Query query,QualityManageVO qualityManageVO) {
+ Object pageList = qualityManageService.selectCustomizePage(Condition.getPage(query), qualityManageVO);
return R.data(pageList);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageDetailController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageDetailController.java
index 6bb9449..d523eb2 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageDetailController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageDetailController.java
@@ -2,21 +2,33 @@
import cn.gistack.sm.resDataCheck.entity.QualityManage;
import cn.gistack.sm.resDataCheck.entity.QualityManageDetail;
+import cn.gistack.sm.resDataCheck.excel.QualityManageDetailExcel;
import cn.gistack.sm.resDataCheck.service.IQualityManageDetailService;
import cn.gistack.sm.resDataCheck.vo.QualityManageDetailVO;
import cn.gistack.sm.resDataCheck.vo.QualityManageVO;
+import cn.gistack.system.user.entity.User;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.DateUtil;
import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
/**
* @Description: 数据规则校验
@@ -88,6 +100,14 @@
return R.data(qualityManageDetailService.removeByIds(Arrays.asList(ids.split(","))));
}
+ /**
+ * 导出数据
+ */
+ @GetMapping("export-data")
+ public void exportUser(QualityManageDetailVO qualityManageDetailVO,HttpServletResponse response) {
+ List<QualityManageDetailExcel> list = qualityManageDetailService.exportData(qualityManageDetailVO);
+ ExcelUtil.export(response, "大坝安全监测数据" + DateUtil.time(), "大坝安全监测数据表", list, QualityManageDetailExcel.class);
+ }
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/QualityManage.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/QualityManage.java
index 7539486..251f232 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/QualityManage.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/QualityManage.java
@@ -39,4 +39,7 @@
*/
@ApiModelProperty("值")
private String val;
+
+ //数据来源
+ private String flag;
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/QualityManageDetail.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/QualityManageDetail.java
index a426e4a..bfb11a0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/QualityManageDetail.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/entity/QualityManageDetail.java
@@ -97,4 +97,7 @@
//备注
private String remark;
+
+ //数据来源
+ private String flag;
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/excel/QualityManageDetailExcel.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/excel/QualityManageDetailExcel.java
new file mode 100644
index 0000000..f8ddd50
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/excel/QualityManageDetailExcel.java
@@ -0,0 +1,112 @@
+package cn.gistack.sm.resDataCheck.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class QualityManageDetailExcel implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 水库id
+ */
+ @ExcelProperty(value = "序号")
+ private Integer no;
+
+ //水库名称
+ @ExcelProperty("水库名称")
+ private String resName;
+
+ /**
+ * 数据来源
+ */
+ @ExcelProperty("数据来源")
+ private String flag;
+
+ //市(州)
+ @ExcelProperty("市(州)")
+ private String cityName;
+
+
+
+ //县(区)
+ @ExcelProperty("县(区)")
+ private String countyName;
+
+ //注册登记号
+ @ExcelProperty("注册登记号")
+ private String resRegCode;
+
+ //工程规模
+ @ExcelProperty("工程规模")
+ private String engScal;
+
+ //是否有闸
+ @ExcelProperty("是否有闸")
+ private String isGate;
+
+
+ //是否病险
+ @ExcelProperty("是否病险")
+ private String isDanger;
+
+ //实时水位
+ @ExcelProperty("当前水位(m)")
+ private String rz;
+
+ //堰顶高程
+ @ExcelProperty("堰顶高程(m)")
+ private String tbWeirTopElevation;
+
+ //主汛期限制水位
+ @ExcelProperty("汛限水位(m)")
+ private String tbFlseLimStag;
+
+ //正常蓄水位
+ @ExcelProperty("正常水位(m)")
+ private String tbNormPoolStag;
+
+
+ //控制运行水位
+ @ExcelProperty("控制水位(m)")
+ private String tbControlZ;
+
+
+ //设计洪水位
+ @ExcelProperty("设计水位(m)")
+ private String tbDesFlStag;
+
+
+ //校核洪水位
+ @ExcelProperty("校核水位(m)")
+ private String tbCheckFlStag;
+
+
+ //坝顶高程
+ @ExcelProperty("坝顶高程(m)")
+ private String tbDamTopElevation;
+
+ //死水位
+ @ExcelProperty("死水位(m)")
+ private String tbDeadStag;
+
+ //校验时间
+ @ExcelProperty("校验时间")
+ private String createTime;
+
+ //备注
+ @ExcelProperty("备注")
+ @ColumnWidth(50)
+ private String remark;
+
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/excel/QualityManageExcel.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/excel/QualityManageExcel.java
new file mode 100644
index 0000000..7b4be89
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/excel/QualityManageExcel.java
@@ -0,0 +1,112 @@
+package cn.gistack.sm.resDataCheck.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class QualityManageExcel implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 水库id
+ */
+ @ExcelProperty(value = "序号")
+ private Integer no;
+
+ //水库名称
+ @ExcelProperty("水库名称")
+ private String resName;
+
+ /**
+ * 数据来源
+ */
+ @ExcelProperty("数据来源")
+ private String flag;
+
+ //市(州)
+ @ExcelProperty("市(州)")
+ private String cityName;
+
+
+
+ //县(区)
+ @ExcelProperty("县(区)")
+ private String countyName;
+
+ //注册登记号
+ @ExcelProperty("注册登记号")
+ private String resRegCode;
+
+ //工程规模
+ @ExcelProperty("工程规模")
+ private String engScal;
+
+ //是否有闸
+ @ExcelProperty("是否有闸")
+ private String isGate;
+
+
+ //是否病险
+ @ExcelProperty("是否病险")
+ private String isDanger;
+
+ //实时水位
+ @ExcelProperty("当前水位(m)")
+ private String rz;
+
+ //堰顶高程
+ @ExcelProperty("堰顶高程(m)")
+ private String tbWeirTopElevation;
+
+ //主汛期限制水位
+ @ExcelProperty("汛限水位(m)")
+ private String tbFlseLimStag;
+
+ //正常蓄水位
+ @ExcelProperty("正常水位(m)")
+ private String tbNormPoolStag;
+
+
+ //控制运行水位
+ @ExcelProperty("控制水位(m)")
+ private String tbControlZ;
+
+
+ //设计洪水位
+ @ExcelProperty("设计水位(m)")
+ private String tbDesFlStag;
+
+
+ //校核洪水位
+ @ExcelProperty("校核水位(m)")
+ private String tbCheckFlStag;
+
+
+ //坝顶高程
+ @ExcelProperty("坝顶高程(m)")
+ private String tbDamTopElevation;
+
+ //死水位
+ @ExcelProperty("死水位(m)")
+ private String tbDeadStag;
+
+ //校验时间
+ @ExcelProperty("校验时间")
+ private String createTime;
+
+ //备注
+ @ExcelProperty("备注")
+ @ColumnWidth(50)
+ private String remark;
+
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.java
index 03a6103..f58deb7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.java
@@ -3,6 +3,7 @@
import cn.gistack.sm.resDataCheck.entity.QualityManage;
import cn.gistack.sm.resDataCheck.entity.QualityManageDetail;
import cn.gistack.sm.resDataCheck.entity.Rules;
+import cn.gistack.sm.resDataCheck.excel.QualityManageDetailExcel;
import cn.gistack.sm.resDataCheck.vo.QualityManageDetailVO;
import cn.gistack.sm.resDataCheck.vo.QualityManageVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -20,4 +21,8 @@
Integer saveQualityManageDetail(@Param("rule")Rules rules, @Param("varStr") String varStr, @Param("whereStr") String whereStr);
+
+ List<QualityManageDetailVO> getAll(@Param("vo") QualityManageDetailVO qualityManageDetailVO);
+
+ List<QualityManageDetailExcel> exportData(@Param("vo") QualityManageDetailVO qualityManageDetailVO);
}
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 b4197c6..9754f5d 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_flse_lim_stag,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,flag,remark
)
select
distinct
@@ -52,7 +52,13 @@
c."tb_des_fl_stag",
h."tb_dam_top_elevation",
c."tb_dead_stag",
+ case when f."flag" = '老库' THEN '地方平台'
+ when f."flag" = '物联网' THEN '省级平台'
+ when f."flag" = '水文' THEN '水文系统'
+ else ''
+ end as flag,
${rule.description} as remark
+
from SJZT_MD."att_res_base" a
@@ -100,7 +106,8 @@
MAX(tb_dam_top_elevation) tb_dam_top_elevation,
MAX(tb_dead_stag) tb_dead_stag,
replace(wm_concat(remark),',',';') as remark,
- MAX(create_time) create_time
+ MAX(create_time) create_time,
+ MAX(flag) flag
from YWXT.SM_RES_DATA_QUALITY_MANAGE_DETAIL
where
1=1
@@ -111,10 +118,10 @@
AND res_name LIKE CONCAT('%', #{vo.resName},'%')
</if>
<if test="vo.startTime != null and vo.startTime != ''">
- AND DATE_FORMAT(create_time,'%Y-%m-%d') >= #{vo.startTime}
+ AND create_time >= #{vo.startTime}
</if>
<if test="vo.endTime != null and vo.endTime !='' ">
- AND DATE_FORMAT(create_time,'%Y-%m-%d') <= #{vo.endTime}
+ AND create_time <= #{vo.endTime}
</if>
<if test="vo.engScal != null and vo.engScal != ''">
and eng_scal = #{vo.engScal}
@@ -131,7 +138,146 @@
<if test="vo.townCode != null and vo.townCode != ''">
and town_code= #{vo.townCode}
</if>
+ <if test="vo.flag != null and vo.flag != ''">
+ and flag= #{vo.flag}
+ </if>
GROUP BY
RES_ID
</select>
+ <select id="getAll" resultType="cn.gistack.sm.resDataCheck.vo.QualityManageDetailVO">
+ SELECT
+ MAX(id) id,
+ RES_ID,
+ MAX(is_gate) is_gate,
+ MAX(eng_scal) eng_scal,
+ MAX(is_danger) is_danger,
+ MAX(town_code) town_code,
+ MAX(town_name) town_name,
+ MAX(county_code)county_code,
+ MAX(county_name)county_name,
+ MAX(city_code) city_code,
+ MAX(city_name) city_name,
+ MAX(res_reg_code) res_reg_code,
+ MAX(res_name) res_name,
+ MAX(rz) rz,
+ MAX(tb_flse_lim_stag) tb_flse_lim_stag,
+ MAX(tb_weir_top_elevation) tb_weir_top_elevation,
+ MAX(tb_norm_pool_stag) tb_norm_pool_stag,
+ MAX(tb_control_z) tb_control_z,
+ MAX(tb_des_fl_stag) tb_des_fl_stag,
+ MAX(tb_dam_top_elevation) tb_dam_top_elevation,
+ MAX(tb_dead_stag) tb_dead_stag,
+ replace(wm_concat(remark),',',';') as remark,
+ MAX(create_time) create_time,
+ MAX(flag) flag
+ from YWXT.SM_RES_DATA_QUALITY_MANAGE_DETAIL
+ where
+ 1=1
+ <if test="vo.resId != null and vo.resId != ''">
+ AND res_id = #{vo.resId}
+ </if>
+ <if test="vo.resName != null and vo.resName != ''">
+ AND res_name LIKE CONCAT('%', #{vo.resName},'%')
+ </if>
+ <if test="vo.startTime != null and vo.startTime != ''">
+ AND create_time >= #{vo.startTime}
+ </if>
+ <if test="vo.endTime != null and vo.endTime !='' ">
+ AND create_time <= #{vo.endTime}
+ </if>
+ <if test="vo.engScal != null and vo.engScal != ''">
+ and eng_scal = #{vo.engScal}
+ </if>
+ <if test="vo.isDanger != null and vo.isDanger != ''">
+ and is_danger = #{vo.isDanger}
+ </if>
+ <if test="vo.cityCode != null and vo.cityCode != ''">
+ and city_code = #{vo.cityCode}
+ </if>
+ <if test="vo.countyCode != null and vo.countyCode != ''">
+ and county_code = #{vo.countyCode}
+ </if>
+ <if test="vo.townCode != null and vo.townCode != ''">
+ and town_code= #{vo.townCode}
+ </if>
+ <if test="vo.flag != null and vo.flag != ''">
+ and flag= #{vo.flag}
+ </if>
+ GROUP BY
+ RES_ID
+ </select>
+
+
+ <select id="exportData" resultType="cn.gistack.sm.resDataCheck.excel.QualityManageDetailExcel">
+ SELECT ROWNUM AS no ,t.* from (
+ SELECT
+ MAX(id) id,
+ RES_ID,
+ MAX(is_gate) is_gate,
+ MAX(eng_scal) eng_scal,
+
+ case when max(is_danger)= 'false' THEN '否'
+ when max(is_danger)= 'true' THEN '是'
+ else ''
+ end as is_danger,
+
+ MAX(town_code) town_code,
+ MAX(town_name) town_name,
+ MAX(county_code)county_code,
+ MAX(county_name)county_name,
+ MAX(city_code) city_code,
+ MAX(city_name) city_name,
+ MAX(res_reg_code) res_reg_code,
+ MAX(res_name) res_name,
+ MAX(rz) rz,
+ MAX(tb_flse_lim_stag) tb_flse_lim_stag,
+ MAX(tb_weir_top_elevation) tb_weir_top_elevation,
+ MAX(tb_norm_pool_stag) tb_norm_pool_stag,
+ MAX(tb_control_z) tb_control_z,
+ MAX(tb_des_fl_stag) tb_des_fl_stag,
+ MAX(tb_dam_top_elevation) tb_dam_top_elevation,
+ MAX(tb_dead_stag) tb_dead_stag,
+ replace(wm_concat(remark),',',';') as remark,
+ MAX(create_time) create_time,
+ MAX(flag) flag
+ from YWXT.SM_RES_DATA_QUALITY_MANAGE_DETAIL
+ where
+ 1=1
+ <if test="vo.resId != null and vo.resId != ''">
+ AND res_id = #{vo.resId}
+ </if>
+ <if test="vo.resName != null and vo.resName != ''">
+ AND res_name LIKE CONCAT('%', #{vo.resName},'%')
+ </if>
+ <if test="vo.startTime != null and vo.startTime != ''">
+ AND create_time >= #{vo.startTime}
+ </if>
+ <if test="vo.endTime != null and vo.endTime !='' ">
+ AND create_time <= #{vo.endTime}
+ </if>
+ <if test="vo.engScal != null and vo.engScal != ''">
+ and eng_scal = #{vo.engScal}
+ </if>
+ <if test="vo.isDanger != null and vo.isDanger != ''">
+ and is_danger = #{vo.isDanger}
+ </if>
+ <if test="vo.cityCode != null and vo.cityCode != ''">
+ and city_code = #{vo.cityCode}
+ </if>
+ <if test="vo.countyCode != null and vo.countyCode != ''">
+ and county_code = #{vo.countyCode}
+ </if>
+ <if test="vo.townCode != null and vo.townCode != ''">
+ and town_code= #{vo.townCode}
+ </if>
+ <if test="vo.flag != null and vo.flag != ''">
+ and flag= #{vo.flag}
+ </if>
+ GROUP BY
+ RES_ID
+
+ ) t
+
+
+ </select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml
index d7bd469..d0f9a02 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageMapper.xml
@@ -75,8 +75,19 @@
</select>
<insert id="addQualityManage">
- insert into SM_RES_DATA_QUALITY_MANAGE (res_id,rule_id,create_time,update_time,val)
- select distinct a."guid" as res_id,${ruleId} AS rule_id,NOW() AS create_time,NOW() AS update_time, ${varStr}
+ insert into SM_RES_DATA_QUALITY_MANAGE (res_id,rule_id,create_time,update_time,flag,val)
+ select
+ distinct a."guid" as res_id,
+ ${ruleId} AS rule_id,
+ NOW() AS create_time,
+ NOW() AS update_time,
+ case when f."flag" = '老库' THEN '地方平台'
+ when f."flag" = '物联网' THEN '省级平台'
+ when f."flag" = '水文' THEN '水文系统'
+ else ''
+ end as flag,
+ ${varStr}
+
from SJZT_MD."att_res_base" a
left join SJZT_MD."att_res_danger_manage_special" b on (a."guid" = b."res_guid")
left join SJZT_MD."att_res_stag_char" c on (a."guid" = c."res_guid")
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IQualityManageDetailService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IQualityManageDetailService.java
index c535fb0..b753165 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IQualityManageDetailService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IQualityManageDetailService.java
@@ -2,14 +2,19 @@
import cn.gistack.sm.resDataCheck.entity.QualityManage;
import cn.gistack.sm.resDataCheck.entity.QualityManageDetail;
+import cn.gistack.sm.resDataCheck.excel.QualityManageDetailExcel;
import cn.gistack.sm.resDataCheck.vo.QualityManageDetailVO;
import cn.gistack.sm.resDataCheck.vo.QualityManageVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
+
+import java.util.List;
public interface IQualityManageDetailService extends BaseService<QualityManageDetail> {
Object selectCustomizePage(IPage<QualityManageDetailVO> page, QualityManageDetailVO qualityManageDetailVO);
Integer saveQualityManageDetail(Long ruleId, String varStr, String whereStr);
+
+ List<QualityManageDetailExcel> exportData(QualityManageDetailVO qualityManageDetailVO);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IQualityManageService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IQualityManageService.java
index c82b148..107eaf7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IQualityManageService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IQualityManageService.java
@@ -7,7 +7,7 @@
import org.springblade.core.mp.base.BaseService;
public interface IQualityManageService extends BaseService<QualityManage> {
- IPage<QualityManageVO> selectCustomizePage(IPage<QualityManageVO> page, QualityManageVO qualityManageVO);
+ Object selectCustomizePage(IPage<QualityManageVO> page, QualityManageVO qualityManageVO);
QualityManageVO getDetail(String id);
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/QualityManageDetailServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/QualityManageDetailServiceImpl.java
index 1fb8887..2df6f21 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/QualityManageDetailServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/QualityManageDetailServiceImpl.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.resDataCheck.entity.QualityManageDetail;
import cn.gistack.sm.resDataCheck.entity.Rules;
+import cn.gistack.sm.resDataCheck.excel.QualityManageDetailExcel;
import cn.gistack.sm.resDataCheck.mapper.QualityManageDetailMapper;
import cn.gistack.sm.resDataCheck.service.IQualityManageDetailService;
import cn.gistack.sm.resDataCheck.service.IRulesService;
@@ -13,6 +14,8 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.stereotype.Service;
+import java.util.List;
+
@Service
@AllArgsConstructor
public class QualityManageDetailServiceImpl extends BaseServiceImpl<QualityManageDetailMapper, QualityManageDetail> implements IQualityManageDetailService {
@@ -22,7 +25,7 @@
public Object selectCustomizePage(IPage<QualityManageDetailVO> page, QualityManageDetailVO qualityManageDetailVO) {
if (qualityManageDetailVO.getIsExport() != null && qualityManageDetailVO.getIsExport().equals("1")){
- return baseMapper.selectCustomizePage(null,qualityManageDetailVO);
+ return baseMapper.getAll(qualityManageDetailVO);
}
return page.setRecords(baseMapper.selectCustomizePage(page, qualityManageDetailVO));
}
@@ -35,4 +38,10 @@
return baseMapper.saveQualityManageDetail(rule, varStr, whereStr);
}
+
+ @Override
+ public List<QualityManageDetailExcel> exportData(QualityManageDetailVO qualityManageDetailVO) {
+ List<QualityManageDetailExcel> list = baseMapper.exportData(qualityManageDetailVO);
+ return list;
+ }
}
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 7310147..f771452 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
@@ -18,7 +18,12 @@
private final IQualityManageDetailService qualityManageDetailService;
@Override
- public IPage<QualityManageVO> selectCustomizePage(IPage<QualityManageVO> page, QualityManageVO qualityManageVO) {
+ public Object selectCustomizePage(IPage<QualityManageVO> page, QualityManageVO qualityManageVO) {
+
+ if (qualityManageVO.getIsExport() != null && qualityManageVO.getIsExport().equals("1")){
+ return baseMapper.selectCustomizePage(null,qualityManageVO);
+ }
+
return page.setRecords(baseMapper.selectCustomizePage(page,qualityManageVO));
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/vo/QualityManageVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/vo/QualityManageVO.java
index b668c4c..5796fae 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/vo/QualityManageVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/vo/QualityManageVO.java
@@ -67,4 +67,6 @@
*/
private String adCode;
+ private String isExport;
+
}
--
Gitblit v1.9.3