提交 aebdedb8 作者: 17607474349

fix:

1、处置、撤离日志信息关联预计信息
上级 bddf0696
...@@ -7,7 +7,6 @@ import com.yiring.auth.domain.user.User; ...@@ -7,7 +7,6 @@ import com.yiring.auth.domain.user.User;
import com.yiring.common.domain.BasicEntity; import com.yiring.common.domain.BasicEntity;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import javax.persistence.*; import javax.persistence.*;
import lombok.*; import lombok.*;
import lombok.experimental.FieldDefaults; import lombok.experimental.FieldDefaults;
...@@ -38,7 +37,7 @@ public class RiskHandlePushLog extends BasicEntity implements Serializable { ...@@ -38,7 +37,7 @@ public class RiskHandlePushLog extends BasicEntity implements Serializable {
@Serial @Serial
private static final long serialVersionUID = -4525914994066766232L; private static final long serialVersionUID = -4525914994066766232L;
@OneToOne @ManyToOne
@Comment("预警信息") @Comment("预警信息")
WarningMessage warningMessage; WarningMessage warningMessage;
...@@ -46,9 +45,6 @@ public class RiskHandlePushLog extends BasicEntity implements Serializable { ...@@ -46,9 +45,6 @@ public class RiskHandlePushLog extends BasicEntity implements Serializable {
@Comment("风险推送") @Comment("风险推送")
RiskPush riskPush; RiskPush riskPush;
@Comment("最新监测值")
BigDecimal newestMonitor;
@Comment("通知方式") @Comment("通知方式")
String types; String types;
......
...@@ -7,7 +7,6 @@ import com.yiring.auth.domain.user.User; ...@@ -7,7 +7,6 @@ import com.yiring.auth.domain.user.User;
import com.yiring.common.domain.BasicEntity; import com.yiring.common.domain.BasicEntity;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import javax.persistence.*; import javax.persistence.*;
import lombok.*; import lombok.*;
import lombok.experimental.FieldDefaults; import lombok.experimental.FieldDefaults;
...@@ -38,7 +37,7 @@ public class RiskWithdrawalPushLog extends BasicEntity implements Serializable { ...@@ -38,7 +37,7 @@ public class RiskWithdrawalPushLog extends BasicEntity implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 3245051209143173609L; private static final long serialVersionUID = 3245051209143173609L;
@OneToOne @ManyToOne
@Comment("预警信息") @Comment("预警信息")
WarningMessage warningMessage; WarningMessage warningMessage;
...@@ -46,9 +45,6 @@ public class RiskWithdrawalPushLog extends BasicEntity implements Serializable { ...@@ -46,9 +45,6 @@ public class RiskWithdrawalPushLog extends BasicEntity implements Serializable {
@Comment("风险推送") @Comment("风险推送")
RiskPush riskPush; RiskPush riskPush;
@Comment("最新监测值")
BigDecimal newestMonitor;
@Comment("通知方式") @Comment("通知方式")
String types; String types;
......
...@@ -192,7 +192,7 @@ public class MockPositionMessageJob { ...@@ -192,7 +192,7 @@ public class MockPositionMessageJob {
private JSONObject mockMeterDetectMessage(JSONObject extra) { private JSONObject mockMeterDetectMessage(JSONObject extra) {
JSONObject params = new JSONObject(); JSONObject params = new JSONObject();
params.put("locationNum", "AT-4736"); params.put("locationNum", "1");
params.put("newestMonitor", 1.5); params.put("newestMonitor", 1.5);
params.put("time", LocalDateTime.now()); params.put("time", LocalDateTime.now());
params.putAll(extra); params.putAll(extra);
......
...@@ -32,7 +32,7 @@ public class RiskPushSaveParam implements Serializable { ...@@ -32,7 +32,7 @@ public class RiskPushSaveParam implements Serializable {
@NotNull(message = "工区id不能为空") @NotNull(message = "工区id不能为空")
Long workId; Long workId;
@ApiModelProperty(value = "风险等级", example = "1-红色风险,2-橙色风险,3-黄色风险,4-蓝色风险", required = true) @ApiModelProperty(value = "风险等级", example = "1", required = true)
@NotNull(message = "风险等级不能为空") @NotNull(message = "风险等级不能为空")
Integer level; Integer level;
} }
...@@ -252,7 +252,9 @@ public class KeyAlarmServiceImpl implements KeyAlarmService { ...@@ -252,7 +252,9 @@ public class KeyAlarmServiceImpl implements KeyAlarmService {
// 员工 // 员工
List<User> userList = mapTypes.get(User.Type.EMPLOYEES); List<User> userList = mapTypes.get(User.Type.EMPLOYEES);
if (ObjectUtil.isEmpty(userList)) {
userList = ListUtil.toList();
}
// 普通人员 // 普通人员
AtomicInteger oPer = new AtomicInteger(0); AtomicInteger oPer = new AtomicInteger(0);
// 内部特殊工作人员 // 内部特殊工作人员
...@@ -290,9 +292,11 @@ public class KeyAlarmServiceImpl implements KeyAlarmService { ...@@ -290,9 +292,11 @@ public class KeyAlarmServiceImpl implements KeyAlarmService {
// 巡检人员+ // 巡检人员+
userListInfoVos.add(UserListInfoVo.builder().type("巡检人员").numOfPeo(inspectionPer.get()).build()); userListInfoVos.add(UserListInfoVo.builder().type("巡检人员").numOfPeo(inspectionPer.get()).build());
// 访客+ // 访客+
userListInfoVos.add( int visitor = 0;
UserListInfoVo.builder().type("访客").numOfPeo(mapTypes.get(User.Type.GUEST).size()).build() if (ObjectUtil.isNotEmpty(mapTypes.get(User.Type.GUEST))) {
); visitor = mapTypes.get(User.Type.GUEST).size();
}
userListInfoVos.add(UserListInfoVo.builder().type("访客").numOfPeo(visitor).build());
PageVo<UserListInfoVo> pageVo = PageVo.build(userListInfoVos, users.size()); PageVo<UserListInfoVo> pageVo = PageVo.build(userListInfoVos, users.size());
return Result.ok(pageVo); return Result.ok(pageVo);
......
...@@ -798,7 +798,6 @@ public class PositionMessageServiceImpl implements PositionMessageService { ...@@ -798,7 +798,6 @@ public class PositionMessageServiceImpl implements PositionMessageService {
.riskPush(riskPush) .riskPush(riskPush)
.types(s) .types(s)
.warningMessage(warningMessage) .warningMessage(warningMessage)
.newestMonitor(newestMonitor)
.user(user) .user(user)
.status(status) .status(status)
.build(); .build();
...@@ -846,7 +845,6 @@ public class PositionMessageServiceImpl implements PositionMessageService { ...@@ -846,7 +845,6 @@ public class PositionMessageServiceImpl implements PositionMessageService {
.riskPush(riskPush) .riskPush(riskPush)
.types(s) .types(s)
.warningMessage(warningMessage) .warningMessage(warningMessage)
.newestMonitor(newestMonitor)
.user(user) .user(user)
.status(status) .status(status)
.build(); .build();
......
...@@ -657,7 +657,9 @@ public class UserAppServiceImpl implements UserAppService { ...@@ -657,7 +657,9 @@ public class UserAppServiceImpl implements UserAppService {
// 员工 // 员工
List<User> userList = mapTypes.get(User.Type.EMPLOYEES); List<User> userList = mapTypes.get(User.Type.EMPLOYEES);
if (ObjectUtil.isEmpty(userList)) {
userList = ListUtil.toList();
}
// 普通人员 // 普通人员
AtomicInteger oPer = new AtomicInteger(0); AtomicInteger oPer = new AtomicInteger(0);
// 内部特殊工作人员 // 内部特殊工作人员
...@@ -695,9 +697,11 @@ public class UserAppServiceImpl implements UserAppService { ...@@ -695,9 +697,11 @@ public class UserAppServiceImpl implements UserAppService {
// 巡检人员+ // 巡检人员+
userListInfoVos.add(UserListInfoVo.builder().type("巡检人员").numOfPeo(inspectionPer.get()).build()); userListInfoVos.add(UserListInfoVo.builder().type("巡检人员").numOfPeo(inspectionPer.get()).build());
// 访客+ // 访客+
userListInfoVos.add( int visitor = 0;
UserListInfoVo.builder().type("访客").numOfPeo(mapTypes.get(User.Type.GUEST).size()).build() if (ObjectUtil.isNotEmpty(mapTypes.get(User.Type.GUEST))) {
); visitor = mapTypes.get(User.Type.GUEST).size();
}
userListInfoVos.add(UserListInfoVo.builder().type("访客").numOfPeo(visitor).build());
PageVo<UserListInfoVo> pageVo = PageVo.build(userListInfoVos, users.size()); PageVo<UserListInfoVo> pageVo = PageVo.build(userListInfoVos, users.size());
return Result.ok(pageVo); return Result.ok(pageVo);
......
...@@ -31,8 +31,7 @@ public class UserPhoneParam implements Serializable { ...@@ -31,8 +31,7 @@ public class UserPhoneParam implements Serializable {
@NotEmpty(message = "手机号码不能为空") @NotEmpty(message = "手机号码不能为空")
String mobile; String mobile;
@ApiModelProperty(value = "验证码", example = "7758", required = true) @ApiModelProperty(value = "验证码", example = "7758")
@NotEmpty(message = "验证码不能为空")
String code; String code;
@ApiModelProperty(value = "类型", example = "phone/pwd", required = true) @ApiModelProperty(value = "类型", example = "phone/pwd", required = true)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论