调整接口最新数据封装

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.appmana.controller;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -263,7 +264,7 @@ public class BigScreenController {
              for (SurvStationInfo survStationInfo : stationList) {
                  //设备数量
                  int counts = survStationInfo.getDeviceList()!=null?survStationInfo.getDeviceList().size():0;
-                 JSONObject jsonObject = new JSONObject();
+                 List<CommonDataTrans> dataTransList = new ArrayList<>();
                  survStationInfo.setName(count.toString());
                  List<String> deployList = new ArrayList<>();
                  List<String> orientIds = new ArrayList<>();
@@ -279,72 +280,38 @@ public class BigScreenController {
                              for (SurvDeviceDeploy survDeviceDeploy : survStationInfo.getDeviceList()) {
                                  deployList.add(survDeviceDeploy.getId());
                                      if(PollutionConstants.SOIL_SURV.equals(survDeviceDeploy.getDeployType()) || PollutionConstants.WATER_QULITY.equals(survDeviceDeploy.getDeployType())){//土壤水质设备
-                                         SurvTransdataSoilVo transdataSoil = transdataSoilService.getNewestData(survDeviceDeploy.getDeployCode());
+                                         SurvTransdataSoil transdataSoil = transdataSoilService.getOneByDeviceCode(survDeviceDeploy.getDeployCode());
-                                         if(transdataSoil!=null) {
+                                         if(transdataSoil==null) {
-                                             jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataSoil)));
+                                             transdataSoil = transdataSoilService.initData(zhibiaoMap.get(survDeviceDeploy.getId()));
-                                         }else{
-                                             transdataSoil= new SurvTransdataSoilVo();
-                                             transdataSoil.setDataSoilTemp("0");
-                                             transdataSoil.setDataSoilWet("0");
-                                             transdataSoil.setDataSoilTemp2("0");
-                                             transdataSoil.setDataSoilTemp3("0");
-                                             transdataSoil.setDataSoilWet2("0");
-                                             transdataSoil.setDataSoilWet3("0");
-                                             transdataSoil.setDataSoilDdl("0");
-                                             transdataSoil.setDataSoilDdl2("0");
-                                             transdataSoil.setDataSoilDdl3("0");
-                                             transdataSoil.setDataSoilPh("0");
-                                             transdataSoil.setDataWaterDo("0");
-                                             transdataSoil.setDataWaterNtu("0");
-                                             jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataSoil)));
                                          }
+                                         List<CommonDataTrans> trans =  CommonUtils.constructSoil(transdataSoil);
+                                         dataTransList.addAll(trans);
                                      }else if(PollutionConstants.AIR_SURV.equals(survDeviceDeploy.getDeployType())){//气象设备
-                                         SurvTransdataAirVo transdataAir= transdataAirService.getNewestData(survDeviceDeploy.getDeployCode());
+                                         SurvTransdataAir transdataAir= transdataAirService.getOneByDeviceCode(survDeviceDeploy.getDeployCode());
-                                         if(transdataAir!=null) {
+                                         if(transdataAir==null) {
-                                             jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataAir)));
+                                             transdataAir=  transdataAirService.initData(zhibiaoMap.get(survDeviceDeploy.getId()));
-                                         }else{
-                                             transdataAir= new SurvTransdataAirVo();
-                                             transdataAir.setDataAirTemp("0");
-                                             transdataAir.setDataAirWet("0");
-                                             transdataAir.setDataAirPress("0");
-                                             transdataAir.setDataRainFall("0");
-                                             transdataAir.setDataWindSpeed("0");
-                                             transdataAir.setDataWindDirection("0");
-                                             transdataAir.setDataRainTotal("0");
-                                             transdataAir.setDataSunTotal("0");
-                                             transdataAir.setDataSunFallout("0");
-                                             jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataAir)));
                                          }
-
+                                         List<CommonDataTrans> trans =  CommonUtils.constructAir(transdataAir);
+                                         dataTransList.addAll(trans);
                                      }else if(PollutionConstants.CAMERA.equals(survDeviceDeploy.getDeployType())) {//摄像头
                                          //只保留摄像头的数据
                                          remainList.add(survDeviceDeploy);
                                      }else if(PollutionConstants.WATER_ORIENT.equals(survDeviceDeploy.getDeployType())) {//面源
                                          orientIds.add(survDeviceDeploy.getId());
                                          SurvTransdataOrientwaterVo transdataVo= transdataOrientwaterService.getNewestData(survDeviceDeploy.getDeployCode());
-                                     if(transdataVo!=null) {
+                                         if(transdataVo==null) {
-                                         jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataVo)));
+                                             transdataVo = transdataOrientwaterService.initData(zhibiaoMap.get(survDeviceDeploy.getId()));
-                                     }else{
-                                         transdataVo = new SurvTransdataOrientwaterVo();
-                                         transdataVo.setDataWaterTp("0");
-                                         transdataVo.setDataWaterTn("0");
-                                         transdataVo.setDataWaterNo("0");
-                                         jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataVo)));
                                          }
-
+                                         List<CommonDataTrans> orientData = commonP3Service.constructOrient(transdataVo,survStationInfo,survDeviceDeploy);
+                                         dataTransList.addAll(orientData);
                                      }else if(PollutionConstants.WATER_LIVE.equals(survDeviceDeploy.getDeployType())) {//畜禽
                                          orientIds.add(survDeviceDeploy.getId());
-                                         SurvTransdataLivestockwaterVo transdataAir= transdataLivestockwaterService.getNewestData(survDeviceDeploy.getDeployCode());
+                                         SurvTransdataLivestockwaterVo transdataVo= transdataLivestockwaterService.getNewestData(survDeviceDeploy.getDeployCode());
-                                         if(transdataAir!=null) {
+                                         if(transdataVo==null) {
-                                             jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataAir)));
+                                             transdataVo = transdataLivestockwaterService.initData(zhibiaoMap.get(survDeviceDeploy.getId()));
-                                         }else{
-                                             transdataAir= new SurvTransdataLivestockwaterVo();
-                                             transdataAir.setDataWaterCod("0");
-                                             transdataAir.setDataWaterTp("0");
-                                             transdataAir.setDataWaterNh("0");
-                                             transdataAir.setDataWaterTn("0");
-                                             jsonObject.putAll(JSONObject.parseObject(JSON.toJSONString(transdataAir)));
                                          }
+                                         List<CommonDataTrans> liveData = commonP3Service.constructLive(transdataVo,survStationInfo,survDeviceDeploy);
+                                         dataTransList.addAll(liveData);
                                      }
 
                              }
@@ -352,7 +319,7 @@ public class BigScreenController {
                              survStationInfo.getDeviceList().retainAll(remainList);
                          }
 
-                 survStationInfo.setNewestData(jsonObject);
+                 survStationInfo.setNewestData(dataTransList);
                   //补充指标
                  List<ScEquZhibiao>  equList  = zhibiaoService.getAllChemical(deployList);
                  List<String> allSurv = new ArrayList<>();
