日报和工业数据新增JSON数组字符串存放某些池子的数据合集

slibra-quartz/src/main/java/com/slibra/quartz/task/RyTask.java

@@ -267,6 +267,17 @@ public class RyTask
                     }else if ("信义污水厂除磷加药瞬时流量".equals(type)) {
                         industry.setCLJYSSLL(value);
                     }
+                    //2024年4月22日15:45:24  额外保存两个字段 数组
+                    List<BigDecimal> extraList = new ArrayList<>();
+                    extraList.add(industry.getOneHyzdDo());
+                    extraList.add(industry.getOneHymdDo());
+                    extraList.add(industry.getTwoHyzdDo());
+                    extraList.add(industry.getTwoHymdDo());
+                    industry.setHycRjyAll(JSON.toJSONString(extraList));
+                    extraList.clear();
+                    extraList.add(industry.getOneMlss());
+                    extraList.add(industry.getTwoMlss());
+                    industry.setHycWnndAll(JSON.toJSONString(extraList));
                     //只有最后一次才执行数据库添加
                     if(finalJ == list.size()-1){
                         //插入数据库
@@ -366,11 +377,20 @@ public class RyTask
         System.out.println(str);
         System.out.println(str.substring(0,10));
         System.out.println(str.substring(0,13));*/
-        String str = "2024/04/18 08:00";
+
+        /*String str = "2024/04/18 08:00";
         str = str + ":00";
         System.out.println(str);
         LocalDateTime startTime = LocalDateTime.parse(str.replaceAll("/", "-").replace(" ", "T"));
-        System.out.println(startTime.plusMinutes(1L).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        System.out.println(startTime.plusMinutes(1L).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));*/
+
+        ArrayList<Integer> objects = new ArrayList<>();
+        objects.add(1);
+        objects.add(2);
+        objects.add(3);
+        System.out.println(objects);
+        objects.clear();
+        System.out.println(objects);
 
     }
 }

slibra-system/src/main/java/com/slibra/business/domain/TXinyiDaily.java

@@ -235,6 +235,34 @@ public class TXinyiDaily extends BaseEntity
     @Excel(name = "投药后 BOD₅/TN")
     private BigDecimal tyhBod5Tn;
 
+    /** 好氧池溶解氧集合 */
+    @Excel(name = "好氧池溶解氧集合")
+    private String hycRjyAll;
+
+    /** 好氧池污泥浓度集合 */
+    @Excel(name = "好氧池污泥浓度集合")
+    private String hycWnndAll;
+
+    /** 厌氧池溶解氧集合 */
+    @Excel(name = "厌氧池溶解氧集合")
+    private String yycRjyAll;
+
+    /** 缺氧池溶解氧集合 */
+    @Excel(name = "缺氧池溶解氧集合")
+    private String qycRjyAll;
+
+    /** 污泥沉降比集合 */
+    @Excel(name = "污泥沉降比集合")
+    private String wncjbAll;
+
+    /** 污泥体积指数集合 */
+    @Excel(name = "污泥体积指数集合")
+    private String wntjzsAll;
+
+    /** 挥发性污泥浓度集合 */
+    @Excel(name = "挥发性污泥浓度集合")
+    private String hfxwnndAll;
+
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")

slibra-system/src/main/java/com/slibra/business/domain/TXinyiIndustry.java

@@ -226,6 +226,14 @@ public class TXinyiIndustry
     @Excel(name = "信义污水厂除磷加药瞬时流量")
     private BigDecimal CLJYSSLL;
 
+    /** 好氧池溶解氧集合 */
+    @Excel(name = "好氧池溶解氧集合")
+    private String hycRjyAll;
+
+    /** 好氧池污泥浓度集合 */
+    @Excel(name = "好氧池污泥浓度集合")
+    private String hycWnndAll;
+
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")

slibra-system/src/main/resources/mapper/business/TXinyiDailyMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.slibra.business.mapper.TXinyiDailyMapper">
-    
+
     <resultMap type="TXinyiDaily" id="TXinyiDailyResult">
         <result property="ID"    column="ID"    />
         <result property="testDate"    column="TEST_DATE"    />
@@ -58,16 +58,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="CNL"    column="CNL"    />
         <result property="tyqBod5Tn"    column="TYQ_BOD5_TN"    />
         <result property="tyhBod5Tn"    column="TYH_BOD5_TN"    />
