From 474ba1ebf60b9ffc28274437e75cab8a6c4663e9 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 04 Nov 2023 17:22:38 +0800
Subject: [PATCH] 位移测点名称修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java | 30 ++++++
skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/vo/AlarmGetVO.java | 2
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml | 104 ++++++++++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java | 7 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml | 38 +++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReportMapper.java | 4
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/AlarmGetServiceImpl.java | 4
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DbReport.java | 9 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java | 2
skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml | 35 ++++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java | 12 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DbReportVO.java | 5 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDbReportService.java | 4
13 files changed, 240 insertions(+), 16 deletions(-)
diff --git a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/vo/AlarmGetVO.java b/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/vo/AlarmGetVO.java
index cedd78f..4b27a14 100644
--- a/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/vo/AlarmGetVO.java
+++ b/skjcmanager/skjcmanager-service-api/skjcmanager-nky-api/src/main/java/cn/gistack/nky/vo/AlarmGetVO.java
@@ -7,6 +7,8 @@
public class AlarmGetVO extends AlarmGet {
private String cdName;
+ private String cdWyName;
+
private String startTime;
private String endTime;
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
index 62e53fc..d274aa7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/mapper/AlarmGetMapper.xml
@@ -42,20 +42,23 @@
</if>
AND dam_id = #{vo.damId}
</select>
+
<select id="getAlarmDetailPage" resultType="cn.gistack.nky.vo.AlarmGetVO">
+ SELECT temp.*,awcb."cd_nm" as cdWyName FROM
+ (
SELECT
- NAG.ID,
- NAG.DAM_ID,
- NAG.POINT_ID,
- acb."cd_nm" as cdName,
- NAG.TYPE,
- (
- CASE
- WHEN NAG.TYPE=1 THEN '渗压'
- WHEN NAG.TYPE=2 THEN '渗流'
- WHEN (NAG.TYPE=3 OR NAG.TYPE=4 OR NAG.TYPE=5) THEN '位移'
- END) AS typeName,
- NAG."TIME",NAG."VALUE",NAG."DESC",NAG.CREATE_TIME,NAG.TASK_CATEGORY,NAG."LEVEL",NAG.BAOJINGZHI,NAG.ORIGIN_ID,
+ NAG.ID,
+ NAG.DAM_ID,
+ NAG.POINT_ID,
+ acb."cd_nm" as cdName,
+ NAG.TYPE,
+ (
+ CASE
+ WHEN NAG.TYPE=1 THEN '渗压'
+ WHEN NAG.TYPE=2 THEN '渗流'
+ WHEN (NAG.TYPE=3 OR NAG.TYPE=4 OR NAG.TYPE=5) THEN '位移'
+ END) AS typeName,
+ NAG."TIME",NAG."VALUE",NAG."DESC",NAG.CREATE_TIME,NAG.TASK_CATEGORY,NAG."LEVEL",NAG.BAOJINGZHI,NAG.ORIGIN_ID,
NAG.FORWARD,NAG."REVERSE",NAG.RATIO,NAG.STATUS
FROM YWXT.NKY_ALARM_GET NAG
@@ -80,7 +83,7 @@
AND NAG.type = #{vo.type}
</if>
<if test="vo.type != null and vo.type !='' and vo.type == 3">
- AND (NAG.type = '3' or NAG.type = '4' orNAG. type = '5')
+ AND (NAG.type = '3' or NAG.type = '4' or NAG. type = '5')
</if>
<if test="vo.pointId != null and vo.pointId !='' ">
AND NAG.POINT_id = #{vo.pointId}
@@ -89,5 +92,11 @@
AND acb."cd_nm" LIKE CONCAT('%',#{vo.cdName},'%')
</if>
AND NAG.dam_id = #{vo.damId}
+ ORDER BY NAG."time" DESC
+ )temp
+ LEFT JOIN SJZT_MD."att_wy_cd_base" awcb ON awcb."res_cd" = temp.DAM_ID AND temp.POINT_ID = awcb."cd"
+
+
+
</select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/AlarmGetServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/AlarmGetServiceImpl.java
index b880745..0d78f7b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/AlarmGetServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-nky/src/main/java/cn/gistack/nky/service/impl/AlarmGetServiceImpl.java
@@ -58,7 +58,9 @@
@Override
public IPage<AlarmGetVO> getAlarmDetailPage(IPage<AlarmGetVO> page, AlarmGetVO alarmGet) {
- return page.setRecords(baseMapper.getAlarmDetailPage(page,alarmGet));
+
+
+ return page.setRecords(baseMapper.getAlarmDetailPage(page,alarmGet));
}
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java
index 2772110..2432851 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.java
@@ -41,4 +41,6 @@
List<LevelPo> getLevelList(@Param("dam") DamMonitor damMonitor);
List<AlarmGetVO> pageMonitor(@Param("page") IPage<AlarmGetVO> page, @Param("vo") AlarmGetVO alarmGet);
+
+ List<AlarmGetVO> pageMonitorWy(IPage<AlarmGetVO> page, @Param("vo") AlarmGetVO alarmGet);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
index 3d015c0..8d3dcaf 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/mapper/DamSecurityMapper.xml
@@ -1320,6 +1320,110 @@
ORDER BY NAG.TIME DESC
</select>
+ <select id="pageMonitorWy" resultType="cn.gistack.nky.vo.AlarmGetVO">
+
+ SELECT
+ NAG.ID,
+ NAG.DAM_ID,
+ NAG.POINT_ID,
+ NAG.TYPE,
+ (
+ CASE
+ WHEN NAG.TYPE=1 THEN '渗压'
+ WHEN NAG.TYPE=2 THEN '渗流'
+ WHEN (NAG.TYPE=3 OR NAG.TYPE=4 OR NAG.TYPE=5) THEN '位移'
+ END) AS typeName,
+ NAG.TIME,
+ NAG.VALUE,
+ NAG."DESC",
+ NAG.CREATE_TIME,
+ NAG.TASK_CATEGORY,
+ NAG.LEVEL,
+ NAG.BAOJINGZHI,
+ NAG.ORIGIN_ID,
+ NAG.FORWARD,
+ NAG."REVERSE",
+ NAG.RATIO,
+ NAG.STATUS,
+ province."guid" as provinceCode,
+ province."ad_name" as provinceName,
+ city."guid" as cityCode,
+ city."ad_name" as cityName,
+ county."guid" as countyCode,
+ county."ad_name" as countyName,
+
+ arb."name" as reservoirName,
+ awcb."cd_nm" as cdName
+
+ FROM NKY_ALARM_GET NAG
+
+ LEFT JOIN SJZT_MD."att_res_base" arb ON arb."guid" = NAG.DAM_ID
+ LEFT JOIN SJZT_MD."att_ad_base" town ON town."guid" = arb."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 SJZT_MD."att_ad_base" province ON province."guid" = city."p_ad_code"
+
+
+ LEFT JOIN SJZT_MD."rel_res_bas_loc" rrbl ON rrbl."res_guid" = NAG.DAM_ID
+
+ LEFT JOIN SJZT_MD."att_bas_base" abb ON abb."code" = rrbl."bas_guid"
+ LEFT JOIN SJZT_MD."att_bas_base" pabb ON abb."p_code" = pabb."code"
+ LEFT JOIN SJZT_MD."att_wy_cd_base" awcb ON awcb."res_cd" = NAG.DAM_ID AND NAG.POINT_ID = awcb."cd"
+ WHERE 1=1
+ <if test=" vo.adCode != null and vo.adCode !='' ">
+ AND (province."ad_code" =#{vo.adCode} or city."ad_code" = #{vo.adCode} or county."ad_code" = #{vo.adCode})
+ </if>
+
+ <if test="vo.startTime != null and vo.startTime != ''">
+ AND DATE_FORMAT(NAG.time,'%Y-%m-%d') >= #{vo.startTime}
+ </if>
+
+ <if test="vo.endTime != null and vo.endTime !='' ">
+ AND DATE_FORMAT(NAG.time,'%Y-%m-%d') <= #{vo.endTime}
+ </if>
+
+ <if test="vo.level != null and vo.level !='' ">
+ AND NAG.level = #{vo.level}
+ </if>
+
+ <if test="vo.status != null and vo.status !='' ">
+ AND NAG.status = #{vo.status}
+ </if>
+ <if test="vo.type != null and vo.type !='' and vo.type == 3">
+ AND (NAG.type = '3' or NAG.type = '4' or NAG.type = '5')
+ </if>
+
+ <if test="vo.pointId != null and vo.pointId !='' ">
+ AND NAG.POINT_id = #{vo.pointId}
+ </if>
+
+ <if test="vo.basGuids != null and vo.basGuids !='' ">
+ AND(
+ abb."code" in
+ <foreach collection="vo.basGuids.split(',')" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ or pabb."code" in
+ <foreach collection="vo.basGuids.split(',')" item="item" index="index" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ )
+ </if>
+
+ <if test="vo.labels != null and vo.labels != '' ">
+ AND( 1!=1
+ <foreach collection="vo.labels.split(',')" item="item" open="" separator="" close="" index="index">
+ OR #{item} in (arb."label")
+ </foreach>
+ )
+ </if>
+
+ <if test="vo.engScal != null and vo.engScal !='' ">
+ AND arb."eng_scal" = #{vo.engScal}
+ </if>
+ ORDER BY NAG.TIME DESC
+
+ </select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java
index f8205b9..7cecbdb 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/service/impl/DamSecurityServiceImpl.java
@@ -110,8 +110,16 @@
@Override
public IPage<AlarmGetVO> pageMonitor(AlarmGetVO alarmGet, IPage<AlarmGetVO> page) {
- List<AlarmGetVO> list = damSecurityMapper.pageMonitor(page,alarmGet);
- return page.setRecords(list);
+
+ //位移
+ if (alarmGet.getType().equals("3")){
+ List<AlarmGetVO> list = damSecurityMapper.pageMonitorWy(page,alarmGet);
+ return page.setRecords(list);
+ }else{
+ List<AlarmGetVO> list = damSecurityMapper.pageMonitor(page,alarmGet);
+ return page.setRecords(list);
+ }
+
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java
index 463f5d7..6f85bbf 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/controller/DbReportController.java
@@ -76,4 +76,11 @@
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
return R.data(dbReportService.removeBatchByIds(Func.toLongList(ids)));
}
+
+
+ //获取最新上报数据
+ @GetMapping("/getLatestList")
+ public R getLatestList(DbReportVO dbReport){
+ return R.data(dbReportService.getLatestList(dbReport));
+ }
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DbReport.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DbReport.java
index 179bcac..8e2446c 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DbReport.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/entity/DbReport.java
@@ -38,6 +38,15 @@
//监测值
private String val;
+ //水平监测值
+ private String deVal;
+
+ //上下监测值
+ private String dnVal;
+
+ //位移垂直监测值
+ private String duVal;
+
//描述
private String description;
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReportMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReportMapper.java
index 06ce28c..593699f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReportMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReportMapper.java
@@ -10,4 +10,8 @@
public interface DbReportMapper extends BaseMapper<DbReport> {
List<DbReportVO> getPage(@Param("page") IPage<DbReportVO> page, @Param("db") DbReportVO dbReport);
+
+ List<DbReportVO> getDayList(@Param("vo") DbReportVO dbReport);
+
+ DbReport getRecordTimeData(@Param("entity") DbReport entity);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml
index c064777..76e7eff 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/mapper/DbReporttMapper.xml
@@ -24,4 +24,42 @@
</if>
ORDER BY sdr.create_time DESC
</select>
+ <select id="getDayList" resultType="cn.gistack.sm.jcsb.vo.DbReportVO">
+
+ SELECT
+ SDR.ID,SDR.RESERVOIR_NAME,
+ SDR.RESERVOIR_ID,
+ SDR.TYPE,
+ SDR.STATION_ID,acb.stationName,
+ DATE_FORMAT(sdr.record_time,'%Y-%m-%d') AS record_time,
+ SDR.VAL,SDR.DE_VAL,SDR.DN_VAL,SDR.DU_VAL
+ FROM SM_DB_REPORT SDR
+ LEFT JOIN SJZT_MD."att_cd_base" acb ON acb."res_cd" = sdr.reservoir_id and acb."cd" = SDR.station_id
+ WHERE SDR.IS_DELETED = 0
+ <if test="vo.type != null and vo.type != ''">
+ AND SDR.TYPE = #{vo.type}
+ </if>
+ <if test="db.startTime !=null and db.startTime !=''">
+ AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') >= #{db.startTime}
+ </if>
+ <if test="db.endTime !=null and db.endTime !=''">
+ AND DATE_FORMAT(sdr.record_time,'%Y-%m-%d') <= #{db.endTime}
+ </if>
+ <if test="vo.ch != null and vo.ch != ''">
+ AND acb."ch" = #{vo.ch}
+ </if>
+
+
+ </select>
+ <select id="getRecordTimeData" resultType="cn.gistack.sm.jcsb.entity.DbReport">
+
+ SELECT * FROM SM_DB_REPORT
+ WHERE
+ is_deleted = 0
+ AND RESERVOIR_ID = #{entity.reservoirId}
+ AND type = #{entity.type}
+ AND station_id = #{entity.stationId}
+ AND DATE_FORMAT(record_time,'%Y-%m-%d') = DATE_FORMAT(#{entity.recordTime},'%Y-%m-%d')
+
+ </select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDbReportService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDbReportService.java
index 68d9c38..152b960 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDbReportService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/IDbReportService.java
@@ -5,6 +5,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
public interface IDbReportService extends BaseService<DbReport> {
IPage<DbReportVO> selectPage(IPage<DbReportVO> page, DbReportVO dbReport);
+
+ List<DbReportVO> getLatestList(DbReportVO dbReport);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java
index 5799545..a9126b6 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java
@@ -8,10 +8,40 @@
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.List;
+
@Service
public class DbReportServiceImpl extends BaseServiceImpl<DbReportMapper, DbReport> implements IDbReportService {
@Override
public IPage<DbReportVO> selectPage(IPage<DbReportVO> page, DbReportVO dbReport) {
return page.setRecords(baseMapper.getPage(page,dbReport));
}
+
+ @Override
+ public List<DbReportVO> getLatestList(DbReportVO dbReport) {
+
+ List<DbReportVO> list = new ArrayList<>();
+ if (dbReport.getTimeFlag().equals("day")){
+ if (dbReport.getType().equals("3")){
+ //位移
+ }else{
+ list = baseMapper.getDayList(dbReport);
+ }
+
+ }else if (dbReport.getTimeFlag().equals("year")){
+
+ }
+ return list;
+
+ }
+
+ @Override
+ public boolean save(DbReport entity) {
+
+ //先判断上报时间当天是否有
+ DbReport dbReport = baseMapper.getRecordTimeData(entity);
+
+ return super.save(entity);
+ }
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DbReportVO.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DbReportVO.java
index 5303dd3..8757f73 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DbReportVO.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/vo/DbReportVO.java
@@ -12,4 +12,9 @@
//测站名称
private String stationName;
+
+ private String timeFlag;
+
+ //断面
+ private String ch;
}
--
Gitblit v1.9.3