Merge branch 'v14.4_vehicle_warn_20240425' into dev

performance-api/src/main/java/com/clx/performance/param/pc/vehiclewarn/VehicleWarnUserConfigUpdateParam.java

 package com.clx.performance.param.pc.vehiclewarn;
 
+import com.clx.performance.vo.pc.vehiclewarn.VehicleWarnUserVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -17,6 +18,6 @@ public class VehicleWarnUserConfigUpdateParam {
     @NotNull(message = "id不能为空")
     private Integer id;
     @ApiModelProperty(value = "选中报警类型列表")
-    private List<Integer> warnTypeList;
+    private List<VehicleWarnUserVO.WarnTypeItem> warnTypeList;
 
 }

performance-web/src/main/java/com/clx/performance/controller/pc/vehiclewarn/VehicleWarnUserController.java

@@ -49,7 +49,6 @@ public class VehicleWarnUserController {
     @ApiOperation(value = "更新通知配置", notes = "<br>By:艾庆国")
     @PostMapping("/updateConfig")
     public Result<Void> updateConfig(@RequestBody @Validated VehicleWarnUserConfigUpdateParam param) {
-        if (param.getWarnTypeList() == null) {param.setWarnTypeList(new ArrayList<>());}
 
         vehicleWarnUserService.updateConfig(param);
         return Result.ok();

performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java

@@ -6,6 +6,7 @@ import com.clx.performance.feign.TransportFeignService;
 import com.clx.performance.listener.OrderChildDtsListener;
 import com.clx.performance.service.TempService;
 import com.clx.performance.service.child.FeignOrderChildService;
+import com.clx.performance.service.trace.TruckTraceMqHandlerService;
 import com.msl.common.result.Result;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -35,17 +36,17 @@ public class TempController {
     @Autowired
     private TransportFeignService transportFeignService;
 
+
     @Autowired
-    private OrderChildDtsListener orderChildDtsListener;
+    private TruckTraceMqHandlerService truckTraceMqHandlerService;
 
 
     @ApiOperation(value = "test", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/test", method = RequestMethod.GET)
     public Result test() {
 
-        OrderChildSyncMessage message = new OrderChildSyncMessage();
-        message.setId(1);
-        orderChildDtsListener.thirdpartySync(message);
+        truckTraceMqHandlerService.save();
+
         return Result.ok();
     }
 

performance-web/src/main/java/com/clx/performance/model/vehiclewarn/VehicleWarnConfig.java

 package com.clx.performance.model.vehiclewarn;
 
 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 com.msl.common.config.KeyColumn;
@@ -30,6 +31,7 @@ public class VehicleWarnConfig  implements HasKey<Integer> {
     private String warnName;                        //预警方案名称
     private Integer warnType;                       //预警类型
     private Integer warnLevel;                      //预警级别
+    @TableField(value = "`interval`")
     private BigDecimal interval;                    //预警间隔（小时）
     private BigDecimal timeoutRatio;                //超时比例（%）
     private BigDecimal longitude;                   //经度

performance-web/src/main/java/com/clx/performance/service/impl/trace/TruckTraceMqHandlerServiceImpl.java

 package com.clx.performance.service.impl.trace;
 
 import com.clx.performance.dto.zjxl.TruckTraceDTO;
-import com.clx.performance.esplus.mapper.DriverTraceESPlusMapper;
 import com.clx.performance.esplus.mapper.TruckTraceESPlusMapper;
 import com.clx.performance.esplus.model.TruckTraceESPlus;
 import com.clx.performance.param.mq.trace.TruckTraceSyncMqParam;
 import com.clx.performance.service.trace.TruckTraceMqHandlerService;
+import com.clx.performance.utils.LocalDateTimeUtils;
 import com.clx.performance.utils.zjxl.ZjxlGpsService;
 import lombok.extern.slf4j.Slf4j;
 import org.elasticsearch.common.geo.GeoPoint;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -50,4 +50,16 @@ public class TruckTraceMqHandlerServiceImpl implements TruckTraceMqHandlerServic
         truckTraceESPlusMapper.insertBatch(esList);
 
     }
+
+    @Override
+    public void save(){
+        TruckTraceESPlus es = new TruckTraceESPlus();
+        es.setTruckNo("京A12345");
+        es.setAngle(new BigDecimal("123.45"));
+        es.setHeight(new BigDecimal("23.45"));
+        es.setLocation(new GeoPoint(45.67, 123.45));
+        es.setGpsTime(LocalDateTimeUtils.formatTime());
+        es.setMileage(new BigDecimal(34.56));
+        es.setSpeed(new BigDecimal("67.89"));
+    }
 }

performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnUserServiceImpl.java

@@ -20,7 +20,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -71,7 +73,9 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService {
     public void updateConfig(VehicleWarnUserConfigUpdateParam param) {
         VehicleWarnUser vehicleWarnUser = vehicleWarnUserDao.findById(param.getId()).orElseThrow(ResultEnum.DATA_NOT_FIND);
 
-        vehicleWarnUser.setWarmTypeJson(JSON.toJSONString(param.getWarnTypeList()));
+        List<VehicleWarnUserVO.WarnTypeItem> warnTypeList = param.getWarnTypeList().stream().filter(item -> Objects.equals(item.getEnable(), 1)).collect(Collectors.toList());
+
+        vehicleWarnUser.setWarmTypeJson(JSON.toJSONString(warnTypeList));
         vehicleWarnUserDao.updateWarnType(vehicleWarnUser);
 
     }

performance-web/src/main/java/com/clx/performance/service/trace/TruckTraceMqHandlerService.java

@@ -7,4 +7,5 @@ public interface TruckTraceMqHandlerService {
     void truckTracSync(TruckTraceSyncMqParam mq);
 
 
+    void save();
 }