From 4fe2de9d2d26981c18a334154243f116e9b6d9e2 Mon Sep 17 00:00:00 2001 From: chenlinghy Date: Sun, 13 Aug 2023 17:06:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constenum/AlarmTypeEnum.java | 55 +++++++ .../constenum/ExecStatusEnum.java | 40 +++++ .../constenum/ManufacturerTypeEnum.java | 53 +++++++ .../controller/DeviceController.java | 66 +++++++++ .../controller/DeviceTaskController.java | 36 +++++ .../controller/LocationController.java | 65 ++++++++ .../mapper/DevAttributesMapper.java | 18 +++ .../mapper/DevBasicInfoMapper.java | 17 +++ .../beidouservice/mapper/DevTaskMapper.java | 15 ++ .../beidouservice/mapper/LocCityMapper.java | 16 ++ .../beidouservice/mapper/LocCountyMapper.java | 14 ++ .../mapper/LocProvinceMapper.java | 14 ++ .../zjyr/beidouservice/mapper/TaskMapper.java | 12 ++ .../com/zjyr/beidouservice/pojo/MyResp.java | 43 ++++++ .../com/zjyr/beidouservice/pojo/Resp.java | 35 +++++ .../pojo/dataobject/DevAttributesDO.java | 117 +++++++++++++++ .../pojo/dataobject/DevBasicInfoDO.java | 100 +++++++++++++ .../pojo/dataobject/DevTaskDO.java | 65 ++++++++ .../pojo/dataobject/LocCityDO.java | 47 ++++++ .../pojo/dataobject/LocCountyDO.java | 51 +++++++ .../pojo/dataobject/LocProvinceDO.java | 37 +++++ .../beidouservice/pojo/dataobject/TaskDO.java | 77 ++++++++++ .../pojo/dto/AlarmDevContentDTO.java | 27 ++++ .../pojo/dto/AlarmDevRespDTO.java | 26 ++++ .../beidouservice/pojo/dto/DevMaunDTO.java | 27 ++++ .../pojo/dto/DeviceInfoByLocDTO.java | 28 ++++ .../beidouservice/pojo/dto/DeviceReqDTO.java | 33 +++++ .../beidouservice/pojo/dto/DeviceRespDTO.java | 56 +++++++ .../pojo/dto/DeviceTaskContentDTO.java | 37 +++++ .../pojo/dto/DeviceTaskRespDTO.java | 56 +++++++ .../pojo/dto/ManufacturerContentDTO.java | 24 +++ .../pojo/dto/ManufacturerRespDTO.java | 18 +++ .../pojo/dto/city/CityContent.java | 25 ++++ .../pojo/dto/city/CityCountyDTO.java | 30 ++++ .../pojo/dto/city/CityRespDTO.java | 13 ++ .../pojo/dto/city/CitySearchDTO.java | 22 +++ .../pojo/dto/city/CountyContent.java | 18 +++ .../pojo/dto/province/CityContentDTO.java | 20 +++ .../dto/province/OnlyProvinceContentDTO.java | 18 +++ .../pojo/dto/province/OnlyProvinceResp.java | 12 ++ .../pojo/dto/province/ProvinceContent.java | 25 ++++ .../pojo/dto/province/ProvinceRespDTO.java | 15 ++ .../pojo/dto/province/ProvinceSearchDTO.java | 18 +++ .../beidouservice/service/DeviceService.java | 31 ++++ .../service/DeviceTaskService.java | 14 ++ .../service/LocationService.java | 36 +++++ .../service/impl/DeviceServiceImpl.java | 132 +++++++++++++++++ .../service/impl/DeviceTaskServiceImpl.java | 96 ++++++++++++ .../service/impl/LocationServiceImpl.java | 140 ++++++++++++++++++ .../resources/mappers/DevAttributesMapper.xml | 49 ++++++ .../resources/mappers/DevBasicInfoMapper.xml | 48 ++++++ src/main/resources/mappers/DevTaskMapper.xml | 26 ++++ src/main/resources/mappers/LocCityMapper.xml | 40 +++++ .../resources/mappers/LocCountyMapper.xml | 30 ++++ .../resources/mappers/LocProvinceMapper.xml | 30 ++++ src/main/resources/mappers/TaskMapper.xml | 26 ++++ 56 files changed, 2239 insertions(+) create mode 100644 src/main/java/com/zjyr/beidouservice/constenum/AlarmTypeEnum.java create mode 100644 src/main/java/com/zjyr/beidouservice/constenum/ExecStatusEnum.java create mode 100644 src/main/java/com/zjyr/beidouservice/constenum/ManufacturerTypeEnum.java create mode 100644 src/main/java/com/zjyr/beidouservice/controller/DeviceController.java create mode 100644 src/main/java/com/zjyr/beidouservice/controller/DeviceTaskController.java create mode 100644 src/main/java/com/zjyr/beidouservice/controller/LocationController.java create mode 100644 src/main/java/com/zjyr/beidouservice/mapper/DevAttributesMapper.java create mode 100644 src/main/java/com/zjyr/beidouservice/mapper/DevBasicInfoMapper.java create mode 100644 src/main/java/com/zjyr/beidouservice/mapper/DevTaskMapper.java create mode 100644 src/main/java/com/zjyr/beidouservice/mapper/LocCityMapper.java create mode 100644 src/main/java/com/zjyr/beidouservice/mapper/LocCountyMapper.java create mode 100644 src/main/java/com/zjyr/beidouservice/mapper/LocProvinceMapper.java create mode 100644 src/main/java/com/zjyr/beidouservice/mapper/TaskMapper.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/MyResp.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/Resp.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dataobject/DevAttributesDO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dataobject/DevBasicInfoDO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dataobject/DevTaskDO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dataobject/LocCityDO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dataobject/LocCountyDO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dataobject/LocProvinceDO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dataobject/TaskDO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/AlarmDevContentDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/AlarmDevRespDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/DevMaunDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceInfoByLocDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceReqDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceRespDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceTaskContentDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceTaskRespDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/ManufacturerContentDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/ManufacturerRespDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/city/CityContent.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/city/CityCountyDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/city/CityRespDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/city/CitySearchDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/city/CountyContent.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/province/CityContentDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/province/OnlyProvinceContentDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/province/OnlyProvinceResp.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/province/ProvinceContent.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/province/ProvinceRespDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/pojo/dto/province/ProvinceSearchDTO.java create mode 100644 src/main/java/com/zjyr/beidouservice/service/DeviceService.java create mode 100644 src/main/java/com/zjyr/beidouservice/service/DeviceTaskService.java create mode 100644 src/main/java/com/zjyr/beidouservice/service/LocationService.java create mode 100644 src/main/java/com/zjyr/beidouservice/service/impl/DeviceServiceImpl.java create mode 100644 src/main/java/com/zjyr/beidouservice/service/impl/DeviceTaskServiceImpl.java create mode 100644 src/main/java/com/zjyr/beidouservice/service/impl/LocationServiceImpl.java create mode 100644 src/main/resources/mappers/DevAttributesMapper.xml create mode 100644 src/main/resources/mappers/DevBasicInfoMapper.xml create mode 100644 src/main/resources/mappers/DevTaskMapper.xml create mode 100644 src/main/resources/mappers/LocCityMapper.xml create mode 100644 src/main/resources/mappers/LocCountyMapper.xml create mode 100644 src/main/resources/mappers/LocProvinceMapper.xml create mode 100644 src/main/resources/mappers/TaskMapper.xml diff --git a/src/main/java/com/zjyr/beidouservice/constenum/AlarmTypeEnum.java b/src/main/java/com/zjyr/beidouservice/constenum/AlarmTypeEnum.java new file mode 100644 index 0000000..4609ae2 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/constenum/AlarmTypeEnum.java @@ -0,0 +1,55 @@ +package com.zjyr.beidouservice.constenum; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.ArrayList; +import java.util.List; + +/** + * 警报器类型 + */ +@Getter +@AllArgsConstructor +public enum AlarmTypeEnum { + /** + * 电动警报 + */ + DIAN_DONG_ALARM(1, "电动警报"), + /** + * 电动警报 + */ + DIAN_SHENG_ALARM(2, "电声警报"), + /** + * 电动警报 + */ + DI_DONG_ALARM(3, "气动警报"), + /** + * 电动警报 + */ + OTHER_ALARM(4, "其他"); + + + private final Integer code; + private final String msg; + + public static String getByCode(Integer code) { + AlarmTypeEnum[] values = AlarmTypeEnum.values(); + for (AlarmTypeEnum v : values) { + if (code.equals(v.getCode())) { + return v.getMsg(); + } + } + return null; + } + + public static List getAllCodes() { + AlarmTypeEnum[] values = AlarmTypeEnum.values(); + List codes = new ArrayList<>(); + for (AlarmTypeEnum v : values) { + codes.add(v.getCode()); + } + return codes; + } + +} diff --git a/src/main/java/com/zjyr/beidouservice/constenum/ExecStatusEnum.java b/src/main/java/com/zjyr/beidouservice/constenum/ExecStatusEnum.java new file mode 100644 index 0000000..1fbb1db --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/constenum/ExecStatusEnum.java @@ -0,0 +1,40 @@ +package com.zjyr.beidouservice.constenum; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 命令执行状态类型 + */ +@Getter +@AllArgsConstructor +public enum ExecStatusEnum { + + /** + * 执行中 + */ + EXEC_PENDING(0, "执行中"), + /** + * 电动警报 + */ + EXEC_SUCCESS(1, "执行成功"), + /** + * 电动警报 + */ + EXEC_FAIL(2, "执行失败"), + ; + + private final Integer code; + + private final String msg; + + public static String getByCode(Integer code) { + ExecStatusEnum[] values = ExecStatusEnum.values(); + for (ExecStatusEnum v : values) { + if (code.equals(v.getCode())) { + return v.getMsg(); + } + } + return null; + } +} diff --git a/src/main/java/com/zjyr/beidouservice/constenum/ManufacturerTypeEnum.java b/src/main/java/com/zjyr/beidouservice/constenum/ManufacturerTypeEnum.java new file mode 100644 index 0000000..20290df --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/constenum/ManufacturerTypeEnum.java @@ -0,0 +1,53 @@ +package com.zjyr.beidouservice.constenum; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.ArrayList; +import java.util.List; + +/** + * 厂家类型类型 + */ +@Getter +@AllArgsConstructor +public enum ManufacturerTypeEnum { + /** + * 欧丽 + */ + MANUFACTURER_OULI(0, "欧丽"), + /** + * 厦门日华 + */ + MANUFACTURER_XIAMEN_RIHUA(1, "厦门日化"), + /** + * 南京厚华 + */ + MANUFACTURER_NANJING_HOUHUA_(2, "南京厚华"), + ; + + + private final Integer code; + + private final String msg; + + + public static String getByCode(Integer code) { + ManufacturerTypeEnum[] values = ManufacturerTypeEnum.values(); + for (ManufacturerTypeEnum v : values) { + if (code.equals(v.getCode())) { + return v.getMsg(); + } + } + return null; + } + + public static List getAllCodes() { + ManufacturerTypeEnum[] values = ManufacturerTypeEnum.values(); + List codes = new ArrayList<>(); + for (ManufacturerTypeEnum v : values) { + codes.add(v.getCode()); + } + return codes; + } +} diff --git a/src/main/java/com/zjyr/beidouservice/controller/DeviceController.java b/src/main/java/com/zjyr/beidouservice/controller/DeviceController.java new file mode 100644 index 0000000..29f297e --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/controller/DeviceController.java @@ -0,0 +1,66 @@ +package com.zjyr.beidouservice.controller; + +import com.zjyr.beidouservice.pojo.MyResp; +import com.zjyr.beidouservice.pojo.dto.AlarmDevRespDTO; +import com.zjyr.beidouservice.pojo.dto.DeviceReqDTO; +import com.zjyr.beidouservice.pojo.dto.DeviceRespDTO; +import com.zjyr.beidouservice.pojo.dto.ManufacturerRespDTO; +import com.zjyr.beidouservice.service.DeviceService; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 终端设备 + */ +@RestController +@RequestMapping("/") +@Validated +@Slf4j +public class DeviceController { + + @Resource + DeviceService deviceService; + + /** + * 获取省份信息 + * + * @return 省份信息 + */ + @PostMapping("device/location") + public MyResp> getDeviceInfo(@RequestBody DeviceReqDTO deviceReqDTO) { + List deviceRespDTO = deviceService.getDeviceInfo(deviceReqDTO); + return MyResp.success(deviceRespDTO); + } + + /** + * 获取厂家信息 + * + * @return 厂家信息 + */ + @PostMapping("device/manufacturer") + public MyResp getDeviceManufacturerInfo() { + ManufacturerRespDTO manufacturerRes = deviceService.getDeviceManufacturerInfo(); + return MyResp.success(manufacturerRes); + + } + + /** + * 获取警报终端信息 + * + * @return 省份信息 + */ + @PostMapping("alarm/device") + public MyResp getAlarmDeviceInfo() { + AlarmDevRespDTO alarmDevRespDTO = deviceService.getAlarmDeviceInfo(); + return MyResp.success(alarmDevRespDTO); + + } + +} diff --git a/src/main/java/com/zjyr/beidouservice/controller/DeviceTaskController.java b/src/main/java/com/zjyr/beidouservice/controller/DeviceTaskController.java new file mode 100644 index 0000000..5e01fa5 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/controller/DeviceTaskController.java @@ -0,0 +1,36 @@ +package com.zjyr.beidouservice.controller; + +import com.zjyr.beidouservice.pojo.MyResp; +import com.zjyr.beidouservice.pojo.dto.DeviceTaskRespDTO; +import com.zjyr.beidouservice.service.DeviceTaskService; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/") +@Validated +@Slf4j +public class DeviceTaskController { + + @Resource + DeviceTaskService deviceTaskService; + + + /** + * 获取任务信息 + * + * @return MyResp + */ + @PostMapping("task/info") + public MyResp> getDeviceTaskInfo() { + List deviceTaskRespDTOS = deviceTaskService.getDeviceTaskInfo(); + return MyResp.success(deviceTaskRespDTOS); + } + +} diff --git a/src/main/java/com/zjyr/beidouservice/controller/LocationController.java b/src/main/java/com/zjyr/beidouservice/controller/LocationController.java new file mode 100644 index 0000000..0fccce2 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/controller/LocationController.java @@ -0,0 +1,65 @@ +package com.zjyr.beidouservice.controller; + +import com.zjyr.beidouservice.pojo.MyResp; +import com.zjyr.beidouservice.pojo.dto.city.CityRespDTO; +import com.zjyr.beidouservice.pojo.dto.city.CitySearchDTO; +import com.zjyr.beidouservice.pojo.dto.province.OnlyProvinceResp; +import com.zjyr.beidouservice.pojo.dto.province.ProvinceSearchDTO; +import com.zjyr.beidouservice.pojo.dto.province.ProvinceRespDTO; +import com.zjyr.beidouservice.service.LocationService; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 省份、地市、区描述 + */ +@RestController +@RequestMapping("/") +@Validated +@Slf4j +public class LocationController { + + @Resource + LocationService locationService; + + + /** + * 获取省份信息 + * + * @return 省份信息 + */ + @PostMapping("only/provinces") + public MyResp getOnlyProvinces() { + OnlyProvinceResp onlyProvinceResp = locationService.getOnlyProvinces(); + return MyResp.success(onlyProvinceResp); + } + /** + * 获取省份及省份对应的地市信息 + * + * @return 省份及省份对应的地市信息 + */ + @PostMapping("provinces") + public MyResp getProvinces(@RequestBody ProvinceSearchDTO provinceSearchDTO) { + ProvinceRespDTO provinceResp = locationService.getProvinces(provinceSearchDTO); + return MyResp.success(provinceResp); + } + + + /** + * 获取地市及地市对应的区信息 + * + * @return 地市及地市对应的区信息 + */ + @PostMapping("citys") + public MyResp getCity(@RequestBody CitySearchDTO citySearchDTO) { + CityRespDTO cityResp = locationService.getCity(citySearchDTO); + return MyResp.success(cityResp); + } + + +} diff --git a/src/main/java/com/zjyr/beidouservice/mapper/DevAttributesMapper.java b/src/main/java/com/zjyr/beidouservice/mapper/DevAttributesMapper.java new file mode 100644 index 0000000..f2248d0 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/mapper/DevAttributesMapper.java @@ -0,0 +1,18 @@ +package com.zjyr.beidouservice.mapper; + +import com.zjyr.beidouservice.pojo.dataobject.DevAttributesDO; +import com.zjyr.beidouservice.pojo.dto.DevMaunDTO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface DevAttributesMapper { + + List selectManuByManufacturer(@Param("deviceId") Long deviceId, + @Param("manufacturer") String manufacturer); + + + List selectManuAll(); +} diff --git a/src/main/java/com/zjyr/beidouservice/mapper/DevBasicInfoMapper.java b/src/main/java/com/zjyr/beidouservice/mapper/DevBasicInfoMapper.java new file mode 100644 index 0000000..b538c78 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/mapper/DevBasicInfoMapper.java @@ -0,0 +1,17 @@ +package com.zjyr.beidouservice.mapper; + +import com.zjyr.beidouservice.pojo.dataobject.DevBasicInfoDO; +import com.zjyr.beidouservice.pojo.dto.DeviceInfoByLocDTO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface DevBasicInfoMapper { + + List selectDeviceByLoc(DeviceInfoByLocDTO deviceInfoByLocDTO); + + + DevBasicInfoDO selectDeviceByDeviceId(@Param("deviceId") Long deviceId); +} diff --git a/src/main/java/com/zjyr/beidouservice/mapper/DevTaskMapper.java b/src/main/java/com/zjyr/beidouservice/mapper/DevTaskMapper.java new file mode 100644 index 0000000..2195ddb --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/mapper/DevTaskMapper.java @@ -0,0 +1,15 @@ +package com.zjyr.beidouservice.mapper; + +import com.zjyr.beidouservice.pojo.dataobject.DevTaskDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface DevTaskMapper { + + List selectDevTaskByTaskId(@Param("taskId") String taskId); + + +} diff --git a/src/main/java/com/zjyr/beidouservice/mapper/LocCityMapper.java b/src/main/java/com/zjyr/beidouservice/mapper/LocCityMapper.java new file mode 100644 index 0000000..d9c7c26 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/mapper/LocCityMapper.java @@ -0,0 +1,16 @@ +package com.zjyr.beidouservice.mapper; + +import com.zjyr.beidouservice.pojo.dataobject.LocCityDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface LocCityMapper { + + List selectCityByProvince(@Param("provinceCode") String provinceCode); + + + List selectCity(@Param("provinceCode") String provinceCode, @Param("cityCode") String cityCode); +} diff --git a/src/main/java/com/zjyr/beidouservice/mapper/LocCountyMapper.java b/src/main/java/com/zjyr/beidouservice/mapper/LocCountyMapper.java new file mode 100644 index 0000000..b13d11c --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/mapper/LocCountyMapper.java @@ -0,0 +1,14 @@ +package com.zjyr.beidouservice.mapper; + +import com.zjyr.beidouservice.pojo.dataobject.LocCountyDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface LocCountyMapper { + + List selectCountyByCity(@Param("provinceCode") String provinceCode, + @Param("cityCode") String cityCode); +} diff --git a/src/main/java/com/zjyr/beidouservice/mapper/LocProvinceMapper.java b/src/main/java/com/zjyr/beidouservice/mapper/LocProvinceMapper.java new file mode 100644 index 0000000..cd85ea3 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/mapper/LocProvinceMapper.java @@ -0,0 +1,14 @@ +package com.zjyr.beidouservice.mapper; + +import com.zjyr.beidouservice.pojo.dataobject.LocProvinceDO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface LocProvinceMapper { + + List selectAllProvince(); + List selectProvince(@Param("provinceCode") String provinceCode); +} diff --git a/src/main/java/com/zjyr/beidouservice/mapper/TaskMapper.java b/src/main/java/com/zjyr/beidouservice/mapper/TaskMapper.java new file mode 100644 index 0000000..cccf557 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/mapper/TaskMapper.java @@ -0,0 +1,12 @@ +package com.zjyr.beidouservice.mapper; + +import com.zjyr.beidouservice.pojo.dataobject.TaskDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface TaskMapper { + + List selectAllTask(); +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/MyResp.java b/src/main/java/com/zjyr/beidouservice/pojo/MyResp.java new file mode 100644 index 0000000..a4b991f --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/MyResp.java @@ -0,0 +1,43 @@ +package com.zjyr.beidouservice.pojo; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +public class MyResp { + + private int code = Resp.SUCCESS.getCede(); + private String msg; + private T data; + + public static MyResp build() { + return new MyResp(); + } + + public static MyResp result(Resp resp) { + return MyResp.builder() + .code(resp.getCede()) + .msg(resp.getMsg()) + .build(); + } + + public static MyResp success(T data) { + return MyResp.builder() + .code(Resp.SUCCESS.getCede()) + .msg(Resp.SUCCESS.getMsg()) + .data(data) + .build(); + } + + public static MyResp error(Resp respEnum) { + return MyResp.builder() + .code(respEnum.getCede()) + .msg(respEnum.getMsg()) + .build(); + } +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/Resp.java b/src/main/java/com/zjyr/beidouservice/pojo/Resp.java new file mode 100644 index 0000000..b64a8aa --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/Resp.java @@ -0,0 +1,35 @@ +package com.zjyr.beidouservice.pojo; + +import com.alibaba.fastjson.JSONObject; + +public enum Resp { + //成功返回码 + SUCCESS(200, "SUCCESS"); + + + private int code; + + private String msg; + + Resp(int code, String msg) { + this.code = code; + this.msg = msg; + } + + public int getCede() { + return code; + } + + public String getMsg() { + return msg; + } + + @Override + public String toString() { + JSONObject json = new JSONObject(); + json.put("code", code); + json.put("msg", msg); + return json.toString(); + } +} + diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dataobject/DevAttributesDO.java b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/DevAttributesDO.java new file mode 100644 index 0000000..0a5a351 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/DevAttributesDO.java @@ -0,0 +1,117 @@ +package com.zjyr.beidouservice.pojo.dataobject; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class DevAttributesDO { + /** + * 主键id + */ + private Long id; + + /** + * 设备id + */ + private Long deviceId; + + /** + * 设备状态 + */ + private Integer deviceStatus; + + /** + * 警报器型号 + */ + private String alarmModel; + + /** + * 警报器状态 + */ + private String alarmStatus; + + /** + * 警报器类型 + */ + private Integer alarmType; + + /** + * 警报器功率 + */ + private Integer alarmPower; + + /** + * 警报器厂家 + */ + private Integer alarmManufacturer; + + /** + * 警报器安装时间 + */ + private Date alarmInstallTime; + + /** + * 控制器型号 + */ + private String controlModel; + /** + * 控制器状态 + */ + private Integer controlStatus; + + /** + * 控制器厂家 + */ + private Integer controlManufacturer; + + /** + * 控制器安装时间 + */ + private Date controlInstallTime; + + /** + * 后备电源型号 + */ + private String powerModel; + + /** + * 后备电源状态 + */ + private Integer powerStatus; + + /** + * 后备电源类型 + */ + private Integer powerType; + + /** + * 后备电源功率 + */ + private Integer power; + + /** + * 后备电源厂家 + */ + private Integer powerManufacturer; + + /** + * 后备电源安装时间 + */ + private Date powerInstallTime; + + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新时间 + */ + private Date updateTime; + + +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dataobject/DevBasicInfoDO.java b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/DevBasicInfoDO.java new file mode 100644 index 0000000..a870ed2 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/DevBasicInfoDO.java @@ -0,0 +1,100 @@ +package com.zjyr.beidouservice.pojo.dataobject; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class DevBasicInfoDO implements Serializable { + /** + * 主键id + */ + private Long id; + + /** + * 设备id + */ + private Long deviceId; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 设备描述 + */ + private String deviceDesc; + + /** + * 省份编码 + */ + private String provinceCode; + + /** + * 地市编码 + */ + private String cityCode; + + /** + * 区编码 + */ + private String countyCode; + + + /** + * 所属单位 + */ + private String subordinateUnits; + + /** + * 控制站编号 + */ + private Integer controlStationId; + + /** + * 管理员 + */ + private String administrator; + + /** + * 联系方式 + */ + private String mobile; + + /** + * 安装地址 + */ + private String installAddr; + + /** + * 经度 + */ + private String latitude; + + /** + * 纬度 + */ + private String longitude; + + /** + * 设备数据、预留字段 + */ + private String devData; + + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新时间 + */ + private Date updateTime; + + +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dataobject/DevTaskDO.java b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/DevTaskDO.java new file mode 100644 index 0000000..519c6bd --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/DevTaskDO.java @@ -0,0 +1,65 @@ +package com.zjyr.beidouservice.pojo.dataobject; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class DevTaskDO { + /** + * 主键id + */ + private Long id; + + /** + * 任务id，前端界面的记录编号，可以按照规则添加前缀名 + */ + private String taskId; + + /** + * 控制模式 0:无声演练模式 1:大声警报模式 + */ + private Integer controlMode; + + /** + * 区id=？区编码 + */ + private String countyCode; + + /** + * 控制类型:。1:单点控制 2:市属控制 3:区属控制 + */ + private Integer controlType; + + /** + * 设备id + */ + private Long deviceId; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 执行命令 + */ + private String execCmd; + + /** + * 执行状态 + */ + private Integer execState; + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dataobject/LocCityDO.java b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/LocCityDO.java new file mode 100644 index 0000000..0105a9f --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/LocCityDO.java @@ -0,0 +1,47 @@ +package com.zjyr.beidouservice.pojo.dataobject; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class LocCityDO implements Serializable { + /** + * 主键id + */ + private Long id; + + /** + * 地市名称 + */ + private String cityName; + + /** + * 地市编码 + */ + private String cityCode; + + /** + * 省份编码 + */ + private String provinceCode; + + /** + * 地市北斗号 + */ + private String beidouBroadcastId; + + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dataobject/LocCountyDO.java b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/LocCountyDO.java new file mode 100644 index 0000000..7d20146 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/LocCountyDO.java @@ -0,0 +1,51 @@ +package com.zjyr.beidouservice.pojo.dataobject; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class LocCountyDO implements Serializable { + /** + * 主键id + */ + private Long id; + + /** + * 区名称 + */ + private String countyName; + + /** + * 区编码 + */ + private String countyCode; + /** + * 地市编码 + */ + private String cityCode; + + /** + * 省份编码 + */ + private String provinceCode; + + /** + * 地市北斗号 + */ + private String beidouBroadcastId; + + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dataobject/LocProvinceDO.java b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/LocProvinceDO.java new file mode 100644 index 0000000..35a4095 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/LocProvinceDO.java @@ -0,0 +1,37 @@ +package com.zjyr.beidouservice.pojo.dataobject; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class LocProvinceDO implements Serializable { + /** + * 主键id + */ + private Long id; + + /** + * 省份名称 + */ + private String provinceName; + + /** + * 省份编码 + */ + private String provinceCode; + + /** + * 创建时间 + */ + private Date createTime; + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dataobject/TaskDO.java b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/TaskDO.java new file mode 100644 index 0000000..8ae482a --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/TaskDO.java @@ -0,0 +1,77 @@ +package com.zjyr.beidouservice.pojo.dataobject; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class TaskDO { + /** + * 主键id + */ + private Long id; + + /** + * 任务id，前端界面的记录编号，可以按照规则添加前缀名 + */ + private String taskId; + + /** + * 控制通道。2:无线 3:北斗 4:电话 5:all + */ + private Integer controlChannel; + + /** + * 北斗号，如果以市为单位，则携带市北斗号，区为单位携带区北斗号，具体设备则携带区北斗号 + */ + private Integer beidouId; + + /** + * 省份编码 + */ + private String provinceCode; + + /** + * 地市编码 + */ + private String cityCode; + + /** + * 区编码 + */ + private String countyCode; + + /** + * 设备id，多个设备,相隔 + */ + private String deviceIds; + + /** + * 执行设备数量 + */ + private Integer deviceNum; + + /** + * 执行正常设备数量 + */ + private Integer execNormalNum; + + /** + * 执行异常设备数量 + */ + private Integer execAbnormalNum; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/AlarmDevContentDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/AlarmDevContentDTO.java new file mode 100644 index 0000000..75b10e2 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/AlarmDevContentDTO.java @@ -0,0 +1,27 @@ +package com.zjyr.beidouservice.pojo.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class AlarmDevContentDTO { + /** + * 警报器设备类型 + */ + private String alarmType; + /** + * 该类型的数量 + */ + private Integer alarmNum; + + /** + * 该类型的占比 + */ + private Double alarmRatio; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/AlarmDevRespDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/AlarmDevRespDTO.java new file mode 100644 index 0000000..1548ded --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/AlarmDevRespDTO.java @@ -0,0 +1,26 @@ +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 AlarmDevRespDTO { + /** + * 警报器设备总数 + */ + private Integer alarmDevTotalNum; + + /** + * 警报器设备类型、数量、占比 + */ + private List data; + + +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/DevMaunDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/DevMaunDTO.java new file mode 100644 index 0000000..e0fea67 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/DevMaunDTO.java @@ -0,0 +1,27 @@ +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 { + /** + * 设备id + */ + private Long deviceId; + + /** + * 警报器厂家 + */ + private Integer alarmManufacturer; + + /** + * 控制器厂家 + */ + private Integer controlManufacturer; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceInfoByLocDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceInfoByLocDTO.java new file mode 100644 index 0000000..3c691ff --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceInfoByLocDTO.java @@ -0,0 +1,28 @@ +package com.zjyr.beidouservice.pojo.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DeviceInfoByLocDTO { + /** + * 省份编码 + */ + private String provinceCode; + + /** + * 地市编码 + */ + private String cityCode; + + /** + * 区编码 + */ + private String countyCode; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceReqDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceReqDTO.java new file mode 100644 index 0000000..b74b4c6 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceReqDTO.java @@ -0,0 +1,33 @@ +package com.zjyr.beidouservice.pojo.dto; + + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DeviceReqDTO { + /** + * 省份编码 + */ + private String provinceCode; + + /** + * 地市编码 + */ + private String cityCode; + + /** + * 区编码 + */ + private String countyCode; + + /** + * 厂家 + */ + private String manufacturer; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceRespDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceRespDTO.java new file mode 100644 index 0000000..145f7bc --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceRespDTO.java @@ -0,0 +1,56 @@ +package com.zjyr.beidouservice.pojo.dto; + + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DeviceRespDTO { + + /** + * 设备id + */ + private Long deviceId; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 省份编码 + */ + private String provinceCode; + + /** + * 地市编码 + */ + private String cityCode; + + /** + * 区编码 + */ + private String countyCode; + + /** + * 安装地址，用于展示经纬度 + */ + private String installAddr; + + /** + * 警报器厂家 + */ + private String alarmManufacturer; + + /** + * 控制器厂家 + */ + private String controlManufacturer; + + +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceTaskContentDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceTaskContentDTO.java new file mode 100644 index 0000000..8537b31 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceTaskContentDTO.java @@ -0,0 +1,37 @@ +package com.zjyr.beidouservice.pojo.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DeviceTaskContentDTO { + /** + * 设备id + */ + private Long deviceId; + + /** + * 设备名称 + */ + private String deviceName; + + + /** + * 回示时间 + */ + private Date respTime; + + /** + * 执行状态 + */ + private String execStateMsg; + + +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceTaskRespDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceTaskRespDTO.java new file mode 100644 index 0000000..68127eb --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceTaskRespDTO.java @@ -0,0 +1,56 @@ +package com.zjyr.beidouservice.pojo.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import java.util.List; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class DeviceTaskRespDTO { + /** + * 主键id + */ + private Long id; + + /** + * 任务id，前端界面的记录编号，可以按照规则添加前缀名 + */ + private String taskId; + + /** + * 记录时间 + */ + private Date recodeTime; + + /** + * 执行设备数量 + */ + private Integer deviceNum; + + /** + * 执行正常设备数量 + */ + private Integer execNormalNum; + + /** + * 执行异常设备数量 + */ + private Integer execAbnormalNum; + + /** + * 回市率 回示率通常用于描述在特定时间段内对特定请求或行动的响应数量与总请求数量之间的比率 + */ + private Double respRate; + + /** + * 任务详细信息 + */ + private List data; + +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/ManufacturerContentDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/ManufacturerContentDTO.java new file mode 100644 index 0000000..9f3803a --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/ManufacturerContentDTO.java @@ -0,0 +1,24 @@ +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 new file mode 100644 index 0000000..ac25b34 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/ManufacturerRespDTO.java @@ -0,0 +1,18 @@ +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/city/CityContent.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/city/CityContent.java new file mode 100644 index 0000000..cdb7a3f --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/city/CityContent.java @@ -0,0 +1,25 @@ +package com.zjyr.beidouservice.pojo.dto.city; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +public class CityContent { + /** + * 地市名称 + */ + private String cityName; + + /** + * 地市编码 + */ + private String cityCode; + + /** + * 地市对应的区信息 + */ + private List countyList; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/city/CityCountyDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/city/CityCountyDTO.java new file mode 100644 index 0000000..5f8cf51 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/city/CityCountyDTO.java @@ -0,0 +1,30 @@ +package com.zjyr.beidouservice.pojo.dto.city; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + + +@Data +@NoArgsConstructor +public class CityCountyDTO { + /** + * 省份编码 + */ + private String provinceCode; + /** + * 地市名称 + */ + private String cityName; + + /** + * 地市编码 + */ + private String cityCode; + + /** + * 地市包含的区信息 + */ + List countyList; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/city/CityRespDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/city/CityRespDTO.java new file mode 100644 index 0000000..be3cbb0 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/city/CityRespDTO.java @@ -0,0 +1,13 @@ +package com.zjyr.beidouservice.pojo.dto.city; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +public class CityRespDTO { + + List cityList; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/city/CitySearchDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/city/CitySearchDTO.java new file mode 100644 index 0000000..0544ca6 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/city/CitySearchDTO.java @@ -0,0 +1,22 @@ +package com.zjyr.beidouservice.pojo.dto.city; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class CitySearchDTO implements Serializable { + /** + * 省份编码 + */ + private String provinceCode; + + /** + * 地市编码 + */ + private String cityCode; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/city/CountyContent.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/city/CountyContent.java new file mode 100644 index 0000000..03d332c --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/city/CountyContent.java @@ -0,0 +1,18 @@ +package com.zjyr.beidouservice.pojo.dto.city; + +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +public class CountyContent { + /** + * 区名称 + */ + private String countyName; + + /** + * 地市编码 + */ + private String countyCode; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/province/CityContentDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/province/CityContentDTO.java new file mode 100644 index 0000000..61283eb --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/province/CityContentDTO.java @@ -0,0 +1,20 @@ +package com.zjyr.beidouservice.pojo.dto.province; + +import lombok.Data; +import lombok.NoArgsConstructor; + + +@Data +@NoArgsConstructor +public class CityContentDTO { + /** + * 地市名称 + */ + private String cityName; + + /** + * 地市编码 + */ + private String cityCode; + +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/province/OnlyProvinceContentDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/province/OnlyProvinceContentDTO.java new file mode 100644 index 0000000..2575d4e --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/province/OnlyProvinceContentDTO.java @@ -0,0 +1,18 @@ +package com.zjyr.beidouservice.pojo.dto.province; + +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +public class OnlyProvinceContentDTO { + /** + * 省份名称 + */ + private String provinceName; + + /** + * 省份编码 + */ + private String provinceCode; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/province/OnlyProvinceResp.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/province/OnlyProvinceResp.java new file mode 100644 index 0000000..d983be6 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/province/OnlyProvinceResp.java @@ -0,0 +1,12 @@ +package com.zjyr.beidouservice.pojo.dto.province; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +public class OnlyProvinceResp { + List onlyProvinceList; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/province/ProvinceContent.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/province/ProvinceContent.java new file mode 100644 index 0000000..c066c8b --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/province/ProvinceContent.java @@ -0,0 +1,25 @@ +package com.zjyr.beidouservice.pojo.dto.province; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +public class ProvinceContent { + /** + * 省份名称 + */ + private String provinceName; + + /** + * 省份编码 + */ + private String provinceCode; + + /** + * s省对应的地市信息 + */ + private List cityList; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/province/ProvinceRespDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/province/ProvinceRespDTO.java new file mode 100644 index 0000000..8224579 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/province/ProvinceRespDTO.java @@ -0,0 +1,15 @@ +package com.zjyr.beidouservice.pojo.dto.province; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +public class ProvinceRespDTO { + /** + * 省份信息 + */ + List provinceList; +} diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/province/ProvinceSearchDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/province/ProvinceSearchDTO.java new file mode 100644 index 0000000..14936b7 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/province/ProvinceSearchDTO.java @@ -0,0 +1,18 @@ +package com.zjyr.beidouservice.pojo.dto.province; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ProvinceSearchDTO implements Serializable { + + /** + * 省份编码 + */ + private String provinceCode; +} diff --git a/src/main/java/com/zjyr/beidouservice/service/DeviceService.java b/src/main/java/com/zjyr/beidouservice/service/DeviceService.java new file mode 100644 index 0000000..74637e2 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/service/DeviceService.java @@ -0,0 +1,31 @@ +package com.zjyr.beidouservice.service; +import com.zjyr.beidouservice.pojo.dto.AlarmDevRespDTO; +import com.zjyr.beidouservice.pojo.dto.DeviceReqDTO; +import com.zjyr.beidouservice.pojo.dto.DeviceRespDTO; +import com.zjyr.beidouservice.pojo.dto.ManufacturerRespDTO; + +import java.util.List; + + +public interface DeviceService { + /** + * 获取省份信息 + * + * @return 省份信息 + */ + List getDeviceInfo(DeviceReqDTO deviceReqDTO); + + /** + * 获取厂家信息 + * + * @return 厂家信息 + */ + ManufacturerRespDTO getDeviceManufacturerInfo(); + + /** + * 获取警报终端信息 + * + * @return 省份信息 + */ + AlarmDevRespDTO getAlarmDeviceInfo(); +} diff --git a/src/main/java/com/zjyr/beidouservice/service/DeviceTaskService.java b/src/main/java/com/zjyr/beidouservice/service/DeviceTaskService.java new file mode 100644 index 0000000..ed9569f --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/service/DeviceTaskService.java @@ -0,0 +1,14 @@ +package com.zjyr.beidouservice.service; + + +import com.zjyr.beidouservice.pojo.dto.DeviceTaskRespDTO; +import java.util.List; + +public interface DeviceTaskService { + /** + * 获取任务信息 + * + * @return DeviceTaskRespDTO + */ + List getDeviceTaskInfo(); +} diff --git a/src/main/java/com/zjyr/beidouservice/service/LocationService.java b/src/main/java/com/zjyr/beidouservice/service/LocationService.java new file mode 100644 index 0000000..9e9893f --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/service/LocationService.java @@ -0,0 +1,36 @@ +package com.zjyr.beidouservice.service; + +import com.zjyr.beidouservice.pojo.dto.city.CityRespDTO; +import com.zjyr.beidouservice.pojo.dto.city.CitySearchDTO; +import com.zjyr.beidouservice.pojo.dto.province.OnlyProvinceResp; +import com.zjyr.beidouservice.pojo.dto.province.ProvinceSearchDTO; +import com.zjyr.beidouservice.pojo.dto.province.ProvinceRespDTO; + + +import java.util.List; + +public interface LocationService { + /** + * 获取省份信息 + * + * @return 省份信息 + */ + OnlyProvinceResp getOnlyProvinces(); + + /** + * 获取省份信息 + * + * @return ProvinceRespDTO + */ + ProvinceRespDTO getProvinces(ProvinceSearchDTO provinceSearchDTO); + + + /** + * 获取地市信息 + * + * @return CityRespDTO + */ + CityRespDTO getCity(CitySearchDTO citySearchDTO); + + +} diff --git a/src/main/java/com/zjyr/beidouservice/service/impl/DeviceServiceImpl.java b/src/main/java/com/zjyr/beidouservice/service/impl/DeviceServiceImpl.java new file mode 100644 index 0000000..f2a097b --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/service/impl/DeviceServiceImpl.java @@ -0,0 +1,132 @@ +package com.zjyr.beidouservice.service.impl; + +import com.zjyr.beidouservice.constenum.AlarmTypeEnum; +import com.zjyr.beidouservice.constenum.ManufacturerTypeEnum; +import com.zjyr.beidouservice.mapper.DevAttributesMapper; +import com.zjyr.beidouservice.mapper.DevBasicInfoMapper; +import com.zjyr.beidouservice.pojo.dataobject.DevAttributesDO; +import com.zjyr.beidouservice.pojo.dataobject.DevBasicInfoDO; +import com.zjyr.beidouservice.pojo.dto.AlarmDevContentDTO; +import com.zjyr.beidouservice.pojo.dto.AlarmDevRespDTO; +import com.zjyr.beidouservice.pojo.dto.DevMaunDTO; +import com.zjyr.beidouservice.pojo.dto.DeviceInfoByLocDTO; +import com.zjyr.beidouservice.pojo.dto.DeviceReqDTO; +import com.zjyr.beidouservice.pojo.dto.DeviceRespDTO; +import com.zjyr.beidouservice.pojo.dto.ManufacturerContentDTO; +import com.zjyr.beidouservice.pojo.dto.ManufacturerRespDTO; +import com.zjyr.beidouservice.service.DeviceService; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +@Service +@Slf4j +public class DeviceServiceImpl implements DeviceService { + + @Resource + DevBasicInfoMapper devBasicInfoMapper; + + @Resource + DevAttributesMapper devAttributesMapper; + + @Override + public List getDeviceInfo(DeviceReqDTO deviceReqDTO) { + log.info("get device info : [{}]", deviceReqDTO); + List deviceRespList = new ArrayList<>(); + + //根据省份、地市、区信息查询设备 + DeviceInfoByLocDTO searchDTO = new DeviceInfoByLocDTO(); + searchDTO.setProvinceCode(deviceReqDTO.getProvinceCode()); + searchDTO.setCityCode(deviceReqDTO.getCityCode()); + searchDTO.setCountyCode(deviceReqDTO.getCountyCode()); + log.info("device search info : [{}]", searchDTO); + + List devBasicInfoList = devBasicInfoMapper.selectDeviceByLoc(searchDTO); + if (devBasicInfoList.isEmpty()) { + log.warn("根据省份、地市、区编码未查找到设备信息"); + return new ArrayList<>(); + } + + devBasicInfoList.forEach(dev -> { + Long deviceId = dev.getDeviceId(); + String manufacturer = deviceReqDTO.getManufacturer(); + List devMaunDTO = devAttributesMapper.selectManuByManufacturer(deviceId, manufacturer); + //根据过滤过厂商的device查找device基本信息 + devMaunDTO.forEach(v -> { + DeviceRespDTO deviceResp = new DeviceRespDTO(); + deviceResp.setDeviceId(v.getDeviceId()); + deviceResp.setAlarmManufacturer(ManufacturerTypeEnum.getByCode(v.getAlarmManufacturer())); + deviceResp.setControlManufacturer(ManufacturerTypeEnum.getByCode(v.getControlManufacturer())); + + //根据deviceId查找device basic info + DevBasicInfoDO devBasicInfo = devBasicInfoMapper.selectDeviceByDeviceId(v.getDeviceId()); + deviceResp.setDeviceName(devBasicInfo.getDeviceName()); + deviceResp.setProvinceCode(devBasicInfo.getProvinceCode()); + deviceResp.setCityCode(devBasicInfo.getCityCode()); + deviceResp.setCountyCode(devBasicInfo.getCountyCode()); + + deviceRespList.add(deviceResp); + }); + }); + + return deviceRespList; + } + + @Override + public ManufacturerRespDTO getDeviceManufacturerInfo() { + ManufacturerRespDTO manufacturerResp = new ManufacturerRespDTO(); + //获取厂家名称和类型 + List contents = new ArrayList<>(); + List codeList = ManufacturerTypeEnum.getAllCodes(); + codeList.forEach(v->{ + ManufacturerContentDTO content = new ManufacturerContentDTO(); + content.setManufacturerType(v); + content.setManufacturerName(ManufacturerTypeEnum.getByCode(v)); + + contents.add(content); + }); + + manufacturerResp.setData(contents); + return manufacturerResp; + } + + @Override + public AlarmDevRespDTO getAlarmDeviceInfo() { + AlarmDevRespDTO respDTO = new AlarmDevRespDTO(); + List contents = new ArrayList<>(); + + //获取所有的设备属性信息 + List devMaunDTOList = devAttributesMapper.selectManuAll(); + if (devMaunDTOList.isEmpty()) { + log.warn("不存在告警终端"); + return new AlarmDevRespDTO(); + } + + int totalMum = devMaunDTOList.size(); + + //分别过滤出不同的警报器类型 + List typeList = AlarmTypeEnum.getAllCodes(); + typeList.forEach(type -> { + AlarmDevContentDTO content = new AlarmDevContentDTO(); + String typeMsg = AlarmTypeEnum.getByCode(type); + log.info("alarm type :[{}]", typeMsg); + + //过滤出不同类型的设备属性 + List devType = devMaunDTOList.stream().filter(v -> v.getAlarmType().equals(type)).collect(Collectors.toList()); + content.setAlarmType(typeMsg); + content.setAlarmNum(devType.size()); + double ratio = (double) devType.size() / (double) totalMum; + content.setAlarmRatio(ratio); + + contents.add(content); + }); + + respDTO.setAlarmDevTotalNum(totalMum); + respDTO.setData(contents); + return respDTO; + } +} diff --git a/src/main/java/com/zjyr/beidouservice/service/impl/DeviceTaskServiceImpl.java b/src/main/java/com/zjyr/beidouservice/service/impl/DeviceTaskServiceImpl.java new file mode 100644 index 0000000..715a89a --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/service/impl/DeviceTaskServiceImpl.java @@ -0,0 +1,96 @@ +package com.zjyr.beidouservice.service.impl; + +import com.zjyr.beidouservice.constenum.ExecStatusEnum; +import com.zjyr.beidouservice.mapper.DevTaskMapper; +import com.zjyr.beidouservice.mapper.TaskMapper; +import com.zjyr.beidouservice.pojo.dataobject.DevTaskDO; +import com.zjyr.beidouservice.pojo.dataobject.TaskDO; +import com.zjyr.beidouservice.pojo.dto.DeviceTaskContentDTO; +import com.zjyr.beidouservice.pojo.dto.DeviceTaskRespDTO; +import com.zjyr.beidouservice.service.DeviceTaskService; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +@Service +@Slf4j +public class DeviceTaskServiceImpl implements DeviceTaskService { + + @Resource + DevTaskMapper devTaskMapper; + + @Resource + TaskMapper taskMapper; + + @Override + public List getDeviceTaskInfo() { + log.info(" get all device task information"); + List respDTOList = new ArrayList<>(); + + //获取所有任务id + List taskDOList = taskMapper.selectAllTask(); + if (taskDOList.isEmpty()) { + log.warn("不存在终端设备告警任务"); + return new ArrayList<>(); + } + + taskDOList.forEach(task -> { + DeviceTaskRespDTO taskResp = new DeviceTaskRespDTO(); + taskResp.setId(task.getId()); + taskResp.setTaskId(task.getTaskId()); + //告警任务记录时间为任务创建时间 + taskResp.setRecodeTime(task.getCreateTime()); + + + //告警任务回示率,收到响应信息的设备数量(执行成功、执行失败)/总设备数量 + int respNum = task.getExecNormalNum() + task.getExecAbnormalNum(); + int deviceNum = task.getDeviceNum(); + double respRate = (double) respNum / (double) deviceNum; + + //告警任务执行设备数量、执行正常数量、执行异常数量、回示率 + taskResp.setDeviceNum(deviceNum); + taskResp.setExecNormalNum(task.getExecNormalNum()); + taskResp.setExecAbnormalNum(task.getExecAbnormalNum()); + taskResp.setRespRate(respRate); + + //获取任务id详细信息 + List devTaskContents = new ArrayList<>(); + List devTaskDOList = devTaskMapper.selectDevTaskByTaskId(task.getTaskId()); + if (devTaskDOList.isEmpty()) { + log.warn("根据任务Id: [{}] 获取不到告警任务详情信息", task.getTaskId()); + taskResp.setData(new ArrayList<>()); + } + + devTaskDOList.forEach(devTask -> { + DeviceTaskContentDTO devTaskContent = new DeviceTaskContentDTO(); + devTaskContent.setDeviceId(devTask.getDeviceId()); + devTaskContent.setDeviceName(devTask.getDeviceName()); + //回示时间为dev task表中的更新时间，收到执行状态后更新时间 + devTaskContent.setRespTime(devTask.getUpdateTime()); + devTaskContent.setExecStateMsg(ExecStatusEnum.getByCode(devTask.getExecState())); + + devTaskContents.add(devTaskContent); + + }); + + taskResp.setData(devTaskContents); + respDTOList.add(taskResp); + + }); + + // 使用自定义比较器按recodeTime排序 + respDTOList.sort(new Comparator() { + public int compare(DeviceTaskRespDTO t1, DeviceTaskRespDTO t2) { + return t2.getRecodeTime().compareTo(t1.getRecodeTime()); + } + }); + + return respDTOList; + } +} diff --git a/src/main/java/com/zjyr/beidouservice/service/impl/LocationServiceImpl.java b/src/main/java/com/zjyr/beidouservice/service/impl/LocationServiceImpl.java new file mode 100644 index 0000000..fd5f8e9 --- /dev/null +++ b/src/main/java/com/zjyr/beidouservice/service/impl/LocationServiceImpl.java @@ -0,0 +1,140 @@ +package com.zjyr.beidouservice.service.impl; + +import com.zjyr.beidouservice.mapper.LocCityMapper; +import com.zjyr.beidouservice.mapper.LocCountyMapper; +import com.zjyr.beidouservice.mapper.LocProvinceMapper; +import com.zjyr.beidouservice.pojo.dataobject.LocCityDO; +import com.zjyr.beidouservice.pojo.dataobject.LocCountyDO; +import com.zjyr.beidouservice.pojo.dataobject.LocProvinceDO; +import com.zjyr.beidouservice.pojo.dto.city.CityCountyDTO; +import com.zjyr.beidouservice.pojo.dto.city.CityRespDTO; +import com.zjyr.beidouservice.pojo.dto.city.CitySearchDTO; +import com.zjyr.beidouservice.pojo.dto.city.CountyContent; +import com.zjyr.beidouservice.pojo.dto.province.CityContentDTO; +import com.zjyr.beidouservice.pojo.dto.province.OnlyProvinceContentDTO; +import com.zjyr.beidouservice.pojo.dto.province.OnlyProvinceResp; +import com.zjyr.beidouservice.pojo.dto.province.ProvinceContent; +import com.zjyr.beidouservice.pojo.dto.province.ProvinceSearchDTO; +import com.zjyr.beidouservice.pojo.dto.province.ProvinceRespDTO; +import com.zjyr.beidouservice.service.LocationService; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +@Slf4j +public class LocationServiceImpl implements LocationService { + @Resource + LocProvinceMapper locProvinceMapper; + + @Resource + LocCityMapper locCityMapper; + + @Resource + LocCountyMapper locCountyMapper; + + @Override + public OnlyProvinceResp getOnlyProvinces() { + OnlyProvinceResp onlyProvinceResp = new OnlyProvinceResp(); + List onlyProvinceList = new ArrayList<>(); + + //获取省份信息 + List provinceDOS = locProvinceMapper.selectAllProvince(); + if (provinceDOS.isEmpty()) { + log.warn("不存在省份信息"); + return new OnlyProvinceResp(); + } + + provinceDOS.forEach(province ->{ + OnlyProvinceContentDTO onlyProvinceContent = new OnlyProvinceContentDTO(); + onlyProvinceContent.setProvinceName(province.getProvinceName()); + onlyProvinceContent.setProvinceCode(province.getProvinceCode()); + onlyProvinceList.add(onlyProvinceContent); + }); + + onlyProvinceResp.setOnlyProvinceList(onlyProvinceList); + return onlyProvinceResp; + } + + @Override + public ProvinceRespDTO getProvinces(ProvinceSearchDTO provinceSearchDTO) { + ProvinceRespDTO provinceResp = new ProvinceRespDTO(); + List provinceContents = new ArrayList<>(); + + //获取省份信息 + String provinceCode = provinceSearchDTO.getProvinceCode(); + List provinceDOS = locProvinceMapper.selectProvince(provinceCode); + if (provinceDOS.isEmpty()) { + log.warn("不存在省份信息"); + return new ProvinceRespDTO(); + } + + + provinceDOS.forEach(province -> { + ProvinceContent provinceContent = new ProvinceContent(); + provinceContent.setProvinceName(province.getProvinceName()); + provinceContent.setProvinceCode(province.getProvinceCode()); + + //根据省份查询对应的地市信息 + List cityContentDTOList = new ArrayList<>(); + List cityDOList = locCityMapper.selectCityByProvince(province.getProvinceCode()); + cityDOList.forEach(city -> { + CityContentDTO cityContent = new CityContentDTO(); + cityContent.setCityName(city.getCityName()); + cityContent.setCityCode(city.getCityCode()); + cityContentDTOList.add(cityContent); + }); + + provinceContent.setCityList(cityContentDTOList); + provinceContents.add(provinceContent); + + }); + + provinceResp.setProvinceList(provinceContents); + return provinceResp; + } + + + @Override + public CityRespDTO getCity(CitySearchDTO citySearchDTO) { + CityRespDTO cityResp = new CityRespDTO(); + List cityContents = new ArrayList<>(); + + //获取地市信息 + String provinceCode = citySearchDTO.getProvinceCode(); + String cityCode = citySearchDTO.getCityCode(); + List cityDOS = locCityMapper.selectCity(provinceCode, cityCode); + if (cityDOS.isEmpty()) { + log.warn("不存在地市信息"); + return new CityRespDTO(); + } + + cityDOS.forEach(city -> { + CityCountyDTO cityContent = new CityCountyDTO(); + cityContent.setProvinceCode(city.getProvinceCode()); + cityContent.setCityName(city.getCityName()); + cityContent.setCityCode(city.getCityCode()); + + //根据地市查询对应的区信息 + List countyContentList = new ArrayList<>(); + List countyDOList = locCountyMapper.selectCountyByCity(city.getProvinceCode(), city.getCityCode()); + countyDOList.forEach(county -> { + CountyContent countyContent = new CountyContent(); + countyContent.setCountyName(county.getCountyName()); + countyContent.setCountyCode(county.getCountyCode()); + countyContentList.add(countyContent); + }); + + cityContent.setCountyList(countyContentList); + cityContents.add(cityContent); + + }); + + cityResp.setCityList(cityContents); + return cityResp; + } + +} diff --git a/src/main/resources/mappers/DevAttributesMapper.xml b/src/main/resources/mappers/DevAttributesMapper.xml new file mode 100644 index 0000000..f1a03db --- /dev/null +++ b/src/main/resources/mappers/DevAttributesMapper.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mappers/DevBasicInfoMapper.xml b/src/main/resources/mappers/DevBasicInfoMapper.xml new file mode 100644 index 0000000..4633eaa --- /dev/null +++ b/src/main/resources/mappers/DevBasicInfoMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mappers/DevTaskMapper.xml b/src/main/resources/mappers/DevTaskMapper.xml new file mode 100644 index 0000000..76d5cf8 --- /dev/null +++ b/src/main/resources/mappers/DevTaskMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mappers/LocCityMapper.xml b/src/main/resources/mappers/LocCityMapper.xml new file mode 100644 index 0000000..b878731 --- /dev/null +++ b/src/main/resources/mappers/LocCityMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mappers/LocCountyMapper.xml b/src/main/resources/mappers/LocCountyMapper.xml new file mode 100644 index 0000000..9eec1ae --- /dev/null +++ b/src/main/resources/mappers/LocCountyMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mappers/LocProvinceMapper.xml b/src/main/resources/mappers/LocProvinceMapper.xml new file mode 100644 index 0000000..9d1f97d --- /dev/null +++ b/src/main/resources/mappers/LocProvinceMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mappers/TaskMapper.xml b/src/main/resources/mappers/TaskMapper.xml new file mode 100644 index 0000000..a67c41d --- /dev/null +++ b/src/main/resources/mappers/TaskMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file