+        <result property="hycRjyAll"    column="HYC_RJY_ALL"    />
+        <result property="hycWnndAll"    column="HYC_WNND_ALL"    />
+        <result property="yycRjyAll"    column="YYC_RJY_ALL"    />
+        <result property="qycRjyAll"    column="QYC_RJY_ALL"    />
+        <result property="wncjbAll"    column="WNCJB_ALL"    />
+        <result property="wntjzsAll"    column="WNTJZS_ALL"    />
+        <result property="hfxwnndAll"    column="HFXWNND_ALL"    />
         <result property="createdTime"    column="CREATED_TIME"    />
     </resultMap>
 
     <sql id="selectTXinyiDailyVo">
-        select ID, TEST_DATE, TEST_HOUR, TEST_TIME, SORT, JS_COD, JS_PH, JS_BOD5, JS_SS, JS_NH3, JS_TN, JS_TP, JS_DCGJ, CS_COD, CS_PH, CS_BOD5, CS_SS, CS_NH3, CS_TN, CS_TP, CS_DCGJ, JS_SW, CS_SW, SHC_ONE_PH, SHC_TWO_PH, SHC_HY_ONE_SV, SHC_HY_TWO_SV, SHC_HY_ONE_SVI, SHC_HY_TWO_SVI, SHC_HY_ONE_MLSS, SHC_HY_TWO_MLSS, SHC_HY_ONE_MLVSS, SHC_HY_TWO_MLVSS, SHC_YY_ONE_DO, SHC_YY_TWO_DO, SHC_QY_ONE_DO, SHC_QY_TWO_DO, SHC_HY_ONE_DO, SHC_HY_TWO_DO, JSL, CSL, SDCLCXSL, QSB, F_M, YY_HRT, HY_HRT, QY_HRT, NHL_R, WHL_R, SRT, CNL, TYQ_BOD5_TN, TYH_BOD5_TN, CREATED_TIME from t_xinyi_daily
+        select ID, TEST_DATE, TEST_HOUR, TEST_TIME, SORT, JS_COD, JS_PH, JS_BOD5, JS_SS, JS_NH3, JS_TN, JS_TP, JS_DCGJ, CS_COD, CS_PH, CS_BOD5, CS_SS, CS_NH3, CS_TN, CS_TP, CS_DCGJ, JS_SW, CS_SW, SHC_ONE_PH, SHC_TWO_PH, SHC_HY_ONE_SV, SHC_HY_TWO_SV, SHC_HY_ONE_SVI, SHC_HY_TWO_SVI, SHC_HY_ONE_MLSS, SHC_HY_TWO_MLSS, SHC_HY_ONE_MLVSS, SHC_HY_TWO_MLVSS, SHC_YY_ONE_DO, SHC_YY_TWO_DO, SHC_QY_ONE_DO, SHC_QY_TWO_DO, SHC_HY_ONE_DO, SHC_HY_TWO_DO, JSL, CSL, SDCLCXSL, QSB, F_M, YY_HRT, HY_HRT, QY_HRT, NHL_R, WHL_R, SRT, CNL, TYQ_BOD5_TN, TYH_BOD5_TN, HYC_RJY_ALL, HYC_WNND_ALL, YYC_RJY_ALL, QYC_RJY_ALL, WNCJB_ALL, WNTJZS_ALL, HFXWNND_ALL, CREATED_TIME from t_xinyi_daily
     </sql>
 
     <select id="selectTXinyiDailyList" parameterType="TXinyiDaily" resultMap="TXinyiDailyResult">
         <include refid="selectTXinyiDailyVo"/>
-        <where>  
+        <where>
             <if test="testDate != null  and testDate != ''"> and TEST_DATE = #{testDate}</if>
             <if test="testHour != null  and testHour != ''"> and TEST_HOUR = #{testHour}</if>
             <if test="testTime != null  and testTime != ''"> and TEST_TIME = #{testTime}</if>
@@ -120,15 +127,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CNL != null "> and CNL = #{CNL}</if>
             <if test="tyqBod5Tn != null "> and TYQ_BOD5_TN = #{tyqBod5Tn}</if>
             <if test="tyhBod5Tn != null "> and TYH_BOD5_TN = #{tyhBod5Tn}</if>
+            <if test="hycRjyAll != null  and hycRjyAll != ''"> and HYC_RJY_ALL = #{hycRjyAll}</if>
+            <if test="hycWnndAll != null  and hycWnndAll != ''"> and HYC_WNND_ALL = #{hycWnndAll}</if>
+            <if test="yycRjyAll != null  and yycRjyAll != ''"> and YYC_RJY_ALL = #{yycRjyAll}</if>
+            <if test="qycRjyAll != null  and qycRjyAll != ''"> and QYC_RJY_ALL = #{qycRjyAll}</if>
+            <if test="wncjbAll != null  and wncjbAll != ''"> and WNCJB_ALL = #{wncjbAll}</if>
+            <if test="wntjzsAll != null  and wntjzsAll != ''"> and WNTJZS_ALL = #{wntjzsAll}</if>
+            <if test="hfxwnndAll != null  and hfxwnndAll != ''"> and HFXWNND_ALL = #{hfxwnndAll}</if>
             <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
         </where>
     </select>
