报文更新

zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/controller/GroupController.java

@@ -65,7 +65,7 @@ public class GroupController extends BaseController
      */
 //    @RequiresPermissions("system:group:query")
     @GetMapping(value = "/{id}")
-    public Result getInfo(@PathVariable("id") Long id)
+    public Result getInfo( @PathVariable("id") Long id)
     {
         return success(groupService.selectGroupById(id));
     }

zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/controller/MessageDetailController.java

@@ -1,8 +1,11 @@
 package com.zhiLian.vehicle.controller;
 
+import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.zhiLian.common.core.domain.Result;
 import com.zhiLian.common.core.utils.poi.ExcelUtil;
 import com.zhiLian.common.core.web.controller.BaseController;
@@ -15,7 +18,9 @@ import com.zhiLian.vehicle.domain.VehicleMessage;
 import com.zhiLian.vehicle.domain.req.MessageDetailEditReq;
 import com.zhiLian.vehicle.domain.req.MessageDetailQueryReq;
 import com.zhiLian.vehicle.domain.req.MessageDetailSaveReq;
+import com.zhiLian.vehicle.domain.vo.MessageDetailQueryVo;
 import com.zhiLian.vehicle.domain.vo.VehicleMessageVo;
+import com.zhiLian.vehicle.mapper.MessageDetailMapper;
 import com.zhiLian.vehicle.service.MessageDetailService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +56,19 @@ public class MessageDetailController extends BaseController {
         List<MessageDetail> list = messageDetailService.list(MessageDetail.queryBuild(messageDetailQueryReq));
         return getDataTable(list);
     }
+    @Autowired
+    private MessageDetailMapper messageDetailMapper;
+
+    @ApiOperation("获取报文详情列表")
+    @GetMapping("/listByVin")
+    public Result<List<MessageDetail>> listByVin(MessageDetailQueryVo messageDetailQueryVo) {
+        VehicleMessage vehicleMessage = new VehicleMessage();
+        vehicleMessage.setVin(messageDetailQueryVo.getVin());
+        VehicleMessage byVin = messageDetailMapper.findByVin(vehicleMessage);
+        List<MessageDetail> messageDetailList = messageDetailService.list(new QueryWrapper<MessageDetail>().
+                in("id", Arrays.asList(byVin.getMessageIds().split(","))));
+        return Result.success(messageDetailList);
+    }
 
     @PostMapping("addMessageIds")
     public Result addMessageIds(@RequestBody VehicleMessage vehicleMessageVo){

zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/domain/vo/MessageDetailQueryVo.java

@@ -0,0 +1,22 @@
+package com.zhiLian.vehicle.domain.vo;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+/**
+ * BingRui.Hou
+ *
+ * @Description 描述
+ * @ClassName MessageDetailQueryVo
+ * @Date 2024/06/28 17:05
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
+public class MessageDetailQueryVo {
+    private String vin;
+}

zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/job/ManyJob.java

@@ -76,7 +76,7 @@ public class ManyJob {
     }
 
 
-    @Scheduled(cron = "* */20 * * * ?")// 每10分钟执行一次
+//    @Scheduled(cron = "* */20 * * * ?")// 每10分钟执行一次
     public void manyJobMess(){
         List<Entinfo> list = remoteBusinessService.listAll();
         ExecutorService executorService = Executors.newFixedThreadPool(list.size());
@@ -99,6 +99,28 @@ public class ManyJob {
             });
         });
     }
+//    @Scheduled(cron = "* */8 * * * ?")// 每10分钟执行一次
+    public void redisTemplate(){
+        List<Entinfo> list = remoteBusinessService.listAll();
+        ExecutorService executorService = Executors.newFixedThreadPool(list.size());
+        list.forEach(entinfo -> {
+            executorService.submit(new Runnable() {
+                @Override
+                public void run() {
+                    log.info("车辆报文续期：{}");
+                    DynamicDataSourceHolder.setDynamicDataSourceKey(entinfo.getEntCode());
+                    List<VehicleMessage> list1= messageDetailMapper.listVehicleMess();
+                    list1.forEach(vehicleMessage -> {
+                        if (redisTemplate.hasKey(vehicleMessage.getVin()+"List")){
+                            redisTemplate.expire(vehicleMessage.getVin()+"List",8,TimeUnit.MINUTES);
+                        }
+                    });
+                    DynamicDataSourceHolder.removeDynamicDataSourceKey();
+                }
+            });
+        });
+    }
+
 
     public void redis(Entinfo entinfo){
         DynamicDataSourceHolder.setDynamicDataSourceKey(entinfo.getEntCode());

zhiLian-vehicle/zhiLian-vehicle-service/src/main/java/com/zhiLian/vehicle/service/impl/MessageDetailServiceImpl.java

@@ -43,6 +43,7 @@ public class MessageDetailServiceImpl extends ServiceImpl<MessageDetailMapper, M
      */
     @Autowired
     private RedisTemplate<String,String> redisTemplate;
+
     /**
      * 查询报文详情列表
      *
@@ -55,8 +56,6 @@ public class MessageDetailServiceImpl extends ServiceImpl<MessageDetailMapper, M
         return list(queryWrapper);
     }
 
-    @Autowired
-    private RedisService redisService;
     @Override
     public Result addMessageIds(VehicleMessage vehicleMessageVo) {
         redisTemplate.delete(vehicleMessageVo.getVin()+"List");