@@ -832,10 +799,10 @@ public class BigScreenController {
         List<SurvStationInfo> stationList = survStationInfoService.getAllStationAndDevice(stationCode,"",token);
         //补充最新数据进入
         JSONArray returnArrs= new JSONArray();
-        JSONArray returnSoilArrs= new JSONArray();
+        List<CommonDataTrans> returnSoilArrs= new ArrayList<>();
-        JSONArray returnWaterArrs= new JSONArray();
+        List<CommonDataTrans> returnWaterArrs  = new ArrayList<>();
-        JSONArray returnAirArrs= new JSONArray();
+        List<CommonDataTrans> returnAirArrs= new ArrayList();
-        JSONArray returnStinkArrs= new JSONArray();
+        List<CommonDataTrans> returnStinkArrs= new ArrayList();
         if(stationList!=null&&stationList.size()>0){
                  SurvStationInfo  survStationInfo = stationList.get(0);
                  List<String> deviceList = new ArrayList<>();
@@ -858,27 +825,30 @@ public class BigScreenController {
 
 
                             if(PollutionConstants.SOIL_SURV.equals(survDeviceDeploy.getDeployType())){//土壤设备
-                                SurvTransdataSoilVo transdataSoil = transdataSoilService.getNewestData(survDeviceDeploy.getDeployCode());
+                                SurvTransdataSoil transdataSoil = transdataSoilService.getOneByDeviceCode(survDeviceDeploy.getDeployCode());
                                 if(transdataSoil!=null) {
                                     transdataSoil.setStationName(survStationInfo.getStationName());
-                                    returnSoilArrs.add(JSONObject.parseObject(JSONObject.toJSONString(transdataSoil)));
+                                    List<CommonDataTrans> trans =  CommonUtils.constructSoil(transdataSoil);
+                                    returnSoilArrs.addAll(trans);
                                 }
                             }else if(PollutionConstants.AIR_SURV.equals(survDeviceDeploy.getDeployType())){//气象设备
-                                SurvTransdataAirVo transdataAir= transdataAirService.getNewestData(survDeviceDeploy.getDeployCode());
+                                SurvTransdataAir transdataAir= transdataAirService.getOneByDeviceCode(survDeviceDeploy.getDeployCode());
                                 if(transdataAir!=null) {
                                     transdataAir.setStationName(survStationInfo.getStationName());
-                                    returnAirArrs.add(JSONObject.parseObject(JSONObject.toJSONString(transdataAir)));
+                                    List<CommonDataTrans> trans =  CommonUtils.constructAir(transdataAir);
+                                    returnAirArrs.addAll(trans);
                                 }
-
                             }else if(PollutionConstants.WATER_QULITY.equals(survDeviceDeploy.getDeployType())){//水质设备
-                                SurvTransdataSoilVo transdataSoil = transdataSoilService.getNewestData(survDeviceDeploy.getDeployCode());
+                                SurvTransdataSoil transdataSoil = transdataSoilService.getOneByDeviceCode(survDeviceDeploy.getDeployCode());
                                 if(transdataSoil!=null) {
                                     transdataSoil.setStationName(survStationInfo.getStationName());
-                                    returnWaterArrs.add(JSONObject.parseObject(JSONObject.toJSONString(transdataSoil)));
+                                    List<CommonDataTrans> trans =  CommonUtils.constructSoil(transdataSoil);
+                                    returnSoilArrs.addAll(trans);
                                 }
                             }else if(PollutionConstants.STINK.equals(survDeviceDeploy.getDeployType())) {//恶臭
                                      SurvTransdataStinkVo  survTransdataAirVo = transdataVocsService.getNewestData(survDeviceDeploy.getDeployCode());
-                                     returnStinkArrs.add(JSONObject.parseObject(JSONObject.toJSONString(survTransdataAirVo)));
+                                     List<CommonDataTrans> trans =  CommonUtils.constructStink(survTransdataAirVo);
+                                     returnStinkArrs.addAll(trans);
                             }
                              else if(PollutionConstants.WATER_ORIENT.equals(survDeviceDeploy.getDeployType())) {//面源
                                 SurvTransdataOrientwaterVo transdataOrientwaterVo=transdataOrientwaterService.getNewestData(survDeviceDeploy.getDeployCode());

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataLivestockwaterMapper.xml

@@ -10,6 +10,26 @@
         <result property="dataWaterNo" column="DATA_WATER_NO" jdbcType="VARCHAR"/>
         <result property="dataWaterNh" column="DATA_WATER_NH" jdbcType="VARCHAR"/>
         <result property="dataWaterCod" column="DATA_WATER_COD" jdbcType="VARCHAR"/>
+
+        <result property="dataWaterTpSy" column="DATA_WATER_TP_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterTpLd" column="DATA_WATER_TP_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterTnSy" column="DATA_WATER_TN_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterTnLd" column="DATA_WATER_TN_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterNhSy" column="DATA_WATER_NH_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNhLd" column="DATA_WATER_NH_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodSy" column="DATA_WATER_COD_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodLd" column="DATA_WATER_COD_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoSy" column="DATA_WATER_NO_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoLd" column="DATA_WATER_NO_LD" jdbcType="VARCHAR"/>
+
+        <result property="fluidLevel" column="FLUID_LEVEL" jdbcType="VARCHAR"/>
+        <result property="firstValveStatus" column="FIRST_VALVE_STATUS" jdbcType="VARCHAR"/>
+        <result property="secondValveStatus" column="SECOND_VALVE_STATUS" jdbcType="VARCHAR"/>
+        <result property="thirdValveStatus" column="THIRD_VALVE_STATUS" jdbcType="VARCHAR"/>
+        <result property="crashStopStatus" column="CRASH_STOP_STATUS" jdbcType="VARCHAR"/>
+        <result property="waterPumpStatus" column="WATER_PUMP_STATUS" jdbcType="VARCHAR"/>
+        <result property="mainSideStatus" column="MAIN_SIDE_STATUS" jdbcType="VARCHAR"/>
+
         <result property="dataDateTime" column="DATA_DATE_TIME"/>
         <result property="dataGatherType" column="DATA_GATHER_TYPE" jdbcType="VARCHAR"/>
         <result property="stationId" column="STATION_ID" jdbcType="VARCHAR"/>
@@ -28,31 +48,27 @@
         <result property="isDel" column="IS_DEL" jdbcType="INTEGER"/>
         <result property="updatedTime" column="UPDATED_TIME" />
 
-        <result property="fluidLevel" column="FLUID_LEVEL" jdbcType="VARCHAR"/>
+
-        <result property="firstValveStatus" column="FIRST_VALVE_STATUS" jdbcType="VARCHAR"/>
-        <result property="secondValveStatus" column="SECOND_VALVE_STATUS" jdbcType="VARCHAR"/>
-        <result property="thirdValveStatus" column="THIRD_VALVE_STATUS" jdbcType="VARCHAR"/>
-        <result property="crashStopStatus" column="CRASH_STOP_STATUS" jdbcType="VARCHAR"/>
-        <result property="waterPumpStatus" column="WATER_PUMP_STATUS" jdbcType="VARCHAR"/>
-        <result property="mainSideStatus" column="MAIN_SIDE_STATUS" jdbcType="VARCHAR"/>
 
         <association property="stationName" column="{deplyCode = DEPLOY_CODE}" javaType="java.lang.String" select="org.jeecg.modules.appmana.mapper.SurvDeviceDeployMapper.getStationNameByDeployCode"/>
     </resultMap>
 
     <sql id="baseSql">
         ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NO,DATA_WATER_NH,DATA_WATER_COD,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,
-        STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,
+        STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,DATA_WATER_TP_SY,DATA_WATER_TP_LD,DATA_WATER_TN_SY,DATA_WATER_TN_LD,
+        DATA_WATER_NH_SY,DATA_WATER_NH_LD,DATA_WATER_COD_SY,DATA_WATER_COD_LD,DATA_WATER_NO_SY,DATA_WATER_NO_LD,
         FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,THIRD_VALVE_STATUS
     </sql>
 
     <select id="getMonthSummry" resultType="org.jeecg.common.vo.LiveDataTrans">
 
-        SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNH,0) as avgNH,IFNULL(t2.avgCOD,0) as avgCOD FROM (
+        SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNO,0) as avgNO,IFNULL(t2.avgNH,0) as avgNH,IFNULL(t2.avgCOD,0) as avgCOD FROM (
         SELECT @a:=@a + 1 AS `index` FROM mysql.help_topic,(SELECT @a:=0) temp LIMIT 12
         ) t1
         LEFT JOIN (
 
-        SELECT ROUND(AVG(t.DATA_WATER_TP),4) AS avgTP,ROUND(AVG(t.DATA_WATER_TN),4) AS avgTN,ROUND(AVG(t.DATA_WATER_NH),4) AS avgNH,ROUND(AVG(t.DATA_WATER_COD),4) AS avgCOD, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_livestockwater t where 1 = 1
+        SELECT ROUND(AVG(t.DATA_WATER_TP_SY),4) AS avgTP,ROUND(AVG(t.DATA_WATER_TN_SY),4) AS avgTN,ROUND(AVG(t.DATA_WATER_NO_SY),4) AS avgNO,ROUND(AVG(t.DATA_WATER_NH_SY),4) AS avgNH,ROUND(AVG(t.DATA_WATER_COD_SY),4) AS avgCOD, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_livestockwater t
+        <where>
             <if test="yearStr!=null and yearStr!=''">
                 and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr}
             </if>
@@ -62,14 +78,14 @@
                     #{id}
                 </foreach>
             </if>
-        and t.DATA_WATER_TP &lt;&gt; '0.0000'
+        </where>
         GROUP BY MONTH(t.DATA_DATE_TIME)
         ) t2 ON t1.index = t2.month ORDER BY t1.index asc
-
     </select>
 
     <select id="pages" resultMap="baseResultMap">
-        select <include refid="baseSql"/> from surv_hisdata_livestockwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND length(DATA_WATER_NH) &lt; 10
+        select <include refid="baseSql"/> from surv_hisdata_livestockwater
+        <where>
             <if test="query.dataDateTime != null">
                 and  DATE_FORMAT(DATA_DATE_TIME, '%Y-%m-%d') = DATE_FORMAT(#{query.dataDateTime},'%Y-%m-%d')
             </if>
@@ -82,6 +98,7 @@
                     #{id}
                 </foreach>
             </if>
+        </where>
         order by DATA_DATE_TIME desc
     </select>
 
@@ -96,10 +113,15 @@
     <select id="integrateSummary" resultType="org.jeecg.common.iot.common.VOSurvIntegrateLiveDetail">
         select date_format(t.DATA_DATE_TIME,#{timeDataFormat}) as dates,
         ifnull(ROUND(avg(cast(DATA_WATER_TP as decimal(10,1))), 2),'0') as dataWaterTp,
+        ifnull(ROUND(avg(cast(DATA_WATER_TP_SY as decimal(10,1))), 2),'0') as dataWaterTpSy,
         ifnull(ROUND(avg(cast(DATA_WATER_TN as decimal(10,1))), 2),'0') as dataWaterTn,
+        ifnull(ROUND(avg(cast(DATA_WATER_TN_SY as decimal(10,1))), 2),'0') as dataWaterTnSy,
         ifnull(ROUND(avg(cast(DATA_WATER_NO as decimal(10,1))), 2),'0') as dataWaterNo,
+        ifnull(ROUND(avg(cast(DATA_WATER_NO_SY as decimal(10,1))), 2),'0') as dataWaterNoSy,
         ifnull(ROUND(avg(cast(DATA_WATER_NH as decimal(10,1))), 2),'0') as dataWaterNh,
-        ifnull(ROUND(avg(cast(DATA_WATER_COD as decimal(10,1))), 2),'0') as dataWaterCod
+        ifnull(ROUND(avg(cast(DATA_WATER_NH_SY as decimal(10,1))), 2),'0') as dataWaterNhSy,
+        ifnull(ROUND(avg(cast(DATA_WATER_COD as decimal(10,1))), 2),'0') as dataWaterCod,
+        ifnull(ROUND(avg(cast(DATA_WATER_COD_SY as decimal(10,1))), 2),'0') as dataWaterCodSy
         from surv_hisdata_livestockwater t
         <where>
         <if test="tenantId != null and tenantId != ''">

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvHisdataOrientwaterMapper.xml

@@ -14,6 +14,14 @@
         <result property="dataWaterTpLd" column="DATA_WATER_TP_LD" jdbcType="VARCHAR"/>
         <result property="dataWaterTnSy" column="DATA_WATER_TN_SY" jdbcType="VARCHAR"/>
         <result property="dataWaterTnLd" column="DATA_WATER_TN_LD" jdbcType="VARCHAR"/>
+
+        <result property="dataWaterNhSy" column="DATA_WATER_NH_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNhLd" column="DATA_WATER_NH_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodSy" column="DATA_WATER_COD_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodLd" column="DATA_WATER_COD_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoSy" column="DATA_WATER_NO_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoLd" column="DATA_WATER_NO_LD" jdbcType="VARCHAR"/>
+
         <result property="fluidLevel" column="FLUID_LEVEL" jdbcType="VARCHAR"/>
         <result property="firstValveStatus" column="FIRST_VALVE_STATUS" jdbcType="VARCHAR"/>
         <result property="secondValveStatus" column="SECOND_VALVE_STATUS" jdbcType="VARCHAR"/>
@@ -43,11 +51,12 @@
 
     <select id="getMonthSummry" resultType="org.jeecg.common.vo.OrientDataTrans">
 
-        SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNO,0) as avgNO,IFNULL(t2.avgCod,0) as avgCod FROM (
+        SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNO,0) as avgNO,IFNULL(t2.avgNH,0) as avgNH,IFNULL(t2.avgCod,0) as avgCod FROM (
         SELECT @a:=@a + 1 AS `index` FROM mysql.help_topic,(SELECT @a:=0) temp LIMIT 12
         ) t1
         LEFT JOIN (
-                    SELECT ROUND(AVG(t.DATA_WATER_TP),4) AS avgTP,ROUND(AVG(t.DATA_WATER_TN),4) AS avgTN,ROUND(AVG(t.DATA_WATER_NO),4) AS avgNO,ROUND(AVG(t.DATA_WATER_COD),4) AS avgCod, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_orientwater t where 1 = 1 AND t.DATA_WATER_TP &lt;&gt; '0.0000'
+                    SELECT ROUND(AVG(t.DATA_WATER_TP_SY),4) AS avgTP,ROUND(AVG(t.DATA_WATER_TN_SY),4) AS avgTN,ROUND(AVG(t.DATA_WATER_NO_SY),4) AS avgNO,ROUND(AVG(t.DATA_WATER_NH_SY),4) AS avgNH,ROUND(AVG(t.DATA_WATER_COD_SY),4) AS avgCod, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_orientwater t
+                    <where>
                         <if test="yearStr!=null and yearStr!=''">
                             and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr}
                         </if>
@@ -57,18 +66,22 @@
                                 #{id}
                             </foreach>
                         </if>
-                    and t.DATA_WATER_TP &lt;&gt; '0.0000'
+                    </where>
                     GROUP BY MONTH(t.DATA_DATE_TIME)
         ) t2 ON t1.index = t2.month ORDER BY t1.index asc
     </select>
 
 
 <sql id="baseSql" >
-    ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NH,DATA_WATER_COD,DATA_WATER_NO,DATA_WATER_TP_SY,DATA_WATER_TP_LD,DATA_WATER_TN_SY,DATA_WATER_TN_LD,FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,THIRD_VALVE_STATUS
+    ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NH,DATA_WATER_COD,DATA_WATER_NO,DATA_WATER_TP_SY,DATA_WATER_TP_LD,DATA_WATER_TN_SY,DATA_WATER_TN_LD,FLUID_LEVEL,FIRST_VALVE_STATUS,
+    SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,
+    TRANS_DATE,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,THIRD_VALVE_STATUS,
+    DATA_WATER_NH_SY,DATA_WATER_NH_LD,DATA_WATER_COD_SY,DATA_WATER_COD_LD,DATA_WATER_NO_SY,DATA_WATER_NO_LD
 </sql>
 
     <select id="pages" resultMap="baseResultMap">
-        select <include refid="baseSql"/> from surv_hisdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10
+        select <include refid="baseSql"/> from surv_hisdata_orientwater
+        <where>
             <if test="query.dataDateTime != null">
                 and  DATE_FORMAT(DATA_DATE_TIME, '%Y-%m-%d') = DATE_FORMAT(#{query.dataDateTime},'%Y-%m-%d')
             </if>
@@ -81,11 +94,12 @@
                     #{id}
                 </foreach>
             </if>
+        </where>
         order by DATA_DATE_TIME desc
     </select>
 
     <select id="getDaySummry" resultType="java.util.LinkedHashMap">
-        SELECT t1.hour,IFNULL(t2.avgTP,0) AS avgTP,IFNULL(t2.avgTN,0) AS avgTN,IFNULL(t2.avgNO,0) AS avgNO FROM
+        SELECT t1.hour,IFNULL(t2.avgTP,0) AS avgTP,IFNULL(t2.avgTN,0) AS avgTN,IFNULL(t2.avgNO,0) AS avgNO,IFNULL(t2.avgNH,0) AS avgNH,IFNULL(t2.avgCOD,0) AS avgCOD FROM
             (
                 SELECT 0 hour UNION ALL SELECT 1 hour UNION ALL SELECT 2 hour UNION ALL SELECT 3 hour UNION ALL SELECT 4 hour UNION ALL
                 SELECT 5 hour UNION ALL SELECT 6 hour UNION ALL SELECT 7 hour UNION ALL SELECT 8 hour UNION ALL SELECT 9 hour UNION ALL
@@ -95,7 +109,7 @@
             ) AS t1
                 LEFT JOIN
             (
-                SELECT ROUND(AVG(t.DATA_WATER_TP),4) AS avgTP,ROUND(AVG(t.DATA_WATER_TN),4) AS avgTN,ROUND(AVG(t.DATA_WATER_NO),4) AS avgNO, date_format(t.DATA_DATE_TIME, '%H') AS hours FROM surv_hisdata_orientwater t where 1 = 1
+                SELECT ROUND(AVG(t.DATA_WATER_TP_SY),4) AS avgTP,ROUND(AVG(t.DATA_WATER_TN_SY),4) AS avgTN,ROUND(AVG(t.DATA_WATER_NO_SY),4) AS avgNO,ROUND(AVG(t.DATA_WATER_NH_SY),4) AS avgNH,ROUND(AVG(t.DATA_WATER_COD_SY),4) AS avgCOD, date_format(t.DATA_DATE_TIME, '%H') AS hours FROM surv_hisdata_orientwater t where 1 = 1
                 and DATE_FORMAT(DATA_DATE_TIME, '%Y-%m-%d') =  #{days} and t.DATA_WATER_TP &lt;&gt; '0.0000' group by date_format(t.DATA_DATE_TIME, '%H')
             ) t2 ON t1.hour = t2.hours ORDER BY t1.hour asc
     </select>
@@ -111,10 +125,15 @@
     <select id="integrateSummary" resultType="org.jeecg.common.iot.common.VOSurvIntegrateOrientDetail">
         select date_format(t.DATA_DATE_TIME,#{timeDataFormat}) as dates,
         ifnull(ROUND(avg(cast(DATA_WATER_TP as decimal(10,1))), 2),'0') as dataWaterTp,
+        ifnull(ROUND(avg(cast(DATA_WATER_TP_SY as decimal(10,1))), 2),'0') as dataWaterTpSy,
         ifnull(ROUND(avg(cast(DATA_WATER_TN as decimal(10,1))), 2),'0') as dataWaterTn,
+        ifnull(ROUND(avg(cast(DATA_WATER_TN_SY as decimal(10,1))), 2),'0') as dataWaterTnSy,
         ifnull(ROUND(avg(cast(DATA_WATER_NO as decimal(10,1))), 2),'0') as dataWaterNo,
+        ifnull(ROUND(avg(cast(DATA_WATER_NO_SY as decimal(10,1))), 2),'0') as dataWaterNoSy,
         ifnull(ROUND(avg(cast(DATA_WATER_NH as decimal(10,1))), 2),'0') as dataWaterNh,
-        ifnull(ROUND(avg(cast(DATA_WATER_COD as decimal(10,1))), 2),'0') as dataWaterCod
+        ifnull(ROUND(avg(cast(DATA_WATER_NH_SY as decimal(10,1))), 2),'0') as dataWaterNhSy,
+        ifnull(ROUND(avg(cast(DATA_WATER_COD as decimal(10,1))), 2),'0') as dataWaterCod,
+        ifnull(ROUND(avg(cast(DATA_WATER_COD_SY as decimal(10,1))), 2),'0') as dataWaterCodSy
         from surv_hisdata_orientwater t
         <where>
         <if test="tenantId != null and tenantId != ''">

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataLivestockwaterMapper.xml

@@ -10,6 +10,18 @@
         <result property="dataWaterNo" column="DATA_WATER_NO" jdbcType="VARCHAR"/>
         <result property="dataWaterNh" column="DATA_WATER_NH" jdbcType="VARCHAR"/>
         <result property="dataWaterCod" column="DATA_WATER_COD" jdbcType="VARCHAR"/>
+
+        <result property="dataWaterTpSy" column="DATA_WATER_TP_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterTpLd" column="DATA_WATER_TP_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterTnSy" column="DATA_WATER_TN_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterTnLd" column="DATA_WATER_TN_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterNhSy" column="DATA_WATER_NH_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNhLd" column="DATA_WATER_NH_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodSy" column="DATA_WATER_COD_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodLd" column="DATA_WATER_COD_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoSy" column="DATA_WATER_NO_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoLd" column="DATA_WATER_NO_LD" jdbcType="VARCHAR"/>
+
         <result property="dataDateTime" column="DATA_DATE_TIME"/>
         <result property="dataGatherType" column="DATA_GATHER_TYPE" jdbcType="VARCHAR"/>
         <result property="stationId" column="STATION_ID" jdbcType="VARCHAR"/>
@@ -44,23 +56,24 @@
         <result property="dataWaterTn" column="DATA_WATER_TN" jdbcType="VARCHAR"/>
         <result property="dataWaterCod" column="DATA_WATER_COD" jdbcType="VARCHAR"/>
         <result property="dataWaterNh" column="DATA_WATER_NH" jdbcType="VARCHAR"/>
-<!--        <result property="dataWaterNo" column="DATA_WATER_NO" jdbcType="VARCHAR"/>-->
+        <result property="dataWaterNo" column="DATA_WATER_NO" jdbcType="VARCHAR"/>
-<!--        <result property="dataDateTime" column="DATA_DATE_TIME" />-->
+        <result property="dataDateTime" column="DATA_DATE_TIME" />
-<!--        <result property="deployCode" column="DEPLOY_CODE" />-->
+        <result property="deployCode" column="DEPLOY_CODE" />
     </resultMap>
 
     <sql id="baseSql">
         ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NO,DATA_WATER_NH,DATA_WATER_COD,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,
         TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME,
+        DATA_WATER_TP_SY,DATA_WATER_TP_LD,DATA_WATER_TN_SY,DATA_WATER_TN_LD,DATA_WATER_NH_SY,DATA_WATER_NH_LD,DATA_WATER_COD_SY,DATA_WATER_COD_LD,DATA_WATER_NO_SY,DATA_WATER_NO_LD,
         FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,THIRD_VALVE_STATUS
     </sql>
 
     <select id="getNewestData" resultMap="simpleResultMap">
-        select * from surv_transdata_livestockwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND length(DATA_WATER_NH) &lt; 10 AND DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1
+        select <include refid="baseSql"/> from surv_transdata_livestockwater where DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1
     </select>
 
     <select id="getNewestDataWithStation" resultMap="simpleResultMap">
-        select * from surv_transdata_livestockwater where DEPLOY_CODE IN
+        select <include refid="baseSql"/> from surv_transdata_livestockwater where DEPLOY_CODE IN
         <foreach collection="liveList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -69,7 +82,8 @@
 
 
     <select id="pages" resultMap="baseResultMap">
-        select <include refid="baseSql"/> from surv_transdata_livestockwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND length(DATA_WATER_NH) &lt; 10
+        select <include refid="baseSql"/> from surv_transdata_livestockwater
+        <where>
             <if test="query.dataDateTime != null">
                 and  DATE_FORMAT(DATA_DATE_TIME, '%Y-%m-%d') = DATE_FORMAT(#{query.dataDateTime},'%Y-%m-%d')
             </if>
@@ -82,6 +96,7 @@
                     #{id}
                 </foreach>
             </if>
+        </where>
         order by DATA_DATE_TIME desc
     </select>
 </mapper>

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataOrientwaterMapper.xml

@@ -11,10 +11,17 @@
         <result property="dataWaterNh" column="DATA_WATER_NH" jdbcType="VARCHAR"/>
         <result property="dataWaterCod" column="DATA_WATER_COD" jdbcType="VARCHAR"/>
         <result property="dataWaterNo" column="DATA_WATER_NO" jdbcType="VARCHAR"/>
+
         <result property="dataWaterTpSy" column="DATA_WATER_TP_SY" jdbcType="VARCHAR"/>
         <result property="dataWaterTpLd" column="DATA_WATER_TP_LD" jdbcType="VARCHAR"/>
         <result property="dataWaterTnSy" column="DATA_WATER_TN_SY" jdbcType="VARCHAR"/>
         <result property="dataWaterTnLd" column="DATA_WATER_TN_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterNhSy" column="DATA_WATER_NH_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNhLd" column="DATA_WATER_NH_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodSy" column="DATA_WATER_COD_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodLd" column="DATA_WATER_COD_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoSy" column="DATA_WATER_NO_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoLd" column="DATA_WATER_NO_LD" jdbcType="VARCHAR"/>
 
         <result property="fluidLevel" column="FLUID_LEVEL" jdbcType="VARCHAR"/>
         <result property="firstValveStatus" column="FIRST_VALVE_STATUS" jdbcType="VARCHAR"/>
@@ -44,26 +51,27 @@
 
     <resultMap id="simpleResultMap" type="org.jeecg.common.vo.SurvTransdataOrientwaterVo">
 
-        <result property="dataWaterTp" column="DATA_WATER_TP" jdbcType="VARCHAR"/>
+        <result property="dataWaterTp" column="DATA_WATER_TP_SY" jdbcType="VARCHAR"/>
-        <result property="dataWaterTn" column="DATA_WATER_TN" jdbcType="VARCHAR"/>
+        <result property="dataWaterTn" column="DATA_WATER_TN_SY" jdbcType="VARCHAR"/>
-<!--        <result property="dataWaterCod" column="DATA_WATER_COD" jdbcType="VARCHAR"/>-->
+        <result property="dataWaterCod" column="DATA_WATER_COD_SY" jdbcType="VARCHAR"/>
-<!--        <result property="dataWaterNh" column="DATA_WATER_NH" jdbcType="VARCHAR"/>-->
+        <result property="dataWaterNh" column="DATA_WATER_NH" jdbcType="VARCHAR"/>
         <result property="dataWaterNo" column="DATA_WATER_NO" jdbcType="VARCHAR"/>
-<!--        <result property="dataDateTime" column="DATA_DATE_TIME" />-->
+        <result property="dataDateTime" column="DATA_DATE_TIME" />
-<!--        <result property="deployCode" column="DEPLOY_CODE" />-->
+        <result property="deployCode" column="DEPLOY_CODE" />
     </resultMap>
 
     <sql id="baseSql" >
         ID,DATA_ID,DATA_WATER_TP,DATA_WATER_TN,DATA_WATER_NH,DATA_WATER_COD,DATA_WATER_NO,DATA_WATER_TP_SY,DATA_WATER_TP_LD,DATA_WATER_TN_SY,DATA_WATER_TN_LD,
         FLUID_LEVEL,FIRST_VALVE_STATUS,SECOND_VALVE_STATUS,THIRD_VALVE_STATUS,CRASH_STOP_STATUS,WATER_PUMP_STATUS,MAIN_SIDE_STATUS,DATA_DATE_TIME,DATA_GATHER_TYPE,STATION_ID,
+        DATA_WATER_NH_SY,DATA_WATER_NH_LD,DATA_WATER_COD_SY,DATA_WATER_COD_LD,DATA_WATER_NO_SY,DATA_WATER_NO_LD,
         DEVICE_ID,STATION_CODE,DEPLOY_CODE,CORP_ID,STATION_NAME,DEVICE_NAME,TENANT_ID,RE_VISION,CREATED_BY,CREATE_TIME,UPDATED_BY,IS_DEL,UPDATED_TIME
     </sql>
     <select id="getNewestData" resultMap="simpleResultMap">
-        select * from surv_transdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1
+        select <include refid="baseSql"/> from surv_transdata_orientwater where DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1
     </select>
 
     <select id="getNewestDataWithStation" resultMap="simpleResultMap">
-        select * from surv_transdata_orientwater where DEPLOY_CODE IN
+        select <include refid="baseSql"/> from surv_transdata_orientwater where DEPLOY_CODE IN
         <foreach collection="orientList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -71,7 +79,8 @@
     </select>
 
     <select id="pages" resultMap="baseResultMap">
-        select <include refid="baseSql"/> from surv_transdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10
+        select <include refid="baseSql"/> from surv_transdata_orientwater
+        <where>
             <if test="query.dataDateTime != null">
                 and  DATE_FORMAT(DATA_DATE_TIME, '%Y-%m-%d') = DATE_FORMAT(#{query.dataDateTime},'%Y-%m-%d')
             </if>
@@ -84,6 +93,7 @@
                     #{id}
                 </foreach>
             </if>
+        </where>
         order by DATA_DATE_TIME desc
     </select>
 </mapper>

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvTransdataVocsMapper.xml

@@ -4,6 +4,7 @@
 
     <resultMap id="baseResultMap" type="org.jeecg.common.entity.SurvTransdataVocs">
         <result property="id" column="ID" jdbcType="VARCHAR"/>
+        <result property="deployId" column="DEPLOY_ID" jdbcType="VARCHAR"/>
         <result property="dataTvoc" column="DATA_TVOC" jdbcType="VARCHAR"/>
         <result property="dataOu" column="DATA_OU" jdbcType="VARCHAR"/>
         <result property="dataNh3" column="DATA_NH3" jdbcType="VARCHAR"/>

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvTransdataAirService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.appmana.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.entity.ScEquZhibiao;
 import org.jeecg.common.entity.SurvTransdataAir;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.vo.SurvTransdataAirVo;
@@ -22,4 +23,6 @@ public interface ISurvTransdataAirService extends IService<SurvTransdataAir> {
     IPage<SurvTransdataAir> pages(Page<SurvTransdataAir> page, SurvTransdataAir survTransdataAir, List<String> deviceList);
 
     SurvTransdataAir getOneByDeviceCode(String deployCode);
+
+    SurvTransdataAir initData(List<ScEquZhibiao> scEquZhibiaos);
 }

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvTransdataLivestockwaterService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.appmana.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.entity.ScEquZhibiao;
 import org.jeecg.common.entity.SurvTransdataLivestockwater;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.vo.SurvTransdataAirVo;
@@ -24,4 +25,6 @@ public interface ISurvTransdataLivestockwaterService extends IService<SurvTransd
     IPage<SurvTransdataLivestockwater> pages(Page<SurvTransdataLivestockwater> page, SurvTransdataLivestockwater survTransdataLivestockwater, List<String> deviceList);
 
     SurvTransdataLivestockwater getOneByDeviceCode(String deployCode);
+
+    SurvTransdataLivestockwaterVo initData(List<ScEquZhibiao> scEquZhibiaos);
 }

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvTransdataOrientwaterService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.appmana.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.entity.ScEquZhibiao;
 import org.jeecg.common.entity.SurvTransdataOrientwater;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.vo.SurvTransdataAirVo;
@@ -24,4 +25,6 @@ public interface ISurvTransdataOrientwaterService extends IService<SurvTransdata
     IPage<SurvTransdataOrientwater> pages(Page<SurvTransdataOrientwater> page, SurvTransdataOrientwater survTransdataOrientwater,List<String> deviceList);
 
     SurvTransdataOrientwater getOneByDeviceCode(String deployCode);
+
+    SurvTransdataOrientwaterVo initData(List<ScEquZhibiao> scEquZhibiaos);
 }

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/ISurvTransdataSoilService.java

@@ -2,6 +2,8 @@ package org.jeecg.modules.appmana.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.entity.ScEquZhibiao;
+import org.jeecg.common.entity.SurvDeviceDeploy;
 import org.jeecg.common.entity.SurvTransdataSoil;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.vo.DataTrans;
@@ -23,4 +25,6 @@ public interface ISurvTransdataSoilService extends IService<SurvTransdataSoil> {
     IPage<SurvTransdataSoil> pages(Page<SurvTransdataSoil> page, SurvTransdataSoil survTransdataSoil, List<String> deviceList);
 
     SurvTransdataSoil getOneByDeviceCode(String deployCode);
+
+    SurvTransdataSoil initData(List<ScEquZhibiao> zhibiaos);
 }

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataAirServiceImpl.java

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.entity.ScEquZhibiao;
 import org.jeecg.common.entity.SurvDeviceDeploy;
 import org.jeecg.common.entity.SurvStationInfo;
 import org.jeecg.common.entity.SurvTransdataAir;
+import org.jeecg.common.util.EntityFieldUtil;
 import org.jeecg.common.vo.SurvTransdataAirVo;
 import org.jeecg.modules.appmana.mapper.SurvTransdataAirMapper;
 import org.jeecg.modules.appmana.service.ISurvTransdataAirService;
@@ -59,6 +61,8 @@ public class SurvTransdataAirServiceImpl extends ServiceImpl<SurvTransdataAirMap
         return getOne(queryWrapper);
     }
 
+
+
     public void fill(List<SurvTransdataAir> list){
         if(list!=null && !list.isEmpty()){
             List<String> stationCode = new ArrayList<>();
@@ -92,4 +96,16 @@ public class SurvTransdataAirServiceImpl extends ServiceImpl<SurvTransdataAirMap
             }
         }
     }
+
+
+    @Override
+    public SurvTransdataAir initData(List<ScEquZhibiao> zhibiaos) {
+        SurvTransdataAir soil = new SurvTransdataAir();
+        if(zhibiaos!=null && !zhibiaos.isEmpty()){
+            for (ScEquZhibiao zhibiao : zhibiaos) {
+                EntityFieldUtil.setFieldValue(soil,zhibiao.getEntityField(),"0");
+            }
+        }
+        return soil;
+    }
 }

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataLivestockwaterServiceImpl.java

@@ -3,7 +3,9 @@ package org.jeecg.modules.appmana.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.jeecg.common.entity.ScEquZhibiao;
 import org.jeecg.common.entity.SurvTransdataLivestockwater;
+import org.jeecg.common.util.EntityFieldUtil;
 import org.jeecg.common.vo.SurvTransdataAirVo;
 import org.jeecg.common.vo.SurvTransdataLivestockwaterVo;
 import org.jeecg.modules.appmana.mapper.SurvTransdataLivestockwaterMapper;
@@ -65,4 +67,15 @@ public class SurvTransdataLivestockwaterServiceImpl extends ServiceImpl<SurvTran
         queryWrapper.eq("DEPLOY_CODE",deployCode).orderByDesc("DATA_DATE_TIME").last("limit 1");
         return getOne(queryWrapper);
     }
