.

src/main/java/com/gunshi/project/hsz/controller/ReservoirWaterController.java

@@ -97,7 +97,7 @@ public class ReservoirWaterController {
 
     @Post(path = "/data", summary = "闸阀总览-库容曲线")
     public R<List<AttResMonitorVo>> data(@RequestBody @Validated DataQueryCommonSo dataQueryCommonSo) {
-        dataQueryCommonSo.setStcd("61610700");//檀树岗水库
+        dataQueryCommonSo.setStcd("232");//檀树岗水库
         return R.ok(reservoirWaterService.data(dataQueryCommonSo));
     }
 

src/main/java/com/gunshi/project/hsz/mapper/AttResBaseMapper.java

@@ -34,7 +34,7 @@ public interface AttResBaseMapper extends BaseMapper<AttResBase> {
             left join public.st_addvcd_d sad on t.adcd = sad.adcd
             left join public.st_rsvr_r_real m on t.stcd = m.stcd
             left join public.st_pptn_r_real sprr on t.stcd = sprr.stcd
-            where t.sttp = 'RR' and s.res_code = '42112230001' and t.stcd='61610700'
+            where t.sttp = 'RR' and s.res_code = '42118130001' and t.stcd='232'
             order by aFsltdz desc nulls last
               </script>
                         """)

src/main/java/com/gunshi/project/hsz/mapper/IaCFlrvvlgMapper.java

@@ -22,7 +22,7 @@ public interface IaCFlrvvlgMapper extends BaseMapper<IaCFlrvvlg> {
             SELECT st.*,r1.adnm||r2.adnm adnm  FROM ia_c_flrvvlg st
             LEFT JOIN st_addvcd_d r1 ON concat ( LEFT ( st.adcd, 9 ), '000000' ) = r1.adcd
             LEFT JOIN st_addvcd_d r2 ON concat ( LEFT ( st.adcd, 12 ), '000' ) = r2.adcd
-            WHERE st.adcd like '421122101%'
+            WHERE st.adcd like '421181%'
             </script>
             """)
     List<HomeIaCFlrvvlgVo> getDetailsAndMonitoringDataLis();

src/main/java/com/gunshi/project/hsz/service/MessageCenterService.java

@@ -73,7 +73,7 @@ public class MessageCenterService extends ServiceImpl<MessageCenterMapper, Messa
 
 
     public void rzWarnMes(List<StRsvrR> rlist) {
-        AttResBase attResBase = resBaseMapper.selectById("42112230001");
+        AttResBase attResBase = resBaseMapper.selectById("42118130001");
         String stcd = attResBase.getStcd();
         Optional<StRsvrR> first = rlist.stream().filter(o -> o.getStcd().equals(stcd)).findFirst();
         if(first.isPresent()){

src/main/java/com/gunshi/project/hsz/service/ReservoirWaterService.java

@@ -120,8 +120,10 @@ public class ReservoirWaterService {
             }
 
             BigDecimal rz = vo.getRz();
+            if (rz != null) {
                 BigDecimal w = stZvarlBService.getWFromZvarl(rz, null, zvarlList);
                 vo.setNowCap(w);
+            }
         });
 
         return voList;

src/main/java/com/gunshi/project/hsz/service/StQxWarnRService.java

@@ -66,20 +66,20 @@ public class StQxWarnRService extends ServiceImpl<StQxWarnRMapper, StQxWarnR> {
             BigDecimal rz = attResBaseVo.getRz();
             if (attResBaseVo.getCalState() == 1) {
                 BigDecimal aboveCal = rz.subtract(attResBaseVo.getCalFloodLev());
-                vo.setRzWarn("超校核(" + aboveCal.setScale(1, RoundingMode.HALF_UP) + "m)");
+                vo.setRzWarn("超校核(" + aboveCal.setScale(2, RoundingMode.HALF_UP) + "m)");
                 attResBaseVo.setDesState(0);
                 attResBaseVo.setFlState(0);
             } else if (attResBaseVo.getDesState() == 1) {
                 BigDecimal aboveDes = rz.subtract(attResBaseVo.getDesFloodLev());
-                vo.setRzWarn("超设计(" + aboveDes.setScale(1, RoundingMode.HALF_UP) + "m)");
+                vo.setRzWarn("超设计(" + aboveDes.setScale(2, RoundingMode.HALF_UP) + "m)");
                 attResBaseVo.setFlState(0);
             } else if (attResBaseVo.getFlState() == 1) {
-                vo.setRzWarn("超汛限(" + attResBaseVo.getAFsltdz().setScale(1, RoundingMode.HALF_UP) + "m)");
+                vo.setRzWarn("超汛限(" + attResBaseVo.getAFsltdz().setScale(2, RoundingMode.HALF_UP) + "m)");
             } else if (rz.compareTo(attResBaseVo.getDeadLev()) < 0) {
                 BigDecimal aboveDead = rz.subtract(attResBaseVo.getDeadLev());
                 vo.setRzWarn("低水位(" + aboveDead.setScale(1, RoundingMode.HALF_UP) + "m)");
             } else {
-                vo.setRzWarn("正常(" + attResBaseVo.getAFsltdz().setScale(1, RoundingMode.HALF_UP) + "m)");
+                vo.setRzWarn("正常(" + attResBaseVo.getAFsltdz().setScale(2, RoundingMode.HALF_UP) + "m)");
             }
         }
 

src/main/resources/mapper/StPptnRHMapper.xml

@@ -4,20 +4,20 @@
 
     <select id="queryList" resultType="com.gunshi.project.hsz.model.StPptnRH">
         select tm,drp from public.st_pptn_r_h where tm <![CDATA[>]]> #{start} and tm <![CDATA[<=]]> #{end}
-        and stcd = (select stcd from public.att_res_base where res_code = '42112230001')
+        and stcd = (select stcd from public.att_res_base where res_code = '42118130001')
         order by tm asc
     </select>
 
     <select id="queryRzList" resultType="com.gunshi.project.hsz.entity.vo.StRzVo">
         select tm,rz from public.st_rsvr_r where tm <![CDATA[>=]]> #{start} and tm <![CDATA[<]]> #{end}
         and TRIM(TO_CHAR(tm, 'MI:SS')) = '00:00'
-        and stcd = (select stcd from public.att_res_base where res_code = '42112230001')
+        and stcd = (select stcd from public.att_res_base where res_code = '42118130001')
         order by tm asc
     </select>
 
     <select id="queryDayDrp" resultType="com.gunshi.project.hsz.model.StPptnRD">
         select tm,drp,TO_CHAR(tm, 'DD') as day,TO_CHAR(tm, 'MM') as month from public.st_pptn_r_d where year = #{year}
-        and stcd = (select stcd from public.att_res_base where res_code = '42112230001')
+        and stcd = (select stcd from public.att_res_base where res_code = '42118130001')
         order by tm asc
     </select>
 
@@ -44,7 +44,7 @@
     <select id="queryDayRz" resultType="com.gunshi.project.hsz.model.StPptnRD">
         select tm,rz as drp,TO_CHAR(tm, 'DD') as day,TO_CHAR(tm, 'MM') as month from public.st_rsvr_r where TO_CHAR(tm, 'YYYY') = #{year}
         and TRIM(TO_CHAR(tm, 'HH24:MI')) = '08:00'
-        and stcd = (select stcd from public.att_res_base where res_code = '42112230001')
+        and stcd = (select stcd from public.att_res_base where res_code = '42118130001')
         order by tm asc
     </select>
 </mapper>