huangws пре 8 месеци
родитељ
комит
2a6ec13531

+ 0 - 15
GetDataByRESTful/src/main/java/com/jyxt/getdatabyrestful/service/IBPSService.java

@@ -44,21 +44,6 @@ public class IBPSService {
     }
 
 
-    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_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, contrlFlag);
-//                prepareStatement.setString(4, undoMonitorID);
-//                return prepareStatement;
-//            }
-//        });
-    }
 
     public String UpdateData(String TableName, String id, String retJsonStr, String JsonFlag, String timeSlot, String timeStr){
         // 解析状态标志

+ 4 - 4
GetDataByRESTful/src/main/java/com/jyxt/getdatabyrestful/service/PlatformService.java

@@ -96,10 +96,10 @@ public class PlatformService {
                                             String registerName = item.has("registerName") ? item.get("registerName").asText() : "未命名寄存器";
                                             String data = item.has("data") ? item.get("data").asText() : "无数据";
                                             // 填充数据
-                                            sensor.put("deviceName", deviceName);
-                                            sensor.put("deviceAddr", deviceAddr);
-                                            sensor.put("registerName", registerName);
-                                            sensor.put("data", data);
+                                            sensor.put("deviceName", deviceName);       //设备名称
+                                            sensor.put("deviceAddr", deviceAddr);       //设备ID
+                                            sensor.put("registerName", registerName);   //探头类别
+                                            sensor.put("data", data);                   //温度&湿度结果
 
                                             log.info("deviceName: {}, deviceAddr: {}, registerName: {}, data: {}",
                                                     deviceName, deviceAddr, registerName, data);