From 3d9cc5b50c880f60f69e0164508a90427673a1e2 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 06 三月 2026 10:02:27 +0800
Subject: [PATCH] 功能优化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java | 28 +++++++-------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java | 44 +++++++++------------
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 4 --
3 files changed, 33 insertions(+), 43 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
index cc8b29e..cb579b2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java
@@ -398,7 +398,7 @@
maxMonth = DateUtil.getNowMonthNum();
}
for (int i = maxMonth; i >0 ; i--) {
- dateList.add(inParkDataDTO.getDateStr()+"-"+ StringUtils.leftPad(i+"",2,"0"));
+ dateList.add(DateUtil.getNowYearNum()+"-"+ StringUtils.leftPad(i+"",2,"0"));
}
}else {
//鏃ユ湡
@@ -554,31 +554,25 @@
@Override
public TelecomInParkDataVO getInParkDataForTelecom(){
TelecomInParkDataVO telecomInParkDataVO = new TelecomInParkDataVO();
- telecomInParkDataVO.setInCarNum(Constants.ZERO);
- telecomInParkDataVO.setInUserNum(Constants.ZERO);
- List<InoutRecord> listCar = inoutRecordMapper.selectList(new MPJLambdaWrapper<InoutRecord>()
- .eq(InoutRecord::getIsdeleted,Constants.ZERO)
- .eq(InoutRecord::getInOrOut,Constants.ZERO)
- .isNotNull(InoutRecord::getCarCode)
- .apply(" ( DATE_FORMAT(CREATE_DATE, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d') ) "));
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(listCar)){
- telecomInParkDataVO.setInCarNum(
- new HashSet<>(listCar.stream().map(i->i.getCarCode()).collect(Collectors.toList())).size()
- );
- }
+ telecomInParkDataVO.setInCarNum(
+ inoutRecordMapper.selectCount(new MPJLambdaWrapper<InoutRecord>()
+ .selectAll(InoutRecord.class)
+ .eq(InoutRecord::getIsdeleted,Constants.ZERO)
+ .eq(InoutRecord::getInOrOut,Constants.ZERO)
+ .isNotNull(InoutRecord::getCarCode)
+ .apply(" ( DATE_FORMAT(CREATE_DATE, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d') ) ")
+ .groupBy(InoutRecord::getCarCode)
+ ).intValue());
-
- List<InoutRecord> listUser = inoutRecordMapper.selectList(new MPJLambdaWrapper<InoutRecord>()
- .eq(InoutRecord::getIsdeleted,Constants.ZERO)
- .eq(InoutRecord::getInOrOut,Constants.ZERO)
- .isNotNull(InoutRecord::getMemberPhone)
- .apply(" ( DATE_FORMAT(CREATE_DATE, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d') ) "));
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(listUser)){
- telecomInParkDataVO.setInUserNum(
- new HashSet<>(listUser.stream().map(i->i.getMemberPhone()).collect(Collectors.toList())).size()
- );
- }
-
+ telecomInParkDataVO.setInUserNum(
+ inoutRecordMapper.selectCount(new MPJLambdaWrapper<InoutRecord>()
+ .selectAll(InoutRecord.class)
+ .eq(InoutRecord::getIsdeleted,Constants.ZERO)
+ .eq(InoutRecord::getInOrOut,Constants.ZERO)
+ .isNotNull(InoutRecord::getMemberPhone)
+ .apply(" ( DATE_FORMAT(CREATE_DATE, '%Y%m%d') = DATE_FORMAT(now(), '%Y%m%d') ) ")
+ .groupBy(InoutRecord::getMemberPhone)
+ ).intValue());
return telecomInParkDataVO;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
index 3d69da7..fd954d2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCabinetGridServiceImpl.java
@@ -771,20 +771,20 @@
map.put("is_start_trigger","true");
map.put("data",this.getJdyChildData(warningEvent,ddUserId));
- OkHttpClient client = new OkHttpClient().newBuilder()
- .build();
- MediaType mediaType = MediaType.parse("application/json");
- RequestBody body = RequestBody.create(mediaType, JSONObject.toJSONString(map));//"{\"data\":{\"notice_time\":{\"value\":\"2025-12-23 04:56:29\"},\"title\":{\"value\":\"璺ㄨ秺鐢熶骇绾縗"},\"user\":{\"value\":\"1568490244651036\"},\"content\":{\"value\":\"璺ㄨ秺鐢熶骇绾�-鑺滄箹鐗╂祦涓績鍖楀洿澧欒繃閬撲笢\"},\"notice_type\":{\"value\":\"璺ㄨ秺鐢熶骇绾縗"}},\"is_start_trigger\":\"true\",\"app_id\":\"6909d0fbdb93b068192dc4a9\",\"entry_id\":\"694a19ecf57e071788efc20b\",\"is_start_workflow\":\"false\"}");
- log.error("绠�閬撲簯鍙戦�侀�氱煡璇锋眰淇℃伅" + JSONObject.toJSONString(map));
- Request request = new Request.Builder()
- .url("https://api.jiandaoyun.com/api/v5/app/entry/data/create")
- .method("POST", body)
- .addHeader("Authorization", "Bearer "+jdyApiKey)
- .addHeader("Content-Type", "application/json")
- .build();
- Response response = client.newCall(request).execute();
-
- log.error("绠�閬撲簯鍙戦�侀�氱煡杩斿洖淇℃伅" + JSONObject.toJSONString(response));
+// OkHttpClient client = new OkHttpClient().newBuilder()
+// .build();
+// MediaType mediaType = MediaType.parse("application/json");
+// RequestBody body = RequestBody.create(mediaType, JSONObject.toJSONString(map));//"{\"data\":{\"notice_time\":{\"value\":\"2025-12-23 04:56:29\"},\"title\":{\"value\":\"璺ㄨ秺鐢熶骇绾縗"},\"user\":{\"value\":\"1568490244651036\"},\"content\":{\"value\":\"璺ㄨ秺鐢熶骇绾�-鑺滄箹鐗╂祦涓績鍖楀洿澧欒繃閬撲笢\"},\"notice_type\":{\"value\":\"璺ㄨ秺鐢熶骇绾縗"}},\"is_start_trigger\":\"true\",\"app_id\":\"6909d0fbdb93b068192dc4a9\",\"entry_id\":\"694a19ecf57e071788efc20b\",\"is_start_workflow\":\"false\"}");
+// log.error("绠�閬撲簯鍙戦�侀�氱煡璇锋眰淇℃伅" + JSONObject.toJSONString(map));
+// Request request = new Request.Builder()
+// .url("https://api.jiandaoyun.com/api/v5/app/entry/data/create")
+// .method("POST", body)
+// .addHeader("Authorization", "Bearer "+jdyApiKey)
+// .addHeader("Content-Type", "application/json")
+// .build();
+// Response response = client.newCall(request).execute();
+//
+// log.error("绠�閬撲簯鍙戦�侀�氱煡杩斿洖淇℃伅" + JSONObject.toJSONString(response));
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index bd3711c..3a663eb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -2124,10 +2124,6 @@
}
-
-
-
-
@Override
public StagingDataVO stagingHead(StagingDataVO stagingHeadVO){
//浜哄憳淇℃伅
--
Gitblit v1.9.3