2024-3.26 /// 日喀则水库添加 的瞬时流量其他时候不用 //单位从mm->cm 数值/10(只对某个项目 所以打包完 注释) "version": "24.01"

eladmin-system/pom.xml

@@ -132,7 +132,7 @@
 
     <!-- 打包 -->
     <build>
-        <finalName>MineTRS_NEW</finalName>
+        <finalName>MineTRS_NEW_24.01</finalName>
         <plugins>
             <!-- 跳过单元测试 -->
             <plugin>

eladmin-system/src/main/java/me/zhengjie/gemho/entity/data/PslData.java

@@ -95,5 +95,8 @@ public class PslData implements Serializable {
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     @TableField(exist = false)
     private Date jctime;
+    /// 日喀则水库添加 的瞬时流量其他时候不用
+    //瞬时流量
+    private String psssvalue;
 
 }

eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/MpDataServiceImpl.java

@@ -414,6 +414,13 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme
             }
         } else {
             for (MpData record : records) {
+                //单位从mm->cm 数值/10(只对某个项目 所以打包完 注释)
+     /*           String dispx = record.getDispx();
+                String dispy = record.getDispy();
+                String disph = record.getDisph();
+                record.setDispx(String.format("%.2f",Double.valueOf(dispx)/10));
+                record.setDispy(String.format("%.2f",Double.valueOf(dispy)/10));
+                record.setDisph(String.format("%.2f",Double.valueOf(disph)/10));*/
                 record.setSensorname(noName.get(record.getSensorid()));
                 record.setDanwei(noDan.get(record.getSensorid()));
             }

eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/PslDataServiceImpl.java

@@ -386,6 +386,8 @@ public class PslDataServiceImpl extends ServiceImpl<PslDataMapper, PslData> impl
                 map.put("设备名称", pslDatum.getSensorname());
                 map.put("设备ID", pslDatum.getSensorid());
                 map.put("测量值", pslDatum.getPslvalue());
+                /// 日喀则水库添加 的瞬时流量其他时候不用
+                map.put("瞬时流量", pslDatum.getPsssvalue());
                 map.put("是否报警", pslDatum.getState() == 0 ? "否" : "是");
                 map.put("监测时间", pslDatum.getTime());
                 if (result) {