Merge remote-tracking branch 'origin/master'

muyu-common/muyu-common-saas/src/main/java/com/muyu/clw/common/many/remote/RemoteMessageDataService.java

@@ -0,0 +1,28 @@
+package com.muyu.clw.common.many.remote;
+
+import com.muyu.clw.common.many.remote.factory.RemoteEnterpriseFallbackFactory;
+import com.muyu.clw.common.many.remote.factory.RemoteMessageDataFallbackFactory;
+import com.muyu.common.core.constant.ServiceNameConstants;
+import com.muyu.common.core.domain.Result;
+import com.muyu.domain.Enterprise;
+import com.muyu.domain.MessageData;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
+/**
+ * 用户服务
+ *
+ * @author muyu
+ */
+@FeignClient(
+        contextId = "remoteMessageDataService",
+        value = ServiceNameConstants.COMPANY_ENTERPRISE,
+        fallbackFactory = RemoteMessageDataFallbackFactory.class
+)
+public interface RemoteMessageDataService {
+
+    @GetMapping("/messageData/list")
+    public Result<List<MessageData>> enterpriseAllList();
+}

muyu-common/muyu-common-saas/src/main/java/com/muyu/clw/common/many/remote/factory/RemoteMessageDataFallbackFactory.java

@@ -0,0 +1,35 @@
+package com.muyu.clw.common.many.remote.factory;
+
+import com.muyu.clw.common.many.remote.RemoteEnterpriseService;
+import com.muyu.clw.common.many.remote.RemoteMessageDataService;
+import com.muyu.common.core.domain.Result;
+import com.muyu.domain.Enterprise;
+import com.muyu.domain.MessageData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @ClassName RemoteEnterpriseFallbackFactory
+ * @Author AnNan.Wang
+ * @Date 2024/6/7 21:55
+ */
+
+@Component
+public class RemoteMessageDataFallbackFactory implements FallbackFactory<RemoteMessageDataService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteMessageDataFallbackFactory.class);
+
+    @Override
+    public RemoteMessageDataService create(Throwable cause) {
+        log.error("日志服务调用失败:{}", cause.getMessage());
+        return new  RemoteMessageDataService() {
+            @Override
+            public Result<List<MessageData>> enterpriseAllList() {
+                return Result.error("报文配置获取失败:{}"+cause.getMessage());
+            }
+        };
+    }
+}

muyu-modules/muyu-company/muyu-company-common/src/main/java/com/muyu/domain/MessageData.java

@@ -0,0 +1,50 @@
+package com.muyu.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.muyu.common.core.web.domain.BaseEntity;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 报文表
+ *
+ * @ClassName MessageData
+ * @Author AnNan.Wang
+ * @Date 2024/6/27 9:56
+ */
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("message_data")
+public class MessageData extends BaseEntity {
+    /**
+     * 主键
+     */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+    /**
+     * 报文标签
+     */
+    private String messageLabel;
+    /**
+     * 指标Key
+     */
+    private String analyzeKey;
+    /**
+     * 起始位
+     */
+    private String initiationPosition;
+    /**
+     * 终止位
+     */
+    private String terminatePosition;
+    /**
+     * 报文类型
+     */
+    private String typeIdentification;
+}

muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/MuYuCompanyApplication.java

@@ -1,12 +1,24 @@
 package com.muyu.authentication;
 
 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
+import com.muyu.authentication.mapper.EnterpriseMapper;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.security.annotation.EnableCustomConfig;
 import com.muyu.common.security.annotation.EnableMyFeignClients;
 import com.muyu.common.swagger.annotation.EnableCustomSwagger2;
+import com.muyu.domain.Enterprise;
+import io.netty.handler.address.DynamicAddressConnectHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 企业模块
@@ -21,4 +33,5 @@ public class MuYuCompanyApplication {
     public static void main (String[] args) {
         SpringApplication.run(MuYuCompanyApplication.class, args);
     }
+
 }

muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/EnterpriseController.java

@@ -34,7 +34,7 @@ public class EnterpriseController extends BaseController
     /**
      * 查询企业列表
      */
