diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index c3b382a..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -23,16 +23,16 @@ * 序号 */ private Long id; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("井名称") + @ExcelProperty("点位名称") private String wellName; @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; private String wellType; - @ExcelProperty("井类型") + @ExcelProperty("点位类型") private String wellTypeName; private String deptId; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index c3b382a..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -23,16 +23,16 @@ * 序号 */ private Long id; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("井名称") + @ExcelProperty("点位名称") private String wellName; @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; private String wellType; - @ExcelProperty("井类型") + @ExcelProperty("点位类型") private String wellTypeName; private String deptId; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 34c1772..b43c3d8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -48,7 +48,7 @@ */ private Long id;//主键 - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @Length(max = 15, min = 12) private String wellCode; @ExcelProperty("设备编号") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index c3b382a..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -23,16 +23,16 @@ * 序号 */ private Long id; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("井名称") + @ExcelProperty("点位名称") private String wellName; @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; private String wellType; - @ExcelProperty("井类型") + @ExcelProperty("点位类型") private String wellTypeName; private String deptId; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 34c1772..b43c3d8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -48,7 +48,7 @@ */ private Long id;//主键 - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @Length(max = 15, min = 12) private String wellCode; @ExcelProperty("设备编号") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 0aa4846..e521ddc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -26,7 +26,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index c3b382a..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -23,16 +23,16 @@ * 序号 */ private Long id; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("井名称") + @ExcelProperty("点位名称") private String wellName; @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; private String wellType; - @ExcelProperty("井类型") + @ExcelProperty("点位类型") private String wellTypeName; private String deptId; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 34c1772..b43c3d8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -48,7 +48,7 @@ */ private Long id;//主键 - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @Length(max = 15, min = 12) private String wellCode; @ExcelProperty("设备编号") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 0aa4846..e521ddc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -26,7 +26,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 84ae05d..3335181 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index c3b382a..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -23,16 +23,16 @@ * 序号 */ private Long id; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("井名称") + @ExcelProperty("点位名称") private String wellName; @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; private String wellType; - @ExcelProperty("井类型") + @ExcelProperty("点位类型") private String wellTypeName; private String deptId; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 34c1772..b43c3d8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -48,7 +48,7 @@ */ private Long id;//主键 - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @Length(max = 15, min = 12) private String wellCode; @ExcelProperty("设备编号") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 0aa4846..e521ddc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -26,7 +26,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 84ae05d..3335181 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 0ce5716..c70230c 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index c3b382a..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -23,16 +23,16 @@ * 序号 */ private Long id; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("井名称") + @ExcelProperty("点位名称") private String wellName; @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; private String wellType; - @ExcelProperty("井类型") + @ExcelProperty("点位类型") private String wellTypeName; private String deptId; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 34c1772..b43c3d8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -48,7 +48,7 @@ */ private Long id;//主键 - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @Length(max = 15, min = 12) private String wellCode; @ExcelProperty("设备编号") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 0aa4846..e521ddc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -26,7 +26,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 84ae05d..3335181 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 0ce5716..c70230c 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java index e86142c..5d4229a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index c3b382a..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -23,16 +23,16 @@ * 序号 */ private Long id; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("井名称") + @ExcelProperty("点位名称") private String wellName; @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; private String wellType; - @ExcelProperty("井类型") + @ExcelProperty("点位类型") private String wellTypeName; private String deptId; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 34c1772..b43c3d8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -48,7 +48,7 @@ */ private Long id;//主键 - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @Length(max = 15, min = 12) private String wellCode; @ExcelProperty("设备编号") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 0aa4846..e521ddc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -26,7 +26,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 84ae05d..3335181 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 0ce5716..c70230c 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java index e86142c..5d4229a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java index 4b9f355..67ce1de 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index c3b382a..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -23,16 +23,16 @@ * 序号 */ private Long id; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("井名称") + @ExcelProperty("点位名称") private String wellName; @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; private String wellType; - @ExcelProperty("井类型") + @ExcelProperty("点位类型") private String wellTypeName; private String deptId; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 34c1772..b43c3d8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -48,7 +48,7 @@ */ private Long id;//主键 - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @Length(max = 15, min = 12) private String wellCode; @ExcelProperty("设备编号") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 0aa4846..e521ddc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -26,7 +26,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 84ae05d..3335181 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 0ce5716..c70230c 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java index e86142c..5d4229a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java index 4b9f355..67ce1de 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java index 06d5578..05e47c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java @@ -37,7 +37,7 @@ private Long deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井盖编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index c3b382a..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -23,16 +23,16 @@ * 序号 */ private Long id; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("井名称") + @ExcelProperty("点位名称") private String wellName; @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; private String wellType; - @ExcelProperty("井类型") + @ExcelProperty("点位类型") private String wellTypeName; private String deptId; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 34c1772..b43c3d8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -48,7 +48,7 @@ */ private Long id;//主键 - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @Length(max = 15, min = 12) private String wellCode; @ExcelProperty("设备编号") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 0aa4846..e521ddc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -26,7 +26,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 84ae05d..3335181 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 0ce5716..c70230c 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java index e86142c..5d4229a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java index 4b9f355..67ce1de 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java index 06d5578..05e47c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java @@ -37,7 +37,7 @@ private Long deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井盖编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index d4af1f7..41644eb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -2,14 +2,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.DeptPermissionConfigService; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/deptPermission") -public class DeptPermissionController { +public class DeptPermissionController extends BaseController { private final DeptPermissionConfigService deptPermissionService; @@ -24,7 +26,9 @@ @ResponseBody public Object deviceDeptPermissionList(String deptid) { Page page = PageFactory.defaultPage(); - return deptPermissionService.deviceDeptPermissionList(page, deptid); + ResponseData responseData = deptPermissionService.deviceDeptPermissionList(page, deptid); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index c3b382a..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -23,16 +23,16 @@ * 序号 */ private Long id; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("井名称") + @ExcelProperty("点位名称") private String wellName; @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; private String wellType; - @ExcelProperty("井类型") + @ExcelProperty("点位类型") private String wellTypeName; private String deptId; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 34c1772..b43c3d8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -48,7 +48,7 @@ */ private Long id;//主键 - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @Length(max = 15, min = 12) private String wellCode; @ExcelProperty("设备编号") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 0aa4846..e521ddc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -26,7 +26,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 84ae05d..3335181 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 0ce5716..c70230c 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java index e86142c..5d4229a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java index 4b9f355..67ce1de 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java index 06d5578..05e47c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java @@ -37,7 +37,7 @@ private Long deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井盖编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index d4af1f7..41644eb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -2,14 +2,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.DeptPermissionConfigService; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/deptPermission") -public class DeptPermissionController { +public class DeptPermissionController extends BaseController { private final DeptPermissionConfigService deptPermissionService; @@ -24,7 +26,9 @@ @ResponseBody public Object deviceDeptPermissionList(String deptid) { Page page = PageFactory.defaultPage(); - return deptPermissionService.deviceDeptPermissionList(page, deptid); + ResponseData responseData = deptPermissionService.deviceDeptPermissionList(page, deptid); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java index e890655..59ead3f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java @@ -1,11 +1,12 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeptPermission; public interface DeptPermissionConfigService { - Object deviceDeptPermissionList(Page page, String deptid); + ResponseData deviceDeptPermissionList(Page page, String deptid); Object addDeptPermission(DeptPermission deviceImei); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index c3b382a..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -23,16 +23,16 @@ * 序号 */ private Long id; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("井名称") + @ExcelProperty("点位名称") private String wellName; @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; private String wellType; - @ExcelProperty("井类型") + @ExcelProperty("点位类型") private String wellTypeName; private String deptId; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 34c1772..b43c3d8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -48,7 +48,7 @@ */ private Long id;//主键 - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @Length(max = 15, min = 12) private String wellCode; @ExcelProperty("设备编号") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 0aa4846..e521ddc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -26,7 +26,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 84ae05d..3335181 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 0ce5716..c70230c 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java index e86142c..5d4229a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java index 4b9f355..67ce1de 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java index 06d5578..05e47c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java @@ -37,7 +37,7 @@ private Long deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井盖编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index d4af1f7..41644eb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -2,14 +2,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.DeptPermissionConfigService; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/deptPermission") -public class DeptPermissionController { +public class DeptPermissionController extends BaseController { private final DeptPermissionConfigService deptPermissionService; @@ -24,7 +26,9 @@ @ResponseBody public Object deviceDeptPermissionList(String deptid) { Page page = PageFactory.defaultPage(); - return deptPermissionService.deviceDeptPermissionList(page, deptid); + ResponseData responseData = deptPermissionService.deviceDeptPermissionList(page, deptid); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java index e890655..59ead3f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java @@ -1,11 +1,12 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeptPermission; public interface DeptPermissionConfigService { - Object deviceDeptPermissionList(Page page, String deptid); + ResponseData deviceDeptPermissionList(Page page, String deptid); Object addDeptPermission(DeptPermission deviceImei); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java index 03e2f89..f7640e8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java @@ -17,7 +17,7 @@ @Service public class DeptPermissionConfigServiceImpl extends ServiceImpl implements DeptPermissionConfigService { - public Object deviceDeptPermissionList(Page page, String deptid) { + public ResponseData deviceDeptPermissionList(Page page, String deptid) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getListPage(page, deptid); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index c3b382a..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -23,16 +23,16 @@ * 序号 */ private Long id; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("井名称") + @ExcelProperty("点位名称") private String wellName; @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; private String wellType; - @ExcelProperty("井类型") + @ExcelProperty("点位类型") private String wellTypeName; private String deptId; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 34c1772..b43c3d8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -48,7 +48,7 @@ */ private Long id;//主键 - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @Length(max = 15, min = 12) private String wellCode; @ExcelProperty("设备编号") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 0aa4846..e521ddc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -26,7 +26,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 84ae05d..3335181 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 0ce5716..c70230c 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java index e86142c..5d4229a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java index 4b9f355..67ce1de 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java index 06d5578..05e47c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java @@ -37,7 +37,7 @@ private Long deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井盖编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index d4af1f7..41644eb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -2,14 +2,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.DeptPermissionConfigService; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/deptPermission") -public class DeptPermissionController { +public class DeptPermissionController extends BaseController { private final DeptPermissionConfigService deptPermissionService; @@ -24,7 +26,9 @@ @ResponseBody public Object deviceDeptPermissionList(String deptid) { Page page = PageFactory.defaultPage(); - return deptPermissionService.deviceDeptPermissionList(page, deptid); + ResponseData responseData = deptPermissionService.deviceDeptPermissionList(page, deptid); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java index e890655..59ead3f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java @@ -1,11 +1,12 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeptPermission; public interface DeptPermissionConfigService { - Object deviceDeptPermissionList(Page page, String deptid); + ResponseData deviceDeptPermissionList(Page page, String deptid); Object addDeptPermission(DeptPermission deviceImei); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java index 03e2f89..f7640e8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java @@ -17,7 +17,7 @@ @Service public class DeptPermissionConfigServiceImpl extends ServiceImpl implements DeptPermissionConfigService { - public Object deviceDeptPermissionList(Page page, String deptid) { + public ResponseData deviceDeptPermissionList(Page page, String deptid) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getListPage(page, deptid); diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx index de0f0d2..401b722 100644 --- a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index c3b382a..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -23,16 +23,16 @@ * 序号 */ private Long id; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("井名称") + @ExcelProperty("点位名称") private String wellName; @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; private String wellType; - @ExcelProperty("井类型") + @ExcelProperty("点位类型") private String wellTypeName; private String deptId; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 34c1772..b43c3d8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -48,7 +48,7 @@ */ private Long id;//主键 - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @Length(max = 15, min = 12) private String wellCode; @ExcelProperty("设备编号") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 0aa4846..e521ddc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -26,7 +26,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 84ae05d..3335181 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 0ce5716..c70230c 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java index e86142c..5d4229a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java index 4b9f355..67ce1de 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java index 06d5578..05e47c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java @@ -37,7 +37,7 @@ private Long deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井盖编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index d4af1f7..41644eb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -2,14 +2,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.DeptPermissionConfigService; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/deptPermission") -public class DeptPermissionController { +public class DeptPermissionController extends BaseController { private final DeptPermissionConfigService deptPermissionService; @@ -24,7 +26,9 @@ @ResponseBody public Object deviceDeptPermissionList(String deptid) { Page page = PageFactory.defaultPage(); - return deptPermissionService.deviceDeptPermissionList(page, deptid); + ResponseData responseData = deptPermissionService.deviceDeptPermissionList(page, deptid); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java index e890655..59ead3f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java @@ -1,11 +1,12 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeptPermission; public interface DeptPermissionConfigService { - Object deviceDeptPermissionList(Page page, String deptid); + ResponseData deviceDeptPermissionList(Page page, String deptid); Object addDeptPermission(DeptPermission deviceImei); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java index 03e2f89..f7640e8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java @@ -17,7 +17,7 @@ @Service public class DeptPermissionConfigServiceImpl extends ServiceImpl implements DeptPermissionConfigService { - public Object deviceDeptPermissionList(Page page, String deptid) { + public ResponseData deviceDeptPermissionList(Page page, String deptid) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getListPage(page, deptid); diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx index de0f0d2..401b722 100644 --- a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx index 8402675..0e0012f 100644 --- a/casic-web/src/main/resources/config/temp/device_template.xlsx +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index c3b382a..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -23,16 +23,16 @@ * 序号 */ private Long id; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("井名称") + @ExcelProperty("点位名称") private String wellName; @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; private String wellType; - @ExcelProperty("井类型") + @ExcelProperty("点位类型") private String wellTypeName; private String deptId; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 34c1772..b43c3d8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -48,7 +48,7 @@ */ private Long id;//主键 - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @Length(max = 15, min = 12) private String wellCode; @ExcelProperty("设备编号") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 0aa4846..e521ddc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -26,7 +26,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 84ae05d..3335181 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 0ce5716..c70230c 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java index e86142c..5d4229a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java index 4b9f355..67ce1de 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java index 06d5578..05e47c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java @@ -37,7 +37,7 @@ private Long deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井盖编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index d4af1f7..41644eb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -2,14 +2,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.DeptPermissionConfigService; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/deptPermission") -public class DeptPermissionController { +public class DeptPermissionController extends BaseController { private final DeptPermissionConfigService deptPermissionService; @@ -24,7 +26,9 @@ @ResponseBody public Object deviceDeptPermissionList(String deptid) { Page page = PageFactory.defaultPage(); - return deptPermissionService.deviceDeptPermissionList(page, deptid); + ResponseData responseData = deptPermissionService.deviceDeptPermissionList(page, deptid); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java index e890655..59ead3f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java @@ -1,11 +1,12 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeptPermission; public interface DeptPermissionConfigService { - Object deviceDeptPermissionList(Page page, String deptid); + ResponseData deviceDeptPermissionList(Page page, String deptid); Object addDeptPermission(DeptPermission deviceImei); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java index 03e2f89..f7640e8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java @@ -17,7 +17,7 @@ @Service public class DeptPermissionConfigServiceImpl extends ServiceImpl implements DeptPermissionConfigService { - public Object deviceDeptPermissionList(Page page, String deptid) { + public ResponseData deviceDeptPermissionList(Page page, String deptid) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getListPage(page, deptid); diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx index de0f0d2..401b722 100644 --- a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx index 8402675..0e0012f 100644 --- a/casic-web/src/main/resources/config/temp/device_template.xlsx +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx index f118688..19af71a 100644 --- a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx +++ b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx Binary files differ diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java index c083e16..80104a0 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmTypeConfigController.java @@ -1,7 +1,9 @@ package com.casic.missiles.modular.alarm.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.alarm.service.IAlarmContentTypeService; import com.casic.missiles.modular.system.model.AlarmContentType; import lombok.extern.slf4j.Slf4j; @@ -15,15 +17,17 @@ @Slf4j @Controller @RequestMapping("/alarmContent") -public class AlarmTypeConfigController { +public class AlarmTypeConfigController extends BaseController { @Autowired private IAlarmContentTypeService alarmContentTypeService; @RequestMapping(value = "/list") @ResponseBody - public Object selectListPage(String alarmType,String deviceType,String alarmContent) { + public Object selectListPage(String alarmType, String deviceType, String alarmContent) { Page page = PageFactory.defaultPage(); - return alarmContentTypeService.selectListPage(page,alarmType,deviceType,alarmContent); + ResponseData responseData = alarmContentTypeService.selectListPage(page, alarmType, deviceType, alarmContent); + responseData.setData(super.packForBT(page)); + return responseData; } @RequestMapping(value = "/delete/{id}") diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java index 5515651..2caeb3f 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmContentTypeService.java @@ -8,7 +8,7 @@ import com.casic.missiles.modular.system.model.AlarmLevel; public interface IAlarmContentTypeService extends IService { - Object selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; + ResponseData selectListPage(Page page,String alarmType,String deviceType,String alarmContent);; ResponseData deleteById(Long id); ResponseData add(AlarmContentType AlarmContentType); ResponseData update(AlarmContentType AlarmContentType); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java index 4bf3621..291d448 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java @@ -15,7 +15,7 @@ @Override - public Object selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { + public ResponseData selectListPage(Page page, String alarmType, String deviceType, String alarmContent) { ResponseData responseData = new ResponseData(); try { page.setRecords(this.baseMapper.selectListPage(page, alarmType, deviceType, alarmContent)); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java index 18b8650..61e20d5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceImeiController.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.controller; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.model.response.SuccessResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import com.casic.missiles.modular.system.service.IDeviceImeiService; @@ -17,9 +20,9 @@ */ @RestController @RequestMapping("/device/simManage") -public class DeviceImeiController { +public class DeviceImeiController extends BaseController { - private final IDeviceImeiService deviceImeiService; + private final IDeviceImeiService deviceImeiService; public DeviceImeiController(IDeviceImeiService deviceImeiService) { this.deviceImeiService = deviceImeiService; @@ -32,7 +35,9 @@ public Object deviceImeiListPage(String devcode) { // devcode 否 string 设备编号 Page page = PageFactory.defaultPage(); - return deviceImeiService.deviceImeiListPage(page, devcode); + ResponseData responseData = deviceImeiService.deviceImeiListPage(page, devcode); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java index 6c30d9c..9232bbf 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTypeController.java @@ -51,11 +51,14 @@ @RequestMapping(value = "/listPage") @ResponseBody public Object listPage(String typeName, String isValid) { - Page> page = PageFactory.defaultPage(); + Page> page = PageFactory.defaultPage(); typeName = typeName == null ? "" : typeName; isValid = isValid == null ? "" : isValid; - return deviceTypeService.listPage(page,typeName,isValid); + ResponseData responseData = deviceTypeService.listPage(page, typeName, isValid); + responseData.setData(super.packForBT(page)); + return responseData; } + /** * 新增 */ diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index c1516f3..011d02f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -19,7 +19,7 @@ - AS "INSTALLDATE",INSTALL_HEIGHT + AS "INSTALLDATE",INSTALL_HEIGHT AS "installHeight" diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java index 5b3553f..4c1f526 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceImeiService.java @@ -1,12 +1,13 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceImei; import org.springframework.web.multipart.MultipartFile; public interface IDeviceImeiService { - Object deviceImeiListPage(Page page, String devcode); + ResponseData deviceImeiListPage(Page page, String devcode); Object addImei(DeviceImei deviceImei); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java index 88f7e55..3037648 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceTypeService.java @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeviceType; import com.baomidou.mybatisplus.extension.service.IService; @@ -28,6 +29,6 @@ DeviceType selectDeviceTypeById(Long id); - Object listPage(Page> page, String typeName, String isValid); + ResponseData listPage(Page> page, String typeName, String isValid); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java index 06ed785..67bde2c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceImeiService.java @@ -26,7 +26,7 @@ private IBaseExportService exportService; @Override - public Object deviceImeiListPage(Page page, String devcode) { + public ResponseData deviceImeiListPage(Page page, String devcode) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getImeiListPage(page, devcode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java index ca50dc2..57d324f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTypeServiceImpl.java @@ -46,7 +46,7 @@ } @Override - public Object listPage(Page> page, String typeName, String isValid) { + public ResponseData listPage(Page> page, String typeName, String isValid) { ResponseData responseData = new ResponseData(); try { List> pageList = this.baseMapper.getlistPage(page, typeName, isValid); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java index c3b382a..35ef9bc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/BatchExportDataDto.java @@ -23,16 +23,16 @@ * 序号 */ private Long id; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; - @ExcelProperty("井名称") + @ExcelProperty("点位名称") private String wellName; @ExcelProperty("井深") private Integer deep; @ExcelProperty("详细地址") private String position; private String wellType; - @ExcelProperty("井类型") + @ExcelProperty("点位类型") private String wellTypeName; private String deptId; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 34c1772..b43c3d8 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -48,7 +48,7 @@ */ private Long id;//主键 - @ExcelProperty("井编号") + @ExcelProperty("点位编号") @Length(max = 15, min = 12) private String wellCode; @ExcelProperty("设备编号") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java index 0aa4846..e521ddc 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DigNoiseDataDto.java @@ -26,7 +26,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java index 84ae05d..3335181 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/HarmfulDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java index 0ce5716..c70230c 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemhumDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java index e86142c..5d4229a 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/TemppressDataDto.java @@ -23,7 +23,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java index 4b9f355..67ce1de 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellAppointDataDto.java @@ -22,7 +22,7 @@ private String deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java index 06d5578..05e47c0 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/WellCoverDataDto.java @@ -37,7 +37,7 @@ private Long deptid; @ExcelProperty("部门名称") private String deptName; - @ExcelProperty("井盖编号") + @ExcelProperty("点位编号") private String wellCode; @ExcelProperty("状态描述") private String descn; diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java index d4af1f7..41644eb 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java @@ -2,14 +2,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeptPermission; import com.casic.missiles.modular.system.service.DeptPermissionConfigService; import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/deptPermission") -public class DeptPermissionController { +public class DeptPermissionController extends BaseController { private final DeptPermissionConfigService deptPermissionService; @@ -24,7 +26,9 @@ @ResponseBody public Object deviceDeptPermissionList(String deptid) { Page page = PageFactory.defaultPage(); - return deptPermissionService.deviceDeptPermissionList(page, deptid); + ResponseData responseData = deptPermissionService.deviceDeptPermissionList(page, deptid); + responseData.setData(super.packForBT(page)); + return responseData; } /** diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java index e890655..59ead3f 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java @@ -1,11 +1,12 @@ package com.casic.missiles.modular.system.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.model.DeptPermission; public interface DeptPermissionConfigService { - Object deviceDeptPermissionList(Page page, String deptid); + ResponseData deviceDeptPermissionList(Page page, String deptid); Object addDeptPermission(DeptPermission deviceImei); diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java index 03e2f89..f7640e8 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java @@ -17,7 +17,7 @@ @Service public class DeptPermissionConfigServiceImpl extends ServiceImpl implements DeptPermissionConfigService { - public Object deviceDeptPermissionList(Page page, String deptid) { + public ResponseData deviceDeptPermissionList(Page page, String deptid) { ResponseData responseData = new ResponseData(); try { List pageList = this.baseMapper.getListPage(page, deptid); diff --git a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx index de0f0d2..401b722 100644 --- a/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx +++ b/casic-web/src/main/resources/config/temp/alarmRecTemplate.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/device_template.xlsx b/casic-web/src/main/resources/config/temp/device_template.xlsx index 8402675..0e0012f 100644 --- a/casic-web/src/main/resources/config/temp/device_template.xlsx +++ b/casic-web/src/main/resources/config/temp/device_template.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx index f118688..19af71a 100644 --- a/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx +++ b/casic-web/src/main/resources/config/temp/jobRecEmpty.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx index 9145a70..adfdd00 100644 --- a/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx +++ b/casic-web/src/main/resources/config/temp/sluicewell_template.xlsx Binary files differ