运单预警

performance-api/src/main/java/com/clx/performance/vo/pc/vehiclewarn/VehicleWarnUserVO.java

@@ -40,7 +40,7 @@ public class VehicleWarnUserVO {
     @ApiModelProperty(value = "通知配置列表")
     private List<WarnTypeItem> warnTypeItemList;
     public List<WarnTypeItem> getWarnTypeItemList() {
-        List<Integer> warnTypeList = JSON.parseArray(warmTypeJson, Integer.class);
+        List<Integer> warnTypeList = JSON.parseArray(warnTypeJson, Integer.class);
 
         List<WarnTypeItem> list = new ArrayList<>();
         for (VehicleWarnConfigEnum.WarnType item : VehicleWarnConfigEnum.WarnType.values()) {
@@ -56,7 +56,10 @@ public class VehicleWarnUserVO {
 
     @JsonIgnore
     @ApiModelProperty(value = "预警配置", example = "", hidden = true)
-    private String warmTypeJson;
+    private String warnTypeJson;
+    @JsonIgnore
+    @ApiModelProperty(value = "线路预警配置", example = "", hidden = true)
+    private String lineWarnTypeJson;
 
     @Getter
     @Setter

performance-web/src/main/java/com/clx/performance/dao/impl/vehiclewarn/VehicleWarnUserDaoImpl.java

@@ -37,7 +37,7 @@ public class VehicleWarnUserDaoImpl extends BaseDaoImpl<VehicleWarnUserMapper, V
     public boolean updateWarnType(VehicleWarnUser item) {
         return update(lUdWrapper()
                 .eq(VehicleWarnUser::getId, item.getId())
-                .set(VehicleWarnUser::getWarmTypeJson, item.getWarmTypeJson())
+                .set(VehicleWarnUser::getWarnTypeJson, item.getWarnTypeJson())
         );
     }
 

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

@@ -28,7 +28,8 @@ public class VehicleWarnUser  implements HasKey<Integer> {
     private Integer id;                             //id
     private String name;                            //姓名
     private String mobile;                          //手机
-    private String warmTypeJson;                    //预警配置
+    private String warnTypeJson;                    //预警配置
+    private String lineWarnTypeJson;                //线路预警配置
     private Integer deleteStatus;                   //删除状态: 0-否;1-是
     private String createBy;                        //创建人
     private LocalDateTime createTime;               //创建时间

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

@@ -301,7 +301,7 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
         // 过滤需要通知的人员
         List<VehicleWarnUser> list = vehicleWarnUserDao.listAllEnable();
         for (VehicleWarnUser item : list) {
-            List<Integer> warnTypeList = JSON.parseArray(item.getWarmTypeJson(),Integer.class);
+            List<Integer> warnTypeList = JSON.parseArray(item.getWarnTypeJson(),Integer.class);
             if (warnTypeList.contains(vehicleWarnInfo.getWarnType())){
                 mobileList.add(item.getMobile());
             }

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

@@ -50,7 +50,7 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService {
         VehicleWarnUser vehicleWarnUser = new VehicleWarnUser();
         vehicleWarnUser.setName(param.getName());
         vehicleWarnUser.setMobile(param.getMobile());
-        vehicleWarnUser.setWarmTypeJson(JSON.toJSONString(warnTypeList));
+        vehicleWarnUser.setWarnTypeJson(JSON.toJSONString(warnTypeList));
         vehicleWarnUser.setCreateBy(loginUserInfo.getUserName());
 
         vehicleWarnUserDao.saveEntity(vehicleWarnUser);
@@ -78,7 +78,7 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService {
 
         List<Integer> warnTypeList = param.getWarnTypeList().stream().filter(item -> Objects.equals(item.getEnable(), 1)).map(item->item.getWarnType()).collect(Collectors.toList());
 
-        vehicleWarnUser.setWarmTypeJson(JSON.toJSONString(warnTypeList));
+        vehicleWarnUser.setWarnTypeJson(JSON.toJSONString(warnTypeList));
         vehicleWarnUserDao.updateWarnType(vehicleWarnUser);
 
     }