From 51d25be2fac930b44a13784c311e7603009d7f6d Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期六, 29 三月 2025 10:47:22 +0800
Subject: [PATCH] 更新hik温度读取
---
src/main/java/com/whyc/service/BattStationTempService.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattStationTempService.java b/src/main/java/com/whyc/service/BattStationTempService.java
index 0da95da..7b7af62 100644
--- a/src/main/java/com/whyc/service/BattStationTempService.java
+++ b/src/main/java/com/whyc/service/BattStationTempService.java
@@ -1,14 +1,19 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.whyc.dto.Point;
import com.whyc.dto.Response;
import com.whyc.mapper.BattStationTempMapper;
import com.whyc.pojo.db_power_rt.BattStationTemp;
import com.whyc.util.ActionUtil;
+import com.whyc.util.PointUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.LinkedList;
import java.util.List;
@Service
@@ -18,15 +23,23 @@
private BattStationTempMapper mapper;
public Response<List<BattStationTemp>> getList() {
- List<BattStationTemp> list = mapper.selectList((Wrapper<BattStationTemp>) ActionUtil.objeNull);
+ QueryWrapper<BattStationTemp> query = Wrappers.query();
+ query.orderByAsc("camera_id");
+ List<BattStationTemp> list = mapper.selectList(query);
//瀵规俯搴﹀潗鏍囪繘琛岃В鏋�,minTempPoint鏍煎紡涓�"1*2,2*3",鎶婇噷闈㈡墍鏈夌殑x*y鐐� 鎷嗚В鍒癙oint(x,y)鍒楄〃涓�
list.stream().forEach(battStationTemp -> {
String minTempPointStr = battStationTemp.getMinTempPoint();
+
+ List<Point> minTempPointList = battStationTemp.getMinTempPointList();
+ minTempPointList = new LinkedList<>();
+
+ List<Point> maxTempPointList = battStationTemp.getMaxTempPointList();
+ maxTempPointList =new LinkedList<>();
if(minTempPointStr!=null&&!minTempPointStr.equals("")){
String[] split = minTempPointStr.split(",");
for (String s : split) {
String[] split1 = s.split("\\*");
- battStationTemp.getMinTempPointList().add(new Point(Integer.parseInt(split1[0]),Integer.parseInt(split1[1])));
+ minTempPointList.add(new Point(Integer.parseInt(split1[0]),Integer.parseInt(split1[1])));
}
}
String maxTempPointStr = battStationTemp.getMaxTempPoint();
@@ -38,11 +51,23 @@
//瀵逛簬鏈�楂樻俯搴︾偣 p(a,b)
//TODO 宸茬煡鍧愭爣鐐逛袱鐐逛负p1(a1,b1)鍜宲2(a2,b2), 姹� maxTempPoint鐐逛笌p1p2缁勬垚鐨勭嚎鍨傜洿鐩镐氦鐨勭偣p3鐨勫潗鏍囪绠楁柟寮�
- battStationTemp.getMaxTempPointList().add(p);
+ maxTempPointList.add(p);
}
}
});
return new Response<List<BattStationTemp>>().set(1,list);
}
+
+ public void addOrUpdate(BattStationTemp battStationTemp) {
+ QueryWrapper<BattStationTemp> query = Wrappers.query();
+ query.eq("camera_id",battStationTemp.getCameraId());
+ BattStationTemp tempInDB = mapper.selectOne(query);
+ if (tempInDB ==null) {
+ mapper.insert(battStationTemp);
+ }else{
+ battStationTemp.setId(tempInDB.getId());
+ mapper.updateById(battStationTemp);
+ }
+ }
}
--
Gitblit v1.9.1