From 42a8adae751bf130c17d0a361638ca10a39de81e Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 25 十二月 2025 14:05:41 +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/dao/business/vo/TelecomInParkDataVO.java | 25 ++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/InoutRecordServiceImpl.java | 31 +++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 4 --
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/TelecomApiController.java | 11 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InoutRecordService.java | 3 +
6 files changed, 84 insertions(+), 18 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/TelecomApiController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/TelecomApiController.java
index 431251b..32e9894 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/TelecomApiController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/TelecomApiController.java
@@ -47,6 +47,9 @@
@Autowired
private JkSketchService jkSketchService;
+ @Autowired
+ private InoutRecordService inoutRecordService;
+
@LoginNoRequired
@PreventRepeat
@@ -92,4 +95,12 @@
}
+ @LoginNoRequired
+ @PreventRepeat
+ @ApiOperation("鐢典俊-浠婃棩鍏ュ洯鏁版嵁")
+ @PostMapping("/getInParkData")
+ public ApiResponse<TelecomInParkDataVO> getInParkData () {
+ return ApiResponse.success(inoutRecordService.getInParkDataForTelecom());
+ }
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/TelecomInParkDataVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/TelecomInParkDataVO.java
new file mode 100644
index 0000000..23e25f3
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/TelecomInParkDataVO.java
@@ -0,0 +1,25 @@
+package com.doumee.dao.business.vo;
+
+import com.doumee.dao.business.model.JkCustomerNavigation;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 浜ゆ帶-绾胯矾淇℃伅琛�
+ * @author 姹熻箘韫�
+ * @date 2025/09/28 09:01
+ */
+@Data
+@ApiModel("鍏ュ洯缁熻 - 鐢典俊澶у睆")
+public class TelecomInParkDataVO {
+
+ @ApiModelProperty(value = "鍏ュ洯浜烘暟缁熻", example = "1")
+ private Integer inUserNum;
+
+ @ApiModelProperty(value = "鍏ュ洯杞﹁締缁熻", example = "1")
+ private Integer inCarNum;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InoutRecordService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InoutRecordService.java
index 916bfe0..45667bf 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InoutRecordService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/InoutRecordService.java
@@ -4,6 +4,7 @@
import com.doumee.dao.business.model.InoutRecord;
import com.doumee.dao.business.vo.GeneralDataVO;
import com.doumee.dao.business.vo.InParkUserDataVO;
+import com.doumee.dao.business.vo.TelecomInParkDataVO;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
@@ -107,4 +108,6 @@
List<List<String>> getReportList(InParkDataDTO inParkDataDTO);
void excel(InParkDataDTO inParkDataDTO, HttpServletResponse response);
+
+ TelecomInParkDataVO getInParkDataForTelecom();
}
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 dd19231..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
@@ -14,6 +14,7 @@
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.vo.GeneralDataVO;
import com.doumee.dao.business.vo.InParkUserDataVO;
+import com.doumee.dao.business.vo.TelecomInParkDataVO;
import com.doumee.service.business.InoutRecordService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -547,4 +548,34 @@
throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
}
}
+
+
+
+ @Override
+ public TelecomInParkDataVO getInParkDataForTelecom(){
+ TelecomInParkDataVO telecomInParkDataVO = new TelecomInParkDataVO();
+ 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());
+
+ 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 7ccca98..28ed5e9 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
@@ -2106,10 +2106,6 @@
}
-
-
-
-
@Override
public StagingDataVO stagingHead(StagingDataVO stagingHeadVO){
//浜哄憳淇℃伅
--
Gitblit v1.9.3