Merge branch 'dev' into feature-integrated_with_JCPP

jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessStationInfoController.java

@@ -12,9 +12,12 @@ import com.jsowell.pile.dto.business.StationBusinessAnalyzeInfoDTO;
 import com.jsowell.pile.dto.business.StationStatisticsInfoDTO;
 import com.jsowell.pile.service.OrderBasicInfoService;
 import com.jsowell.pile.service.PileStationInfoService;
+import com.jsowell.pile.util.UserUtils;
+import com.jsowell.pile.vo.base.LoginUserDetailVO;
 import com.jsowell.pile.vo.uniapp.business.StationBusinessAnalyzeInfoVO;
 import com.jsowell.pile.vo.uniapp.business.StationStatisticsInfosVO;
 import com.jsowell.pile.vo.web.StationSelectVO;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -83,6 +86,12 @@ public class BusinessStationInfoController extends BaseController {
     public RestApiResponse<?> getStationBusinessAnalyzeInfo(@RequestBody StationBusinessAnalyzeInfoDTO dto){
         RestApiResponse<?> response = null;
         try {
+            // 获取登录账号信息
+            LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
+            List<String> merchantIdList = loginUserDetail.getFirstMerchantIdList();
+            if (CollectionUtils.isEmpty(dto.getStationIds())) {
+                dto.setStationIds(pileStationInfoService.getStationIdsByMerchantIds(merchantIdList));
+            }
             StationBusinessAnalyzeInfoVO vo = pileStationInfoService.getStationBusinessAnalyzeInfo(dto);
             response = new RestApiResponse<>(ImmutableMap.of("stationBusinessAnalyzeInfoVO", vo));
         } catch (Exception e) {
@@ -145,6 +154,12 @@ public class BusinessStationInfoController extends BaseController {
     public RestApiResponse<?> getStationOrderQuantityInfo(@RequestBody StationBusinessAnalyzeInfoDTO dto) {
         RestApiResponse<?> response = null;
         try {
+            // 获取登录账号信息
+            LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
+            List<String> merchantIdList = loginUserDetail.getFirstMerchantIdList();
+            if (CollectionUtils.isEmpty(dto.getStationIds())) {
+                dto.setStationIds(pileStationInfoService.getStationIdsByMerchantIds(merchantIdList));
+            }
             StationBusinessAnalyzeInfoVO vo = pileStationInfoService.getStationOrderQuantityInfo(dto);
             response = new RestApiResponse<>(ImmutableMap.of("stationBusinessAnalyzeInfoVO", vo));
         } catch (Exception e) {
@@ -163,6 +178,12 @@ public class BusinessStationInfoController extends BaseController {
     public RestApiResponse<?> getStationConnectorUsedInfo(@RequestBody StationBusinessAnalyzeInfoDTO dto) {
         RestApiResponse<?> response = null;
         try {
+            // 获取登录账号信息
+            LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail();
+            List<String> merchantIdList = loginUserDetail.getFirstMerchantIdList();
+            if (CollectionUtils.isEmpty(dto.getStationIds())) {
+                dto.setStationIds(pileStationInfoService.getStationIdsByMerchantIds(merchantIdList));
+            }
             StationBusinessAnalyzeInfoVO vo = pileStationInfoService.getStationConnectorUsedInfo(dto);
             response = new RestApiResponse<>(ImmutableMap.of("stationBusinessAnalyzeInfoVO", vo));
         } catch (Exception e) {

jsowell-admin/src/main/resources/application-pre.yml

@@ -92,29 +92,11 @@ 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: 172.23.0.187
+    host: 172.23.0.190
     port: 5672
-    username: admin
-    password: js160829@
+    username: guest
+    password: guest
     #这个配置是保证提供者确保消息推送到交换机中，不管成不成功，都会回调
     publisher-confirm-type: correlated
     #保证交换机能把消息推送到队列中
@@ -127,6 +109,24 @@ spring:
     template:
       mandatory: true
 
+  # rabbitmq配置 prd
+#  rabbitmq:
+#    host: 172.23.0.187
+#    port: 5672
+#    username: admin
+#    password: js160829@
+#    #这个配置是保证提供者确保消息推送到交换机中，不管成不成功，都会回调
+#    publisher-confirm-type: correlated
+#    #保证交换机能把消息推送到队列中
+#    publisher-returns: true
+#    virtual-host: /
+#    #这个配置是保证消费者会消费消息，手动确认
+#    listener:
+#      simple:
+#        acknowledge-mode: manual
+#    template:
+#      mandatory: true
+
 # Swagger配置
 swagger:
   # 是否开启swagger