From d186525f28330a2efb560c4eb9358a0730fbfd8b Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Thu, 06 Jun 2024 15:50:26 +0800
Subject: [PATCH] 新增字段及查询调整
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkStaffGaugeMonServiceImpl.java | 51 ++++++++++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 27 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 9aaa89d..9b68342 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
@@ -1,5 +1,6 @@
package cn.gistack.sm.hk.service.impl;
+import cn.gistack.common.utils.IdUtils;
import cn.gistack.sm.hk.entity.HkEvent;
import cn.gistack.sm.hk.entity.HkStaffGaugeMon;
import cn.gistack.sm.hk.mapper.HkStaffGaugeMonMapper;
@@ -64,33 +65,29 @@
if (null!= jsonArray && jsonArray.size()>0) {
for (int i = 0; i < jsonArray.size(); i++) {
HkStaffGaugeMon hkStaffGaugeMon = new HkStaffGaugeMon();
- String id = jsonArray.getJSONObject(i).getString("id");
- // 查询是否已存在
- HkStaffGaugeMon staffGaugeMon = getById(id);
- if (null==staffGaugeMon) {
- // 设置数据
- hkStaffGaugeMon.setId(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);
- }
+ // 设置数据
+ 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);
}
}
}
--
Gitblit v1.9.3