From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 5bbc2d2..ca84e17 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -490,6 +490,7 @@
}*/
return list;
}
+
@Override
public WaningEventDataVO warningEventData(Integer type){
WaningEventDataVO lastResult = new WaningEventDataVO();
@@ -499,16 +500,39 @@
request.setPageSize(1000);
request.setFiledOptions(new ArrayList<>());
request.setSorts(new ArrayList<>());
+ request.setFetchImg(true);
RuleEventFiledOptionsRequest file = new RuleEventFiledOptionsRequest();
file.setFieldName("event_type");
- file.setFieldValue("131588,131593");//瀹夐槻鍛婅鍜屼汉鍛樺憡璀�
+ //瀹夐槻浜嬩欢鍒掑垎鏂瑰紡锛�
+ //閲嶇偣鍖哄煙锛氶噸鐐逛汉鍛�-1644175361銆佸尯鍩熷叆渚�-1644175361銆侀檶鐢熶汉-1644171265銆佽溅杈嗚繚鍋�-1644171265
+ //鍗遍櫓琛屼负锛氫汉鍛樺�掑湴-1644171265銆佹湭甯﹀畨鍏ㄥ附-422000002銆佹娊鐑�-422000000銆佹墦鐢佃瘽-422000001銆佺潯宀�-422400001銆佺宀�-422400000
+ file.setFieldValue("131588,131593,1644171265,422000002,422000000,422000001,422400001,422400000,1644175361,1644175361,1644171265,1644171265");//瀹夐槻鍛婅鍜屼汉鍛樺憡璀�
file.setType("in");
if(type == 1){
- file.setFieldValue("131588");//瀹夐槻鍛婅
+ file.setFieldValue("131588,1644175361,1644175361,1644171265,1644171265");//瀹夐槻鍛婅 鍖哄煙鍏ヤ镜
}else if(type == 2){
- file.setFieldValue("131593");//浜哄憳鍛婅
+ file.setFieldValue("131593,1644171265,422000002,422000000,422000001,422400001,422400000");//浜哄憳鍛婅 鍗遍櫓琛屼负
}
request.getFiledOptions().add(file);
+
+ RuleEventFiledOptionsRequest fileLte = new RuleEventFiledOptionsRequest();
+ fileLte.setFieldName("happen_time");
+ fileLte.setFieldValue(DateUtil.formatDate(Utils.Date.getEnd(new Date()),"yyyy-MM-dd HH:mm:ss"));
+ fileLte.setType("lte");
+ request.getFiledOptions().add(fileLte);
+
+ RuleEventFiledOptionsRequest fileGte = new RuleEventFiledOptionsRequest();
+ fileGte.setFieldName("happen_time");
+ fileGte.setFieldValue(DateUtil.formatDate(Utils.Date.getStart(new Date()),"yyyy-MM-dd HH:mm:ss"));
+ fileGte.setType("gte");
+ request.getFiledOptions().add(fileGte);
+
+ RuleEventFiledOptionsRequest fileStatus = new RuleEventFiledOptionsRequest();
+ fileStatus.setFieldName("handle_status");
+ fileStatus.setFieldValue("99");
+ fileStatus.setType("neq");
+ request.getFiledOptions().add(fileStatus);
+
SortRequest sort = new SortRequest();
sort.setSortField("happen_time");
sort.setSortType("desc");
@@ -524,6 +548,9 @@
try {
if(DateUtil.getISO8601DateByStr(r.getHappen_time()).getTime() < Utils.Date.getStart(new Date()).getTime()){
continue;
+ }
+ if(StringUtils.equals(r.getStatus(),"99")){
+ continue;
}
}catch (Exception e){
}
@@ -1552,12 +1579,13 @@
data.setDeviceTypeList(list);
Long totalNum =hiddenDangerMapper.selectCount(new QueryWrapper<HiddenDanger>().lambda()
.eq(HiddenDanger::getIsdeleted,Constants.ZERO )
- .apply("to_days(create_date) = to_days(now())" ) );
+ .apply(" DATE_FORMAT(create_date, '%Y-%m') = DATE_FORMAT(now(), '%Y-%m') " ) );
data.setDangerTotalNum(totalNum !=null?totalNum.intValue():0);//浠婃棩闅愭偅鏁伴噺
totalNum =hiddenDangerMapper.selectCount(new QueryWrapper<HiddenDanger>().lambda()
.eq(HiddenDanger::getIsdeleted,Constants.ZERO )
- .in(HiddenDanger::getStatus,Constants.ONE,Constants.TWO )
- .apply("to_days(check_date) = to_days(now())" ) );
+// .in(HiddenDanger::getStatus,Constants.ONE,Constants.TWO )
+ .eq(HiddenDanger::getStatus,Constants.ZERO )
+ .apply(" DATE_FORMAT(create_date, '%Y-%m') = DATE_FORMAT(now(), '%Y-%m') " ) );
data.setDangerDealedNum(totalNum !=null?totalNum.intValue():0);//浠婃棩澶勭悊闅愭偅鏁伴噺
return data;
}
--
Gitblit v1.9.3