From fc8ab788d1ea1b69092e580d64ed023a13b25edb Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Sat, 26 Aug 2023 19:00:40 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E8=AD=A6=E6=8A=A5=E7=A7=8D?= =?UTF-8?q?=E7=B1=BB=202.=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E8=AE=BE?= =?UTF-8?q?=E5=A4=87id=E8=BF=94=E5=9B=9E=E8=AE=BE=E5=A4=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=203.=E6=9B=B4=E6=96=B0=E8=8E=B7=E5=8F=96=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=204.=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=8E=B7=E5=8F=96=E4=BB=BB=E5=8A=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/impl/AlarmTypeName.java | 9 +- .../controller/DeviceController.java | 5 +- .../beidouservice/pojo/dto/DevMaunDTO.java | 18 --- .../pojo/dto/DevTaskExecRespDTO.java | 16 --- .../pojo/dto/DeviceByIdRespDTO.java | 106 ++++++++++++++++++ .../pojo/dto/ManufacturerContentDTO.java | 18 --- .../pojo/dto/ManufacturerRespDTO.java | 18 --- .../pojo/dto/task/AlarmTaskReqDTO.java | 4 +- .../beidouservice/service/DeviceService.java | 3 +- .../service/impl/AlarmTaskServiceImpl.java | 10 +- .../service/impl/DeviceServiceImpl.java | 5 +- 11 files changed, 128 insertions(+), 84 deletions(-) delete mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/DevMaunDTO.java delete mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/DevTaskExecRespDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceByIdRespDTO.java delete mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/ManufacturerContentDTO.java delete mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/ManufacturerRespDTO.java diff --git a/src/main/java/com/zjyr/beidouservice/common/impl/AlarmTypeName.java b/src/main/java/com/zjyr/beidouservice/common/impl/AlarmTypeName.java index b4cfbf8..c82607a 100644 --- a/src/main/java/com/zjyr/beidouservice/common/impl/AlarmTypeName.java +++ b/src/main/java/com/zjyr/beidouservice/common/impl/AlarmTypeName.java @@ -4,13 +4,12 @@ import com.zjyr.beidouservice.common.EnumerationBase; public enum AlarmTypeName implements EnumerationBase { - ALARM_TYPE_AIRATTACK(0, "ALARM_TYPE_AIRATTACK"), - ALARM_TYPE_DISASTER(1, "ALARM_TYPE_DISASTER"), - ALARM_TYPE_PREPARE(2, "ALARM_TYPE_PREPARE"), + ALARM_TYPE_PREPARE(1, "ALARM_TYPE_PREPARE"), + ALARM_TYPE_AIRATTACK(2, "ALARM_TYPE_AIRATTACK"), ALARM_TYPE_RELIEVE_AIRATTACK(3, "ALARM_TYPE_RELIEVE_AIRATTACK"), ALARM_TYPE_RELIEVE_DISASTER(4, "ALARM_TYPE_RELIEVE_DISASTER"), - - ; + ALARM_TYPE_DISASTER(5, "ALARM_TYPE_DISASTER"), + ALARM_TYPE_INTERRUPT(6, "ALARM_TYPE_INTERRUPT"); private final Integer code; private final String desc; diff --git a/src/main/java/com/zjyr/beidouservice/controller/DeviceController.java b/src/main/java/com/zjyr/beidouservice/controller/DeviceController.java index b392202..4373a52 100644 --- a/src/main/java/com/zjyr/beidouservice/controller/DeviceController.java +++ b/src/main/java/com/zjyr/beidouservice/controller/DeviceController.java @@ -2,6 +2,7 @@ package com.zjyr.beidouservice.controller; import com.zjyr.beidouservice.pojo.MyResp; +import com.zjyr.beidouservice.pojo.dto.DeviceByIdRespDTO; import com.zjyr.beidouservice.pojo.dto.DeviceReqDTO; import com.zjyr.beidouservice.pojo.dto.DeviceRespDTO; import com.zjyr.beidouservice.pojo.dto.DeviceSearchDTO; @@ -48,8 +49,8 @@ public class DeviceController { */ @Operation(summary = "根据deviceId获取设备信息") @PostMapping("device/info/deviceId") - public MyResp getDeviceByDeviceId(@RequestBody DeviceSearchDTO deviceSearchDTO) { - DeviceRespDTO deviceRespDTO = deviceService.getDeviceByDeviceId(deviceSearchDTO); + public MyResp getDeviceByDeviceId(@RequestBody DeviceSearchDTO deviceSearchDTO) { + DeviceByIdRespDTO deviceRespDTO = deviceService.getDeviceByDeviceId(deviceSearchDTO); return MyResp.success(deviceRespDTO); } } diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/DevMaunDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/DevMaunDTO.java deleted file mode 100644 index 1c4b9d6..0000000 --- a/src/main/java/com/zjyr/beidouservice/pojo/dto/DevMaunDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zjyr.beidouservice.pojo.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class DevMaunDTO { - private Long deviceId; - - private Integer alarmManufacturer; - - private Integer controlManufacturer; -} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/DevTaskExecRespDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/DevTaskExecRespDTO.java deleted file mode 100644 index 4d067c0..0000000 --- a/src/main/java/com/zjyr/beidouservice/pojo/dto/DevTaskExecRespDTO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.zjyr.beidouservice.pojo.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class DevTaskExecRespDTO { - List data; -} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceByIdRespDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceByIdRespDTO.java new file mode 100644 index 0000000..124b8a4 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceByIdRespDTO.java @@ -0,0 +1,106 @@ +package com.zjyr.beidouservice.pojo.dto; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.zjyr.beidouservice.constenum.DeviceAlarmStatusEnum; +import com.zjyr.beidouservice.pojo.dataobject.DeviceDO; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(name = "设备请求返回体") +public class DeviceByIdRespDTO { + + /** + * 设备id + */ + @Schema(title = "设备id", example = "123") + private Integer deviceId; + + /** + * 终端名称 + */ + @Schema(title = "设备名称", example = "大运河002") + private String deviceName; + + /** + * 经度 + */ + @Schema(title = "设备经度", example = "372.12") + private Float latitude; + + /** + * 纬度 + */ + @Schema(title = "设备维度", example = "37.90") + private Float longitude; + + /** + * 所属区县 + */ + @Schema(title = "区县代码", example = "90") + private Integer countyCode; + /** + * 所属地市 + */ + @Schema(title = "所属地市", example = "1") + private Integer cityCode; + + /** + * 所属省份 + */ + @Schema(title = "所属省份", example = "33") + private Integer provinceCode; + + /** + * 安装地址 + */ + @Schema(title = "安装地址", example = "余杭区五常街道") + private String installSite; + + /** + * 是否告警中 + */ + @Schema(title = "是否告警中", example = "false", description = "false为非告警中，true为告警中") + private Boolean isAlarming; + + /** + * 联系方式 + */ + @Schema(title = "联系方式", example = "18867111100") + private String mobile; + + /** + *安装时间 + */ + @Schema(title = "安装时间", example = "2023-08-26 21:00:05", description = "安装时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date installTime; + + + public static DeviceByIdRespDTO fromDO(DeviceDO deviceDO) { + DeviceByIdRespDTO resp = new DeviceByIdRespDTO(); + resp.setDeviceId(deviceDO.getDeviceId()); + resp.setDeviceName(deviceDO.getDeviceName()); + resp.setCountyCode(deviceDO.getCountyCode()); + resp.setCityCode(deviceDO.getCityCode()); + resp.setProvinceCode(deviceDO.getProvinceCode()); + resp.setLatitude(deviceDO.getLatitude()); + resp.setLongitude(deviceDO.getLongitude()); + resp.setInstallSite(deviceDO.getInstallSite()); + resp.setIsAlarming(DeviceAlarmStatusEnum.ALARMING.getCode().equals(deviceDO.getAlarmStatus())); + resp.setMobile(deviceDO.getMobile()); + resp.setInstallTime(deviceDO.getInstallTime()); + + return resp; + } + +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/ManufacturerContentDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/ManufacturerContentDTO.java deleted file mode 100644 index 664db90..0000000 --- a/src/main/java/com/zjyr/beidouservice/pojo/dto/ManufacturerContentDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zjyr.beidouservice.pojo.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class ManufacturerContentDTO { - - private String ManufacturerName; - - private Integer ManufacturerType; -} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/ManufacturerRespDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/ManufacturerRespDTO.java deleted file mode 100644 index ac25b34..0000000 --- a/src/main/java/com/zjyr/beidouservice/pojo/dto/ManufacturerRespDTO.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zjyr.beidouservice.pojo.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class ManufacturerRespDTO { - - - List data; -} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/task/AlarmTaskReqDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/task/AlarmTaskReqDTO.java index 85efda6..f8ee03f 100644 --- a/src/main/java/com/zjyr/beidouservice/pojo/dto/task/AlarmTaskReqDTO.java +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/task/AlarmTaskReqDTO.java @@ -44,9 +44,9 @@ public class AlarmTaskReqDTO { private Integer alarmType; /** - * 警报种类 1:预先警报 2:空袭警报 3:灾情警 4:解除警报灾 5:解除警报 + * 警报种类 1:预先警报 2:空袭警报 3:灾情警 4:解除警报灾 5:解除警报 6:中断警报 */ - @Schema(title = "警报种类", example = "2",description = "1:预先警报 2:空袭警报 3:灾情警 4:解除警报灾 5:解除警报") + @Schema(title = "警报种类", example = "2",description = "1:预先警报 2:空袭警报 3:灾情警报 4:解除警报灾情 5:解除警报 6:中断警报") private Integer alarmKind; /** diff --git a/src/main/java/com/zjyr/beidouservice/service/DeviceService.java b/src/main/java/com/zjyr/beidouservice/service/DeviceService.java index a797a6a..d0095b4 100644 --- a/src/main/java/com/zjyr/beidouservice/service/DeviceService.java +++ b/src/main/java/com/zjyr/beidouservice/service/DeviceService.java @@ -2,6 +2,7 @@ package com.zjyr.beidouservice.service; import com.zjyr.beidouservice.pojo.dataobject.AlarmDeviceTaskDO; +import com.zjyr.beidouservice.pojo.dto.DeviceByIdRespDTO; import com.zjyr.beidouservice.pojo.dto.DeviceReqDTO; import com.zjyr.beidouservice.pojo.dto.DeviceRespDTO; import com.zjyr.beidouservice.pojo.dto.DeviceSearchDTO; @@ -21,7 +22,7 @@ public interface DeviceService { * * @return 设备 */ - DeviceRespDTO getDeviceByDeviceId(DeviceSearchDTO deviceSearchDTO); + DeviceByIdRespDTO getDeviceByDeviceId(DeviceSearchDTO deviceSearchDTO); /** * 根据设备任务更新设备告警状态 diff --git a/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java b/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java index 7132097..2ef56ee 100644 --- a/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java +++ b/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java @@ -99,7 +99,9 @@ public class AlarmTaskServiceImpl implements AlarmTaskService { .approvalStatus(ApprovalStatusEnum.APPROVAL_SUCCESS.getCode()).build(); //入库 - Long generatedId = alarmTaskMapper.addAlarmTask(alarmTaskDO); + alarmTaskMapper.addAlarmTask(alarmTaskDO); + Long generatedId = alarmTaskDO.getId(); + log.info("generatedId:[{}]", generatedId); List alarmDeviceTaskDOS = getAlarmDeviceTaskDOS(alarmTaskReqDTO, deviceInfo, generatedId); alarmDeviceTaskMapper.addAlarmDevTaskInfoList(alarmDeviceTaskDOS); @@ -173,10 +175,13 @@ public class AlarmTaskServiceImpl implements AlarmTaskService { List result = getAggregatedAlarmDeviceTaskDOS(taskIdStrList); // 执行中的不展示在详情页 result = result.stream().filter(s -> !TaskStatusName.TASK_EXECUTING.getValue().equals(s.getStatus())).collect(Collectors.toList()); + if(result.isEmpty()){ + return null; + } PageInfoVO pageInfoVO = new PageInfoVO((long) result.size(), pageSize, pageNum); // 分页 - result = result.stream().skip((long) pageSize * (pageNum -1)).limit(pageSize).collect(Collectors.toList()); + result = result.stream().skip((long) pageSize * (pageNum - 1)).limit(pageSize).collect(Collectors.toList()); List deviceIdList = result.stream().map(AlarmDeviceTaskDO::getDeviceId).distinct().toList(); // 查询设备信息 @@ -246,6 +251,7 @@ public class AlarmTaskServiceImpl implements AlarmTaskService { PageHelper.clearPage(); return pgInfo; } + private static List getAlarmDeviceTaskDOS(AlarmTaskReqDTO alarmTaskReqDTO, DeviceInfoDTO deviceInfo, Long taskId) { List alarmDeviceTaskDOS = new ArrayList<>(); List deviceIds = deviceInfo.getDeviceIds(); diff --git a/src/main/java/com/zjyr/beidouservice/service/impl/DeviceServiceImpl.java b/src/main/java/com/zjyr/beidouservice/service/impl/DeviceServiceImpl.java index 43af535..7619a5e 100644 --- a/src/main/java/com/zjyr/beidouservice/service/impl/DeviceServiceImpl.java +++ b/src/main/java/com/zjyr/beidouservice/service/impl/DeviceServiceImpl.java @@ -6,6 +6,7 @@ import com.zjyr.beidouservice.constenum.DeviceAlarmStatusEnum; import com.zjyr.beidouservice.mapper.DeviceMapper; import com.zjyr.beidouservice.pojo.dataobject.AlarmDeviceTaskDO; import com.zjyr.beidouservice.pojo.dataobject.DeviceDO; +import com.zjyr.beidouservice.pojo.dto.DeviceByIdRespDTO; import com.zjyr.beidouservice.pojo.dto.DeviceByLocationDTO; import com.zjyr.beidouservice.pojo.dto.DeviceReqDTO; import com.zjyr.beidouservice.pojo.dto.DeviceRespDTO; @@ -55,7 +56,7 @@ public class DeviceServiceImpl implements DeviceService { } @Override - public DeviceRespDTO getDeviceByDeviceId(DeviceSearchDTO deviceSearchDTO) { + public DeviceByIdRespDTO getDeviceByDeviceId(DeviceSearchDTO deviceSearchDTO) { log.info("get device info by deviceId: [{}]", deviceSearchDTO.getDeviceId()); List deviceDOList = deviceMapper.selectDeviceByDeviceIds(Collections.singletonList(deviceSearchDTO.getDeviceId())); @@ -64,7 +65,7 @@ public class DeviceServiceImpl implements DeviceService { return null; } - return DeviceRespDTO.fromDO(deviceDOList.get(0)); + return DeviceByIdRespDTO.fromDO(deviceDOList.get(0)); } @Override