From c79a39f54e9fc705b2abcea5aeaa97cae8cd78f0 Mon Sep 17 00:00:00 2001 From: Number7 <1845377266@qq.com> Date: Wed, 2 Oct 2024 10:03:36 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-modules/cloud-modules-template/pom.xml | 16 +-- .../template/CloudTemplateApplication.java | 4 - .../muyu/template/config/MqttConfigure.java | 24 ++-- .../template/service/TemplateService.java | 16 --- .../service/impl/TemplateServiceImpl.java | 103 ------------------ .../main/resources/mapper/CarTypeMapper.xml | 9 -- .../resources/mapper/EnterpriseMapper.xml | 67 ------------ .../main/resources/mapper/SysCarMapper.xml | 83 -------------- .../resources/mapper/TemplateNeedMapper.xml | 10 -- .../main/resources/mapper/WarnLogsMapper.xml | 31 ------ .../main/resources/mapper/WarnRuleMapper.xml | 23 ---- .../resources/mapper/WarnStrategyMapper.xml | 35 ------ 12 files changed, 17 insertions(+), 404 deletions(-) delete mode 100644 cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/service/TemplateService.java delete mode 100644 cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/service/impl/TemplateServiceImpl.java delete mode 100644 cloud-modules/cloud-modules-template/src/main/resources/mapper/CarTypeMapper.xml delete mode 100644 cloud-modules/cloud-modules-template/src/main/resources/mapper/EnterpriseMapper.xml delete mode 100644 cloud-modules/cloud-modules-template/src/main/resources/mapper/SysCarMapper.xml delete mode 100644 cloud-modules/cloud-modules-template/src/main/resources/mapper/TemplateNeedMapper.xml delete mode 100644 cloud-modules/cloud-modules-template/src/main/resources/mapper/WarnLogsMapper.xml delete mode 100644 cloud-modules/cloud-modules-template/src/main/resources/mapper/WarnRuleMapper.xml delete mode 100644 cloud-modules/cloud-modules-template/src/main/resources/mapper/WarnStrategyMapper.xml diff --git a/cloud-modules/cloud-modules-template/pom.xml b/cloud-modules/cloud-modules-template/pom.xml index 2e1c1be..65e4bd1 100644 --- a/cloud-modules/cloud-modules-template/pom.xml +++ b/cloud-modules/cloud-modules-template/pom.xml @@ -19,7 +19,14 @@ com.muyu - cloud-common-saas + cloud-common-kafka + 3.6.3 + + + + com.muyu.server + saas-server + 3.6.3 @@ -81,13 +88,6 @@ com.muyu cloud-common-xxl - - com.muyu.server - saas-server - 3.6.3 - compile - - diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/CloudTemplateApplication.java b/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/CloudTemplateApplication.java index 823f919..80804e6 100644 --- a/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/CloudTemplateApplication.java +++ b/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/CloudTemplateApplication.java @@ -1,19 +1,15 @@ package com.muyu.template; - import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; - /** * @author liuxinyue * @Package：com.muyu.template * @name：CloudTemplateApplication * @Date：2024/9/30 10:36 */ - @EnableCustomConfig -//@EnableCustomSwagger2 @EnableMyFeignClients @SpringBootApplication public class CloudTemplateApplication { diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java b/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java index a41157e..e4ae3a1 100644 --- a/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java +++ b/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/config/MqttConfigure.java @@ -1,5 +1,4 @@ package com.muyu.template.config; - import cn.hutool.json.JSONObject; import com.alibaba.fastjson2.JSON; import com.muyu.common.domain.MessageTemplateType; @@ -7,18 +6,16 @@ import com.muyu.common.domain.SysCar; import com.muyu.common.redis.service.RedisService; import com.muyu.server.service.MessageTemplateTypeService; import com.muyu.server.service.SysCarService; -import com.muyu.server.service.TemplateService; +import com.muyu.server.service.impl.SysCarServiceImpl; import lombok.extern.log4j.Log4j2; import org.eclipse.paho.client.mqttv3.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; - import javax.annotation.PostConstruct; +import javax.annotation.Resource; import java.util.List; - /** - * * @author liuxinyue * @Package：com.muyu.mqtt.configure * @Project：cloud-server @@ -31,18 +28,21 @@ public class MqttConfigure { @Autowired private RedisService redisService; - @Autowired + @Resource private SysCarService sysCarService; - @Autowired + @Resource + private SysCarServiceImpl service; + + @Resource private MessageTemplateTypeService messageTemplateTypeService; @Autowired private RedisTemplate redisTemplate; - @PostConstruct public void MQTTMonitoring(){ + String topic = "vehicle"; int qos = 2; String broker = "tcp://47.101.53.251:1883"; @@ -108,16 +108,13 @@ public class MqttConfigure { String carVin = result.substring(0, 18 - 1); log.info("carVin码为:" + carVin); //根据VIN码获取车辆信息 - SysCar carByVin = sysCarService.findCarByVin(carVin); + SysCar carByVin = service.findCarByVin(carVin); log.info("车辆信息为:" + carByVin); //对应车辆所对应的报文模版 Integer templateId = carByVin.getTemplateId(); - List templateTypeList; - //key String redisKey = "messageTemplateType" + templateId; - //key存在 if (redisTemplate.hasKey(redisKey)) { @@ -125,7 +122,6 @@ public class MqttConfigure { templateTypeList = list.stream().map(o -> JSON.parseObject(o.toString(), MessageTemplateType.class)) .toList(); - } else { List templateTypeList1 = messageTemplateTypeService.findTemplateById(templateId); templateTypeList = templateTypeList1; @@ -150,7 +146,5 @@ public class MqttConfigure { log.info("解析后的报文是:" + jsonObject); return jsonObject; - } - } diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/service/TemplateService.java b/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/service/TemplateService.java deleted file mode 100644 index d4e4239..0000000 --- a/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/service/TemplateService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.template.service; - -import java.sql.SQLException; -import java.util.concurrent.ExecutionException; - -/** - * @author liuxinyue - * @Package：com.muyu.template.service - * @name：TemplateService - * @Date：2024/9/30 10:57 - */ -public interface TemplateService { - - void messageParsing(String templateMessage) ; - -} diff --git a/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/service/impl/TemplateServiceImpl.java b/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/service/impl/TemplateServiceImpl.java deleted file mode 100644 index 9279118..0000000 --- a/cloud-modules/cloud-modules-template/src/main/java/com/muyu/template/service/impl/TemplateServiceImpl.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.muyu.template.service.impl; - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson2.JSON; -import com.muyu.common.domain.MessageTemplateType; -import com.muyu.common.domain.SysCar; -import com.muyu.common.redis.service.RedisService; -import com.muyu.server.service.MessageTemplateTypeService; -import com.muyu.server.service.SysCarService; -import com.muyu.template.service.TemplateService; -import lombok.extern.log4j.Log4j2; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; - -import java.sql.SQLException; -import java.util.List; -import java.util.concurrent.ExecutionException; - -/** - * @author liuxinyue - * @Package：com.muyu.template.service.impl - * @name：TemplateServiceImpl - * @Date：2024/9/30 10:57 - */ -@Log4j2 -@Service -public class TemplateServiceImpl implements TemplateService { - - @Autowired - private RedisService redisService; - - @Autowired - private SysCarService sysCarService; - - @Autowired - private MessageTemplateTypeService messageTemplateTypeService; - - @Autowired - private RedisTemplate redisTemplate; - - @Override - public void messageParsing(String templateMessage) { - //给一个JSON对象 - JSONObject jsonObject = new JSONObject(); - //先截取出VIN码 然后根据VIN码查询这个车属于什么类型 - if (templateMessage.length() < 18) { - throw new RuntimeException("The vehicle message is incorrect"); - } - //将报文进行切割 - String[] hexArray = templateMessage.split(" "); - StringBuilder result = new StringBuilder(); - for (String hex : hexArray) { - int decimal = Integer.parseInt(hex, 16); - result.append((char) decimal); - } - //取出VIN码 - String carVin = result.substring(0, 18 - 1); - log.info("carVin码为:" + carVin); - //根据VIN码获取车辆信息 - SysCar carByVin = sysCarService.findCarByVin(carVin); - log.info("车辆信息为:" + carByVin); - //对应车辆所对应的报文模版 - Integer templateId = carByVin.getTemplateId(); - - List templateTypeList; - - //key - String redisKey = "messageTemplateType" + templateId; - - //key存在 - if (redisTemplate.hasKey(redisKey)) { - - List list = redisTemplate.opsForList().range(redisKey, 0, -1); - - templateTypeList = list.stream().map(o -> JSON.parseObject(o.toString(), MessageTemplateType.class)) - .toList(); - - } else { - List templateTypeList1 = messageTemplateTypeService.findTemplateById(templateId); - templateTypeList = templateTypeList1; - templateTypeList.forEach( - templateType -> - redisTemplate.opsForList().rightPush( - redisKey, com.alibaba.fastjson.JSON.toJSONString(templateType) - ) - ); - } - //将模版里面有的配置进行循环 - for (MessageTemplateType messageTemplateType : templateTypeList) { - //开始位置 - Integer startIndex = messageTemplateType.getStartIndex() - 1; - //结束位置 - Integer endIndex = messageTemplateType.getEndIndex(); - //将每个解析后的字段都存入到JSON对象中 - jsonObject.put(messageTemplateType.getMessageField(), result.substring(startIndex, endIndex)); - } - - System.out.println("哈哈哈红红火火恍恍惚惚"); - log.info("解析后的报文是:" + jsonObject); - - } -} diff --git a/cloud-modules/cloud-modules-template/src/main/resources/mapper/CarTypeMapper.xml b/cloud-modules/cloud-modules-template/src/main/resources/mapper/CarTypeMapper.xml deleted file mode 100644 index 63274cf..0000000 --- a/cloud-modules/cloud-modules-template/src/main/resources/mapper/CarTypeMapper.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/cloud-modules/cloud-modules-template/src/main/resources/mapper/EnterpriseMapper.xml b/cloud-modules/cloud-modules-template/src/main/resources/mapper/EnterpriseMapper.xml deleted file mode 100644 index 76e2c13..0000000 --- a/cloud-modules/cloud-modules-template/src/main/resources/mapper/EnterpriseMapper.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - insert into tb_enterprise - set enterprise_name = #{enterpriseName}, - enterprise_car_count = #{enterpriseCarCount}, - enterprise_fence_count = #{enterpriseFenceCount} - - - - - - - - - update tb_enterprise - set enterprise_name = #{enterpriseName}, - enterprise_car_count = #{enterpriseCarCount}, - enterprise_fence_count = #{enterpriseFenceCount} - where enterprise_id = #{enterpriseId} and enterprise_id != 0 - - - - - - - delete from tb_enterprise - where enterprise_id in - - #{one} - - - - - - diff --git a/cloud-modules/cloud-modules-template/src/main/resources/mapper/SysCarMapper.xml b/cloud-modules/cloud-modules-template/src/main/resources/mapper/SysCarMapper.xml deleted file mode 100644 index 792d531..0000000 --- a/cloud-modules/cloud-modules-template/src/main/resources/mapper/SysCarMapper.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - INSERT INTO `four`.`sys_car` - ( `car_vin`, `car_type_id`, `state`, `car_motor_manufacturer`, `car_motor_model`, - `car_battery_manufacturer`, `car_battery_model`, `strategy_id`,`group_id`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`,) - VALUES (#{carVin}, #{carTypeId}, '1', #{carMotorManufacturer}, #{carMotorModel}, - #{carBatteryManufacturer}, #{carBatteryModel}, #{strategyId},#{groupId},#{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark}) - - - UPDATE `four`.`sys_car` - SET `car_vin` = #{carVin}, - `car_type_id` = #{carTypeId}, - `state` = #{state}, - `car_motor_manufacturer` = #{carMotorManufacturer}, - `car_motor_model` = #{carMotorModel}, - `car_battery_manufacturer` = #{carBatteryManufacturer}, - `car_battery_model` = #{carBatteryModel}, - `strategy_id` = #{strategyId}, - `group_id`=#{groupId} - `create_by` = #{createBy}, - `create_time` = #{createTime}, - `update_by` = #{updateBy}, - `update_time` = #{updateTime}, - `remark` = #{remark} WHERE `id` = #{id} - - - - - - - - - diff --git a/cloud-modules/cloud-modules-template/src/main/resources/mapper/TemplateNeedMapper.xml b/cloud-modules/cloud-modules-template/src/main/resources/mapper/TemplateNeedMapper.xml deleted file mode 100644 index 5ea4090..0000000 --- a/cloud-modules/cloud-modules-template/src/main/resources/mapper/TemplateNeedMapper.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/cloud-modules/cloud-modules-template/src/main/resources/mapper/WarnLogsMapper.xml b/cloud-modules/cloud-modules-template/src/main/resources/mapper/WarnLogsMapper.xml deleted file mode 100644 index d837d31..0000000 --- a/cloud-modules/cloud-modules-template/src/main/resources/mapper/WarnLogsMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - INSERT INTO warn_logs VALUES - - (#{warnLogs.id}) - - - - - diff --git a/cloud-modules/cloud-modules-template/src/main/resources/mapper/WarnRuleMapper.xml b/cloud-modules/cloud-modules-template/src/main/resources/mapper/WarnRuleMapper.xml deleted file mode 100644 index a18d318..0000000 --- a/cloud-modules/cloud-modules-template/src/main/resources/mapper/WarnRuleMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - diff --git a/cloud-modules/cloud-modules-template/src/main/resources/mapper/WarnStrategyMapper.xml b/cloud-modules/cloud-modules-template/src/main/resources/mapper/WarnStrategyMapper.xml deleted file mode 100644 index ce15729..0000000 --- a/cloud-modules/cloud-modules-template/src/main/resources/mapper/WarnStrategyMapper.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - -