Merge remote-tracking branch 'origin/master' into master

# Conflicts:
#	blade-service/blade-manager/src/main/java/com/mixsmart/utils/FormulaUtils.java

blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java

@@ -62,6 +62,7 @@ public class AuthProvider {
         DEFAULT_SKIP_URL.add("/assets/**");
         DEFAULT_SKIP_URL.add("/appVersion/page");
         DEFAULT_SKIP_URL.add("/appVersionDetail/**");
+        DEFAULT_SKIP_URL.add("/websocket/**");
     }
 
     /**

blade-service-api/blade-rabbitmq-producer-api/src/main/java/org/springblade/producer/bean/PushMessageAspect.java

@@ -1,128 +1,128 @@
-package org.springblade.producer.bean;
-
-import com.alibaba.fastjson.JSON;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springblade.business.feign.BusinessWebSocketClient;
-import org.springblade.core.tool.api.R;
-import org.springblade.feign.ArchiveWebSocketClient;
-import org.springblade.manager.feign.ManagerWebSocketClient;
-import org.springblade.meter.feign.MeterWebSocketClient;
-import org.springblade.common.constant.ClientIdConstant;
-
-import org.springblade.producer.feign.RabbitMqProducerServiceClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-@Aspect
-@Component
-public class PushMessageAspect {
-
-    private static final Logger logger = LogManager.getLogger(PushMessageAspect.class);
-
-    private final RabbitMqProducerServiceClient rabbitMqProducerServiceClient;
-    private final ArchiveWebSocketClient archiveWebSocketClient;
-    private final BusinessWebSocketClient businessWebSocketClient;
-    private final ManagerWebSocketClient managerWebSocketClient;
-    private final MeterWebSocketClient meterWebSocketClient;
-
-    @Autowired
-    public PushMessageAspect(RabbitMqProducerServiceClient rabbitMqProducerServiceClient, ArchiveWebSocketClient archiveWebSocketClient, BusinessWebSocketClient businessWebSocketClient, ManagerWebSocketClient managerWebSocketClient, MeterWebSocketClient meterWebSocketClient) {
-        this.rabbitMqProducerServiceClient = rabbitMqProducerServiceClient;
-        this.archiveWebSocketClient = archiveWebSocketClient;
-        this.businessWebSocketClient = businessWebSocketClient;
-        this.managerWebSocketClient = managerWebSocketClient;
-        this.meterWebSocketClient = meterWebSocketClient;
-    }
-
-    @Pointcut("@annotation(org.springblade.producer.bean.PushMessage)")
-    public void pushMessagePointcut() {
-    }
-
-    @AfterReturning(value = "pushMessagePointcut()", returning = "result")
-    public void pushMessageAfterMethod(JoinPoint joinPoint, Object result) {
-        logger.info("=========================================== push message start ======================================");
-        if (result instanceof R) {
-            R<?> r = (R<?>) result;
-            Object objSet = r.getData();
-            if (objSet instanceof Set) {
-                MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-                Method method = signature.getMethod();
-                PushMessage pushMessage = method.getAnnotation(PushMessage.class);
-                String clientIds = pushMessage.clientId();
-                if (StringUtils.hasText(clientIds)) {
-                    for (String clientId : clientIds.split(",")) {
-                        Set<?> rawSet = (Set<?>) objSet;
-                        for (Object element : rawSet) {
-                            if (element instanceof String) {
-                                String param = (String) element;
-                                String userId = param.split(",")[0];
-                                String projectId = param.split(",")[1];
-                                String contractId = param.split(",")[2];
-                                this.pushMessageToMqQueue(clientId, userId, projectId, contractId);
-                            }
-                        }
-                        logger.info("=========================================== push message end ========================================");
-                    }
-                } else {
-                    logger.info("=========================================== clientId is null ========================================");
-                }
-            } else {
-                logger.info("=========================================== data is null ========================================");
-            }
-        }
-    }
-
-    private void pushMessageToMqQueue(String clientId, String userId, String projectId, String contractId) {
-        Map<String, String> stringMap = this.getTaskStringMapData(projectId, contractId, userId, clientId);
-        if (stringMap.size() > 0) {
-            switch (clientId) {
-                case ClientIdConstant.ARCHIVE_CLIENT_ID:
-                    rabbitMqProducerServiceClient.sendMessageToArchiveQueue(JSON.toJSONString(stringMap));
-                    break;
-                case ClientIdConstant.MANAGER_CLIENT_ID:
-                    rabbitMqProducerServiceClient.sendMessageToManagerQueue(JSON.toJSONString(stringMap));
-                    break;
-                case ClientIdConstant.BUSINESS_CLIENT_ID:
-                    rabbitMqProducerServiceClient.sendMessageToBusinessQueue(JSON.toJSONString(stringMap));
-                    break;
-                case ClientIdConstant.METER_CLIENT_ID:
-                    rabbitMqProducerServiceClient.sendMessageToMeterQueue(JSON.toJSONString(stringMap));
-                    break;
-            }
-        }
-    }
-
-    private Map<String, String> getTaskStringMapData(String projectId, String contractId, String userId, String clientId) {
-        Map<String, String> stringMap = new HashMap<>();
-        if (StringUtils.hasText(clientId)) {
-            switch (clientId) {
-                case ClientIdConstant.ARCHIVE_CLIENT_ID:
-                    stringMap = archiveWebSocketClient.getWebsocketMsg(projectId, contractId, userId);
-                    break;
-                case ClientIdConstant.MANAGER_CLIENT_ID:
-                    stringMap = managerWebSocketClient.getWebsocketMsg(projectId, contractId, userId);
-                    break;
-                case ClientIdConstant.BUSINESS_CLIENT_ID:
-                    stringMap = businessWebSocketClient.getWebsocketMsg(projectId, contractId, userId);
-                    break;
-                case ClientIdConstant.METER_CLIENT_ID:
-                    // TODO stringMap = meterWebSocketClient.getWebsocketMsg(projectId, contractId, userId);
-                    break;
-            }
-        }
-        return stringMap;
-    }
-
-}
+//package org.springblade.producer.bean;
+//
+//import com.alibaba.fastjson.JSON;
+//import org.apache.logging.log4j.LogManager;
+//import org.apache.logging.log4j.Logger;
+//import org.aspectj.lang.JoinPoint;
+//import org.aspectj.lang.annotation.AfterReturning;
+//import org.aspectj.lang.annotation.Aspect;
+//import org.aspectj.lang.annotation.Pointcut;
+//import org.aspectj.lang.reflect.MethodSignature;
+//import org.springblade.business.feign.BusinessWebSocketClient;
+//import org.springblade.core.tool.api.R;
+//import org.springblade.feign.ArchiveWebSocketClient;
+//import org.springblade.manager.feign.ManagerWebSocketClient;
+//import org.springblade.meter.feign.MeterWebSocketClient;
+//import org.springblade.common.constant.ClientIdConstant;
+//
+//import org.springblade.producer.feign.RabbitMqProducerServiceClient;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//import org.springframework.util.StringUtils;
+//
+//import java.lang.reflect.Method;
+//import java.util.HashMap;
+//import java.util.Map;
+//import java.util.Set;
+//
+//@Aspect
+//@Component
+//public class PushMessageAspect {
+//
+//    private static final Logger logger = LogManager.getLogger(PushMessageAspect.class);
+//
+//    private final RabbitMqProducerServiceClient rabbitMqProducerServiceClient;
+//    private final ArchiveWebSocketClient archiveWebSocketClient;
+//    private final BusinessWebSocketClient businessWebSocketClient;
+//    private final ManagerWebSocketClient managerWebSocketClient;
+//    private final MeterWebSocketClient meterWebSocketClient;
+//
+//    @Autowired
+//    public PushMessageAspect(RabbitMqProducerServiceClient rabbitMqProducerServiceClient, ArchiveWebSocketClient archiveWebSocketClient, BusinessWebSocketClient businessWebSocketClient, ManagerWebSocketClient managerWebSocketClient, MeterWebSocketClient meterWebSocketClient) {
+//        this.rabbitMqProducerServiceClient = rabbitMqProducerServiceClient;
+//        this.archiveWebSocketClient = archiveWebSocketClient;
+//        this.businessWebSocketClient = businessWebSocketClient;
+//        this.managerWebSocketClient = managerWebSocketClient;
+//        this.meterWebSocketClient = meterWebSocketClient;
+//    }
+//
+//    @Pointcut("@annotation(org.springblade.producer.bean.PushMessage)")
+//    public void pushMessagePointcut() {
+//    }
+//
+//    @AfterReturning(value = "pushMessagePointcut()", returning = "result")
+//    public void pushMessageAfterMethod(JoinPoint joinPoint, Object result) {
+//        logger.info("=========================================== push message start ======================================");
+//        if (result instanceof R) {
+//            R<?> r = (R<?>) result;
+//            Object objSet = r.getData();
+//            if (objSet instanceof Set) {
+//                MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+//                Method method = signature.getMethod();
+//                PushMessage pushMessage = method.getAnnotation(PushMessage.class);
+//                String clientIds = pushMessage.clientId();
+//                if (StringUtils.hasText(clientIds)) {
+//                    for (String clientId : clientIds.split(",")) {
+//                        Set<?> rawSet = (Set<?>) objSet;
+//                        for (Object element : rawSet) {
+//                            if (element instanceof String) {
+//                                String param = (String) element;
+//                                String userId = param.split(",")[0];
+//                                String projectId = param.split(",")[1];
+//                                String contractId = param.split(",")[2];
+//                                this.pushMessageToMqQueue(clientId, userId, projectId, contractId);
+//                            }
+//                        }
+//                        logger.info("=========================================== push message end ========================================");
+//                    }
+//                } else {
+//                    logger.info("=========================================== clientId is null ========================================");
+//                }
+//            } else {
+//                logger.info("=========================================== data is null ========================================");
+//            }
+//        }
+//    }
+//
+//    private void pushMessageToMqQueue(String clientId, String userId, String projectId, String contractId) {
+//        Map<String, String> stringMap = this.getTaskStringMapData(projectId, contractId, userId, clientId);
+//        if (stringMap.size() > 0) {
+//            switch (clientId) {
+//                case ClientIdConstant.ARCHIVE_CLIENT_ID:
+//                    rabbitMqProducerServiceClient.sendMessageToArchiveQueue(JSON.toJSONString(stringMap));
+//                    break;
+//                case ClientIdConstant.MANAGER_CLIENT_ID:
+//                    rabbitMqProducerServiceClient.sendMessageToManagerQueue(JSON.toJSONString(stringMap));
+//                    break;
+//                case ClientIdConstant.BUSINESS_CLIENT_ID:
+//                    rabbitMqProducerServiceClient.sendMessageToBusinessQueue(JSON.toJSONString(stringMap));
+//                    break;
+//                case ClientIdConstant.METER_CLIENT_ID:
+//                    rabbitMqProducerServiceClient.sendMessageToMeterQueue(JSON.toJSONString(stringMap));
+//                    break;
+//            }
+//        }
+//    }
+//
+//    private Map<String, String> getTaskStringMapData(String projectId, String contractId, String userId, String clientId) {
+//        Map<String, String> stringMap = new HashMap<>();
+//        if (StringUtils.hasText(clientId)) {
+//            switch (clientId) {
+//                case ClientIdConstant.ARCHIVE_CLIENT_ID:
+//                    stringMap = archiveWebSocketClient.getWebsocketMsg(projectId, contractId, userId);
+//                    break;
+//                case ClientIdConstant.MANAGER_CLIENT_ID:
+//                    stringMap = managerWebSocketClient.getWebsocketMsg(projectId, contractId, userId);
+//                    break;
+//                case ClientIdConstant.BUSINESS_CLIENT_ID:
+//                    stringMap = businessWebSocketClient.getWebsocketMsg(projectId, contractId, userId);
+//                    break;
+//                case ClientIdConstant.METER_CLIENT_ID:
+//                    // TODO stringMap = meterWebSocketClient.getWebsocketMsg(projectId, contractId, userId);
+//                    break;
+//            }
+//        }
+//        return stringMap;
+//    }
+//
+//}

blade-service/blade-business/src/main/java/org/springblade/business/controller/EVisaTaskCheckController.java

@@ -372,7 +372,11 @@ public class EVisaTaskCheckController {
 
         //汇总电签配置的审批角色
         List<String> eVisaRoleList = jsonList.stream().map(jsonObject -> jsonObject.getString("sigRoleId")).distinct().collect(Collectors.toList());
-
+        List<User> users = userClient.selectUserAll();
+        if (ObjectUtil.isEmpty(users)){
+            return R.fail(300, "未获取到当前项目用户信息");
+        }
+        List<Long> userIds = users.stream().map(l -> l.getId()).collect(Collectors.toList());
         //校验这些预设流程哪些是符合条件的
         for (FixedFlowVO next : flowList) {
             //先将流程设置为可选
@@ -382,6 +386,20 @@ public class EVisaTaskCheckController {
             List<FixedFlowLink> flowLink = this.fixedFlowLinkService.selectFixedFlowLink(next.getId().toString());
             List<Long> ids = flowLink.stream().map(l -> l.getFixedFlowLinkUser()).collect(Collectors.toList());
 
+            /** 因删除用户没做限制，存在固定流程用户被删除情况，校验用户是否存在 */
+            Set<Long> flowUser = new HashSet<>(ids);
+            flowUser.removeAll(userIds);
+            if (flowUser.size() > 0){
+                next.setDisabled(true);
+                Map<Long, String> nameMap = flowLink.stream().collect(Collectors.toMap(l -> l.getFixedFlowLinkUser(), l -> l.getFixedFlowLinkUserName()));
+                List<String> names = new ArrayList<>();
+                for (Long id : flowUser) {
+                    names.add(nameMap.get(id));
+                }
+                next.setTips("以下用户账号已经删除:"+String.join(",",names));
+                continue;
+            }
+
             //获取这些人资料合同段下的权限
             List<JSONObject> userRoleList = this.saveUserInfoByProjectClient.queryUserContractRole(flowLink.stream().map(FixedFlowLink::getFixedFlowLinkUser).distinct().collect(Collectors.toList()), node.getContractId() + "");
             if (userRoleList == null || userRoleList.size() <= 0) {
@@ -466,7 +484,11 @@ public class EVisaTaskCheckController {
             map.put(info.getWbsId() + "", eVisaRoleList);
         }
 
-
+        List<User> users = userClient.selectUserAll();
+        if (ObjectUtil.isEmpty(users)){
+            return R.fail(300, "未获取到当前项目用户信息");
+        }
+        List<Long> userIds = users.stream().map(l -> l.getId()).collect(Collectors.toList());
         //校验这些预设流程哪些是符合条件的
         for (FixedFlowVO next : flowList) {
             //先将流程设置为可选
@@ -476,6 +498,19 @@ public class EVisaTaskCheckController {
             List<FixedFlowLink> flowLink = this.fixedFlowLinkService.selectFixedFlowLink(next.getId().toString());
             List<Long> ids = flowLink.stream().map(l -> l.getFixedFlowLinkUser()).collect(Collectors.toList());
 
+            /** 因删除用户没做限制，存在固定流程用户被删除情况，校验用户是否存在 */
+            Set<Long> flowUser = new HashSet<>(ids);
+            flowUser.removeAll(userIds);
+            if (flowUser.size() > 0){
+                next.setDisabled(true);
+                Map<Long, String> nameMap = flowLink.stream().collect(Collectors.toMap(l -> l.getFixedFlowLinkUser(), l -> l.getFixedFlowLinkUserName()));
+                List<String> names = new ArrayList<>();
+                for (Long id : flowUser) {
+                    names.add(nameMap.get(id));
+                }
+                next.setTips("以下用户账号已经删除:"+String.join(",",names));
+                continue;
+            }
 
             //获取这些人资料合同段下的权限
             List<JSONObject> userRoleList = this.saveUserInfoByProjectClient.queryUserContractRole(flowLink.stream().map(FixedFlowLink::getFixedFlowLinkUser).distinct().collect(Collectors.toList()), infoList.get(0).getContractId() + "");

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialDeviceInfoController.java

@@ -7,15 +7,13 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.business.dto.TrialDeviceOverhaulDTO;
 import org.springblade.business.dto.TrialDeviceUseDTO;
+import org.springblade.business.entity.TrialDeviceClassification;
 import org.springblade.business.entity.TrialDeviceOverhaul;
 import org.springblade.business.excel.*;
-import org.springblade.business.service.ITrialDeviceOverhaulService;
+import org.springblade.business.service.*;
 import org.springblade.business.vo.*;
 import org.springblade.business.entity.TrialDeviceInfo;
 import org.springblade.business.entity.TrialDeviceUse;
-import org.springblade.business.service.ITrialDeviceInfoService;
-import org.springblade.business.service.ITrialDeviceUseService;
-import org.springblade.business.service.ITrialSampleInfoService;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
@@ -27,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -40,6 +39,7 @@ public class TrialDeviceInfoController extends BladeController {
     private final ITrialDeviceInfoService iTrialDeviceInfoService;
     private final ITrialDeviceUseService iTrialDeviceUseService;
     private final ITrialDeviceOverhaulService iTrialDeviceOverhaulService;
+    private final ITrialDeviceClassificationService iTrialDeviceClassificationService;
 
     @PostMapping("/mobilization/submit")
     @ApiOperationSupport(order = 1)
@@ -79,8 +79,15 @@ public class TrialDeviceInfoController extends BladeController {
     @PostMapping("/mobilization/read-excel")
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "进场设备读取excel数据", notes = "传入excel")
-    public R<List<TrialDeviceInfoExcel>> readExcel(MultipartFile file) {
+    public R<List<TrialDeviceInfoExcel>> readExcel(MultipartFile file,String classNameId) {
+
+        TrialDeviceClassification trialDeviceInfo = iTrialDeviceClassificationService.getById(Func.toLong(classNameId));
         List<TrialDeviceInfoExcel> list = ExcelUtil.read(file, TrialDeviceInfoExcel.class);
+        if(trialDeviceInfo!=null && Func.isNotEmpty(trialDeviceInfo) && list.size()>=1){
+            list.stream().forEach(TrialDeviceInfoExcel ->{
+                TrialDeviceInfoExcel.setDeviceClassName(trialDeviceInfo.getClassName());
+            });
+        }
         return R.data(list);
     }
 
@@ -155,6 +162,20 @@ public class TrialDeviceInfoController extends BladeController {
         return R.data(list);
     }
 
+
+    /**
+     * 导出模板
+     */
+    @GetMapping("/use/export-template")
+    @ApiOperationSupport(order = 24)
+    @ApiOperation(value = "导出模板")
+    public void exportUser(HttpServletResponse response) {
+        List<TrialDeviceUseExcel> list = new ArrayList<>();
+        ExcelUtil.export(response, "设备进程模板", "设备进程模板", list, TrialDeviceUseExcel.class);
+    }
+
+
+
     @PostMapping("/use/import-batch")
     @ApiOperationSupport(order = 16)
     @ApiOperation(value = "使用设备导入数据保存", notes = "传入TrialDeviceUseExcelDTO")

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVisaServiceImpl.java

@@ -100,8 +100,8 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class EVisaServiceImpl implements EVisaService {
 
-    private static final String SIGN_HOST = "172.30.224.79";
-   // private static final String SIGN_HOST = "47.115.117.246";
+   // private static final String SIGN_HOST = "172.30.224.79";
+    private static final String SIGN_HOST = "47.115.117.246";
 
     private static final String SIGN_PORT = "8183";
 

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/TextdictInfoController.java

@@ -473,6 +473,16 @@ public class TextdictInfoController extends BladeController {
             textdictInfo.setSigRoleName(jsonObject.getString("sigRoleName"));
             textdictInfo.setPyzbx(jsonObject.getDouble("pyzbx"));
             textdictInfo.setPyzby(jsonObject.getDouble("pyzby"));
+            Integer timeState = jsonObject.getInteger("timeState");
+            textdictInfo.setTimeState(timeState);
+            if(timeState!=null && timeState==1){
+                textdictInfo.setTimeColKey(jsonObject.getString("timeColKey"));
+                textdictInfo.setTimeName(jsonObject.getString("timeName"));
+            }else{
+                textdictInfo.setTimeColKey("");
+                textdictInfo.setTimeName("");
+            }
+
             textdictInfo.setProjectId(wbsTreePrivate.getProjectId());
 
             //由于使用联合主键

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -821,7 +821,7 @@
     </select>
 
     <select id="apiTreeNode" resultMap="apiTreeNodeResultMap">
-        select distinct p_key_id ,type, CONCAT(SUBSTR(id, 2, LENGTH(id) - 5), SUBSTR(p_key_id, -5, 5)) as id ,CONCAT(SUBSTR(parent_id, 2, LENGTH(parent_id) - 5), SUBSTR(p_key_id, -5, 5)) as parent_id , node_name
+        select distinct p_key_id ,type, id , parent_id , node_name
         from m_wbs_tree_contract
         where
         is_deleted = 0

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -3657,6 +3657,7 @@ public class TaskController extends BladeController {
                                 rs.setTitle(sheet, title);
                                 /*添加电签*/
                                 setDQInfo(sheet, rs, title);
+
                                 /*合并单元格*/
                                 if (mergeConfig.containsKey(n)) {
                                     mergeConfig.get(n).forEach(ca -> {

blade-service/blade-meter/src/main/java/org/springblade/meter/service/impl/MaterialMeterFormServiceImpl.java

@@ -206,15 +206,15 @@ public class MaterialMeterFormServiceImpl extends BaseServiceImpl<MaterialMeterF
                 throw new ServiceException("未检测到excel中材料计量单数据，请检查格式后后重新导入");
             }
             excels.forEach(l->{
-                if (StringUtils.isBlank(l.getMaterialConformName()) || l.getMaterialConformName().equals("否")){
-                    l.setMaterialConform(0);
-                }else {
+                if (StringUtils.isBlank(l.getMaterialConformName()) || l.getMaterialConformName().equals("是")){
                     l.setMaterialConform(1);
-                }
-                if (StringUtils.isBlank(l.getStorageConformName()) || l.getStorageConformName().equals("否")){
-                    l.setStorageConform(0);
                 }else {
+                    l.setMaterialConform(0);
+                }
+                if (StringUtils.isBlank(l.getStorageConformName()) || l.getStorageConformName().equals("是")){
                     l.setStorageConform(1);
+                }else {
+                    l.setStorageConform(0);
                 }
             });
             //复制数据

blade-service/blade-rabbitmq-consumer/src/main/java/org/springblade/consumer/service/RabbitMqConsumerService.java

@@ -1,60 +1,60 @@
-package org.springblade.consumer.service;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springblade.consumer.socket.WebSocketEndpoint;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-import java.util.Map;
-
-@Service
-public class RabbitMqConsumerService {
-
-    private static final Logger logger = LogManager.getLogger(RabbitMqConsumerService.class);
-    private final WebSocketEndpoint webSocketEndpoint;
-
-    @Autowired
-    public RabbitMqConsumerService(WebSocketEndpoint webSocketEndpoint) {
-        this.webSocketEndpoint = webSocketEndpoint;
-    }
-
-    private void processMessage(String queueName, String message) throws IOException {
-        ObjectMapper objectMapper = new ObjectMapper();
-        Map<String, Object> resultMap = objectMapper.readValue(message, new TypeReference<Map<String, Object>>() {
-        });
-        Object userId = resultMap.getOrDefault("userId", null);
-        if (ObjectUtil.isNotEmpty(userId)) {
-            webSocketEndpoint.sendMessageByUserId(userId.toString(), message);
-            logger.info("Pass " + queueName + " push msg to userId: " + userId + "，msg：" + message);
-        } else {
-            logger.info("No message for" + queueName + " was obtained，msg：" + message);
-        }
-    }
-
-    @RabbitListener(queues = "archiveQueue")
-    public void consumeMessageFromArchiveQueue(String message) throws IOException {
-        processMessage("archiveQueue", message);
-    }
-
-    @RabbitListener(queues = "managerQueue")
-    public void consumeMessageFromManagerQueue(String message) throws IOException {
-        processMessage("managerQueue", message);
-    }
-
-    @RabbitListener(queues = "businessQueue")
-    public void consumeMessageFromBusinessQueue(String message) throws IOException {
-        processMessage("businessQueue", message);
-    }
-
-    @RabbitListener(queues = "meterQueue")
-    public void consumeMessageFromMeterQueue(String message) throws IOException {
-        processMessage("meterQueue", message);
-    }
-
-}
+//package org.springblade.consumer.service;
+//
+//import cn.hutool.core.util.ObjectUtil;
+//import com.fasterxml.jackson.core.type.TypeReference;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import org.apache.logging.log4j.LogManager;
+//import org.apache.logging.log4j.Logger;
+//import org.springblade.consumer.socket.WebSocketEndpoint;
+//import org.springframework.amqp.rabbit.annotation.RabbitListener;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Service;
+//
+//import java.io.IOException;
+//import java.util.Map;
+//
+//@Service
+//public class RabbitMqConsumerService {
+//
+//    private static final Logger logger = LogManager.getLogger(RabbitMqConsumerService.class);
+//    private final WebSocketEndpoint webSocketEndpoint;
+//
+//    @Autowired
+//    public RabbitMqConsumerService(WebSocketEndpoint webSocketEndpoint) {
+//        this.webSocketEndpoint = webSocketEndpoint;
+//    }
+//
+//    private void processMessage(String queueName, String message) throws IOException {
+//        ObjectMapper objectMapper = new ObjectMapper();
+//        Map<String, Object> resultMap = objectMapper.readValue(message, new TypeReference<Map<String, Object>>() {
+//        });
+//        Object userId = resultMap.getOrDefault("userId", null);
+//        if (ObjectUtil.isNotEmpty(userId)) {
+//            webSocketEndpoint.sendMessageByUserId(userId.toString(), message);
+//            logger.info("Pass " + queueName + " push msg to userId: " + userId + "，msg：" + message);
+//        } else {
+//            logger.info("No message for" + queueName + " was obtained，msg：" + message);
+//        }
+//    }
+//
+//    @RabbitListener(queues = "archiveQueue")
+//    public void consumeMessageFromArchiveQueue(String message) throws IOException {
+//        processMessage("archiveQueue", message);
+//    }
+//
+//    @RabbitListener(queues = "managerQueue")
+//    public void consumeMessageFromManagerQueue(String message) throws IOException {
+//        processMessage("managerQueue", message);
+//    }
+//
+//    @RabbitListener(queues = "businessQueue")
+//    public void consumeMessageFromBusinessQueue(String message) throws IOException {
+//        processMessage("businessQueue", message);
+//    }
+//
+//    @RabbitListener(queues = "meterQueue")
+//    public void consumeMessageFromMeterQueue(String message) throws IOException {
+//        processMessage("meterQueue", message);
+//    }
+//
+//}