+
+    @Override
+    public SurvTransdataLivestockwaterVo initData(List<ScEquZhibiao> zhibiaos) {
+        SurvTransdataLivestockwaterVo soil = new SurvTransdataLivestockwaterVo();
+        if(zhibiaos!=null && !zhibiaos.isEmpty()){
+            for (ScEquZhibiao zhibiao : zhibiaos) {
+                EntityFieldUtil.setFieldValue(soil,zhibiao.getEntityField(),"0");
+            }
+        }
+        return soil;
+    }
 }

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataOrientwaterServiceImpl.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.common.entity.ScEquZhibiao;
 import org.jeecg.common.entity.SurvTransdataOrientwater;
+import org.jeecg.common.util.EntityFieldUtil;
 import org.jeecg.common.vo.SurvTransdataAirVo;
 import org.jeecg.common.vo.SurvTransdataOrientwaterVo;
 import org.jeecg.modules.appmana.mapper.SurvTransdataOrientwaterMapper;
@@ -66,4 +68,15 @@ public class SurvTransdataOrientwaterServiceImpl extends ServiceImpl<SurvTransda
         queryWrapper.eq("DEPLOY_CODE",deployCode).orderByDesc("DATA_DATE_TIME").last("limit 1");
         return getOne(queryWrapper);
     }
