Commit b45aa62b by huangjy

fix: 设备编辑问题

parent b8c0c6f3
......@@ -45,7 +45,7 @@ public class PlatDeviceBaseAttrDTO {
@Data
static class DeviceAttrRange {
public static class DeviceAttrRange {
private Integer max;
private Integer min;
}
......
......@@ -548,11 +548,17 @@ public class PlatDeviceServiceImpl extends ServiceImpl<PlatDeviceMapper, PlatDev
if (!Objects.equals(platDeviceBaseAttrDTO.getRadarDelay(), dto.getRadarDelay())) {
map.put("radarDelay", dto.getRadarDelay() );
}
if (!Objects.equals(platDeviceBaseAttrDTO.getRadarDistance(), dto.getRadarDistance())) {
map.put("radarDistance", JSON.toJSONString(dto.getRadarDistance()));
PlatDeviceBaseAttrDTO.DeviceAttrRange radarDistance = platDeviceBaseAttrDTO.getRadarDistance();
if (!Objects.equals(radarDistance, dto.getRadarDistance())) {
if (radarDistance.getMax() != null && radarDistance.getMin() != null) {
map.put("radarDistance", JSON.toJSONString(dto.getRadarDistance()));
}
}
if (!Objects.equals(platDeviceBaseAttrDTO.getRadarAngle(), dto.getRadarAngle())) {
map.put("radarAngle", JSON.toJSONString(dto.getRadarAngle()));
PlatDeviceBaseAttrDTO.DeviceAttrRange radarAngle = platDeviceBaseAttrDTO.getRadarAngle();
if (!Objects.equals(radarAngle, dto.getRadarAngle())) {
if (radarAngle.getMax() != null && radarAngle.getMin() != null) {
map.put("radarAngle", JSON.toJSONString(dto.getRadarAngle()));
}
}
return map;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment