From 607796545d4654b93a4df8f2a0ddd08aa0c1061e Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 06 Jun 2024 16:44:57 +0800
Subject: [PATCH] 水尺监测入库逻辑调整
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkStaffGaugeMonServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 35 insertions(+), 24 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkStaffGaugeMonServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkStaffGaugeMonServiceImpl.java
index 9b68342..a3b0c8b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkStaffGaugeMonServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkStaffGaugeMonServiceImpl.java
@@ -9,12 +9,14 @@
import cn.gistack.sm.hk.vo.HkStaffGaugeMonVO;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.Date;
+import java.util.List;
import java.util.Map;
import static cn.gistack.sm.hk.constant.HkConstant.waterGaugeURLs;
@@ -64,30 +66,39 @@
JSONArray jsonArray = jsonObject.getJSONArray("data");
if (null!= jsonArray && jsonArray.size()>0) {
for (int i = 0; i < jsonArray.size(); i++) {
- HkStaffGaugeMon hkStaffGaugeMon = new HkStaffGaugeMon();
- // 设置数据
- hkStaffGaugeMon.setId(IdUtils.getIdBy36());
- hkStaffGaugeMon.setGaugeMonId(jsonArray.getJSONObject(i).getString("id"));
- hkStaffGaugeMon.setWaterGaugeName(jsonArray.getJSONObject(i).getString("waterGaugeName"));
- hkStaffGaugeMon.setWaterGaugeCode(jsonArray.getJSONObject(i).getString("waterGaugeCode"));
- hkStaffGaugeMon.setCameraIndexCode(jsonArray.getJSONObject(i).getString("cameraIndexCode"));
- hkStaffGaugeMon.setCameraName(jsonArray.getJSONObject(i).getString("cameraName"));
- hkStaffGaugeMon.setLocation(jsonArray.getJSONObject(i).getString("location"));
- hkStaffGaugeMon.setMarkPic(jsonArray.getJSONObject(i).getString("markPic"));
- hkStaffGaugeMon.setMarkData(jsonArray.getJSONObject(i).getString("markData"));
- hkStaffGaugeMon.setCreateTime(jsonArray.getJSONObject(i).getDate("createTime"));
- hkStaffGaugeMon.setConfigUpdateTime(jsonArray.getJSONObject(i).getDate("configUpdateTime"));
- hkStaffGaugeMon.setUpdateTime(jsonArray.getJSONObject(i).getDate("updateTime"));
- hkStaffGaugeMon.setDeleteStatus(jsonArray.getJSONObject(i).getInteger("deleteStatus"));
- hkStaffGaugeMon.setCurrentPic(jsonArray.getJSONObject(i).getString("currentPic"));
- hkStaffGaugeMon.setAlarmHeight(jsonArray.getJSONObject(i).getDouble("alarmHeight"));
- hkStaffGaugeMon.setRemark1(jsonArray.getJSONObject(i).getString("remark1"));
- hkStaffGaugeMon.setRemark2(jsonArray.getJSONObject(i).getString("remark2"));
- hkStaffGaugeMon.setRemark3(jsonArray.getJSONObject(i).getString("remark3"));
- hkStaffGaugeMon.setRemark4(jsonArray.getJSONObject(i).getString("remark4"));
- hkStaffGaugeMon.setRemark5(jsonArray.getJSONObject(i).getString("remark5"));
- // 保存
- save(hkStaffGaugeMon);
+ String cameraIndexCode = jsonArray.getJSONObject(i).getString("cameraIndexCode");
+ Date updateTime = jsonArray.getJSONObject(i).getDate("updateTime");
+ // 查询去重
+ QueryWrapper<HkStaffGaugeMon> wrapper = new QueryWrapper<>();
+ wrapper.eq("camera_index_code",cameraIndexCode).eq("update_time",updateTime);
+ List<HkStaffGaugeMon> list = list(wrapper);
+ if (list.size()==0) {
+ HkStaffGaugeMon hkStaffGaugeMon = new HkStaffGaugeMon();
+ // 设置数据
+ hkStaffGaugeMon.setId(IdUtils.getIdBy36());
+ hkStaffGaugeMon.setGaugeMonId(jsonArray.getJSONObject(i).getString("id"));
+ hkStaffGaugeMon.setWaterGaugeName(jsonArray.getJSONObject(i).getString("waterGaugeName"));
+ hkStaffGaugeMon.setWaterGaugeCode(jsonArray.getJSONObject(i).getString("waterGaugeCode"));
+ hkStaffGaugeMon.setCameraIndexCode(jsonArray.getJSONObject(i).getString("cameraIndexCode"));
+ hkStaffGaugeMon.setCameraName(jsonArray.getJSONObject(i).getString("cameraName"));
+ hkStaffGaugeMon.setLocation(jsonArray.getJSONObject(i).getString("location"));
+ hkStaffGaugeMon.setMarkPic(jsonArray.getJSONObject(i).getString("markPic"));
+ hkStaffGaugeMon.setMarkData(jsonArray.getJSONObject(i).getString("markData"));
+ hkStaffGaugeMon.setCreateTime(jsonArray.getJSONObject(i).getDate("createTime"));
+ hkStaffGaugeMon.setConfigUpdateTime(jsonArray.getJSONObject(i).getDate("configUpdateTime"));
+ hkStaffGaugeMon.setUpdateTime(jsonArray.getJSONObject(i).getDate("updateTime"));
+ hkStaffGaugeMon.setDeleteStatus(jsonArray.getJSONObject(i).getInteger("deleteStatus"));
+ hkStaffGaugeMon.setCurrentPic(jsonArray.getJSONObject(i).getString("currentPic"));
+ hkStaffGaugeMon.setAlarmHeight(jsonArray.getJSONObject(i).getDouble("alarmHeight"));
+ hkStaffGaugeMon.setRemark1(jsonArray.getJSONObject(i).getString("remark1"));
+ hkStaffGaugeMon.setRemark2(jsonArray.getJSONObject(i).getString("remark2"));
+ hkStaffGaugeMon.setRemark3(jsonArray.getJSONObject(i).getString("remark3"));
+ hkStaffGaugeMon.setRemark4(jsonArray.getJSONObject(i).getString("remark4"));
+ hkStaffGaugeMon.setRemark5(jsonArray.getJSONObject(i).getString("remark5"));
+ hkStaffGaugeMon.setSysCreateTime(new Date());
+ // 保存
+ save(hkStaffGaugeMon);
+ }
}
}
}
--
Gitblit v1.9.3