+
+    @Override
+    public SurvTransdataOrientwaterVo initData(List<ScEquZhibiao> zhibiaos) {
+        SurvTransdataOrientwaterVo water = new SurvTransdataOrientwaterVo();
+        if(zhibiaos!=null && !zhibiaos.isEmpty()){
+            for (ScEquZhibiao zhibiao : zhibiaos) {
+                EntityFieldUtil.setFieldValue(water,zhibiao.getEntityField(),"0");
+            }
+        }
+        return water;
+    }
 }

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataSoilServiceImpl.java

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.commons.lang3.StringUtils;
+import org.jeecg.common.entity.ScEquZhibiao;
 import org.jeecg.common.entity.SurvDeviceDeploy;
 import org.jeecg.common.entity.SurvStationInfo;
 import org.jeecg.common.entity.SurvTransdataSoil;
+import org.jeecg.common.util.EntityFieldUtil;
 import org.jeecg.common.vo.SurvTransdataSoilVo;
 import org.jeecg.modules.appmana.mapper.SurvTransdataSoilMapper;
 import org.jeecg.modules.appmana.service.ISurvTransdataSoilService;
@@ -61,6 +63,7 @@ public class SurvTransdataSoilServiceImpl extends ServiceImpl<SurvTransdataSoilM
     }
 
 
+
     public void fill(List<SurvTransdataSoil> list){
         if(list!=null && !list.isEmpty()){
             List<String> stationCode = new ArrayList<>();
@@ -98,4 +101,17 @@ public class SurvTransdataSoilServiceImpl extends ServiceImpl<SurvTransdataSoilM
             }
         }
     }
+
+
+    @Override
+    public SurvTransdataSoil initData(List<ScEquZhibiao> zhibiaos) {
+        SurvTransdataSoil soil = new SurvTransdataSoil();
+        if(zhibiaos!=null && !zhibiaos.isEmpty()){
+            for (ScEquZhibiao zhibiao : zhibiaos) {
+                EntityFieldUtil.setFieldValue(soil,zhibiao.getEntityField(),"0");
+            }
+        }
+        return soil;
+    }
+
 }

zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/utils/CommonUtils.java

@@ -15,6 +15,7 @@ import org.jeecg.common.iot.common.VOZhiBiao;
 import org.jeecg.common.util.DateUtilTools;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.vo.CommonDataTrans;
+import org.jeecg.common.vo.SurvTransdataStinkVo;
 import org.jeecg.modules.appmana.service.IScEquZhibiaoService;
 import org.jeecg.modules.appmana.service.ISurvConfigService;
 import org.jeecg.modules.appmana.service.ISurvTransdataAirService;
@@ -250,7 +251,7 @@ w     * @param pageNo   非必传，虫情孢子类，杀虫灯传入
                             e4.setDeployId(transdataAir.getDeployId());
                             e4.setIconName(iconFinalName);
                             e4.setSurvType(IotConstants.AIR_DATA);
-
+                            e4.setStationName(transdataAir.getStationName());
 
                             listFinal.add(e4);
                         }
@@ -453,6 +454,7 @@ w     * @param pageNo   非必传，虫情孢子类，杀虫灯传入
                             e4.setDeployId(transdataSoil.getDeployId());
                             e4.setIconName(iconFinalName);
                             e4.setSurvType(IotConstants.SOIL_DATA);
+                            e4.setStationName(transdataSoil.getStationName());
                             listFinal.add(e4);
                         }
                     }
@@ -1011,4 +1013,88 @@ w     * @param pageNo   非必传，虫情孢子类，杀虫灯传入
         return prefixStr + str;
     }
 
+    public static List<CommonDataTrans> constructStink(SurvTransdataStinkVo transdataStinkVo) {
+        //调整为从数据库获取
+        if (transdataStinkVo == null) {
+            return new ArrayList<>();
+        }
+        List<CommonDataTrans> listFinal = new ArrayList<>();
+        String timeGap = DateUtilTools.calTimeGap(transdataStinkVo.getDataDateTime(), LocalDateTime.now());
+        Class<? extends SurvTransdataStinkVo> personClass = transdataStinkVo.getClass();
+        Field[] fields = personClass.getDeclaredFields();
+        try {
+            //查找租户配置
+            SurvConfig fSurvConfig = survConfigService.getOneByTypeWithTenant(null, IotConstants.surv_itemname);
+            cn.hutool.json.JSONObject configs = null;
+            if (fSurvConfig != null) {
+                configs = fSurvConfig.getConfigJson();
+            }
+            cn.hutool.json.JSONObject desConfig = null;
+            cn.hutool.json.JSONObject iconConfig = null;
+            if (configs != null) {
+                desConfig = configs.getJSONObject("des");
+                iconConfig = configs.getJSONObject("icons");
+            }
+            for (Field field : fields) {
+                field.setAccessible(true);
+                if (field.getName().startsWith("data") && !field.getName().equals("dataDateTime") && !field.getName().equals("dataGatherType")) {
+                    Object values = field.get(transdataStinkVo);
+                    if (values != null) {
+                        String val = values.toString();
+                        if (StringUtils.isNotBlank(val)) {
+                            PollutionEnum pollutionEnum = PollutionEnum.catchPollution(field.getName());
+                            CommonDataTrans e4 = new CommonDataTrans();//温度
+
+                            String iconFinalName = pollutionEnum.getIconName();
+                            String itemFinalName = pollutionEnum.getDescription();
+                            String bsIcon = pollutionEnum.getBsIcon();
+                            //20241227增加可以按照租户自定义监测项的名称
+                            if (configs != null) {
+                                String itemName = desConfig != null ? desConfig.getStr(pollutionEnum.getCode()) : "";
+                                String bsIconPath = configs.getStr("bsIconPath");
+                                String bsIconPath2 = configs.getStr("bsIconPath2");
+                                String h5IconPath = configs.getStr("h5IconPath");
+                                String appIconPath = configs.getStr("appIconPath");
+                                String midIconPath = configs.getStr("midIconPath");
+                                String iconName = iconConfig != null ? iconConfig.getStr(pollutionEnum.getCode()) : "";
+                                if (StringUtils.isNotBlank(itemName)) {
+                                    itemFinalName = itemName;
+                                }
+                                if (StringUtils.isNotBlank(iconName)) {
+                                    iconFinalName = iconName;
+                                }
+                                if (StringUtils.isNotBlank(bsIconPath)) {
+                                    bsIcon = bsIconPath + iconFinalName;
+                                }
+                                e4.setBsIconPath(bsIconPath);
+                                e4.setBsIconPath2(bsIconPath2);
+                                e4.setH5IconPath(h5IconPath);
+                                e4.setAppIconPath(appIconPath);
+                                e4.setMidIconPath(midIconPath);
+                            }
+                            e4.setUnit(pollutionEnum.getUnit());
+                            e4.setName(itemFinalName);
+                            e4.setColor(pollutionEnum.getColor());
+                            e4.setIcon(pollutionEnum.getIcon());
+                            e4.setMobileIcon(pollutionEnum.getMobileIcon());
+                            e4.setBsIcon(bsIcon);
+                            e4.setSurvItem(pollutionEnum.getCode());
+                            e4.setValue(val);
+                            e4.setLastUpdate(timeGap);
+                            e4.setDataDateTime(transdataStinkVo.getDataDateTime());
+//                            e4.setDeployId(transdataStinkVo.getDeployId());
+                            e4.setIconName(iconFinalName);
+                            e4.setSurvType(IotConstants.SOIL_DATA);
+                            e4.setStationName(transdataStinkVo.getStationName());
+                            listFinal.add(e4);
+                        }
+                    }
+
+                }
+            }
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return listFinal;
+    }
 }

zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataLivestockwaterMapper.xml

@@ -5,21 +5,34 @@
     <resultMap id="baseResultVoMap" type="org.jeecg.common.vo.SurvTransdataLivestockwaterVo">
         <result property="dataWaterTp" column="DATA_WATER_TP" jdbcType="VARCHAR"/>
         <result property="dataWaterTn" column="DATA_WATER_TN" jdbcType="VARCHAR"/>
-<!--        <result property="dataWaterNo" column="DATA_WATER_NO" jdbcType="VARCHAR"/>-->
+        <result property="dataWaterNo" column="DATA_WATER_NO" jdbcType="VARCHAR"/>
         <result property="dataWaterNh" column="DATA_WATER_NH" jdbcType="VARCHAR"/>
         <result property="dataWaterCod" column="DATA_WATER_COD" jdbcType="VARCHAR"/>
+
+
+        <result property="dataWaterTpSy" column="DATA_WATER_TP_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterTpLd" column="DATA_WATER_TP_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterTnSy" column="DATA_WATER_TN_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterTnLd" column="DATA_WATER_TN_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterNhSy" column="DATA_WATER_NH_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNhLd" column="DATA_WATER_NH_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodSy" column="DATA_WATER_COD_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodLd" column="DATA_WATER_COD_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoSy" column="DATA_WATER_NO_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoLd" column="DATA_WATER_NO_LD" jdbcType="VARCHAR"/>
+
         <result property="dataDateTime" column="DATA_DATE_TIME"/>
         <result property="deployCode" column="DEPLOY_CODE" jdbcType="VARCHAR"/>
     </resultMap>
 
     <select id="getMonthSummry" resultType="org.jeecg.common.vo.LiveDataTrans">
 
-        SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNH,0) as avgNH,IFNULL(t2.avgCOD,0) as avgCOD FROM (
+        SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNH,0) as avgNH,IFNULL(t2.avgNO,0) as avgNO,IFNULL(t2.avgCOD,0) as avgCOD FROM (
         SELECT @a:=@a + 1 AS `index` FROM mysql.help_topic,(SELECT @a:=0) temp LIMIT 12
         ) t1
         LEFT JOIN (
 
-        SELECT ROUND(AVG(t.DATA_WATER_TP),2) AS avgTP,ROUND(AVG(t.DATA_WATER_TN),2) AS avgTN,ROUND(AVG(t.DATA_WATER_NH),2) AS avgNH,ROUND(AVG(t.DATA_WATER_COD),2) AS avgCOD, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_livestockwater t where 1 = 1
+        SELECT ROUND(AVG(t.DATA_WATER_TP_SY),2) AS avgTP,ROUND(AVG(t.DATA_WATER_TN_SY),2) AS avgTN,ROUND(AVG(t.DATA_WATER_NH_SY),2) AS avgNH,ROUND(AVG(t.DATA_WATER_NO_SY),2) AS avgNO,ROUND(AVG(t.DATA_WATER_COD_SY),2) AS avgCOD, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_livestockwater t where 1 = 1
         <if test="yearStr!=null and yearStr!=''">
             and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr}
         </if>
