提交 65f189f8 authored 作者: 艾庆国's avatar 艾庆国

线路预警

上级 ff4fabf5
...@@ -3,6 +3,9 @@ package com.clx.performance.enums.vehiclewarn; ...@@ -3,6 +3,9 @@ package com.clx.performance.enums.vehiclewarn;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import java.util.Arrays;
import java.util.Optional;
public enum VehicleWarnUserEnum { public enum VehicleWarnUserEnum {
; ;
...@@ -18,5 +21,22 @@ public enum VehicleWarnUserEnum { ...@@ -18,5 +21,22 @@ public enum VehicleWarnUserEnum {
private final String msg; private final String msg;
} }
@Getter
@AllArgsConstructor
public enum NoticeStatus {
NO(0, "禁用"),
YES(1, "开启"),
;
private final Integer code;
private final String msg;
public static Optional<NoticeStatus> getByCode(int code) {
return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
}
public static String getMsgByCode(int code) {
return getByCode(code).map(NoticeStatus::getMsg).orElse(null);
}
}
} }
package com.clx.performance.param.pc.vehiclewarn;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import javax.validation.constraints.NotNull;
@Getter
@Setter
@NoArgsConstructor
public class VehicleWarnUserStatusUpdateParam {
@ApiModelProperty(value = "id", example = "1")
@NotNull(message = "id不能为空")
private Integer id;
@ApiModelProperty(value = "通知状态: 0禁用 1开启", example = "1")
@NotNull(message = "状态不能为空")
private Integer noticeStatus;
}
...@@ -3,6 +3,7 @@ package com.clx.performance.vo.pc.vehiclewarn; ...@@ -3,6 +3,7 @@ package com.clx.performance.vo.pc.vehiclewarn;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.clx.performance.enums.linewarn.LineWarnConfigEnum; import com.clx.performance.enums.linewarn.LineWarnConfigEnum;
import com.clx.performance.enums.vehiclewarn.VehicleWarnConfigEnum; import com.clx.performance.enums.vehiclewarn.VehicleWarnConfigEnum;
import com.clx.performance.enums.vehiclewarn.VehicleWarnUserEnum;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;
...@@ -30,7 +31,13 @@ public class VehicleWarnUserVO { ...@@ -30,7 +31,13 @@ public class VehicleWarnUserVO {
private String name; private String name;
@ApiModelProperty(value = "手机", example = "13000000000") @ApiModelProperty(value = "手机", example = "13000000000")
private String mobile; private String mobile;
@ApiModelProperty(value = "通知状态: 0禁用 1开启", example = "1")
private Integer noticeStatus;
@ApiModelProperty(value = "通知状态: 0禁用 1开启", example = "1")
private String noticeStatusMsg;
public String getNoticeStatusMsg() {
return VehicleWarnUserEnum.NoticeStatus.getMsgByCode(noticeStatus);
}
@ApiModelProperty(value = "创建人", example = "") @ApiModelProperty(value = "创建人", example = "")
private String createBy; private String createBy;
@ApiModelProperty(value = "创建时间", example = "") @ApiModelProperty(value = "创建时间", example = "")
......
...@@ -24,7 +24,7 @@ public class LineWarnTraceController { ...@@ -24,7 +24,7 @@ public class LineWarnTraceController {
@Autowired @Autowired
private LineWarnTraceService lineWarnTraceService; private LineWarnTraceService lineWarnTraceService;
@ApiOperation(value = "获取预警信息",notes = "<br>By:艾庆国") @ApiOperation(value = "获取轨迹信息",notes = "<br>By:艾庆国")
@GetMapping("/getTraceInfo") @GetMapping("/getTraceInfo")
public Result<LineWarnTraceVO> getTraceInfo(@NotNull(message = "货单编号不能为空") @Validated String orderGoodsNo) { public Result<LineWarnTraceVO> getTraceInfo(@NotNull(message = "货单编号不能为空") @Validated String orderGoodsNo) {
return Result.ok(lineWarnTraceService.getTraceInfo(orderGoodsNo)); return Result.ok(lineWarnTraceService.getTraceInfo(orderGoodsNo));
......
...@@ -61,6 +61,12 @@ public class VehicleWarnUserController { ...@@ -61,6 +61,12 @@ public class VehicleWarnUserController {
vehicleWarnUserService.deleteUser(param); vehicleWarnUserService.deleteUser(param);
return Result.ok(); return Result.ok();
} }
@ApiOperation(value = "更新通知状态", notes = "<br>By:艾庆国")
@PostMapping("/updateNoticeStatus")
public Result<Void> updateNoticeStatus(@RequestBody @Validated VehicleWarnUserStatusUpdateParam param) {
vehicleWarnUserService.updateNoticeStatus(param);
return Result.ok();
}
@ApiOperation(value = "获取人员信息",notes = "<br>By:艾庆国") @ApiOperation(value = "获取人员信息",notes = "<br>By:艾庆国")
@GetMapping("/getUser") @GetMapping("/getUser")
......
...@@ -42,6 +42,14 @@ public class VehicleWarnUserDaoImpl extends BaseDaoImpl<VehicleWarnUserMapper, V ...@@ -42,6 +42,14 @@ public class VehicleWarnUserDaoImpl extends BaseDaoImpl<VehicleWarnUserMapper, V
); );
} }
@Override
public boolean updateNoticeStatus(VehicleWarnUser item) {
return update(lUdWrapper()
.eq(VehicleWarnUser::getId, item.getId())
.set(VehicleWarnUser::getNoticeStatus, item.getNoticeStatus())
);
}
@Override @Override
public Optional<VehicleWarnUser> findById(Integer id) { public Optional<VehicleWarnUser> findById(Integer id) {
return Optional.of(id) return Optional.of(id)
......
...@@ -14,6 +14,7 @@ public interface VehicleWarnUserDao extends BaseDao<VehicleWarnUserMapper, Vehic ...@@ -14,6 +14,7 @@ public interface VehicleWarnUserDao extends BaseDao<VehicleWarnUserMapper, Vehic
boolean updateUser(VehicleWarnUser item); boolean updateUser(VehicleWarnUser item);
boolean deleteUser(VehicleWarnUser item); boolean deleteUser(VehicleWarnUser item);
boolean updateWarnType(VehicleWarnUser item); boolean updateWarnType(VehicleWarnUser item);
boolean updateNoticeStatus(VehicleWarnUser item);
Optional<VehicleWarnUser> findById(Integer id); Optional<VehicleWarnUser> findById(Integer id);
Optional<VehicleWarnUser> findByMobile(String mobile); Optional<VehicleWarnUser> findByMobile(String mobile);
......
...@@ -31,6 +31,7 @@ public class VehicleWarnUser implements HasKey<Integer> { ...@@ -31,6 +31,7 @@ public class VehicleWarnUser implements HasKey<Integer> {
private String warnTypeJson; //预警配置 private String warnTypeJson; //预警配置
private String lineWarnTypeJson; //线路预警配置 private String lineWarnTypeJson; //线路预警配置
private Integer deleteStatus; //删除状态: 0-否;1-是 private Integer deleteStatus; //删除状态: 0-否;1-是
private Integer noticeStatus; //通知状态: 0禁用 1开启
private String createBy; //创建人 private String createBy; //创建人
private LocalDateTime createTime; //创建时间 private LocalDateTime createTime; //创建时间
private LocalDateTime modifiedTime; //修改时间 private LocalDateTime modifiedTime; //修改时间
......
...@@ -104,6 +104,15 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService { ...@@ -104,6 +104,15 @@ public class VehicleWarnUserServiceImpl implements VehicleWarnUserService {
vehicleWarnUser.setDeleteStatus(VehicleWarnUserEnum.DeleteStatus.YES.getCode()); vehicleWarnUser.setDeleteStatus(VehicleWarnUserEnum.DeleteStatus.YES.getCode());
vehicleWarnUserDao.deleteUser(vehicleWarnUser); vehicleWarnUserDao.deleteUser(vehicleWarnUser);
} }
@Override
public void updateNoticeStatus(VehicleWarnUserStatusUpdateParam param) {
VehicleWarnUser vehicleWarnUser = vehicleWarnUserDao
.findById(param.getId()).orElseThrow(ResultEnum.DATA_NOT_FIND);
vehicleWarnUser.setNoticeStatus(param.getNoticeStatus());
vehicleWarnUserDao.updateNoticeStatus(vehicleWarnUser);
}
@Override @Override
public VehicleWarnUserVO getUser(Integer id) { public VehicleWarnUserVO getUser(Integer id) {
......
...@@ -11,6 +11,7 @@ public interface VehicleWarnUserService { ...@@ -11,6 +11,7 @@ public interface VehicleWarnUserService {
void updateUser(VehicleWarnUserUpdateParam param); void updateUser(VehicleWarnUserUpdateParam param);
void updateConfig(VehicleWarnUserConfigUpdateParam param); void updateConfig(VehicleWarnUserConfigUpdateParam param);
void deleteUser(VehicleWarnUserDeleteParam param); void deleteUser(VehicleWarnUserDeleteParam param);
void updateNoticeStatus(VehicleWarnUserStatusUpdateParam param);
VehicleWarnUserVO getUser(Integer id); VehicleWarnUserVO getUser(Integer id);
IPage<VehicleWarnUserVO> pageUser(PageVehicleWarnUserParam param); IPage<VehicleWarnUserVO> pageUser(PageVehicleWarnUserParam param);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论