From 32e2ff6ee6b188c33d85e80a75e77dae819fa03c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E6=9C=9D?= <13694051+wangxizhao123@user.noreply.gitee.com> Date: Sun, 23 Jun 2024 10:43:36 +0800 Subject: [PATCH] =?UTF-8?q?fast()=E9=A2=84=E8=AD=A6=E6=8A=A5=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/common/Select/BreakdownSel.java | 15 ++-- .../com/business/common/domain/Breakdown.java | 53 ++++++------ .../goods/controller/BreakdownController.java | 61 ++++++++++--- .../com/muyu/goods/incident/mq/Producer.java | 12 +++ .../muyu/goods/mapper/BreakdownMapper.java | 11 ++- .../goods/monitor/mq/breakdownMqConsumer.java | 85 +++++++++++++++---- .../muyu/goods/service/IBreakdownService.java | 17 ++-- .../goods/service/impl/BreakdownService.java | 44 +++++++--- .../goods/service/impl/ExecuteService.java | 18 ++++ .../resources/mapper/rule/BreakdownMapper.xml | 23 ++--- .../config/runner/EnterpriseConfigRunner.java | 4 +- .../muyu/goods/config/EnterpiseConfig.java | 37 ++++++++ .../service/impl/EnterpriseServiceImpl.java | 5 -- .../cloud/CloudManyDataSourceApplication.java | 2 + 14 files changed, 286 insertions(+), 101 deletions(-) create mode 100644 muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/config/EnterpiseConfig.java diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/Select/BreakdownSel.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/Select/BreakdownSel.java index 12acc3c..6933a9b 100644 --- a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/Select/BreakdownSel.java +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/Select/BreakdownSel.java @@ -1,5 +1,8 @@ package com.business.common.Select; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.muyu.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -7,20 +10,18 @@ import lombok.NoArgsConstructor; import java.util.Date; @Data -@AllArgsConstructor -@NoArgsConstructor -public class BreakdownSel { - /** - * 故障类型 - */ - private String faultCode; +public class BreakdownSel{ /** * 多 */ +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") +// @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ") + @JsonProperty("faultStartTime") private Date faultStartTime; /** * 少 */ + @JsonProperty("faultEndTime") private Date faultEndTime; } diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/Breakdown.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/Breakdown.java index 591b373..63c2a5c 100644 --- a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/Breakdown.java +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/business/common/domain/Breakdown.java @@ -1,5 +1,8 @@ package com.business.common.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -8,36 +11,36 @@ import lombok.NoArgsConstructor; import java.util.Date; @Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class Breakdown { - /** - * 主键 - */ +public class Breakdown extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ private Long id; - /** - * 故障码 - */ + + /** 故障码 */ + @Excel(name = "故障码") private String faultCode; - /** - * 车辆标识 - */ + + /** 车辆标识 */ + @Excel(name = "车辆标识") private String vin; - /** - * 故障状态 - */ + + /** 故障状态 */ + @Excel(name = "故障状态") private Integer faultState; - /** - * 故障产生时间 - */ + + /** 故障产生时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "故障产生时间", width = 30, dateFormat = "yyyy-MM-dd") private Date faultStartTime; - /** - * 故障解决时间 - */ + + /** 故障解决时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "故障解决时间", width = 30, dateFormat = "yyyy-MM-dd") private Date faultEndTime; - /** - * 故障级别 - */ + + /** 故障级别 */ + @Excel(name = "故障级别") private Integer faultLevel; } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/controller/BreakdownController.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/controller/BreakdownController.java index 5e970f7..bcdbb1f 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/controller/BreakdownController.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/controller/BreakdownController.java @@ -8,11 +8,13 @@ import com.business.common.psvm.FaultInfo; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.goods.incident.mq.Producer; import com.muyu.goods.service.IBreakdownService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.List; import java.util.Map; @@ -22,37 +24,48 @@ import java.util.Map; public class BreakdownController extends BaseController { @Autowired private IBreakdownService service; + @Autowired + private Producer producer; /** * 分页 * @return */ + /** + * 查询故障列表 + */ @GetMapping("/list") - public Result> list(BreakdownSel breakdownSel) + public Result> list( ) { startPage(); - List list = service.selectBreakdownList(breakdownSel); + List list = service.selectBreakdownList(); return getDataTable(list); } + @PostMapping("/lists") + public Result> lists() { + List list = service.lists(); + return success(list); + } + /** * 添加新的故障记录 - * @param faultInfo + * @param breakdown * @return */ @PostMapping("indexBreakDown") - public Result indexBreakDown(@RequestBody FaultInfo faultInfo) { - return success(service.indexBreakDown(faultInfo)); + public Result indexBreakDown(@RequestBody Breakdown breakdown) { + return success(service.indexBreakDown(breakdown)); } /** * 故障解决记录 - * @param faultInfo + * @param breakdown * @return */ @PostMapping("updateBreakDown") - public Result updateBreakDown(@RequestBody FaultInfo faultInfo) { - return success(service.updateBreakDown(faultInfo)); + public Result updateBreakDown(@RequestBody Breakdown breakdown) { + return success(service.updateBreakDown(breakdown)); } /** @@ -64,8 +77,8 @@ public class BreakdownController extends BaseController { return success(service.listFaultCode()); } - @PostMapping("selectVinEnterprise") - public Result selectVinEnterprise(@RequestParam String vin) { + @PostMapping("selectVinEnterprise/{vin}") + public Result selectVinEnterprise(@PathVariable String vin) { return success(service.selectVinEnterprise(vin)); } @@ -74,7 +87,31 @@ public class BreakdownController extends BaseController { * @return */ @PostMapping("pies") - public Result>> pies() { - return success(service.pies()); + public Result>> pies(@RequestBody BreakdownSel breakdownSel) { + System.out.println(breakdownSel); + return success(service.pies(breakdownSel)); + } + + /** + * 测试队列 + */ + @PostMapping("start") + public void start() { + FaultInfo faultInfo = FaultInfo.builder() + .faultCode("456") + .vin("123") + .time(new Date()) + .build(); + producer.start_time(faultInfo); + } + + @PostMapping("end") + public void end() { + FaultInfo faultInfo = FaultInfo.builder() + .faultCode("456") + .vin("123") + .time(new Date()) + .build(); + producer.end_time(faultInfo); } } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/incident/mq/Producer.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/incident/mq/Producer.java index 46aa5f5..92dea5c 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/incident/mq/Producer.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/incident/mq/Producer.java @@ -1,5 +1,7 @@ package com.muyu.goods.incident.mq; +import com.alibaba.fastjson2.JSONObject; +import com.business.common.psvm.FaultInfo; import com.muyu.common.core.domain.Result; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; @@ -13,4 +15,14 @@ public class Producer { public void electronic(Integer id) { rabbitTemplate.convertAndSend("vehicle.event","",id); } + + public void start_time(FaultInfo faultInfo) { + String jsonString = JSONObject.toJSONString(faultInfo); + rabbitTemplate.convertAndSend("fault.message","start",jsonString); + } + + public void end_time(FaultInfo faultInfo) { + String jsonString = JSONObject.toJSONString(faultInfo); + rabbitTemplate.convertAndSend("fault.message","end",jsonString); + } } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/mapper/BreakdownMapper.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/mapper/BreakdownMapper.java index 0e80dda..caddda6 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/mapper/BreakdownMapper.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/mapper/BreakdownMapper.java @@ -11,15 +11,18 @@ import java.util.List; import java.util.Map; public interface BreakdownMapper { - Integer indexBreakDown(FaultInfo faultInfo); + Integer indexBreakDown(Breakdown breakdown); - Integer updateBreakDown(FaultInfo faultInfo); + Integer updateBreakDown(Breakdown breakdown); List listFaultCode(); Car selectVinCar(@Param("vin") String vin); - List selectBreakdownList(BreakdownSel breakdownSel); + List selectBreakdownList(); - List> pies(); + List> pies(BreakdownSel breakdownSel); + + + List lists(); } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/monitor/mq/breakdownMqConsumer.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/monitor/mq/breakdownMqConsumer.java index 7b03e10..1bcf4fd 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/monitor/mq/breakdownMqConsumer.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/monitor/mq/breakdownMqConsumer.java @@ -1,39 +1,76 @@ package com.muyu.goods.monitor.mq; -import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.business.common.domain.Breakdown; +import com.business.common.domain.VehicleInfo; import com.business.common.psvm.FaultInfo; +import com.rabbitmq.client.Channel; + import com.muyu.goods.controller.BreakdownController; +import com.muyu.goods.service.impl.ExecuteService; +import lombok.Data; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.core.AmqpAdmin; +import org.springframework.amqp.core.Message; import org.springframework.amqp.core.ExchangeTypes; import org.springframework.amqp.rabbit.annotation.Exchange; import org.springframework.amqp.rabbit.annotation.Queue; import org.springframework.amqp.rabbit.annotation.QueueBinding; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Component; +import java.io.IOException; +import java.util.Date; +import java.util.concurrent.TimeUnit; + @Component @Log4j2 public class breakdownMqConsumer { @Autowired private AmqpAdmin amqpAdmin; @Autowired + private ExecuteService executeService; + @Autowired private BreakdownController breakdownController; + @Autowired + private RedisTemplate redisTemplate; + /** * 处理发生的故障 * @param message */ - //监听交换机 Queue(队列名) @Exchange(value = "交换机名称", type = ExchangeTypes.FANOUT) - @RabbitListener(bindings = {@QueueBinding(value = @Queue("fault_start_message"), - exchange = @Exchange(value = "fault.message", type = ExchangeTypes.FANOUT))}) - public void failureOccurrence(String message) { - FaultInfo faultInfo = JSONObject.parseObject(message, FaultInfo.class); +// @RabbitListener(queuesToDeclare = {@Queue("fault_start_message")}) +// 监听交换机 Queue(队列名) @Exchange(value = "交换机名称", type = ExchangeTypes.FANOUT) + + @RabbitListener(bindings = {@QueueBinding(value = @Queue(name = "fault_start_message"), + exchange = @Exchange(name = "fault.message", type = ExchangeTypes.DIRECT), + key = { "start" })}) +// @RabbitListener(bindings = {@QueueBinding(value = @Queue("fault_start_message"), +// exchange = @Exchange(value = "fault.message", type = ExchangeTypes.FANOUT))}) + public void failureOccurrence(String message, Channel channel, Message messageProperties) { + String parse = JSON.parse(message).toString(); + FaultInfo faultInfo = JSON.parseObject(parse, FaultInfo.class); log.info("获取存在：{}",faultInfo); - log.info("获取存在：{}",message); -// breakdownController.indexBreakDown(faultInfo); - amqpAdmin.deleteQueue("fault_start_message"); + Breakdown breakdown = new Breakdown(); + breakdown.setFaultLevel(1); + breakdown.setFaultStartTime(faultInfo.getTime()); + breakdown.setFaultCode(faultInfo.getFaultCode()); + breakdown.setVin(faultInfo.getVin()); + breakdown.setFaultState(0); + System.out.println("取"); + executeService.indexBreakdown(breakdown); + redisTemplate.opsForValue().set("vin",faultInfo.getVin(),10,TimeUnit.MINUTES); + executeService.selectVinEnterprise(); + // 消费成功 手动确认 + try { + channel.basicAck(messageProperties.getMessageProperties().getDeliveryTag(),false); + } catch (IOException e) { + throw new RuntimeException(e); + } // 在这里处理接收到的消息 } @@ -41,14 +78,30 @@ public class breakdownMqConsumer { * 处理解决的故障 * @param message */ - @RabbitListener(bindings = {@QueueBinding(value = @Queue("fault_end_message"), - exchange = @Exchange(value = "fault.message", type = ExchangeTypes.FANOUT))}) - public void failureShooting(String message) { - FaultInfo faultInfo = JSONObject.parseObject(message, FaultInfo.class); +// @RabbitListener(queuesToDeclare = {@Queue("fault_end_message")}) + + @RabbitListener(bindings = {@QueueBinding(value = @Queue(name = "fault_end_message"), + exchange = @Exchange(name = "fault.message", type = ExchangeTypes.DIRECT), + key = { "end" })}) +// @RabbitListener(bindings = {@QueueBinding(value = @Queue("fault_end_message"), +// exchange = @Exchange(value = "fault.message", type = ExchangeTypes.FANOUT))}) + public void failureShooting(String message, Channel channel, Message messageProperties) { + String parse = JSON.parse(message).toString(); + FaultInfo faultInfo = JSON.parseObject(parse, FaultInfo.class); log.info("解决:{}",message); - log.info("解决:{}",faultInfo); -// breakdownController.updateBreakDown(faultInfo); - amqpAdmin.deleteQueue("fault_end_message"); + Breakdown breakdown = new Breakdown(); + breakdown.setFaultEndTime(faultInfo.getTime()); + breakdown.setFaultCode(faultInfo.getFaultCode()); + breakdown.setVin(faultInfo.getVin()); + breakdown.setFaultState(1); + System.out.println("改"); + breakdownController.updateBreakDown(breakdown); + // 消费成功 手动确认 + try { + channel.basicAck(messageProperties.getMessageProperties().getDeliveryTag(),false); + } catch (IOException e) { + throw new RuntimeException(e); + } // 在这里处理接收到的消息 } } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/IBreakdownService.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/IBreakdownService.java index 52bb61e..ac357ea 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/IBreakdownService.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/IBreakdownService.java @@ -14,20 +14,23 @@ public interface IBreakdownService { * 故障记录 * @return */ - List selectBreakdownList(BreakdownSel breakdownSel); + List selectBreakdownList(); + + List lists(); + /** * 记录故障发生 - * @param faultInfo + * @param breakdown * @return */ - Integer indexBreakDown(FaultInfo faultInfo); + Integer indexBreakDown(Breakdown breakdown); /** * 记录故障解决 - * @param faultInfo + * @param breakdown * @return */ - Integer updateBreakDown(FaultInfo faultInfo); + Integer updateBreakDown(Breakdown breakdown); List listFaultCode(); @@ -37,5 +40,7 @@ public interface IBreakdownService { * 图形化 * @return */ - List> pies(); + List> pies(BreakdownSel breakdownSel); + + } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/BreakdownService.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/BreakdownService.java index 3386dcc..abfc2bb 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/BreakdownService.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/BreakdownService.java @@ -30,22 +30,27 @@ public class BreakdownService implements IBreakdownService { /** * 故障记录 - * @param breakdownSel + * @param breakdown * @return */ @Override - public List selectBreakdownList(BreakdownSel breakdownSel) { - return mapper.selectBreakdownList(breakdownSel); + public List selectBreakdownList() { + return mapper.selectBreakdownList(); } @Override - public Integer indexBreakDown(FaultInfo faultInfo) { - return mapper.indexBreakDown(faultInfo); + public List lists() { + return mapper.lists(); } @Override - public Integer updateBreakDown(FaultInfo faultInfo) { - return mapper.updateBreakDown(faultInfo); + public Integer indexBreakDown(Breakdown breakdown) { + return mapper.indexBreakDown(breakdown); + } + + @Override + public Integer updateBreakDown(Breakdown breakdown) { + return mapper.updateBreakDown(breakdown); } @Override @@ -57,14 +62,28 @@ public class BreakdownService implements IBreakdownService { public Sources selectVinEnterprise(String vin) { // 查询车辆 Car car = mapper.selectVinCar(vin); + if (car == null) { + System.out.println("查询不到车辆"); + return null; + } //根据车辆管理人查询员工 List userList = remoteUserService.lists().getData(); - SysUser sysUser = userList.stream().filter(firm -> firm.getFirm() == car.getOwnerId()).collect(Collectors.toList()).get(0); + List sysUserList = userList.stream().filter(firm -> firm.getFirm() == car.getOwnerId()).collect(Collectors.toList()); + if (sysUserList == null ){ + System.out.println("该车负责人未找到"); + return null; + } + SysUser sysUser = sysUserList.get(0); //根据员工查询到企业 List enterpriseList = remoteSourcesService.lists().getData(); - Enterprise enterprise1 = enterpriseList.stream().filter(enterprise -> enterprise.getId() == sysUser.getFirm()).collect(Collectors.toList()).get(0); + List enterprises = enterpriseList.stream().filter(enterprise -> enterprise.getId() == sysUser.getFirm()).collect(Collectors.toList()); + if (enterprises == null) { + System.out.println("未成功定义企业"); + return null; + } + Enterprise enterprise = enterprises.get(0); //根据企业查询到企业数据源 - com.muyu.common.goods.domain.Sources sources = remoteSourcesService.listSources().getData().stream().filter(sour -> sour.getEnterpriseId() == enterprise1.getId()).collect(Collectors.toList()).get(0); + com.muyu.common.goods.domain.Sources sources = remoteSourcesService.listSources().getData().stream().filter(sour -> sour.getEnterpriseId() == enterprise.getId()).collect(Collectors.toList()).get(0); Sources sources1 = Sources.builder() .id(sources.getId()) .enterpriseId(sources.getEnterpriseId()) @@ -74,11 +93,12 @@ public class BreakdownService implements IBreakdownService { .username(sources.getUsername()) .password(sources.getPassword()) .build(); + System.out.println(sources1); return sources1; } @Override - public List> pies() { - return mapper.pies(); + public List> pies(BreakdownSel breakdownSel) { + return mapper.pies(breakdownSel); } } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/ExecuteService.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/ExecuteService.java index 7d915ec..ce4ecac 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/ExecuteService.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/goods/service/impl/ExecuteService.java @@ -1,10 +1,13 @@ package com.muyu.goods.service.impl; +import com.business.common.domain.Breakdown; import com.business.common.middle.GroupFenceDev; import com.business.common.domain.Car; +import com.business.common.psvm.FaultInfo; import com.muyu.goods.mapper.MapMapper; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -16,6 +19,10 @@ import java.util.stream.Collectors; public class ExecuteService { @Autowired private MapMapper mapMapper; + @Autowired + private BreakdownService breakdownService; + @Autowired + private RedisTemplate redisTemplate; @Async public void indexGroupFence(Car car) { @@ -35,4 +42,15 @@ public class ExecuteService { mapMapper.deleteCarFence(carId); log.info("delete完成"); } + + @Async + public void indexBreakdown(Breakdown breakdown) { + breakdownService.indexBreakDown(breakdown); + } + + @Async + public void selectVinEnterprise() { + String vin = redisTemplate.opsForValue().get("vin"); + breakdownService.selectVinEnterprise(vin); + } } diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/BreakdownMapper.xml b/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/BreakdownMapper.xml index 162b700..f6ce8d5 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/BreakdownMapper.xml +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/resources/mapper/rule/BreakdownMapper.xml @@ -32,26 +32,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" fault_code, vin, - fault_state, + fault_state, fault_start_time, - fault_level, + fault_level, #{faultCode}, #{vin}, 0, - #{time}, + #{faultStartTime}, 1, update breakdown - set fault_end_time = #{time}, + set fault_end_time = #{faultEndTime}, fault_state = 1 where fault_code = #{faultCode} and vin = #{vin} and - fault_end_time = null + fault_end_time is null + diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/runner/EnterpriseConfigRunner.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/runner/EnterpriseConfigRunner.java index 1e1cb2c..51906b7 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/runner/EnterpriseConfigRunner.java +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-client/src/main/java/muyu/goods/enterprise/client/config/runner/EnterpriseConfigRunner.java @@ -22,8 +22,6 @@ public class EnterpriseConfigRunner implements ApplicationRunner { @Autowired private RemoteSourcesService remoteSourcesService; @Override - public void run(ApplicationArguments args) throws Exception { - Result> listResult = remoteSourcesService.listSources(); - System.out.println(listResult); + public void run(ApplicationArguments args){ } } diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/config/EnterpiseConfig.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/config/EnterpiseConfig.java new file mode 100644 index 0000000..8655953 --- /dev/null +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/config/EnterpiseConfig.java @@ -0,0 +1,37 @@ +package com.muyu.goods.config; + +import com.alibaba.fastjson2.JSONObject; +import com.muyu.goods.controller.EnterpriseController; +import com.muyu.goods.domain.Enterprise; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.core.RedisTemplate; + +import java.util.List; + +@Log4j2 +@Configuration +@ComponentScan +public class EnterpiseConfig implements ApplicationRunner { + @Autowired + private RedisTemplate redisTemplate; + @Autowired + private EnterpriseController enterpriseController; + + + @Override + public void run(ApplicationArguments args) throws Exception { + List enterprises = enterpriseController.lists().getData(); + List range = redisTemplate.opsForList().range("enterprises", 0, -1); + if (range.size() == 0){ + for (Enterprise enterpris : enterprises) { + redisTemplate.opsForList().leftPushAll("enterprises",JSONObject.toJSONString(enterpris)); + } + } + } + } + diff --git a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java index 8d7663c..45f6b3f 100644 --- a/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java +++ b/muyu-modules/muyu-goods-enterprise/muyu-goods-enterprise-server/src/main/java/com/muyu/goods/service/impl/EnterpriseServiceImpl.java @@ -139,9 +139,7 @@ public class EnterpriseServiceImpl implements IEnterpriseService throw new RuntimeException(e); } Sources sources = Sources.index(enterprise1.getId(),"enterprise" + enterprise1.getId(), String.valueOf((int) (enterprise.getId() + 3306))); - System.out.println(sources); enterpriseMapper.indexSources(sources); - System.out.println(sources.getIp()); producer.datasource(sources.getIp()); } return i; @@ -197,9 +195,6 @@ public class EnterpriseServiceImpl implements IEnterpriseService @Override public List lists() { List enterprises = selectEnterpriseList(null); - for (Enterprise enterpris : enterprises) { - redisTemplate.opsForList().leftPush("enterprises",JSONObject.toJSONString(enterpris)); - } List range = redisTemplate.opsForList().range("enterprises", 0, -1); System.out.println(range); return enterprises; diff --git a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/CloudManyDataSourceApplication.java b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/CloudManyDataSourceApplication.java index 28c461b..5857e93 100644 --- a/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/CloudManyDataSourceApplication.java +++ b/muyu-modules/muyu-moudels-many-datasource/src/main/java/com/muyu/cloud/CloudManyDataSourceApplication.java @@ -21,4 +21,6 @@ public class CloudManyDataSourceApplication { public static void main(String[] args) { SpringApplication.run(CloudManyDataSourceApplication.class,args); } + + }