-    
+
     <select id="selectTXinyiDailyByID" parameterType="Long" resultMap="TXinyiDailyResult">
         <include refid="selectTXinyiDailyVo"/>
         where ID = #{ID}
     </select>
-        
+
     <insert id="insertTXinyiDaily" parameterType="TXinyiDaily" useGeneratedKeys="true" keyProperty="ID">
         insert into t_xinyi_daily
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -184,6 +198,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CNL != null">CNL,</if>
             <if test="tyqBod5Tn != null">TYQ_BOD5_TN,</if>
             <if test="tyhBod5Tn != null">TYH_BOD5_TN,</if>
+            <if test="hycRjyAll != null">HYC_RJY_ALL,</if>
+            <if test="hycWnndAll != null">HYC_WNND_ALL,</if>
+            <if test="yycRjyAll != null">YYC_RJY_ALL,</if>
+            <if test="qycRjyAll != null">QYC_RJY_ALL,</if>
+            <if test="wncjbAll != null">WNCJB_ALL,</if>
+            <if test="wntjzsAll != null">WNTJZS_ALL,</if>
+            <if test="hfxwnndAll != null">HFXWNND_ALL,</if>
             <if test="createdTime != null">CREATED_TIME,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -239,6 +260,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CNL != null">#{CNL},</if>
             <if test="tyqBod5Tn != null">#{tyqBod5Tn},</if>
             <if test="tyhBod5Tn != null">#{tyhBod5Tn},</if>
+            <if test="hycRjyAll != null">#{hycRjyAll},</if>
+            <if test="hycWnndAll != null">#{hycWnndAll},</if>
+            <if test="yycRjyAll != null">#{yycRjyAll},</if>
+            <if test="qycRjyAll != null">#{qycRjyAll},</if>
+            <if test="wncjbAll != null">#{wncjbAll},</if>
+            <if test="wntjzsAll != null">#{wntjzsAll},</if>
+            <if test="hfxwnndAll != null">#{hfxwnndAll},</if>
             <if test="createdTime != null">#{createdTime},</if>
          </trim>
     </insert>
@@ -298,6 +326,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="CNL != null">CNL = #{CNL},</if>
             <if test="tyqBod5Tn != null">TYQ_BOD5_TN = #{tyqBod5Tn},</if>
             <if test="tyhBod5Tn != null">TYH_BOD5_TN = #{tyhBod5Tn},</if>
+            <if test="hycRjyAll != null">HYC_RJY_ALL = #{hycRjyAll},</if>
+            <if test="hycWnndAll != null">HYC_WNND_ALL = #{hycWnndAll},</if>
+            <if test="yycRjyAll != null">YYC_RJY_ALL = #{yycRjyAll},</if>
+            <if test="qycRjyAll != null">QYC_RJY_ALL = #{qycRjyAll},</if>
+            <if test="wncjbAll != null">WNCJB_ALL = #{wncjbAll},</if>
+            <if test="wntjzsAll != null">WNTJZS_ALL = #{wntjzsAll},</if>
+            <if test="hfxwnndAll != null">HFXWNND_ALL = #{hfxwnndAll},</if>
             <if test="createdTime != null">CREATED_TIME = #{createdTime},</if>
         </trim>
         where ID = #{ID}

slibra-system/src/main/resources/mapper/business/TXinyiIndustryMapper.xml

@@ -57,11 +57,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="kqllSix"    column="KQLL_SIX"    />
         <result property="SJTYJLY"    column="SJTYJLY"    />
         <result property="CLJYSSLL"    column="CLJYSSLL"    />
+        <result property="hycRjyAll"    column="HYC_RJY_ALL"    />
+        <result property="hycWnndAll"    column="HYC_WNND_ALL"    />
         <result property="createdTime"    column="CREATED_TIME"    />
     </resultMap>
 
     <sql id="selectTXinyiIndustryVo">