@@ -35,8 +48,28 @@
 
     </select>
 
+    <sql id="baseSql">
+        DATA_WATER_TP,
+        DATA_WATER_TN,
+        DATA_WATER_NO,
+        DATA_WATER_NH,
+        DATA_WATER_COD,
+        DATA_WATER_TP_SY,
+        DATA_WATER_TP_LD,
+        DATA_WATER_TN_SY,
+        DATA_WATER_TN_LD,
+        DATA_WATER_NH_SY,
+        DATA_WATER_NH_LD,
+        DATA_WATER_COD_SY,
+        DATA_WATER_COD_LD,
+        DATA_WATER_NO_SY,
+        DATA_WATER_NO_LD,
+        DATA_DATE_TIME,
+        DEPLOY_CODE
+    </sql>
+
     <select id="getResentData" resultMap="baseResultVoMap">
-        select * from surv_hisdata_livestockwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND length(DATA_WATER_NH) &lt; 10 AND DEPLOY_CODE IN
+        select <include refid="baseSql"/> from surv_hisdata_livestockwater where DEPLOY_CODE IN
         <foreach collection="liveList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -44,7 +77,7 @@
     </select>
 
     <select id="getAllNewestData" resultMap="baseResultVoMap">
-        select * from surv_hisdata_livestockwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND length(DATA_WATER_NH) &lt; 10 AND DEPLOY_CODE IN
+        select <include refid="baseSql"/>  from surv_hisdata_livestockwater where AND DEPLOY_CODE IN
         <foreach collection="liveList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -52,14 +85,14 @@
     </select>
 
     <select id="getHisDataCount" resultType="java.lang.Integer">
-        select count(1) from surv_hisdata_livestockwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND length(DATA_WATER_NH) &lt; 10 AND DEPLOY_CODE IN
+        select count(1) from surv_hisdata_livestockwater where DEPLOY_CODE IN
         <foreach collection="liveList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </select>
 
     <select id="getPageResentData" resultMap="baseResultVoMap">
-        select * from surv_hisdata_livestockwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND length(DATA_WATER_NH) &lt; 10 AND DEPLOY_CODE IN
+        select <include refid="baseSql"/>  from surv_hisdata_livestockwater where DEPLOY_CODE IN
         <foreach collection="liveList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>

zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataOrientwaterMapper.xml

@@ -7,18 +7,51 @@
         <result property="dataWaterTp" column="DATA_WATER_TP" jdbcType="VARCHAR"/>
         <result property="dataWaterTn" column="DATA_WATER_TN" jdbcType="VARCHAR"/>
         <result property="dataWaterNo" column="DATA_WATER_NO" jdbcType="VARCHAR"/>
+        <result property="dataWaterNh" column="DATA_WATER_NH" jdbcType="VARCHAR"/>
         <result property="dataWaterCod" column="DATA_WATER_COD" jdbcType="VARCHAR"/>
+
+        <result property="dataWaterTpSy" column="DATA_WATER_TP_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterTpLd" column="DATA_WATER_TP_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterTnSy" column="DATA_WATER_TN_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterTnLd" column="DATA_WATER_TN_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterNhSy" column="DATA_WATER_NH_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNhLd" column="DATA_WATER_NH_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodSy" column="DATA_WATER_COD_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodLd" column="DATA_WATER_COD_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoSy" column="DATA_WATER_NO_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoLd" column="DATA_WATER_NO_LD" jdbcType="VARCHAR"/>
+
         <result property="dataDateTime" column="DATA_DATE_TIME"/>
         <result property="deployCode" column="DEPLOY_CODE" jdbcType="VARCHAR"/>
     </resultMap>
 
+    <sql id="baseSql">
+        DATA_WATER_TP,
+        DATA_WATER_TN,
+        DATA_WATER_NO,
+        DATA_WATER_NH,
+        DATA_WATER_COD,
+        DATA_WATER_TP_SY,
+        DATA_WATER_TP_LD,
+        DATA_WATER_TN_SY,
+        DATA_WATER_TN_LD,
+        DATA_WATER_NH_SY,
+        DATA_WATER_NH_LD,
+        DATA_WATER_COD_SY,
+        DATA_WATER_COD_LD,
+        DATA_WATER_NO_SY,
+        DATA_WATER_NO_LD,
+        DATA_DATE_TIME,
+        DEPLOY_CODE
+    </sql>
+
     <select id="getMonthSummry" resultType="org.jeecg.common.vo.OrientDataTrans">
 
