主表失控状态同步更新

GetDataByView/src/main/java/com/jyxt/getdatabyview/HandleData.java

@@ -86,8 +86,9 @@ public class HandleData {
                         String JsonStr = fridge.getJsonStr();
                         String retString = handJsonStr(JsonStr,wsdEntityList,fridgeMonitor);
                         String hasFinished = retString.split("@")[0];
-                        String newJsonStr = retString.split("@")[1];
-                        ibpsRepository.saveMonitoredData(undoFridgeID, hasFinished, newJsonStr);
+                        String contrlFlag = retString.split("@")[1];
+                        String newJsonStr = retString.split("@")[2];
+                        ibpsRepository.saveMonitoredData(undoFridgeID, hasFinished, contrlFlag, newJsonStr);
                     }
                 }
             }
@@ -108,6 +109,7 @@ public class HandleData {
         String retVal = JsonStr;
         log.info("org json string:"+JsonStr);
         String hasFinished = "1";
+        String contrlFlag = "正常";
         // 字符串转List<Map>
         List<Map<String, String>> jsonList = mapper.readValue(JsonStr, List.class);
         for(Map<String, String> jsonMap : jsonList){
@@ -127,6 +129,9 @@ public class HandleData {
                         curResult = wsdEntity.getResult();
                         curCollectTime = wsdEntity.getCollectTime();
                         curFlag = wsdEntity.getControlFlag();
+                        if (!curFlag.equals("正常")) {
+                            contrlFlag = curFlag;
+                        }
                         break;
                     }
                 }
@@ -142,6 +147,9 @@ public class HandleData {
                         curResult = wsdEntity.getResult();
                         curCollectTime = wsdEntity.getCollectTime();
                         curFlag = wsdEntity.getControlFlag();
+                        if (!curFlag.equals("正常")) {
+                            contrlFlag = curFlag;
+                        }
                         break;
                     }
                 }
@@ -157,6 +165,9 @@ public class HandleData {
                         curResult = wsdEntity.getResult();
                         curCollectTime = wsdEntity.getCollectTime();
                         curFlag = wsdEntity.getControlFlag();
+                        if (!curFlag.equals("正常")) {
+                            contrlFlag = curFlag;
+                        }
                         break;
                     }
                 }
@@ -175,7 +186,7 @@ public class HandleData {
         }
         JsonStr = mapper.writeValueAsString(jsonList);
         log.info("new json string:"+JsonStr);
-        return hasFinished+"@"+JsonStr;
+        return hasFinished+"@"+contrlFlag+"@"+JsonStr;
     }
 
 }

GetDataByView/src/main/java/com/jyxt/getdatabyview/view/HuaTuRepository.java