-        select ID, TEST_DATE, TEST_HOUR, TEST_TIME, JS_COD, JS_PH, JS_SS, JS_TP, JS_TN, JS_NH3, JS_SW_PH, JS_BFYW, CS_SLQC, CS_COD, CS_PH, CS_SS, CS_TN, CS_TP, CS_NH3, ONE_HYZD_DO, ONE_HYMD_DO, TWO_HYZD_DO, TWO_HYMD_DO, ONE_MLSS, TWO_MLSS, JS_TDS, JS_SLQ, N_HLB_ONE_GP, N_HLB_TWO_GP, N_HLB_THREE_GP, N_HLB_FOUR_GP, NHL_B_FIVE_GP, N_HLB_SIX_GP, W_HLB_ONE_GP, W_HLB_TWO_GP, W_HLB_THREE_GP, W_HLB_FOUR_GP, W_HLB_FIVE_GP, FJ_ONE, FJ_TWO, FJ_THREE, FJ_FOUR, FJ_FIVE, FJ_SIX, KQLL_ONE, KQLL_TWO, KQLL_THREE, KQLL_FOUR, KQLL_FIVE, KQLL_SIX, SJTYJLY, CLJYSSLL, CREATED_TIME from t_xinyi_industry
+        select ID, TEST_DATE, TEST_HOUR, TEST_TIME, JS_COD, JS_PH, JS_SS, JS_TP, JS_TN, JS_NH3, JS_SW_PH, JS_BFYW, CS_SLQC, CS_COD, CS_PH, CS_SS, CS_TN, CS_TP, CS_NH3, ONE_HYZD_DO, ONE_HYMD_DO, TWO_HYZD_DO, TWO_HYMD_DO, ONE_MLSS, TWO_MLSS, JS_TDS, JS_SLQ, N_HLB_ONE_GP, N_HLB_TWO_GP, N_HLB_THREE_GP, N_HLB_FOUR_GP, NHL_B_FIVE_GP, N_HLB_SIX_GP, W_HLB_ONE_GP, W_HLB_TWO_GP, W_HLB_THREE_GP, W_HLB_FOUR_GP, W_HLB_FIVE_GP, FJ_ONE, FJ_TWO, FJ_THREE, FJ_FOUR, FJ_FIVE, FJ_SIX, KQLL_ONE, KQLL_TWO, KQLL_THREE, KQLL_FOUR, KQLL_FIVE, KQLL_SIX, SJTYJLY, CLJYSSLL, HYC_RJY_ALL, HYC_WNND_ALL, CREATED_TIME from t_xinyi_industry
     </sql>
 
     <select id="selectTXinyiIndustryList" parameterType="TXinyiIndustry" resultMap="TXinyiIndustryResult">
@@ -118,6 +120,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="kqllSix != null "> and KQLL_SIX = #{kqllSix}</if>
             <if test="SJTYJLY != null "> and SJTYJLY = #{SJTYJLY}</if>
             <if test="CLJYSSLL != null "> and CLJYSSLL = #{CLJYSSLL}</if>
+            <if test="hycRjyAll != null  and hycRjyAll != ''"> and HYC_RJY_ALL = #{hycRjyAll}</if>
+            <if test="hycWnndAll != null  and hycWnndAll != ''"> and HYC_WNND_ALL = #{hycWnndAll}</if>
             <if test="createdTime != null "> and CREATED_TIME = #{createdTime}</if>
         </where>
     </select>
@@ -181,6 +185,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="kqllSix != null">KQLL_SIX,</if>
             <if test="SJTYJLY != null">SJTYJLY,</if>
             <if test="CLJYSSLL != null">CLJYSSLL,</if>
+            <if test="hycRjyAll != null">HYC_RJY_ALL,</if>
+            <if test="hycWnndAll != null">HYC_WNND_ALL,</if>
             <if test="createdTime != null">CREATED_TIME,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -235,6 +241,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="kqllSix != null">#{kqllSix},</if>
             <if test="SJTYJLY != null">#{SJTYJLY},</if>
             <if test="CLJYSSLL != null">#{CLJYSSLL},</if>
+            <if test="hycRjyAll != null">#{hycRjyAll},</if>
+            <if test="hycWnndAll != null">#{hycWnndAll},</if>
             <if test="createdTime != null">#{createdTime},</if>
         </trim>
     </insert>
@@ -293,6 +301,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="kqllSix != null">KQLL_SIX = #{kqllSix},</if>
             <if test="SJTYJLY != null">SJTYJLY = #{SJTYJLY},</if>
             <if test="CLJYSSLL != null">CLJYSSLL = #{CLJYSSLL},</if>
+            <if test="hycRjyAll != null">HYC_RJY_ALL = #{hycRjyAll},</if>
+            <if test="hycWnndAll != null">HYC_WNND_ALL = #{hycWnndAll},</if>
             <if test="createdTime != null">CREATED_TIME = #{createdTime},</if>
         </trim>
         where ID = #{ID}