-    @RequiresPermissions("authentication:enterprise:list")
+//    @RequiresPermissions("authentication:enterprise:list")
     @GetMapping("/list")
     public Result<TableDataInfo<Enterprise>> list(Enterprise enterprise)
     {

muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/MessageDataController.java

@@ -0,0 +1,34 @@
+package com.muyu.authentication.controller;
+
+import com.muyu.authentication.service.MessageDataService;
+import com.muyu.common.core.domain.Result;
+import com.muyu.domain.MessageData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 报文解析配置Controller层
+ *
+ * @ClassName MessageDataController
+ * @Author AnNan.Wang
+ * @Date 2024/6/27 10:27
+ */
+
+@RestController
+@RequestMapping("/messageData")
+public class MessageDataController {
+    @Autowired
+    private MessageDataService messageDataService;
+
+    @GetMapping("/list")
+    public Result<List<MessageData>> list(){
+        return Result.success(
+                messageDataService.messageList()
+        );
+    }
+}

muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/mapper/MessageDataMapper.java

@@ -0,0 +1,15 @@
+package com.muyu.authentication.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.domain.MessageData;
+
+/**
+ * 报文解析Mapper层
+ *
+ * @author AnNan.Wang
+ * @ClassName: MessageDataMapper
+ * @createTime: 2024/6/27 10:33
+ */
+
+public interface MessageDataMapper extends BaseMapper<MessageData> {
+}

muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/MessageDataService.java

@@ -0,0 +1,19 @@
+package com.muyu.authentication.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.domain.MessageData;
+
+import java.util.List;
+
+/**
+ * 报文解析配置Service层
+ *
+ * @author AnNan.Wang
+ * @ClassName: MessageDataService
+ * @createTime: 2024/6/27 10:30
+ */
+public interface MessageDataService extends IService<MessageData> {
+    List<MessageData> messageList();
+
+
+}

muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/EnterpriseServiceImpl.java

@@ -19,9 +19,11 @@ import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.remote.RemoteUserService;
 import com.muyu.domain.vo.EnterpriseReq;
 import com.muyu.many.domain.Message.MessageData;
+import com.muyu.many.forewarning.EarlyWarning;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import com.muyu.domain.Enterprise;
@@ -40,6 +42,8 @@ public class EnterpriseServiceImpl extends ServiceImpl<EnterpriseMapper,Enterpri
     @Autowired
     private EnterpriseMapper enterpriseMapper;
 
+    @Autowired
+    private ApplicationEventPublisher applicationEventPublisher;
     /**
      * 查询企业
      *

muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/MessageDataServiceImpl.java

@@ -0,0 +1,31 @@
+package com.muyu.authentication.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.authentication.mapper.MessageDataMapper;
+import com.muyu.authentication.service.MessageDataService;
+import com.muyu.domain.MessageData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 报文解析配置实现层
+ *
+ * @ClassName MessageDataServiceImpl
+ * @Author AnNan.Wang
+ * @Date 2024/6/27 10:31
+ */
+
+@Service
+public class MessageDataServiceImpl extends ServiceImpl<MessageDataMapper, MessageData>
+        implements MessageDataService {
+
+    @Autowired
+    private MessageDataMapper messageDataMapper;
+
+    @Override
+    public List<MessageData> messageList() {
+        return messageDataMapper.selectList(null);
+    }
+}

muyu-modules/muyu-modules-many/muyu-modules-many-common/src/main/java/com/muyu/many/domain/MessageAnalysis.java

@@ -0,0 +1,57 @@
+package com.muyu.many.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 报文解析配置
+ *
+ * @ClassName MessageAnalysis
+ * @Author AnNan.Wang
+ * @Date 2024/6/26 18:38
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("message_analysis")
+public class MessageAnalysis {
+    /**
+     * 主键
+     */
+    @TableId(value = "id",type = IdType.AUTO)
+    private Long id;
+    /**
+     * 车辆ID
+     */
+    private Long vehicleId;
+    /**
+     * 指标项key
+     */
+    private String analyzeKey;
+    /**
+     * 起始位
+     */
+    private Integer analyzeStart;
+    /**
+     * 终止位
+     */
+    private Integer ent;
+    /**
+     * 指标项标签
+     */
+    private String lable;
+    /**
+     * 类型
+     */
+    private String type;
+
+
+}

muyu-modules/muyu-modules-many/muyu-modules-many-common/src/main/java/com/muyu/many/domain/Vehicle.java

@@ -112,6 +112,9 @@ public class Vehicle extends BaseEntity {
     @ApiModelProperty(name = "车辆类型", value = "车辆类型")
     private String vehicleType;
 
+    @Excel(name = "报文")
+    @ApiModelProperty(name = "报文", value = "报文")
+    private String messageDetail;
     /** 电子围栏ID */
     @Excel(name = "电子围栏ID")
     @ApiModelProperty(name = "电子围栏ID", value = "电子围栏ID")

muyu-modules/muyu-modules-many/muyu-modules-many-common/src/main/java/com/muyu/many/forewarning/EarlyWarning.java

@@ -0,0 +1,27 @@
+package com.muyu.many.forewarning;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+import org.springframework.context.ApplicationEvent;
+
+import java.io.Serializable;
+
+/**
+ * 指标预警
+ *
+ * @ClassName EarlyWarning
+ * @Author AnNan.Wang
+ * @Date 2024/6/25 9:37
+ */
+
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class EarlyWarning implements Serializable {
+    private Integer id;
+    private String name;
+}

muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/MuYuManyApplication.java

@@ -1,16 +1,30 @@
 package com.muyu.authentication;
 
-import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
+import com.alibaba.fastjson.JSON;
+import com.muyu.authentication.mapper.MessageAnalysisMapper;
+import com.muyu.authentication.mapper.VehicleMapper;
 import com.muyu.clw.common.many.datasource.holder.DynamicDataSourceHolder;
+import com.muyu.clw.common.many.remote.RemoteEnterpriseService;
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.security.annotation.EnableCustomConfig;
 import com.muyu.common.security.annotation.EnableMyFeignClients;
 import com.muyu.common.swagger.annotation.EnableCustomSwagger2;
+import com.muyu.domain.Enterprise;
+import com.muyu.many.domain.MessageAnalysis;
+import com.muyu.many.domain.Vehicle;
+import org.apache.commons.collections4.map.HashedMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.actuate.jdbc.DataSourceHealthIndicator;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
 /**
  * 企业模块
  *
@@ -21,8 +35,35 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableCustomSwagger2
 @EnableMyFeignClients
 @SpringBootApplication
-public class MuYuManyApplication {
+public class  MuYuManyApplication implements ApplicationRunner {
     public static void main (String[] args) {
         SpringApplication.run(MuYuManyApplication.class, args);
     }
+
+    @Autowired
+    private RemoteEnterpriseService remoteEnterpriseService;
+    @Autowired
+    private VehicleMapper vehicleMapper;
+    @Autowired
+    private RedisTemplate<String,String> redisTemplate;
+    @Autowired
+    private MessageAnalysisMapper messageAnalysisMapper;
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        Result<List<Enterprise>> enterprised = remoteEnterpriseService.enterpriseAllList();
+        List<Enterprise> enterpriseList = enterprised.getData();
+
+
+        for (Enterprise enterprise1 : enterpriseList) {
+            String ent = "ent_" + enterprise1.getContactPhone().substring(enterprise1.getContactPhone().length() - 4);
+            DynamicDataSourceHolder.setDynamicDataSourceKey(ent);
+            List<Vehicle> vehicles = vehicleMapper.selectList(null);
+            List<MessageAnalysis> messageAnalyses = messageAnalysisMapper.selectList(null);
+
+            for (Vehicle vehicle : vehicles) {
+                redisTemplate.opsForValue().set(vehicle.getVin(), JSON.toJSONString(messageAnalyses),4,TimeUnit.HOURS);
+            }
+        }
+    }
 }

muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/controller/ManyEnterpriseController.java

@@ -29,10 +29,4 @@ public class ManyEnterpriseController {
         );
     }
 
-//    @PostMapping("/manyEnterpriseAdd")
-//    public Result<String> manyEnterpriseAdd(@RequestBody Enterprise enterprise,@RequestHeader("ent_code")String key){
-//        return Result.success(
-//                manyEnterpriseService.manyEnterpriseAdd(enterprise,key)
-//        );
-//    }
 }

muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/controller/MessageAnalysisController.java

@@ -0,0 +1,34 @@
+package com.muyu.authentication.controller;
+
+import com.muyu.authentication.service.MessageAnalysisService;
+import com.muyu.common.core.domain.Result;
+import com.muyu.many.domain.MessageAnalysis;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 报文解析配置的Controller层
+ *
+ * @ClassName MessageAnalysisController
+ * @Author AnNan.Wang
+ * @Date 2024/6/26 18:40
+ */
+
+@RestController
+@RequestMapping("/messageAnalysis")
+public class MessageAnalysisController {
+    @Autowired
+    private MessageAnalysisService messageAnalysisService;
+
+    @PostMapping("/messageAnalysisAdd")
+    public Result<String> messageAnalysisAdd(@RequestBody List<MessageAnalysis> messageAnalysisList){
+        return messageAnalysisService.messageAnalysisAdd(messageAnalysisList);
+    }
+
+
+}

muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/mapper/ManyEnterpriseMapper.java

@@ -11,5 +11,4 @@ import com.muyu.many.domain.Enterprise ;
  * @createTime: 2024/6/6 15:52
  */
 public interface ManyEnterpriseMapper extends BaseMapper<Enterprise> {
-    int enterpriseInsert(Enterprise enterprise);
 }

muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/mapper/MessageAnalysisMapper.java

@@ -0,0 +1,15 @@
+package com.muyu.authentication.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muyu.many.domain.MessageAnalysis;
+
+/**
+ * 报文解析配置的Mapper层
+ *
+ * @author AnNan.Wang
+ * @ClassName: MessageAnalysisMapper
+ * @createTime: 2024/6/26 18:44
+ */
+
+public interface MessageAnalysisMapper extends BaseMapper<MessageAnalysis> {
+}

muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/MessageAnalysisService.java

@@ -0,0 +1,19 @@
+package com.muyu.authentication.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.muyu.common.core.domain.Result;
+import com.muyu.many.domain.MessageAnalysis;
+
+import java.util.List;
+
+/**
+ * 报文解析配置的Service层
+ *
+ * @author AnNan.Wang
+ * @ClassName: MessageAnalysisService
+ * @createTime: 2024/6/26 18:41
+ */
+
+public interface MessageAnalysisService extends IService<MessageAnalysis> {
+    Result<String> messageAnalysisAdd(List<MessageAnalysis> messageAnalysisList);
+}

muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/impl/MessageAnalysisServiceImpl.java

@@ -0,0 +1,42 @@
+package com.muyu.authentication.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.muyu.authentication.mapper.MessageAnalysisMapper;
+import com.muyu.authentication.service.MessageAnalysisService;
+import com.muyu.common.core.domain.Result;
+import com.muyu.many.domain.MessageAnalysis;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 报文解析配置实现类
+ *
+ * @ClassName MessageAnalysisServiceImpl
+ * @Author AnNan.Wang
+ * @Date 2024/6/26 18:43
+ */
+
+@Service
+public class MessageAnalysisServiceImpl extends ServiceImpl<MessageAnalysisMapper, MessageAnalysis>
+        implements MessageAnalysisService {
+    @Autowired
+    private MessageAnalysisMapper messageAnalysisMapper;
+
+    @Override
+    public Result<String> messageAnalysisAdd(List<MessageAnalysis> messageAnalysisList) {
+        for (MessageAnalysis messageAnalysis : messageAnalysisList) {
+            messageAnalysisMapper.insert(
+                    MessageAnalysis.builder()
+                            .analyzeKey(messageAnalysis.getAnalyzeKey())
+                            .analyzeStart(messageAnalysis.getAnalyzeStart())
+                            .ent(messageAnalysis.getEnt())
+                            .lable(messageAnalysis.getLable())
+                            .type(messageAnalysis.getType())
+                            .build()
+            );
+        }
+        return Result.success();
+    }
+}

muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/resources/mapper/VehicleMapper.xml

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="mileage"    column="mileage"    />
         <result property="registrationDate"    column="registration_date"    />
         <result property="licenseNumber"    column="license_number"    />
+        <result property="messageDetail"    column="message_detail"    />
         <result property="vehicleType"    column="vehicle_type"    />
         <result property="fenceId"    column="fence_id"    />
         <result property="createBy"    column="create_by"    />
@@ -29,6 +30,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectVehicleVo">
-        select id, vin, brand, model, production_date, body_type, color, engine_capacity, fuel_type, transmission, drive_type, mileage, registration_date, license_number, vehicle_type, fence_id, create_by, create_time, update_by, update_time, remark from vehicle
+        select id, vin, brand, model, production_date, body_type, color, engine_capacity, fuel_type, transmission, drive_type, mileage, registration_date, license_number, vehicle_type, fence_id, create_by, create_time, update_by, update_time, remark,message_detail from vehicle
     </sql>
 </mapper>