fix: 修改测站编码字段名称

shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java

@@ -337,11 +337,11 @@ public class MonitorService {
         if (Objects.isNull(skRelStRes)) {
             return attResTaskViewDto;
         }
-        attResTaskViewDto.setStationName(skRelStRes.getStName());
+        attResTaskViewDto.setStationName(skRelStRes.getStnm());
-        attResTaskViewDto.setStationCode(skRelStRes.getStCode());
+        attResTaskViewDto.setStationCode(skRelStRes.getStcd());
 
         // 当前水位
-        sp.setStcd(skRelStRes.getStCode());
+        sp.setStcd(skRelStRes.getStcd());
         sp.setStartTime(BsSgcSkStatisticsService.getStartOfDay());
         sp.setEndTime(BsSgcSkStatisticsService.getStartOfNextDay());
         List<MsHdmRsvr> msHdmRsvrFutureList = queryDataList(MonitorSourceEnum.MS_HDM_RSVR, sp);

shuili-system/src/main/java/com/kms/yxgh/base/domain/sk/SkRelStRes.java

@@ -42,14 +42,14 @@ public class SkRelStRes  extends BaseEntity implements Serializable {
      */
     @ApiModelProperty("测站代码")
     @JSONField(name = "STCD")
-    private String stCode;
+    private String stcd;
 
     /**
      * 河流名称
      */
     @ApiModelProperty("测站名称")
     @JSONField(name = "STNM")
-    private String stName;
+    private String stnm;
 
     /**
      * 关系建立时间

shuili-system/src/main/java/com/kms/yxgh/common/service/BsSgcSkStatisticsService.java

@@ -92,12 +92,12 @@ public class BsSgcSkStatisticsService {
             return view;
         }
         // 代表站
-        view.setStationName(skRelOne.getStName());
+        view.setStationName(skRelOne.getStnm());
-        view.setStationCode(skRelOne.getStCode());
+        view.setStationCode(skRelOne.getStcd());
 
         // 当前水位
         MsHdmRsvr msHdmRsvr = msHdmRsvrService.getOne(new LambdaQueryWrapper<MsHdmRsvr>()
-                .eq(!StringUtils.isEmpty(skRelOne.getStCode()), MsHdmRsvr::getStcd, skRelOne.getStCode())
+                .eq(!StringUtils.isEmpty(skRelOne.getStcd()), MsHdmRsvr::getStcd, skRelOne.getStcd())
                 .ge(MsHdmRsvr::getTm, getStartOfDay())
                 .lt(MsHdmRsvr::getTm, getStartOfNextDay())
                 .orderByDesc(MsHdmRsvr::getTm)
@@ -114,7 +114,7 @@ public class BsSgcSkStatisticsService {
 
         // 去年今日
         MsHdmRsvr lastYearRest = msHdmRsvrService.getOne(new LambdaQueryWrapper<MsHdmRsvr>()
-                .eq(!StringUtils.isEmpty(skRelOne.getStCode()), MsHdmRsvr::getStcd, skRelOne.getStCode())
+                .eq(!StringUtils.isEmpty(skRelOne.getStcd()), MsHdmRsvr::getStcd, skRelOne.getStcd())
                 .ge(MsHdmRsvr::getTm, getLastYearTodayStartOfDay())
                 .lt(MsHdmRsvr::getTm, getLastYearTomorrowStartOfDay())
                 .orderByDesc(MsHdmRsvr::getTm)
@@ -126,7 +126,7 @@ public class BsSgcSkStatisticsService {
 
         // 近一个小时
         List<MsHdmObp> msHdmObpOneList = msHdmObpService.list(new LambdaQueryWrapper<MsHdmObp>()
-                .eq(!StringUtils.isEmpty(skRelOne.getStCode()), MsHdmObp::getStcd, skRelOne.getStCode())
+                .eq(!StringUtils.isEmpty(skRelOne.getStcd()), MsHdmObp::getStcd, skRelOne.getStcd())
                 .ge(MsHdmObp::getCollTime, getTimeBeforeHours(1))
                 .le(MsHdmObp::getCollTime, getCurrentTime())
         );
@@ -136,7 +136,7 @@ public class BsSgcSkStatisticsService {
 
         // 近6个小时
         List<MsHdmObp> msHdmObpSixList = msHdmObpService.list(new LambdaQueryWrapper<MsHdmObp>()
-                .eq(!StringUtils.isEmpty(skRelOne.getStCode()), MsHdmObp::getStcd, skRelOne.getStCode())
+                .eq(!StringUtils.isEmpty(skRelOne.getStcd()), MsHdmObp::getStcd, skRelOne.getStcd())
                 .ge(MsHdmObp::getCollTime, getTimeBeforeHours(6))
                 .le(MsHdmObp::getCollTime, getCurrentTime())
         );
@@ -146,7 +146,7 @@ public class BsSgcSkStatisticsService {
 
         // 近9个小时
         List<MsHdmObp> msHdmObpNineList = msHdmObpService.list(new LambdaQueryWrapper<MsHdmObp>()
-                .eq(!StringUtils.isEmpty(skRelOne.getStCode()), MsHdmObp::getStcd, skRelOne.getStCode())
+                .eq(!StringUtils.isEmpty(skRelOne.getStcd()), MsHdmObp::getStcd, skRelOne.getStcd())
                 .ge(MsHdmObp::getCollTime, getTimeBeforeHours(9))
                 .le(MsHdmObp::getCollTime, getCurrentTime())
         );
@@ -156,7 +156,7 @@ public class BsSgcSkStatisticsService {
 
         // 近12个小时
         List<MsHdmObp> msHdmObpTwelveList = msHdmObpService.list(new LambdaQueryWrapper<MsHdmObp>()
-                .eq(!StringUtils.isEmpty(skRelOne.getStCode()), MsHdmObp::getStcd, skRelOne.getStCode())
+                .eq(!StringUtils.isEmpty(skRelOne.getStcd()), MsHdmObp::getStcd, skRelOne.getStcd())
                 .ge(MsHdmObp::getCollTime, getTimeBeforeHours(12))
                 .le(MsHdmObp::getCollTime, getCurrentTime())
         );