diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 42c5493..e1dfbe8 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -7,8 +7,8 @@ */ public enum BusinessExceptionEnum implements AbstractBaseExceptionEnum { - UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"), - ID_NULL(2400, "主键不能为空"); + ID_NULL(2400, "主键不能为空"), + HANDLE_FAILED(500, "操作失败"); private Integer code; private String message; diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 42c5493..e1dfbe8 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -7,8 +7,8 @@ */ public enum BusinessExceptionEnum implements AbstractBaseExceptionEnum { - UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"), - ID_NULL(2400, "主键不能为空"); + ID_NULL(2400, "主键不能为空"), + HANDLE_FAILED(500, "操作失败"); private Integer code; private String message; diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java index 9555a9c..d372121 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -1,4 +1,4 @@ -package com.casic.missiles.util; +package com.casic.missiles.enums; /** * @Description: 字典名枚举 @@ -11,5 +11,8 @@ //报警类型 String ALARM_TYPE = "alarmType"; - + //设备状态 + String DEVICE_STATUS = "deviceStatus"; + //报警类型 + String DEVICE_TYPE = "deviceType"; } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 42c5493..e1dfbe8 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -7,8 +7,8 @@ */ public enum BusinessExceptionEnum implements AbstractBaseExceptionEnum { - UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"), - ID_NULL(2400, "主键不能为空"); + ID_NULL(2400, "主键不能为空"), + HANDLE_FAILED(500, "操作失败"); private Integer code; private String message; diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java index 9555a9c..d372121 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -1,4 +1,4 @@ -package com.casic.missiles.util; +package com.casic.missiles.enums; /** * @Description: 字典名枚举 @@ -11,5 +11,8 @@ //报警类型 String ALARM_TYPE = "alarmType"; - + //设备状态 + String DEVICE_STATUS = "deviceStatus"; + //报警类型 + String DEVICE_TYPE = "deviceType"; } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 826cd9d..4f39bc1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -42,7 +42,7 @@ * 获取监测点/设备信息分页列表 */ @RequestMapping(value = "/listPage") - public Object listPage(Long stationId,String keyword) { + public Object listPage(Long stationId, String keyword) throws Exception { Page page = PageFactory.defaultPage(); return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); } @@ -73,16 +73,16 @@ * 删除监测点/设备信息 */ @RequestMapping(value = "/delete") - public Object delete(@RequestParam Long busMonipoiInfoId) { - return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + public Object delete(@RequestParam Long monitorId) { + return busMonipoiInfoService.deleteMonitor(monitorId); } /** * 监测点/设备信息详情 */ @RequestMapping(value = "/info") - public Object detail(Long busMonipoiInfoId) { - return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + public Object detail(Long id) { + return busMonipoiInfoService.monitorDetail(id); } /** diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 42c5493..e1dfbe8 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -7,8 +7,8 @@ */ public enum BusinessExceptionEnum implements AbstractBaseExceptionEnum { - UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"), - ID_NULL(2400, "主键不能为空"); + ID_NULL(2400, "主键不能为空"), + HANDLE_FAILED(500, "操作失败"); private Integer code; private String message; diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java index 9555a9c..d372121 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -1,4 +1,4 @@ -package com.casic.missiles.util; +package com.casic.missiles.enums; /** * @Description: 字典名枚举 @@ -11,5 +11,8 @@ //报警类型 String ALARM_TYPE = "alarmType"; - + //设备状态 + String DEVICE_STATUS = "deviceStatus"; + //报警类型 + String DEVICE_TYPE = "deviceType"; } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 826cd9d..4f39bc1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -42,7 +42,7 @@ * 获取监测点/设备信息分页列表 */ @RequestMapping(value = "/listPage") - public Object listPage(Long stationId,String keyword) { + public Object listPage(Long stationId, String keyword) throws Exception { Page page = PageFactory.defaultPage(); return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); } @@ -73,16 +73,16 @@ * 删除监测点/设备信息 */ @RequestMapping(value = "/delete") - public Object delete(@RequestParam Long busMonipoiInfoId) { - return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + public Object delete(@RequestParam Long monitorId) { + return busMonipoiInfoService.deleteMonitor(monitorId); } /** * 监测点/设备信息详情 */ @RequestMapping(value = "/info") - public Object detail(Long busMonipoiInfoId) { - return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + public Object detail(Long id) { + return busMonipoiInfoService.monitorDetail(id); } /** diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index bb9efba..bc718cc 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -73,8 +73,8 @@ * 删除场站信息 */ @RequestMapping(value = "/delete") - public Object delete(@RequestParam Long stationId) { - return busStationInfoService.deleteStation(stationId); + public Object delete(@RequestParam Long id) { + return busStationInfoService.deleteStation(id); } } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 42c5493..e1dfbe8 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -7,8 +7,8 @@ */ public enum BusinessExceptionEnum implements AbstractBaseExceptionEnum { - UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"), - ID_NULL(2400, "主键不能为空"); + ID_NULL(2400, "主键不能为空"), + HANDLE_FAILED(500, "操作失败"); private Integer code; private String message; diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java index 9555a9c..d372121 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -1,4 +1,4 @@ -package com.casic.missiles.util; +package com.casic.missiles.enums; /** * @Description: 字典名枚举 @@ -11,5 +11,8 @@ //报警类型 String ALARM_TYPE = "alarmType"; - + //设备状态 + String DEVICE_STATUS = "deviceStatus"; + //报警类型 + String DEVICE_TYPE = "deviceType"; } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 826cd9d..4f39bc1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -42,7 +42,7 @@ * 获取监测点/设备信息分页列表 */ @RequestMapping(value = "/listPage") - public Object listPage(Long stationId,String keyword) { + public Object listPage(Long stationId, String keyword) throws Exception { Page page = PageFactory.defaultPage(); return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); } @@ -73,16 +73,16 @@ * 删除监测点/设备信息 */ @RequestMapping(value = "/delete") - public Object delete(@RequestParam Long busMonipoiInfoId) { - return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + public Object delete(@RequestParam Long monitorId) { + return busMonipoiInfoService.deleteMonitor(monitorId); } /** * 监测点/设备信息详情 */ @RequestMapping(value = "/info") - public Object detail(Long busMonipoiInfoId) { - return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + public Object detail(Long id) { + return busMonipoiInfoService.monitorDetail(id); } /** diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index bb9efba..bc718cc 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -73,8 +73,8 @@ * 删除场站信息 */ @RequestMapping(value = "/delete") - public Object delete(@RequestParam Long stationId) { - return busStationInfoService.deleteStation(stationId); + public Object delete(@RequestParam Long id) { + return busStationInfoService.deleteStation(id); } } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index fe4cc1d..93e341e 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -38,8 +38,13 @@ - SELECT id,monitor_name AS monitorName - FROM bus_monipoi_info + SELECT bmi.id,monitor_name AS monitorName + FROM bus_monipoi_info bmi + JOIN ( + SELECT id,DEPT_ID + FROM bus_station_info + WHERE valid=0 + )bsi ON bsi.id=station_id where valid=0 and station_id =#{stationId} @@ -47,8 +52,14 @@ diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 42c5493..e1dfbe8 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -7,8 +7,8 @@ */ public enum BusinessExceptionEnum implements AbstractBaseExceptionEnum { - UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"), - ID_NULL(2400, "主键不能为空"); + ID_NULL(2400, "主键不能为空"), + HANDLE_FAILED(500, "操作失败"); private Integer code; private String message; diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java index 9555a9c..d372121 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -1,4 +1,4 @@ -package com.casic.missiles.util; +package com.casic.missiles.enums; /** * @Description: 字典名枚举 @@ -11,5 +11,8 @@ //报警类型 String ALARM_TYPE = "alarmType"; - + //设备状态 + String DEVICE_STATUS = "deviceStatus"; + //报警类型 + String DEVICE_TYPE = "deviceType"; } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 826cd9d..4f39bc1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -42,7 +42,7 @@ * 获取监测点/设备信息分页列表 */ @RequestMapping(value = "/listPage") - public Object listPage(Long stationId,String keyword) { + public Object listPage(Long stationId, String keyword) throws Exception { Page page = PageFactory.defaultPage(); return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); } @@ -73,16 +73,16 @@ * 删除监测点/设备信息 */ @RequestMapping(value = "/delete") - public Object delete(@RequestParam Long busMonipoiInfoId) { - return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + public Object delete(@RequestParam Long monitorId) { + return busMonipoiInfoService.deleteMonitor(monitorId); } /** * 监测点/设备信息详情 */ @RequestMapping(value = "/info") - public Object detail(Long busMonipoiInfoId) { - return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + public Object detail(Long id) { + return busMonipoiInfoService.monitorDetail(id); } /** diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index bb9efba..bc718cc 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -73,8 +73,8 @@ * 删除场站信息 */ @RequestMapping(value = "/delete") - public Object delete(@RequestParam Long stationId) { - return busStationInfoService.deleteStation(stationId); + public Object delete(@RequestParam Long id) { + return busStationInfoService.deleteStation(id); } } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index fe4cc1d..93e341e 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -38,8 +38,13 @@ diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 4190653..bc6d094 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.enums.DictEnum; import lombok.Data; /** @@ -48,8 +49,11 @@ * 0:外协，1：自研，2：宇视通 */ @TableField("TYPE") -// @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + @DictCodeField(message = "设备类型描述不合法", cacheName = DictEnum.DEVICE_TYPE) private String deviceType; + + @TableField(exist = false) + private String deviceTypeName; /** * 设备编号 */ @@ -129,10 +133,9 @@ * 0：离线，1在线，报警 */ @TableField("DEVICE_STATUS") - @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + @DictCodeField(message = "设备状态描述不合法", cacheName = DictEnum.DEVICE_STATUS) private String deviceStatus; - @TableField(exist = false) private String deviceStatusName; diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 42c5493..e1dfbe8 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -7,8 +7,8 @@ */ public enum BusinessExceptionEnum implements AbstractBaseExceptionEnum { - UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"), - ID_NULL(2400, "主键不能为空"); + ID_NULL(2400, "主键不能为空"), + HANDLE_FAILED(500, "操作失败"); private Integer code; private String message; diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java index 9555a9c..d372121 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -1,4 +1,4 @@ -package com.casic.missiles.util; +package com.casic.missiles.enums; /** * @Description: 字典名枚举 @@ -11,5 +11,8 @@ //报警类型 String ALARM_TYPE = "alarmType"; - + //设备状态 + String DEVICE_STATUS = "deviceStatus"; + //报警类型 + String DEVICE_TYPE = "deviceType"; } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 826cd9d..4f39bc1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -42,7 +42,7 @@ * 获取监测点/设备信息分页列表 */ @RequestMapping(value = "/listPage") - public Object listPage(Long stationId,String keyword) { + public Object listPage(Long stationId, String keyword) throws Exception { Page page = PageFactory.defaultPage(); return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); } @@ -73,16 +73,16 @@ * 删除监测点/设备信息 */ @RequestMapping(value = "/delete") - public Object delete(@RequestParam Long busMonipoiInfoId) { - return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + public Object delete(@RequestParam Long monitorId) { + return busMonipoiInfoService.deleteMonitor(monitorId); } /** * 监测点/设备信息详情 */ @RequestMapping(value = "/info") - public Object detail(Long busMonipoiInfoId) { - return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + public Object detail(Long id) { + return busMonipoiInfoService.monitorDetail(id); } /** diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index bb9efba..bc718cc 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -73,8 +73,8 @@ * 删除场站信息 */ @RequestMapping(value = "/delete") - public Object delete(@RequestParam Long stationId) { - return busStationInfoService.deleteStation(stationId); + public Object delete(@RequestParam Long id) { + return busStationInfoService.deleteStation(id); } } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index fe4cc1d..93e341e 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -38,8 +38,13 @@ diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 4190653..bc6d094 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.enums.DictEnum; import lombok.Data; /** @@ -48,8 +49,11 @@ * 0:外协，1：自研，2：宇视通 */ @TableField("TYPE") -// @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + @DictCodeField(message = "设备类型描述不合法", cacheName = DictEnum.DEVICE_TYPE) private String deviceType; + + @TableField(exist = false) + private String deviceTypeName; /** * 设备编号 */ @@ -129,10 +133,9 @@ * 0：离线，1在线，报警 */ @TableField("DEVICE_STATUS") - @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + @DictCodeField(message = "设备状态描述不合法", cacheName = DictEnum.DEVICE_STATUS) private String deviceStatus; - @TableField(exist = false) private String deviceStatusName; diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java index 9d5bafd..4d83cf6 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java @@ -28,7 +28,7 @@ * 主键id */ @TableId("ID") - private Long stationId; + private Long id; /** * 场站名 */ @@ -56,7 +56,7 @@ @Override public String toString() { return "BusStationInfo{" + - "stationId=" + stationId + + "id=" + id + ", stationName=" + stationName + ", deptId=" + deptId + ", valid=" + valid + diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 42c5493..e1dfbe8 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -7,8 +7,8 @@ */ public enum BusinessExceptionEnum implements AbstractBaseExceptionEnum { - UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"), - ID_NULL(2400, "主键不能为空"); + ID_NULL(2400, "主键不能为空"), + HANDLE_FAILED(500, "操作失败"); private Integer code; private String message; diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java index 9555a9c..d372121 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -1,4 +1,4 @@ -package com.casic.missiles.util; +package com.casic.missiles.enums; /** * @Description: 字典名枚举 @@ -11,5 +11,8 @@ //报警类型 String ALARM_TYPE = "alarmType"; - + //设备状态 + String DEVICE_STATUS = "deviceStatus"; + //报警类型 + String DEVICE_TYPE = "deviceType"; } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 826cd9d..4f39bc1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -42,7 +42,7 @@ * 获取监测点/设备信息分页列表 */ @RequestMapping(value = "/listPage") - public Object listPage(Long stationId,String keyword) { + public Object listPage(Long stationId, String keyword) throws Exception { Page page = PageFactory.defaultPage(); return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); } @@ -73,16 +73,16 @@ * 删除监测点/设备信息 */ @RequestMapping(value = "/delete") - public Object delete(@RequestParam Long busMonipoiInfoId) { - return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + public Object delete(@RequestParam Long monitorId) { + return busMonipoiInfoService.deleteMonitor(monitorId); } /** * 监测点/设备信息详情 */ @RequestMapping(value = "/info") - public Object detail(Long busMonipoiInfoId) { - return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + public Object detail(Long id) { + return busMonipoiInfoService.monitorDetail(id); } /** diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index bb9efba..bc718cc 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -73,8 +73,8 @@ * 删除场站信息 */ @RequestMapping(value = "/delete") - public Object delete(@RequestParam Long stationId) { - return busStationInfoService.deleteStation(stationId); + public Object delete(@RequestParam Long id) { + return busStationInfoService.deleteStation(id); } } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index fe4cc1d..93e341e 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -38,8 +38,13 @@ diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 4190653..bc6d094 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.enums.DictEnum; import lombok.Data; /** @@ -48,8 +49,11 @@ * 0:外协，1：自研，2：宇视通 */ @TableField("TYPE") -// @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + @DictCodeField(message = "设备类型描述不合法", cacheName = DictEnum.DEVICE_TYPE) private String deviceType; + + @TableField(exist = false) + private String deviceTypeName; /** * 设备编号 */ @@ -129,10 +133,9 @@ * 0：离线，1在线，报警 */ @TableField("DEVICE_STATUS") - @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + @DictCodeField(message = "设备状态描述不合法", cacheName = DictEnum.DEVICE_STATUS) private String deviceStatus; - @TableField(exist = false) private String deviceStatusName; diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java index 9d5bafd..4d83cf6 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java @@ -28,7 +28,7 @@ * 主键id */ @TableId("ID") - private Long stationId; + private Long id; /** * 场站名 */ @@ -56,7 +56,7 @@ @Override public String toString() { return "BusStationInfo{" + - "stationId=" + stationId + + "id=" + id + ", stationName=" + stationName + ", deptId=" + deptId + ", valid=" + valid + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java index 5d95d88..7fddde8 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java @@ -21,7 +21,7 @@ List monitorList(Long stationId); - Page monitorListPage(Page page, Long stationId, String keyword); + Page monitorListPage(Page page, Long stationId, String keyword)throws Exception; ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo); diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 42c5493..e1dfbe8 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -7,8 +7,8 @@ */ public enum BusinessExceptionEnum implements AbstractBaseExceptionEnum { - UNABLE_TO_URGE(2431, "该部门不存在负责人，无法催办"), - ID_NULL(2400, "主键不能为空"); + ID_NULL(2400, "主键不能为空"), + HANDLE_FAILED(500, "操作失败"); private Integer code; private String message; diff --git a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java index 9555a9c..d372121 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/DictEnum.java @@ -1,4 +1,4 @@ -package com.casic.missiles.util; +package com.casic.missiles.enums; /** * @Description: 字典名枚举 @@ -11,5 +11,8 @@ //报警类型 String ALARM_TYPE = "alarmType"; - + //设备状态 + String DEVICE_STATUS = "deviceStatus"; + //报警类型 + String DEVICE_TYPE = "deviceType"; } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 826cd9d..4f39bc1 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -42,7 +42,7 @@ * 获取监测点/设备信息分页列表 */ @RequestMapping(value = "/listPage") - public Object listPage(Long stationId,String keyword) { + public Object listPage(Long stationId, String keyword) throws Exception { Page page = PageFactory.defaultPage(); return ResponseData.success(super.packForBT(busMonipoiInfoService.monitorListPage(page, stationId, keyword))); } @@ -73,16 +73,16 @@ * 删除监测点/设备信息 */ @RequestMapping(value = "/delete") - public Object delete(@RequestParam Long busMonipoiInfoId) { - return busMonipoiInfoService.deleteMonitor(busMonipoiInfoId); + public Object delete(@RequestParam Long monitorId) { + return busMonipoiInfoService.deleteMonitor(monitorId); } /** * 监测点/设备信息详情 */ @RequestMapping(value = "/info") - public Object detail(Long busMonipoiInfoId) { - return busMonipoiInfoService.monitorDetail(busMonipoiInfoId); + public Object detail(Long id) { + return busMonipoiInfoService.monitorDetail(id); } /** diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java index bb9efba..bc718cc 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusStationInfoController.java @@ -73,8 +73,8 @@ * 删除场站信息 */ @RequestMapping(value = "/delete") - public Object delete(@RequestParam Long stationId) { - return busStationInfoService.deleteStation(stationId); + public Object delete(@RequestParam Long id) { + return busStationInfoService.deleteStation(id); } } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index fe4cc1d..93e341e 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -38,8 +38,13 @@ diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java index 4190653..bc6d094 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.casic.missiles.annotation.DictCodeField; +import com.casic.missiles.enums.DictEnum; import lombok.Data; /** @@ -48,8 +49,11 @@ * 0:外协，1：自研，2：宇视通 */ @TableField("TYPE") -// @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + @DictCodeField(message = "设备类型描述不合法", cacheName = DictEnum.DEVICE_TYPE) private String deviceType; + + @TableField(exist = false) + private String deviceTypeName; /** * 设备编号 */ @@ -129,10 +133,9 @@ * 0：离线，1在线，报警 */ @TableField("DEVICE_STATUS") - @DictCodeField(message = "投诉类型描述不合法", cacheName = MeterDictCode.ADVICE_TYPE) + @DictCodeField(message = "设备状态描述不合法", cacheName = DictEnum.DEVICE_STATUS) private String deviceStatus; - @TableField(exist = false) private String deviceStatusName; diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java index 9d5bafd..4d83cf6 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusStationInfo.java @@ -28,7 +28,7 @@ * 主键id */ @TableId("ID") - private Long stationId; + private Long id; /** * 场站名 */ @@ -56,7 +56,7 @@ @Override public String toString() { return "BusStationInfo{" + - "stationId=" + stationId + + "id=" + id + ", stationName=" + stationName + ", deptId=" + deptId + ", valid=" + valid + diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java index 5d95d88..7fddde8 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java @@ -21,7 +21,7 @@ List monitorList(Long stationId); - Page monitorListPage(Page page, Long stationId, String keyword); + Page monitorListPage(Page page, Long stationId, String keyword)throws Exception; ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo); diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java index d9451a9..b75f4da 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java @@ -15,6 +15,7 @@ import com.casic.missiles.modular.system.dao.BusMonipoiInfoMapper; import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; +import com.casic.missiles.util.DictCodeUtils; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -44,10 +45,13 @@ } @Override - public Page monitorListPage(Page page, Long stationId, String keyword) { + public Page monitorListPage(Page page, Long stationId, String keyword)throws Exception { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("DEPT_ID"); List monitorPointLists = this.baseMapper.monitorListPage(dataScope, stationId, keyword); + for(BusMonipoiInfo busMonipoiInfo:monitorPointLists){ + DictCodeUtils.convertDictCodeToName(busMonipoiInfo); + } page.setRecords(monitorPointLists); return page; }