@@ -93,16 +93,17 @@ public class HuaTuRepository {
             /**
              * 正式启用开启这一段
              *  **/
-             String sqlQry = "SELECT COUNT(*) as result FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'sql' AND TABLE_NAME = 'LOGS_"+ equipSn +"'";
+//             String sqlQry = "SELECT COUNT(*) as result FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'sql' AND TABLE_NAME = 'LOGS_"+ equipSn +"'";
 
             /**
              * 测试调试开启这一段
              *
              * String sqlQry = "SELECT COUNT(*) as result FROM information_schema.tables WHERE table_schema = 'klims-ibps3' AND table_name = 'LOGS_"+ equipSn +"'";
              */
-            List<String> hastable = jdbcTemplate.queryForList(sqlQry, String.class);
+//            List<String> hastable = jdbcTemplate.queryForList(sqlQry, String.class);
 //            log.info("hastable: " + hastable.get(0));
-            if (Objects.equals(hastable.get(0), "1")) {
+//            if (Objects.equals(hastable.get(0), "1")) {
+            if (true) {
                 List<EquipResult> equipResultList = jdbcTemplate.query(subSql, humitureRowMapper);
                 for (EquipResult equipResult : equipResultList) {
                     String curDate = "";
@@ -132,7 +133,7 @@ public class HuaTuRepository {
                         //0 温度 1 湿度
                         if (type1==0){
                             wsdEntity.setType("温度");
-                            if(toLoggerInfo.getLOW1()>0){
+                            if(toLoggerInfo.getLOW1()>=0){
                                 wsdEntity.setNote("冷藏");
                             }
                             if(toLoggerInfo.getHIGH1()<0){
@@ -174,7 +175,7 @@ public class HuaTuRepository {
                                 //0 温度 1 湿度
                                 if (type1==0){
                                     wsdEntity.setType("温度");
-                                    if(toLoggerInfo.getLOW1()>0){
+                                    if(toLoggerInfo.getLOW1()>=0){
                                         wsdEntity.setNote("冷藏");
                                     }
                                     if(toLoggerInfo.getHIGH1()<0){
@@ -194,7 +195,7 @@ public class HuaTuRepository {
                                 //0 温度 1 湿度
                                 if (type2==0){
                                     wsdEntity.setType("温度");
-                                    if(toLoggerInfo.getLOW2()>0){
+                                    if(toLoggerInfo.getLOW2()>=0){
                                         wsdEntity.setNote("冷藏");
                                     }
                                     if(toLoggerInfo.getHIGH2()<0){
@@ -214,7 +215,7 @@ public class HuaTuRepository {
                                 //0 温度 1 湿度
                                 if (type3==0){
                                     wsdEntity.setType("温度");
-                                    if(toLoggerInfo.getLOW3()>0){
+                                    if(toLoggerInfo.getLOW3()>=0){
                                         wsdEntity.setNote("冷藏");
                                     }
                                     if(toLoggerInfo.getHIGH3()<0){
@@ -234,7 +235,7 @@ public class HuaTuRepository {
                                 //0 温度 1 湿度
                                 if (type4==0){
                                     wsdEntity.setType("温度");
-                                    if(toLoggerInfo.getLOW4()>0){
+                                    if(toLoggerInfo.getLOW4()>=0){
                                         wsdEntity.setNote("冷藏");
                                     }
                                     if(toLoggerInfo.getHIGH4()<0){
@@ -263,6 +264,7 @@ public class HuaTuRepository {
                 log.info("table:LOGS_"+equipSn+" not exist!");
             }
         }
+//        }
         return new LinkedList<>(wsdlist);
     }
 

GetDataByView/src/main/java/com/jyxt/getdatabyview/view/IBPSRepository.java

@@ -111,12 +111,12 @@ public class IBPSRepository {
 
     public List<WSDEntity> getWSDEntityList(String CurDate, String Type,String DeviceNo) {
         List<WSDEntity> wsdEntityList = jdbcTemplate.query(
-                "select id,collectTime,collectID,collectName,shiYanZu,result,deviceNo,type,note,controlFlag from t_dsfwsdjlb where date(collectTime)=? and deviceNo=? order by collectTime desc",
+                "select id_,collecttime,collectID,collectName,shiYanZu,result,deviceNo,type,note,controlFlag from t_dsfwsdjlb where date(collectTime)=? and deviceNo=? order by collectTime desc",
                 new RowMapper<WSDEntity>() {
                     @Override
                     public WSDEntity mapRow(ResultSet rs, int rowNum) throws SQLException {
                         WSDEntity entity = new WSDEntity();
-                        entity.setId(rs.getString("id"));
+                        entity.setId(rs.getString("id_"));
                         entity.setCollectTime(rs.getTimestamp("collectTime"));
                         entity.setCollectID(rs.getString("collectID"));
                         entity.setCollectName(rs.getString("collectName"));
@@ -142,16 +142,17 @@ public class IBPSRepository {
      * @param hasFinished
      * @param newJsonStr
      */
-    public void saveMonitoredData(String undoMonitorID, String hasFinished, String newJsonStr){
+    public void saveMonitoredData(String undoMonitorID, String hasFinished, String contrlFlag, String newJsonStr){
         final String sql = hasFinished.equals("1")
-                ? "update t_bxwdjkjlb set lie_biao_shu_ju_=?, update_time_=?, bei_zhu_='自动导入', shi_fou_guo_shen_='已完成' where id_=?"
-                : "update t_bxwdjkjlb set lie_biao_shu_ju_=?, update_time_=?, bei_zhu_='自动导入' where id_=?";
+                ? "update t_bxwdjkjlb set lie_biao_shu_ju_=?, update_time_=?, bei_zhu_='自动导入', shi_kong_zhuang_t =?, shi_fou_guo_shen_='已完成' where id_=?"
+                : "update t_bxwdjkjlb set lie_biao_shu_ju_=?, update_time_=?, bei_zhu_='自动导入', shi_kong_zhuang_t =? where id_=?";
         jdbcTemplate.update(new PreparedStatementCreator() {
             public PreparedStatement createPreparedStatement(Connection connection) throws SQLException {
                 PreparedStatement prepareStatement = connection.prepareStatement(sql);
                 prepareStatement.setString(1, newJsonStr);
                 prepareStatement.setTimestamp(2, new Timestamp(System.currentTimeMillis()));  // 设置当前时间
-                prepareStatement.setString(3, undoMonitorID);
+                prepareStatement.setString(3, contrlFlag);
+                prepareStatement.setString(4, undoMonitorID);
                 return prepareStatement;
             }
         });