提交 aebdedb8 作者: 17607474349

fix:

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