-        SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNO,0) as avgNO,IFNULL(t2.avgCod,0) as avgCod FROM (
+        SELECT t1.index,IFNULL(t2.avgTP,0) as avgTP,IFNULL(t2.avgTN,0) as avgTN,IFNULL(t2.avgNH,0) as avgNH,IFNULL(t2.avgNO,0) as avgNO,IFNULL(t2.avgCod,0) as avgCod FROM (
         SELECT @a:=@a + 1 AS `index` FROM mysql.help_topic,(SELECT @a:=0) temp LIMIT 12
         ) t1
         LEFT JOIN (
-        SELECT ROUND(AVG(t.DATA_WATER_TP),2) AS avgTP,ROUND(AVG(t.DATA_WATER_TN),2) AS avgTN,ROUND(AVG(t.DATA_WATER_NO),2) AS avgNO,ROUND(AVG(t.DATA_WATER_COD),2) AS avgCod, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_orientwater t where 1 = 1
+        SELECT ROUND(AVG(t.DATA_WATER_TP_SY),2) AS avgTP,ROUND(AVG(t.DATA_WATER_TN_SY),2) AS avgTN,ROUND(AVG(t.DATA_WATER_NH_SY),2) AS avgNH,ROUND(AVG(t.DATA_WATER_NO_SY),2) AS avgNO,ROUND(AVG(t.DATA_WATER_COD_SY),2) AS avgCod, MONTH(t.DATA_DATE_TIME) AS month FROM surv_hisdata_orientwater t where 1 = 1
         <if test="yearStr!=null and yearStr!=''">
             and DATE_FORMAT(DATA_DATE_TIME, '%Y') = #{yearStr}
         </if>
@@ -34,7 +67,7 @@
     </select>
 
     <select id="getResentData" resultMap="baseResultVoMap">
-        select * from surv_hisdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND DEPLOY_CODE IN
+        select <include refid="baseSql"/>  from surv_hisdata_orientwater where DEPLOY_CODE IN
         <foreach collection="orientList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -42,7 +75,7 @@
     </select>
 
     <select id="getAllNewestData" resultMap="baseResultVoMap">
-        select * from surv_hisdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND DEPLOY_CODE IN
+        select <include refid="baseSql"/>  from surv_hisdata_orientwater where DEPLOY_CODE IN
         <foreach collection="orientList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -50,14 +83,14 @@
     </select>
 
     <select id="getHisDataCount" resultType="java.lang.Integer">
-        select count(1) from surv_hisdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND DEPLOY_CODE IN
+        select count(1) from surv_hisdata_orientwater where DEPLOY_CODE IN
         <foreach collection="orientList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </select>
 
     <select id="getPageResentData" resultMap="baseResultVoMap">
-        select * from surv_hisdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND DEPLOY_CODE IN
+        select <include refid="baseSql"/>  from surv_hisdata_orientwater where DEPLOY_CODE IN
         <foreach collection="orientList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>

zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvTransdataLivestockwaterMapper.xml

@@ -8,16 +8,50 @@
         <result property="dataWaterCod" column="DATA_WATER_COD" jdbcType="VARCHAR"/>
         <result property="dataWaterNh" column="DATA_WATER_NH" jdbcType="VARCHAR"/>
         <result property="dataWaterNo" column="DATA_WATER_NO" jdbcType="VARCHAR"/>
+
+        <result property="dataWaterTpSy" column="DATA_WATER_TP_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterTpLd" column="DATA_WATER_TP_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterTnSy" column="DATA_WATER_TN_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterTnLd" column="DATA_WATER_TN_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterNhSy" column="DATA_WATER_NH_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNhLd" column="DATA_WATER_NH_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodSy" column="DATA_WATER_COD_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodLd" column="DATA_WATER_COD_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoSy" column="DATA_WATER_NO_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoLd" column="DATA_WATER_NO_LD" jdbcType="VARCHAR"/>
+
+
         <result property="dataDateTime" column="DATA_DATE_TIME" />
         <result property="deployCode" column="DEPLOY_CODE" />
     </resultMap>
 
+
+    <sql id="baseSql">
+        DATA_WATER_TP,
+        DATA_WATER_TN,
+        DATA_WATER_NO,
+        DATA_WATER_NH,
+        DATA_WATER_COD,
+        DATA_WATER_TP_SY,
+        DATA_WATER_TP_LD,
+        DATA_WATER_TN_SY,
+        DATA_WATER_TN_LD,
+        DATA_WATER_NH_SY,
+        DATA_WATER_NH_LD,
+        DATA_WATER_COD_SY,
+        DATA_WATER_COD_LD,
+        DATA_WATER_NO_SY,
+        DATA_WATER_NO_LD,
+        DATA_DATE_TIME,
+        DEPLOY_CODE
+    </sql>
+
     <select id="getNewestData" resultMap="simpleResultMap">
-        select * from surv_transdata_livestockwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND length(DATA_WATER_NH) &lt; 10 AND DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1
+        select <include refid="baseSql"/> from surv_transdata_livestockwater where DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1
     </select>
 
     <select id="getNewestDataWithStation" resultMap="simpleResultMap">
-        select * from surv_transdata_livestockwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND length(DATA_WATER_NH) &lt; 10 AND DEPLOY_CODE IN
+        select <include refid="baseSql"/> from surv_transdata_livestockwater where DEPLOY_CODE IN
         <foreach collection="liveList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -25,11 +59,11 @@
     </select>
 
     <select id="getRecentDataByCode" resultMap="simpleResultMap">
-        select * from surv_transdata_livestockwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND length(DATA_WATER_NH) &lt; 10 AND DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 5
+        select <include refid="baseSql"/> from surv_transdata_livestockwater where DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 5
     </select>
 
     <select id="getAllNewestData" resultMap="simpleResultMap">
-        select * from surv_transdata_livestockwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND length(DATA_WATER_NH) &lt; 10 AND DEPLOY_CODE IN
+        select <include refid="baseSql"/> from surv_transdata_livestockwater where DEPLOY_CODE IN
         <foreach collection="liveList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>

zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvTransdataOrientwaterMapper.xml

@@ -8,16 +8,49 @@
         <result property="dataWaterCod" column="DATA_WATER_COD" jdbcType="VARCHAR"/>
         <result property="dataWaterNh" column="DATA_WATER_NH" jdbcType="VARCHAR"/>
         <result property="dataWaterNo" column="DATA_WATER_NO" jdbcType="VARCHAR"/>
+
+        <result property="dataWaterTpSy" column="DATA_WATER_TP_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterTpLd" column="DATA_WATER_TP_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterTnSy" column="DATA_WATER_TN_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterTnLd" column="DATA_WATER_TN_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterNhSy" column="DATA_WATER_NH_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNhLd" column="DATA_WATER_NH_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodSy" column="DATA_WATER_COD_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterCodLd" column="DATA_WATER_COD_LD" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoSy" column="DATA_WATER_NO_SY" jdbcType="VARCHAR"/>
+        <result property="dataWaterNoLd" column="DATA_WATER_NO_LD" jdbcType="VARCHAR"/>
+
         <result property="dataDateTime" column="DATA_DATE_TIME" />
         <result property="deployCode" column="DEPLOY_CODE" />
     </resultMap>
 
+
+    <sql id="baseSql">
+        DATA_WATER_TP,
+        DATA_WATER_TN,
+        DATA_WATER_NO,
+        DATA_WATER_NH,
+        DATA_WATER_COD,
+        DATA_WATER_TP_SY,
+        DATA_WATER_TP_LD,
+        DATA_WATER_TN_SY,
+        DATA_WATER_TN_LD,
+        DATA_WATER_NH_SY,
+        DATA_WATER_NH_LD,
+        DATA_WATER_COD_SY,
+        DATA_WATER_COD_LD,
+        DATA_WATER_NO_SY,
+        DATA_WATER_NO_LD,
+        DATA_DATE_TIME,
+        DEPLOY_CODE
+    </sql>
+
     <select id="getNewestData" resultMap="simpleResultMap">
-        select * from surv_transdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1
+        select <include refid="baseSql"/> from surv_transdata_orientwater where  DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 1
     </select>
 
     <select id="getNewestDataWithStation" resultMap="simpleResultMap">
-        select * from surv_transdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND DEPLOY_CODE IN
+        select <include refid="baseSql"/> from surv_transdata_orientwater where  DEPLOY_CODE IN
         <foreach collection="orientList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -25,11 +58,11 @@
     </select>
 
     <select id="getRecentDataByCode" resultMap="simpleResultMap">
-        select * from surv_transdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 5
+        select <include refid="baseSql"/> from surv_transdata_orientwater where  DEPLOY_CODE = #{deployCode} order by DATA_DATE_TIME desc limit 5
     </select>
 
     <select id="getAllNewestData" resultMap="simpleResultMap">
-        select * from surv_transdata_orientwater where DATA_WATER_TP is not null AND length(DATA_WATER_TP) &lt; 10 AND length(DATA_WATER_TN) &lt; 10 AND DEPLOY_CODE IN
+        select <include refid="baseSql"/> from surv_transdata_orientwater where  DEPLOY_CODE IN
         <foreach collection="orientList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>

zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvTransdataVocsMapper.xml

@@ -4,6 +4,7 @@
 
     <resultMap id="baseResultMap" type="org.jeecg.common.entity.SurvTransdataVocs">
         <result property="id" column="ID" jdbcType="VARCHAR"/>
+        <result property="deployId" column="DEPLOY_ID" jdbcType="VARCHAR"/>
         <result property="dataTvoc" column="DATA_TVOC" jdbcType="VARCHAR"/>
         <result property="dataOu" column="DATA_OU" jdbcType="VARCHAR"/>
         <result property="dataNh3" column="DATA_NH3" jdbcType="VARCHAR"/>

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/constant/enums/PollutionEnum.java

@@ -87,16 +87,16 @@ public enum PollutionEnum {
     //20251122 新增五常
     dataWaterNtu("dataWaterNtu", "浊度", "ntu", "sys/icon/shebei_icon_ntu.png", "6_water", "#92D0F3", "sys/mobile/icon/shebei_icon_ntu.png", "sys/bs/icon/shebei_icon_nto.png", "shebei_icon_nto.png"),
     dataWaterDo("dataWaterDo", "溶解氧", "mg/L", "sys/icon/shebei_icon_do.png", "6_water", "#92D0F5", "sys/mobile/icon/shebei_icon_do.png", "sys/bs/icon/shebei_icon_do.png", "shebei_icon_do.png"),
-    dataWaterPh("dataWaterPh", "pH", "℃", "sys/icon/shebei_icon_waterph.png", "6_water", "#92D1F3", "sys/mobile/icon/shebei_icon_waterph.png", "sys/bs/icon/shebei_icon_waterph.png", "shebei_icon_waterph.png"),
+    dataWaterPh("dataWaterPh", "pH", "", "sys/icon/shebei_icon_waterph.png", "6_water", "#92D1F3", "sys/mobile/icon/shebei_icon_waterph.png", "sys/bs/icon/shebei_icon_waterph.png", "shebei_icon_waterph.png"),
     dataWaterTemp("dataWaterTemp", "水温", "℃", "sys/icon/shebei_icon_watertemp.png", "6_water", "#92D0F3", "sys/mobile/icon/shebei_icon_watertemp.png", "sys/bs/icon/shebei_icon_watertemp.png", "shebei_icon_watertemp.png"),
     dataWaterDdl("dataWaterDdl", "电导率", "uS/cm", "sys/icon/shebei_icon_waterddl.png", "6_water", "#92D0F3", "sys/mobile/icon/shebei_icon_waterddl.png", "sys/bs/icon/shebei_icon_waterddl.png", "shebei_icon_waterddl.png"),
 
     //面源数据
-    dataWaterTp("dataWaterTp", "总磷", "mg/L", "sys/icon/shebei_icon_tp.png", "water", "#C8CC00", "sys/mobile/icon/shebei_icon_tp.png", "sys/bs/icon/shebei_icon_tp.png", "shebei_icon_tp.png"),
+    dataWaterTp("dataWaterTpSy", "总磷", "mg/L", "sys/icon/shebei_icon_tp.png", "water", "#C8CC00", "sys/mobile/icon/shebei_icon_tp.png", "sys/bs/icon/shebei_icon_tp.png", "shebei_icon_tp.png"),
-    dataWaterTn("dataWaterTn", "总氮", "mg/L", "sys/icon/shebei_icon_tn.png", "water", "#009DB2", "sys/mobile/icon/shebei_icon_tn.png", "sys/bs/icon/shebei_icon_tn.png", "shebei_icon_tn.png"),
+    dataWaterTn("dataWaterTnSy", "总氮", "mg/L", "sys/icon/shebei_icon_tn.png", "water", "#009DB2", "sys/mobile/icon/shebei_icon_tn.png", "sys/bs/icon/shebei_icon_tn.png", "shebei_icon_tn.png"),
-    dataWaterNo("dataWaterNo", "硝态氮", "mg/L", "sys/icon/shebei_icon_no3n.png", "water_orient", "#72BAA7", "sys/mobile/icon/shebei_icon_no3n.png", "sys/bs/icon/shebei_icon_no3n.png", "shebei_icon_no3n.png"),
+    dataWaterNo("dataWaterNoSy", "硝态氮", "mg/L", "sys/icon/shebei_icon_no3n.png", "water_orient", "#72BAA7", "sys/mobile/icon/shebei_icon_no3n.png", "sys/bs/icon/shebei_icon_no3n.png", "shebei_icon_no3n.png"),
-    dataWaterNh("dataWaterNh", "氨氮", "mg/L", "sys/icon/shebei_icon_nh3n.png", "water_live", "#225A1F", "sys/mobile/icon/shebei_icon_nh3n.png", "sys/bs/icon/shebei_icon_nh3n.png", "shebei_icon_nh3n.png"),
+    dataWaterNh("dataWaterNhSy", "氨氮", "mg/L", "sys/icon/shebei_icon_nh3n.png", "water_live", "#225A1F", "sys/mobile/icon/shebei_icon_nh3n.png", "sys/bs/icon/shebei_icon_nh3n.png", "shebei_icon_nh3n.png"),
-    dataWaterCod("dataWaterCod", "化学需氧量", "mg/L", "sys/icon/shebei_icon_cod.png", "water_live", "#FDB933", "sys/mobile/icon/shebei_icon_cod.png", "sys/bs/icon/shebei_icon_cod.png", "shebei_icon_cod.png"),
+    dataWaterCod("dataWaterCodSy", "化学需氧量", "mg/L", "sys/icon/shebei_icon_cod.png", "water_live", "#FDB933", "sys/mobile/icon/shebei_icon_cod.png", "sys/bs/icon/shebei_icon_cod.png", "shebei_icon_cod.png"),
 
     //恶臭
     dataStinkOu("dataOu","臭气浓度","mg/m³","sys/icon/zhandian_icon_ou.png","stink","#f47a75", "sys/mobile/icon/shebei_icon_ou.png", "sys/bs/icon/shebei_icon_ou.png", "shebei_icon_ou.png"),

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataLivestockwater.java

@@ -73,22 +73,97 @@ public class SurvHisdataLivestockwater implements Serializable {
 	@Excel(name = "总磷", width = 15)
     @ApiModelProperty(value = "总磷")
     private String dataWaterTp;
+    /**总磷水样*/
+    @Excel(name = "总磷水样", width = 15)
+    @ApiModelProperty(value = "总磷水样")
+    private String dataWaterTpSy;
+    /**总磷零点*/
+    @Excel(name = "总磷零点", width = 15)
+    @ApiModelProperty(value = "总磷零点")
+    private String dataWaterTpLd;
 	/**总氮*/
 	@Excel(name = "总氮", width = 15)
     @ApiModelProperty(value = "总氮")
     private String dataWaterTn;
-	/**硝态氮*/
+    /**总氮水样*/
-	@Excel(name = "硝态氮", width = 15)
+    @Excel(name = "总氮水样", width = 15)
-    @ApiModelProperty(value = "硝态氮")
+    @ApiModelProperty(value = "总氮水样")
-    private String dataWaterNo;
+    private String dataWaterTnSy;
+    /**总氮零点*/
+    @Excel(name = "总氮零点", width = 15)
+    @ApiModelProperty(value = "总氮零点")
+    private String dataWaterTnLd;
+
 	/**氨氮*/
 	@Excel(name = "氨氮", width = 15)
     @ApiModelProperty(value = "氨氮")
     private String dataWaterNh;
+    /**氨氮*/
+    @Excel(name = "氨氮", width = 15)
+    @ApiModelProperty(value = "氨氮")
+    private String dataWaterNhSy;
+    /**氨氮*/
+    @Excel(name = "氨氮", width = 15)
+    @ApiModelProperty(value = "氨氮")
+    private String dataWaterNhLd;
+
 	/**化学需氧量*/
 	@Excel(name = "化学需氧量", width = 15)
     @ApiModelProperty(value = "化学需氧量")
     private String dataWaterCod;
+    /**化学需氧量*/
+    @Excel(name = "化学需氧量", width = 15)
+    @ApiModelProperty(value = "化学需氧量")
+    private String dataWaterCodSy;
+    /**化学需氧量*/
+    @Excel(name = "化学需氧量", width = 15)
+    @ApiModelProperty(value = "化学需氧量")
+    private String dataWaterCodLd;
+
+    /**硝态氮*/
+    @Excel(name = "硝态氮", width = 15)
+    @ApiModelProperty(value = "硝态氮")
+    private String dataWaterNo;
+    /**硝态氮*/
+    @Excel(name = "硝态氮", width = 15)
+    @ApiModelProperty(value = "硝态氮")
+    private String dataWaterNoSy;
+    /**硝态氮*/
+    @Excel(name = "硝态氮", width = 15)
+    @ApiModelProperty(value = "硝态氮")
+    private String dataWaterNoLd;
+
+
+
+    /**液位*/
+    @Excel(name = "液位", width = 15)
+    @ApiModelProperty(value = "液位")
+    private String fluidLevel;
+    /**1#球阀状态*/
+    @Excel(name = "1#球阀状态", width = 15)
+    @ApiModelProperty(value = "1#球阀状态")
+    private String firstValveStatus;
+    /**2#球阀状态*/
+    @Excel(name = "2#球阀状态", width = 15)
+    @ApiModelProperty(value = "2#球阀状态")
+    private String secondValveStatus;
+    /**3#球阀状态 */
+    @TableField("THIRD_VALVE_STATUS")
+    private String thirdValveStatus;
+    /**急停状态*/
+    @Excel(name = "急停状态", width = 15)
+    @ApiModelProperty(value = "急停状态")
+    private String crashStopStatus;
+    /**水泵状态*/
+    @Excel(name = "水泵状态", width = 15)
+    @ApiModelProperty(value = "水泵状态")
+    private String waterPumpStatus;
+    /**主副泵状态*/
+    @Excel(name = "主副泵状态", width = 15)
+    @ApiModelProperty(value = "主副泵状态")
+    private String mainSideStatus;
+
+
 	/**数据更新时间*/
 	@Excel(name = "数据更新时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -134,31 +209,8 @@ public class SurvHisdataLivestockwater implements Serializable {
     @ApiModelProperty(value = "转储时间")
     private Date transDate;
 
-    /**液位*/
+
-    @Excel(name = "液位", width = 15)
+
-    @ApiModelProperty(value = "液位")
+
-    private String fluidLevel;
+
-    /**1#球阀状态*/
-    @Excel(name = "1#球阀状态", width = 15)
-    @ApiModelProperty(value = "1#球阀状态")
-    private String firstValveStatus;
-    /**2#球阀状态*/
-    @Excel(name = "2#球阀状态", width = 15)
-    @ApiModelProperty(value = "2#球阀状态")
-    private String secondValveStatus;
-    /**3#球阀状态 */
-    @TableField("THIRD_VALVE_STATUS")
-    private String thirdValveStatus;
-    /**急停状态*/
-    @Excel(name = "急停状态", width = 15)
-    @ApiModelProperty(value = "急停状态")
-    private String crashStopStatus;
-    /**水泵状态*/
-    @Excel(name = "水泵状态", width = 15)
-    @ApiModelProperty(value = "水泵状态")
-    private String waterPumpStatus;
-    /**主副泵状态*/
-    @Excel(name = "主副泵状态", width = 15)
-    @ApiModelProperty(value = "主副泵状态")
-    private String mainSideStatus;
 }

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataOrientwater.java

@@ -73,22 +73,94 @@ public class SurvHisdataOrientwater implements Serializable {
 	@Excel(name = "总磷", width = 15)
     @ApiModelProperty(value = "总磷")
     private String dataWaterTp;
+    /**总磷水样*/
+    @Excel(name = "总磷水样", width = 15)
+    @ApiModelProperty(value = "总磷水样")
+    private String dataWaterTpSy;
+    /**总磷零点*/
+    @Excel(name = "总磷零点", width = 15)
+    @ApiModelProperty(value = "总磷零点")
+    private String dataWaterTpLd;
 	/**总氮*/
 	@Excel(name = "总氮", width = 15)
     @ApiModelProperty(value = "总氮")
     private String dataWaterTn;
+    /**总氮水样*/
+    @Excel(name = "总氮水样", width = 15)
+    @ApiModelProperty(value = "总氮水样")
+    private String dataWaterTnSy;
+    /**总氮零点*/
+    @Excel(name = "总氮零点", width = 15)
+    @ApiModelProperty(value = "总氮零点")
+    private String dataWaterTnLd;
 	/**氨氮*/
 	@Excel(name = "氨氮", width = 15)
     @ApiModelProperty(value = "氨氮")
     private String dataWaterNh;
+    /**氨氮*/
+    @Excel(name = "氨氮", width = 15)
+    @ApiModelProperty(value = "氨氮")
+    private String dataWaterNhSy;
+    /**氨氮*/
+    @Excel(name = "氨氮", width = 15)
+    @ApiModelProperty(value = "氨氮")
+    private String dataWaterNhLd;
+
 	/**化学需氧量*/
 	@Excel(name = "化学需氧量", width = 15)
     @ApiModelProperty(value = "化学需氧量")
     private String dataWaterCod;
+
+    /**化学需氧量*/
+    @Excel(name = "化学需氧量", width = 15)
+    @ApiModelProperty(value = "化学需氧量")
+    private String dataWaterCodSy;
+    /**化学需氧量*/
+    @Excel(name = "化学需氧量", width = 15)
+    @ApiModelProperty(value = "化学需氧量")
+    private String dataWaterCodLd;
 	/**硝态氮*/
 	@Excel(name = "硝态氮", width = 15)
     @ApiModelProperty(value = "硝态氮")
     private String dataWaterNo;
+    /**硝态氮*/
+    @Excel(name = "硝态氮", width = 15)
+    @ApiModelProperty(value = "硝态氮")
+    private String dataWaterNoSy;
+    /**硝态氮*/
+    @Excel(name = "硝态氮", width = 15)
+    @ApiModelProperty(value = "硝态氮")
+    private String dataWaterNoLd;
+
+    /**液位*/
+    @Excel(name = "液位", width = 15)
+    @ApiModelProperty(value = "液位")
+    private String fluidLevel;
+    /**1#球阀状态*/
+    @Excel(name = "1#球阀状态", width = 15)
+    @ApiModelProperty(value = "1#球阀状态")
+    private String firstValveStatus;
+    /**2#球阀状态*/
+    @Excel(name = "2#球阀状态", width = 15)
+    @ApiModelProperty(value = "2#球阀状态")
+    private String secondValveStatus;
+    /**3#球阀状态 */
+    @TableField("THIRD_VALVE_STATUS")
+    private String thirdValveStatus;
+    /**急停状态*/
+    @Excel(name = "急停状态", width = 15)
+    @ApiModelProperty(value = "急停状态")
+    private String crashStopStatus;
+    /**水泵状态*/
+    @Excel(name = "水泵状态", width = 15)
+    @ApiModelProperty(value = "水泵状态")
+    private String waterPumpStatus;
+    /**主副泵状态*/
+    @Excel(name = "主副泵状态", width = 15)
+    @ApiModelProperty(value = "主副泵状态")
+    private String mainSideStatus;
+
+
 	/**数据更新时间*/
 	@Excel(name = "数据更新时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -131,49 +203,8 @@ public class SurvHisdataOrientwater implements Serializable {
     @ApiModelProperty(value = "转储时间")
     private Date transDate;
 
-    /**总磷水样*/
+
-    @Excel(name = "总磷水样", width = 15)
+
-    @ApiModelProperty(value = "总磷水样")
-    private String dataWaterTpSy;
-    /**总磷零点*/
-    @Excel(name = "总磷零点", width = 15)
-    @ApiModelProperty(value = "总磷零点")
-    private String dataWaterTpLd;
-    /**总氮水样*/
-    @Excel(name = "总氮水样", width = 15)
-    @ApiModelProperty(value = "总氮水样")
-    private String dataWaterTnSy;
-    /**总氮零点*/
-    @Excel(name = "总氮零点", width = 15)
-    @ApiModelProperty(value = "总氮零点")
-    private String dataWaterTnLd;
-    /**液位*/
-    @Excel(name = "液位", width = 15)
-    @ApiModelProperty(value = "液位")
-    private String fluidLevel;
-    /**1#球阀状态*/
-    @Excel(name = "1#球阀状态", width = 15)
-    @ApiModelProperty(value = "1#球阀状态")
-    private String firstValveStatus;
-    /**2#球阀状态*/
-    @Excel(name = "2#球阀状态", width = 15)
-    @ApiModelProperty(value = "2#球阀状态")
-    private String secondValveStatus;
-    /**3#球阀状态 */
-    @TableField("THIRD_VALVE_STATUS")
-    private String thirdValveStatus;
-    /**急停状态*/
-    @Excel(name = "急停状态", width = 15)
-    @ApiModelProperty(value = "急停状态")
-    private String crashStopStatus;
-    /**水泵状态*/
-    @Excel(name = "水泵状态", width = 15)
-    @ApiModelProperty(value = "水泵状态")
-    private String waterPumpStatus;
-    /**主副泵状态*/
-    @Excel(name = "主副泵状态", width = 15)
-    @ApiModelProperty(value = "主副泵状态")
-    private String mainSideStatus;
 
     /**站点名称*/
     @Excel(name = "站点名称", width = 15)

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataVocs.java

@@ -35,6 +35,9 @@ public class SurvHisdataVocs implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
+    @Excel(name = "设备ID", width = 15)
+    @ApiModelProperty(value = "设备id")
+    private java.lang.String deployId;
 	/**总挥发性有机物*/
 	@Excel(name = "总挥发性有机物", width = 15)
     @ApiModelProperty(value = "总挥发性有机物")

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvHisdataVocsMin.java

@@ -35,6 +35,9 @@ public class SurvHisdataVocsMin implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
+    @Excel(name = "设备ID", width = 15)
+    @ApiModelProperty(value = "设备id")
+    private java.lang.String deployId;
 	/**总挥发性有机物分钟最小*/
 	@Excel(name = "总挥发性有机物分钟最小", width = 15)
     @ApiModelProperty(value = "总挥发性有机物分钟最小")

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvStationInfo.java

@@ -17,6 +17,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.TypeHandler;
 import org.jeecg.common.mybatis.typehandler.ArrayStringTypeHandler;
+import org.jeecg.common.vo.CommonDataTrans;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
@@ -177,7 +178,7 @@ public class SurvStationInfo implements Serializable {
     private List<String> survItemList;
 
     @TableField(exist = false)
-    private JSONObject newestData;
+    private List<CommonDataTrans> newestData;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "最新水监测数据")
@@ -185,19 +186,19 @@ public class SurvStationInfo implements Serializable {
 
     @TableField(exist = false)
     @ApiModelProperty(value = "最新土壤监测数据")
-    private JSONArray latestSoilData;
+    private List<CommonDataTrans> latestSoilData;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "最新空气监测数据")
-    private JSONArray latestAirData;
+    private List<CommonDataTrans> latestAirData;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "最新恶臭监测数据")
-    private JSONArray latestStinkData;
+    private List<CommonDataTrans> latestStinkData;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "最新五常水质监测数据")
-    private JSONArray latestWaterData;
+    private List<CommonDataTrans> latestWaterData;
 
     @TableField(exist = false)
     private String name;

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataLivestockwater.java

@@ -73,14 +73,95 @@ public class SurvTransdataLivestockwater implements Serializable {
     @Excel(name = "总磷", width = 15)
     @ApiModelProperty(value = "总磷")
     private String dataWaterTp;
+    /**总磷水样*/
+    @Excel(name = "总磷水样", width = 15)
+    @ApiModelProperty(value = "总磷水样")
+    private String dataWaterTpSy;
+    /**总磷零点*/
+    @Excel(name = "总磷零点", width = 15)
+    @ApiModelProperty(value = "总磷零点")
+    private String dataWaterTpLd;
     /**总氮*/
     @Excel(name = "总氮", width = 15)
     @ApiModelProperty(value = "总氮")
     private String dataWaterTn;
+    /**总氮水样*/
+    @Excel(name = "总氮水样", width = 15)
+    @ApiModelProperty(value = "总氮水样")
+    private String dataWaterTnSy;
+    /**总氮零点*/
+    @Excel(name = "总氮零点", width = 15)
+    @ApiModelProperty(value = "总氮零点")
+    private String dataWaterTnLd;
+
+
+    /**氨氮*/
+    @Excel(name = "氨氮", width = 15)
+    @ApiModelProperty(value = "氨氮")
+    private String dataWaterNh;
+    /**氨氮*/
+    @Excel(name = "氨氮", width = 15)
+    @ApiModelProperty(value = "氨氮")
+    private String dataWaterNhSy;
+    /**氨氮*/
+    @Excel(name = "氨氮", width = 15)
+    @ApiModelProperty(value = "氨氮")
+    private String dataWaterNhLd;
+    /**化学需氧量*/
+    @Excel(name = "化学需氧量", width = 15)
+    @ApiModelProperty(value = "化学需氧量")
+    private String dataWaterCod;
+    /**化学需氧量*/
+    @Excel(name = "化学需氧量", width = 15)
+    @ApiModelProperty(value = "化学需氧量")
+    private String dataWaterCodSy;
+    /**化学需氧量*/
+    @Excel(name = "化学需氧量", width = 15)
+    @ApiModelProperty(value = "化学需氧量")
+    private String dataWaterCodLd;
+
 	/**硝态氮*/
 	@Excel(name = "硝态氮", width = 15)
     @ApiModelProperty(value = "硝态氮")
     private String dataWaterNo;
+    /**硝态氮*/
+    @Excel(name = "硝态氮", width = 15)
+    @ApiModelProperty(value = "硝态氮")
+    private String dataWaterNoSy;
+    /**硝态氮*/
+    @Excel(name = "硝态氮", width = 15)
+    @ApiModelProperty(value = "硝态氮")
+    private String dataWaterNoLd;
+
+    /**液位*/
+    @Excel(name = "液位", width = 15)
+    @ApiModelProperty(value = "液位")
+    private String fluidLevel;
+    /**1#球阀状态*/
+    @Excel(name = "1#球阀状态", width = 15)
+    @ApiModelProperty(value = "1#球阀状态")
+    private String firstValveStatus;
+    /**2#球阀状态*/
+    @Excel(name = "2#球阀状态", width = 15)
+    @ApiModelProperty(value = "2#球阀状态")
+    private String secondValveStatus;
+    /**3#球阀状态 */
+    @TableField("THIRD_VALVE_STATUS")
+    private String thirdValveStatus;
+    /**急停状态*/
+    @Excel(name = "急停状态", width = 15)
+    @ApiModelProperty(value = "急停状态")
+    private String crashStopStatus;
+    /**水泵状态*/
+    @Excel(name = "水泵状态", width = 15)
+    @ApiModelProperty(value = "水泵状态")
+    private String waterPumpStatus;
+    /**主副泵状态*/
+    @Excel(name = "主副泵状态", width = 15)
+    @ApiModelProperty(value = "主副泵状态")
+    private String mainSideStatus;
+
+
 	/**数据更新时间*/
 	@Excel(name = "数据更新时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -91,14 +172,7 @@ public class SurvTransdataLivestockwater implements Serializable {
 	@Excel(name = "数据获取类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据", width = 15)
     @ApiModelProperty(value = "数据获取类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据")
     private String dataGatherType;
-	/**氨氮*/
+
-	@Excel(name = "氨氮", width = 15)
-    @ApiModelProperty(value = "氨氮")
-    private String dataWaterNh;
-	/**化学需氧量*/
-	@Excel(name = "化学需氧量", width = 15)
-    @ApiModelProperty(value = "化学需氧量")
-    private String dataWaterCod;
 	/**站点ID*/
 	@Excel(name = "站点ID", width = 15)
     @ApiModelProperty(value = "站点ID")
@@ -129,31 +203,5 @@ public class SurvTransdataLivestockwater implements Serializable {
     private String deviceName;
 
 
-    /**液位*/
+
-    @Excel(name = "液位", width = 15)
-    @ApiModelProperty(value = "液位")
-    private String fluidLevel;
-    /**1#球阀状态*/
-    @Excel(name = "1#球阀状态", width = 15)
-    @ApiModelProperty(value = "1#球阀状态")
-    private String firstValveStatus;
-    /**2#球阀状态*/
-    @Excel(name = "2#球阀状态", width = 15)
-    @ApiModelProperty(value = "2#球阀状态")
-    private String secondValveStatus;
-    /**3#球阀状态 */
-    @TableField("THIRD_VALVE_STATUS")
-    private String thirdValveStatus;
-    /**急停状态*/
-    @Excel(name = "急停状态", width = 15)
-    @ApiModelProperty(value = "急停状态")
-    private String crashStopStatus;
-    /**水泵状态*/
-    @Excel(name = "水泵状态", width = 15)
-    @ApiModelProperty(value = "水泵状态")
-    private String waterPumpStatus;
-    /**主副泵状态*/
-    @Excel(name = "主副泵状态", width = 15)
-    @ApiModelProperty(value = "主副泵状态")
-    private String mainSideStatus;
 }

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataOrientwater.java

@@ -73,57 +73,6 @@ public class SurvTransdataOrientwater implements Serializable {
 	@Excel(name = "总磷", width = 15)
     @ApiModelProperty(value = "总磷")
     private String dataWaterTp;
-	/**总氮*/
-	@Excel(name = "总氮", width = 15)
-    @ApiModelProperty(value = "总氮")
-    private String dataWaterTn;
-	/**氨氮*/
-	@Excel(name = "氨氮", width = 15)
-    @ApiModelProperty(value = "氨氮")
-    private String dataWaterNh;
-	/**化学需氧量*/
-	@Excel(name = "化学需氧量", width = 15)
-    @ApiModelProperty(value = "化学需氧量")
-    private String dataWaterCod;
-	/**数据更新时间*/
-	@Excel(name = "数据更新时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "数据更新时间")
-    private Date dataDateTime;
-	/**数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据*/
-	@Excel(name = "数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据", width = 15)
-    @ApiModelProperty(value = "数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据")
-    private String dataGatherType;
-	/**硝态氮*/
-	@Excel(name = "硝态氮", width = 15)
-    @ApiModelProperty(value = "硝态氮")
-    private String dataWaterNo;
-	/**站点ID*/
-	@Excel(name = "站点ID", width = 15)
-    @ApiModelProperty(value = "站点ID")
-    private String stationId;
-	/**设备ID*/
-	@Excel(name = "设备ID", width = 15)
-    @ApiModelProperty(value = "设备ID")
-    private String deviceId;
-	/**站点编号*/
-	@Excel(name = "站点编号", width = 15)
-    @ApiModelProperty(value = "站点编号")
-    private String stationCode;
-	/**设备编号*/
-	@Excel(name = "设备编号", width = 15)
-    @ApiModelProperty(value = "设备编号")
-    private String deployCode;
-	/**机构ID*/
-	@Excel(name = "机构ID", width = 15)
-    @ApiModelProperty(value = "机构ID")
-    private String corpId;
-
-	/**设备名称*/
-	@Excel(name = "设备名称", width = 15)
-    @ApiModelProperty(value = "设备名称")
-    private String deviceName;
     /**总磷水样*/
     @Excel(name = "总磷水样", width = 15)
     @ApiModelProperty(value = "总磷水样")
@@ -132,6 +81,10 @@ public class SurvTransdataOrientwater implements Serializable {
     @Excel(name = "总磷零点", width = 15)
     @ApiModelProperty(value = "总磷零点")
     private String dataWaterTpLd;
+	/**总氮*/
+	@Excel(name = "总氮", width = 15)
+    @ApiModelProperty(value = "总氮")
+    private String dataWaterTn;
     /**总氮水样*/
     @Excel(name = "总氮水样", width = 15)
     @ApiModelProperty(value = "总氮水样")
@@ -140,6 +93,45 @@ public class SurvTransdataOrientwater implements Serializable {
     @Excel(name = "总氮零点", width = 15)
     @ApiModelProperty(value = "总氮零点")
     private String dataWaterTnLd;
+	/**氨氮*/
+	@Excel(name = "氨氮", width = 15)
+    @ApiModelProperty(value = "氨氮")
+    private String dataWaterNh;
+    /**氨氮*/
+    @Excel(name = "氨氮", width = 15)
+    @ApiModelProperty(value = "氨氮")
+    private String dataWaterNhSy;
+    /**氨氮*/
+    @Excel(name = "氨氮", width = 15)
+    @ApiModelProperty(value = "氨氮")
+    private String dataWaterNhLd;
+	/**化学需氧量*/
+	@Excel(name = "化学需氧量", width = 15)
+    @ApiModelProperty(value = "化学需氧量")
+    private String dataWaterCod;
+    /**化学需氧量*/
+    @Excel(name = "化学需氧量", width = 15)
+    @ApiModelProperty(value = "化学需氧量")
+    private String dataWaterCodSy;
+    /**化学需氧量*/
+    @Excel(name = "化学需氧量", width = 15)
+    @ApiModelProperty(value = "化学需氧量")
+    private String dataWaterCodLd;
+    /**硝态氮*/
+    @Excel(name = "硝态氮", width = 15)
+    @ApiModelProperty(value = "硝态氮")
+    private String dataWaterNo;
+    /**硝态氮*/
+    @Excel(name = "硝态氮", width = 15)
+    @ApiModelProperty(value = "硝态氮")
+    private String dataWaterNoSy;
+    /**硝态氮*/
+    @Excel(name = "硝态氮", width = 15)
+    @ApiModelProperty(value = "硝态氮")
+    private String dataWaterNoLd;
+
+
+
     /**液位*/
     @Excel(name = "液位", width = 15)
     @ApiModelProperty(value = "液位")
@@ -168,6 +160,45 @@ public class SurvTransdataOrientwater implements Serializable {
     @ApiModelProperty(value = "主副泵状态")
     private String mainSideStatus;
 
+	/**数据更新时间*/
+	@Excel(name = "数据更新时间", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "数据更新时间")
+    private Date dataDateTime;
+	/**数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据*/
+	@Excel(name = "数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据", width = 15)
+    @ApiModelProperty(value = "数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据")
+    private String dataGatherType;
+
+	/**站点ID*/
+	@Excel(name = "站点ID", width = 15)
+    @ApiModelProperty(value = "站点ID")
+    private String stationId;
+	/**设备ID*/
+	@Excel(name = "设备ID", width = 15)
+    @ApiModelProperty(value = "设备ID")
+    private String deviceId;
+	/**站点编号*/
+	@Excel(name = "站点编号", width = 15)
+    @ApiModelProperty(value = "站点编号")
+    private String stationCode;
+	/**设备编号*/
+	@Excel(name = "设备编号", width = 15)
+    @ApiModelProperty(value = "设备编号")
+    private String deployCode;
+	/**机构ID*/
+	@Excel(name = "机构ID", width = 15)
+    @ApiModelProperty(value = "机构ID")
+    private String corpId;
+
+	/**设备名称*/
+	@Excel(name = "设备名称", width = 15)
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+
+
     /**站点名称*/
     @Excel(name = "站点名称", width = 15)
     @ApiModelProperty(value = "站点名称")

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataVocs.java

@@ -35,6 +35,9 @@ public class SurvTransdataVocs implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
+    @Excel(name = "设备ID", width = 15)
+    @ApiModelProperty(value = "设备id")
+    private java.lang.String deployId;
 	/**总挥发性有机物*/
 	@Excel(name = "总挥发性有机物", width = 15)
     @ApiModelProperty(value = "总挥发性有机物")

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/entity/SurvTransdataVocsMin.java

@@ -35,6 +35,9 @@ public class SurvTransdataVocsMin implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
+    @Excel(name = "设备ID", width = 15)
+    @ApiModelProperty(value = "设备id")
+    private java.lang.String deployId;
 	/**总挥发性有机物分钟最小*/
 	@Excel(name = "总挥发性有机物分钟最小", width = 15)
     @ApiModelProperty(value = "总挥发性有机物分钟最小")

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateLiveDetail.java

@@ -16,6 +16,13 @@ public class VOSurvIntegrateLiveDetail {
     @ApiModelProperty(value = "大气温度(mg/L)")
     private String dataWaterTp;
 
+    /**
+     * 总磷
+     */
+    @Excel(name = "总磷水样(mg/L)", width = 15)
+    @ApiModelProperty(value = "总磷水样(mg/L)")
+    private String dataWaterTpSy;
+
     /**
      * 总氮
      */
@@ -23,6 +30,13 @@ public class VOSurvIntegrateLiveDetail {
     @ApiModelProperty(value = "大气湿度(mg/L)")
     private String dataWaterTn;
 
+    /**
+     * 总氮
+     */
+    @Excel(name = "总氮水样(mg/L)", width = 15)
+    @ApiModelProperty(value = "总氮水样(mg/L)")
+    private String dataWaterTnSy;
+
     /**
      * 硝态氮
      */

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/iot/common/VOSurvIntegrateOrientDetail.java

@@ -13,16 +13,30 @@ public class VOSurvIntegrateOrientDetail {
      * 总磷
      */
     @Excel(name = "总磷(mg/L)", width = 15)
-    @ApiModelProperty(value = "大气温度(mg/L)")
+    @ApiModelProperty(value = "总磷(mg/L)")
     private String dataWaterTp;
 
+    /**
+     * 总磷
+     */
+    @Excel(name = "总磷水样(mg/L)", width = 15)
+    @ApiModelProperty(value = "总磷水样(mg/L)")
+    private String dataWaterTpSy;
+
     /**
      * 总氮
      */
     @Excel(name = "总氮(mg/L)", width = 15)
-    @ApiModelProperty(value = "大气湿度(mg/L)")
+    @ApiModelProperty(value = "总氮(mg/L)")
     private String dataWaterTn;
 
+    /**
+     * 总氮
+     */
+    @Excel(name = "总氮水样(mg/L)", width = 15)
+    @ApiModelProperty(value = "总氮水样(mg/L)")
+    private String dataWaterTnSy;
+
     /**
      * 硝态氮
      */

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/OrientDataTrans.java

@@ -19,6 +19,8 @@ public class OrientDataTrans {
 
     private double avgNO;
 
+    private double avgNH;
+
     private double avgCod;
 }
 

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/SurvTransdataLivestockwaterVo.java

@@ -36,22 +36,67 @@ public class SurvTransdataLivestockwaterVo implements Serializable {
     @Excel(name = "总磷", width = 15)
     @ApiModelProperty(value = "总磷")
     private String dataWaterTp;
+    /**总磷水样*/
+    @Excel(name = "总磷水样", width = 15)
+    @ApiModelProperty(value = "总磷水样")
+    private String dataWaterTpSy;
+    /**总磷零点*/
+    @Excel(name = "总磷零点", width = 15)
+    @ApiModelProperty(value = "总磷零点")
+    private String dataWaterTpLd;
     /**总氮*/
     @Excel(name = "总氮", width = 15)
     @ApiModelProperty(value = "总氮")
     private String dataWaterTn;
-	/**硝态氮*/
+    /**总氮水样*/
-	@Excel(name = "硝态氮", width = 15)
+    @Excel(name = "总氮水样", width = 15)
-    @ApiModelProperty(value = "硝态氮")
+    @ApiModelProperty(value = "总氮水样")
-    private String dataWaterNo;
+    private String dataWaterTnSy;
+    /**总氮零点*/
+    @Excel(name = "总氮零点", width = 15)
+    @ApiModelProperty(value = "总氮零点")
+    private String dataWaterTnLd;
     /**氨氮*/
     @Excel(name = "氨氮", width = 15)
     @ApiModelProperty(value = "氨氮")
     private String dataWaterNh;
+    /**氨氮*/
+    @Excel(name = "氨氮", width = 15)
+    @ApiModelProperty(value = "氨氮")
+    private String dataWaterNhSy;
+    /**氨氮*/
+    @Excel(name = "氨氮", width = 15)
+    @ApiModelProperty(value = "氨氮")
+    private String dataWaterNhLd;
     /**化学需氧量*/
     @Excel(name = "化学需氧量", width = 15)
     @ApiModelProperty(value = "化学需氧量")
     private String dataWaterCod;
+    /**化学需氧量*/
+    @Excel(name = "化学需氧量", width = 15)
+    @ApiModelProperty(value = "化学需氧量")
+    private String dataWaterCodSy;
+    /**化学需氧量*/
+    @Excel(name = "化学需氧量", width = 15)
+    @ApiModelProperty(value = "化学需氧量")
+    private String dataWaterCodLd;
+    /**硝态氮*/
+    @Excel(name = "硝态氮", width = 15)
+    @ApiModelProperty(value = "硝态氮")
+    private String dataWaterNo;
+    /**硝态氮*/
+    @Excel(name = "硝态氮", width = 15)
+    @ApiModelProperty(value = "硝态氮")
+    private String dataWaterNoSy;
+    /**硝态氮*/
+    @Excel(name = "硝态氮", width = 15)
+    @ApiModelProperty(value = "硝态氮")
+    private String dataWaterNoLd;
+
+
+
+
+
 	/**设备编号*/
 	@Excel(name = "设备编号", width = 15)
     @ApiModelProperty(value = "设备编号")

zh-module-applet/zh-applet-common/src/main/java/org/jeecg/common/vo/SurvTransdataOrientwaterVo.java

@@ -37,22 +37,63 @@ public class SurvTransdataOrientwaterVo implements Serializable {
     @Excel(name = "总磷", width = 15)
     @ApiModelProperty(value = "总磷")
     private String dataWaterTp;
+    /**总磷水样*/
+    @Excel(name = "总磷水样", width = 15)
+    @ApiModelProperty(value = "总磷水样")
+    private String dataWaterTpSy;
+    /**总磷零点*/
+    @Excel(name = "总磷零点", width = 15)
+    @ApiModelProperty(value = "总磷零点")
+    private String dataWaterTpLd;
     /**总氮*/
     @Excel(name = "总氮", width = 15)
     @ApiModelProperty(value = "总氮")
     private String dataWaterTn;
+    /**总氮水样*/
+    @Excel(name = "总氮水样", width = 15)
+    @ApiModelProperty(value = "总氮水样")
+    private String dataWaterTnSy;
+    /**总氮零点*/
+    @Excel(name = "总氮零点", width = 15)
+    @ApiModelProperty(value = "总氮零点")
+    private String dataWaterTnLd;
     /**氨氮*/
     @Excel(name = "氨氮", width = 15)
     @ApiModelProperty(value = "氨氮")
     private String dataWaterNh;
+    /**氨氮*/
+    @Excel(name = "氨氮", width = 15)
+    @ApiModelProperty(value = "氨氮")
+    private String dataWaterNhSy;
+    /**氨氮*/
+    @Excel(name = "氨氮", width = 15)
+    @ApiModelProperty(value = "氨氮")
+    private String dataWaterNhLd;
     /**化学需氧量*/
     @Excel(name = "化学需氧量", width = 15)
     @ApiModelProperty(value = "化学需氧量")
     private String dataWaterCod;
+    /**化学需氧量*/
+    @Excel(name = "化学需氧量", width = 15)
+    @ApiModelProperty(value = "化学需氧量")
+    private String dataWaterCodSy;
+    /**化学需氧量*/
+    @Excel(name = "化学需氧量", width = 15)
+    @ApiModelProperty(value = "化学需氧量")
+    private String dataWaterCodLd;
     /**硝态氮*/
     @Excel(name = "硝态氮", width = 15)
     @ApiModelProperty(value = "硝态氮")
     private String dataWaterNo;
+    /**硝态氮*/
+    @Excel(name = "硝态氮", width = 15)
+    @ApiModelProperty(value = "硝态氮")
+    private String dataWaterNoSy;
+    /**硝态氮*/
+    @Excel(name = "硝态氮", width = 15)
+    @ApiModelProperty(value = "硝态氮")
+    private String dataWaterNoLd;
+
 	/**设备编号*/
 	@Excel(name = "设备编号", width = 15)
     @ApiModelProperty(value = "设备编号")