From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库：施工：项目查询过滤无效修复、根据角色查询用户
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkStaffGaugeMonServiceImpl.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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..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
@@ -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;
@@ -8,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;
@@ -63,13 +66,17 @@
JSONArray jsonArray = jsonObject.getJSONArray("data");
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) {
+ 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(id);
+ 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"));
@@ -88,6 +95,7 @@
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