Merge branch 'dev' into feature-integrated_with_JCPP

2026-04-20 02:55:04 +08:00 · 2026-01-08 09:38:32 +08:00
parent d9259ae856 3be12178fd
commit 6d37821293
20 changed files with 573 additions and 156 deletions
--- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessConnectorInfoController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessConnectorInfoController.java
@@ -3,17 +3,24 @@ package com.jsowell.api.uniapp.business;
 import com.alibaba.fastjson2.JSONObject;
 import com.google.common.collect.ImmutableMap;
 import com.jsowell.common.core.controller.BaseController;
+import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.pile.dto.business.QueryConnectorInfoDTO;
 import com.jsowell.pile.service.OrderBasicInfoService;
 import com.jsowell.pile.service.PileConnectorInfoService;
+import com.jsowell.pile.service.PileStationInfoService;
+import com.jsowell.pile.util.UserUtils;
+import com.jsowell.pile.vo.base.ConnectorInfoVO;
+import com.jsowell.pile.vo.base.LoginUserDetailVO;
 import com.jsowell.pile.vo.uniapp.business.BusinessConnectorInfoVO;
 import com.jsowell.pile.vo.uniapp.business.StationStatisticsInfosVO;
 import com.jsowell.pile.vo.web.PileConnectorInfoVO;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

 import java.util.List;
+import java.util.Map;

 /**
 * 运营端小程序枪口信息相关controller
@@ -28,6 +35,9 @@ public class BusinessConnectorInfoController extends BaseController {
    @Autowired
    private PileConnectorInfoService pileConnectorInfoService;

+    @Autowired
+    private PileStationInfoService pileStationInfoService;
+
    /**
     * 获取枪口信息列表
     * @param dto
@@ -37,8 +47,14 @@ public class BusinessConnectorInfoController extends BaseController {
    public RestApiResponse<?> getBusinessConnectorInfoList(@RequestBody QueryConnectorInfoDTO dto) {
        RestApiResponse<?> response = null;
        try {
-            BusinessConnectorInfoVO connectorInfoVO = pileConnectorInfoService.getConnectorListByStationAndStatus(dto);
-            response = new RestApiResponse<>(ImmutableMap.of("BusinessConnectorInfoVO", connectorInfoVO));
+            // 获取登录账号信息
+            LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
+            List<String> merchantIdList = loginUserDetail.getFirstMerchantIdList();
+            if (CollectionUtils.isEmpty(dto.getStationIds())) {
+                dto.setStationIds(pileStationInfoService.getStationIdsByMerchantIds(merchantIdList));
+            }
+            PageResponse pageResponse = pileConnectorInfoService.getConnectorListByStationAndStatus(dto);
+            response = new RestApiResponse<>(ImmutableMap.of("pageResponse", pageResponse));
        } catch (Exception e) {
            logger.error("获取枪口信息列表 error", e);
            response = new RestApiResponse<>(e);
@@ -86,6 +102,30 @@ public class BusinessConnectorInfoController extends BaseController {
    }


+    /**
+     * 获取枪口状态统计接口
+     * @param dto
+     * @return
+     */
+    @PostMapping("/getStatusConnectorTotalNum")
+    public RestApiResponse<?> getStatusConnectorTotalNum(@RequestBody QueryConnectorInfoDTO dto) {
+        RestApiResponse<?> response = null;
+        try {
+            // 获取登录账号信息
+            LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
+            List<String> merchantIdList = loginUserDetail.getFirstMerchantIdList();
+            if (CollectionUtils.isEmpty(dto.getStationIds())) {
+                dto.setStationIds(pileStationInfoService.getStationIdsByMerchantIds(merchantIdList));
+            }
+            Map<String, Object> map = pileConnectorInfoService.getConnectorStatusNum(dto.getStationIds(), null);
+            response = new RestApiResponse<>(ImmutableMap.of("connectorStatusNumMap",  map));
+        } catch (Exception e) {
+            logger.error("获取枪口状态统计接口 error", e);
+            response = new RestApiResponse<>(e);
+        }
+        logger.info("获取枪口状态统计接口 params:{}, result:{}", JSONObject.toJSONString(dto), response);
+        return response;
+    }


 }
--- a/jsowell-admin/src/main/resources/application-prd.yml
+++ b/jsowell-admin/src/main/resources/application-prd.yml
@@ -88,7 +88,7 @@ spring:

  # rabbitmq配置 prd
  rabbitmq:
-    host: 47.103.124.69
+    host: 172.23.0.187
    port: 5672
    username: admin
    password: js160829@
@@ -265,7 +265,7 @@ dubbo:
    name: wcc-server
    qosEnable: false
  registry:
-    address: nacos://47.103.124.69:8848
+    address: nacos://172.23.0.187:8848
    parameters:
      namespace: 1c0429d3-2842-45a9-b3f3-11605c3fd06e
    username: nacos
--- a/jsowell-admin/src/main/resources/application-pre.yml
+++ b/jsowell-admin/src/main/resources/application-pre.yml
@@ -9,7 +9,7 @@ spring:
  redis:
    # 地址
    host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com
-#    host: 47.117.244.159
+#    host: 172.23.0.190
    # 端口，默认为6379
    port: 6379
    # 数据库索引
@@ -41,7 +41,7 @@ spring:
        url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: jsowell
        password: js@160829
-#        url: jdbc:mysql://47.117.244.159:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        url: jdbc:mysql://172.23.0.190:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #        username: jsowell_pre
 #        password: Js@160829
      # 从库数据源
@@ -92,11 +92,29 @@ spring:
            multi-statement-allow: true

  # rabbitmq配置 pre
+#  rabbitmq:
+#    host: 172.23.0.190
+#    port: 5672
+#    username: guest
+#    password: guest
+#    #这个配置是保证提供者确保消息推送到交换机中，不管成不成功，都会回调
+#    publisher-confirm-type: correlated
+#    #保证交换机能把消息推送到队列中
+#    publisher-returns: true
+#    virtual-host: /
+#    #这个配置是保证消费者会消费消息，手动确认
+#    listener:
+#      simple:
+#        acknowledge-mode: manual
+#    template:
+#      mandatory: true
+
+  # rabbitmq配置 prd
  rabbitmq:
-    host: 47.117.244.159
+    host: 172.23.0.187
    port: 5672
-    username: guest
-    password: guest
+    username: admin
+    password: js160829@
    #这个配置是保证提供者确保消息推送到交换机中，不管成不成功，都会回调
    publisher-confirm-type: correlated
    #保证交换机能把消息推送到队列中
@@ -270,7 +288,7 @@ dubbo:
    name: wcc-server
    qosEnable: false
  registry:
-    address: nacos://47.117.244.159:8848
+    address: nacos://172.23.0.190:8848
    parameters:
      namespace: c95d1cb4-8d46-48b5-9982-a6942c28e953
    username: nacos