diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java index d5ee329..12a3907 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -1,28 +1,32 @@ package com.casic.missiles.modular.system.controller; - +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.system.service.DeviceTubeService; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + @RestController @RequestMapping("/tube") -public class DeviceTubeController { +public class DeviceTubeController extends BaseController { private final DeviceTubeService tubeService; private AbstractPermissionContext permissionService; - public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + public DeviceTubeController(DeviceTubeService tubeService, AbstractPermissionContext permissionService) { this.tubeService = tubeService; - this.permissionService=permissionService; + this.permissionService = permissionService; } /** - * 获取列表 + * 获取点位列表 */ @RequestMapping(value = "/well/list") @ResponseBody @@ -32,13 +36,44 @@ } /** + * 获取管盯设备组列表信息 + */ + @RequestMapping(value = "/groups/list") + @ResponseBody + public Object DevicesGroupList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupsList(dataScope); + } + + /** * 获取列表 */ - @RequestMapping(value = "/group/list") + @RequestMapping(value = "/groupdevice/listpage") @ResponseBody - public Object DeviceGroupList(String wellGroupId) { + public Object DeviceListPage(String wellGroupId, Integer order) { + Page> page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return tubeService.deviceGroupList(wellGroupId,dataScope); + return tubeService.groupDeviceListPage(order,page, wellGroupId, dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/groupdevice/history") + @ResponseBody + public Object DeviceHistory(String devcode, String beginTime, String endTime) { + Page> page = PageFactory.defaultPage(); + return tubeService.tubeDataHistory(page,devcode, beginTime, endTime); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/groupdevice/list") + @ResponseBody + public Object DeviceList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.groupDeviceList(wellGroupId, dataScope); } @@ -47,7 +82,7 @@ */ @RequestMapping(value = "/detail/{detailId}") @ResponseBody - public Object list(@PathVariable(name = "detailId") String tubeId) { ; + public Object list(@PathVariable(name = "detailId") String tubeId) { return tubeService.deviceDetail(tubeId); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java index d5ee329..12a3907 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -1,28 +1,32 @@ package com.casic.missiles.modular.system.controller; - +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.system.service.DeviceTubeService; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + @RestController @RequestMapping("/tube") -public class DeviceTubeController { +public class DeviceTubeController extends BaseController { private final DeviceTubeService tubeService; private AbstractPermissionContext permissionService; - public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + public DeviceTubeController(DeviceTubeService tubeService, AbstractPermissionContext permissionService) { this.tubeService = tubeService; - this.permissionService=permissionService; + this.permissionService = permissionService; } /** - * 获取列表 + * 获取点位列表 */ @RequestMapping(value = "/well/list") @ResponseBody @@ -32,13 +36,44 @@ } /** + * 获取管盯设备组列表信息 + */ + @RequestMapping(value = "/groups/list") + @ResponseBody + public Object DevicesGroupList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupsList(dataScope); + } + + /** * 获取列表 */ - @RequestMapping(value = "/group/list") + @RequestMapping(value = "/groupdevice/listpage") @ResponseBody - public Object DeviceGroupList(String wellGroupId) { + public Object DeviceListPage(String wellGroupId, Integer order) { + Page> page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return tubeService.deviceGroupList(wellGroupId,dataScope); + return tubeService.groupDeviceListPage(order,page, wellGroupId, dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/groupdevice/history") + @ResponseBody + public Object DeviceHistory(String devcode, String beginTime, String endTime) { + Page> page = PageFactory.defaultPage(); + return tubeService.tubeDataHistory(page,devcode, beginTime, endTime); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/groupdevice/list") + @ResponseBody + public Object DeviceList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.groupDeviceList(wellGroupId, dataScope); } @@ -47,7 +82,7 @@ */ @RequestMapping(value = "/detail/{detailId}") @ResponseBody - public Object list(@PathVariable(name = "detailId") String tubeId) { ; + public Object list(@PathVariable(name = "detailId") String tubeId) { return tubeService.deviceDetail(tubeId); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java index 5f9764f..99ccb28 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -1,9 +1,9 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -13,7 +13,18 @@ List> deviceList(@Param("scope") DataScope dataScope); - List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); + List> deviceGroupsList(@Param("scope") DataScope dataScope); + + List> groupDeviceListPage(@Param("page") Page> page, @Param("wellGroupId") String wellGroupId, + @Param("scope") DataScope dataScope); + + Map dataTubeByDevcode(@Param("devcode") String devcode); + + List> tubeDataHistory(@Param("page") Page> page, @Param("devcode") String devcode, + @Param("endTime") String endTime, @Param("beginTime") String beginTime); + + + List> groupDeviceList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); Map deviceDetail(@Param("id") Long id); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java index d5ee329..12a3907 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -1,28 +1,32 @@ package com.casic.missiles.modular.system.controller; - +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.system.service.DeviceTubeService; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + @RestController @RequestMapping("/tube") -public class DeviceTubeController { +public class DeviceTubeController extends BaseController { private final DeviceTubeService tubeService; private AbstractPermissionContext permissionService; - public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + public DeviceTubeController(DeviceTubeService tubeService, AbstractPermissionContext permissionService) { this.tubeService = tubeService; - this.permissionService=permissionService; + this.permissionService = permissionService; } /** - * 获取列表 + * 获取点位列表 */ @RequestMapping(value = "/well/list") @ResponseBody @@ -32,13 +36,44 @@ } /** + * 获取管盯设备组列表信息 + */ + @RequestMapping(value = "/groups/list") + @ResponseBody + public Object DevicesGroupList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupsList(dataScope); + } + + /** * 获取列表 */ - @RequestMapping(value = "/group/list") + @RequestMapping(value = "/groupdevice/listpage") @ResponseBody - public Object DeviceGroupList(String wellGroupId) { + public Object DeviceListPage(String wellGroupId, Integer order) { + Page> page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return tubeService.deviceGroupList(wellGroupId,dataScope); + return tubeService.groupDeviceListPage(order,page, wellGroupId, dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/groupdevice/history") + @ResponseBody + public Object DeviceHistory(String devcode, String beginTime, String endTime) { + Page> page = PageFactory.defaultPage(); + return tubeService.tubeDataHistory(page,devcode, beginTime, endTime); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/groupdevice/list") + @ResponseBody + public Object DeviceList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.groupDeviceList(wellGroupId, dataScope); } @@ -47,7 +82,7 @@ */ @RequestMapping(value = "/detail/{detailId}") @ResponseBody - public Object list(@PathVariable(name = "detailId") String tubeId) { ; + public Object list(@PathVariable(name = "detailId") String tubeId) { return tubeService.deviceDetail(tubeId); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java index 5f9764f..99ccb28 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -1,9 +1,9 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -13,7 +13,18 @@ List> deviceList(@Param("scope") DataScope dataScope); - List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); + List> deviceGroupsList(@Param("scope") DataScope dataScope); + + List> groupDeviceListPage(@Param("page") Page> page, @Param("wellGroupId") String wellGroupId, + @Param("scope") DataScope dataScope); + + Map dataTubeByDevcode(@Param("devcode") String devcode); + + List> tubeDataHistory(@Param("page") Page> page, @Param("devcode") String devcode, + @Param("endTime") String endTime, @Param("beginTime") String beginTime); + + + List> groupDeviceList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); Map deviceDetail(@Param("id") Long id); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java index 92b3d95..cf71e11 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; +import java.util.Map; + public interface DeviceTubeService { /** @@ -12,16 +15,36 @@ Object deviceList(DataScope dataScope); /** - * 获取设备点位的信息 + * 获取设备列表信息 + * + * @param dataScope + * @return + */ + Object deviceGroupsList(DataScope dataScope); + + + /** + * 获取设备列表信息 * * @param wellGroupId * @return */ - Object deviceGroupList(String wellGroupId, DataScope dataScope); + Object groupDeviceListPage(Integer oreder, Page> page, String wellGroupId, DataScope dataScope); + + Object tubeDataHistory(Page> page, String DEVCOE, String beginTime, String endTime); + + + /** + * 获取同一个组设备列表信息 + * + * @param wellGroupId + * @return + */ + Object groupDeviceList(String wellGroupId, DataScope dataScope); /** * 获取详情信息 */ - Object deviceDetail(String id); + Object deviceDetail(String id);; } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java index d5ee329..12a3907 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -1,28 +1,32 @@ package com.casic.missiles.modular.system.controller; - +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.system.service.DeviceTubeService; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + @RestController @RequestMapping("/tube") -public class DeviceTubeController { +public class DeviceTubeController extends BaseController { private final DeviceTubeService tubeService; private AbstractPermissionContext permissionService; - public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + public DeviceTubeController(DeviceTubeService tubeService, AbstractPermissionContext permissionService) { this.tubeService = tubeService; - this.permissionService=permissionService; + this.permissionService = permissionService; } /** - * 获取列表 + * 获取点位列表 */ @RequestMapping(value = "/well/list") @ResponseBody @@ -32,13 +36,44 @@ } /** + * 获取管盯设备组列表信息 + */ + @RequestMapping(value = "/groups/list") + @ResponseBody + public Object DevicesGroupList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupsList(dataScope); + } + + /** * 获取列表 */ - @RequestMapping(value = "/group/list") + @RequestMapping(value = "/groupdevice/listpage") @ResponseBody - public Object DeviceGroupList(String wellGroupId) { + public Object DeviceListPage(String wellGroupId, Integer order) { + Page> page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return tubeService.deviceGroupList(wellGroupId,dataScope); + return tubeService.groupDeviceListPage(order,page, wellGroupId, dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/groupdevice/history") + @ResponseBody + public Object DeviceHistory(String devcode, String beginTime, String endTime) { + Page> page = PageFactory.defaultPage(); + return tubeService.tubeDataHistory(page,devcode, beginTime, endTime); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/groupdevice/list") + @ResponseBody + public Object DeviceList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.groupDeviceList(wellGroupId, dataScope); } @@ -47,7 +82,7 @@ */ @RequestMapping(value = "/detail/{detailId}") @ResponseBody - public Object list(@PathVariable(name = "detailId") String tubeId) { ; + public Object list(@PathVariable(name = "detailId") String tubeId) { return tubeService.deviceDetail(tubeId); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java index 5f9764f..99ccb28 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -1,9 +1,9 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -13,7 +13,18 @@ List> deviceList(@Param("scope") DataScope dataScope); - List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); + List> deviceGroupsList(@Param("scope") DataScope dataScope); + + List> groupDeviceListPage(@Param("page") Page> page, @Param("wellGroupId") String wellGroupId, + @Param("scope") DataScope dataScope); + + Map dataTubeByDevcode(@Param("devcode") String devcode); + + List> tubeDataHistory(@Param("page") Page> page, @Param("devcode") String devcode, + @Param("endTime") String endTime, @Param("beginTime") String beginTime); + + + List> groupDeviceList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); Map deviceDetail(@Param("id") Long id); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java index 92b3d95..cf71e11 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; +import java.util.Map; + public interface DeviceTubeService { /** @@ -12,16 +15,36 @@ Object deviceList(DataScope dataScope); /** - * 获取设备点位的信息 + * 获取设备列表信息 + * + * @param dataScope + * @return + */ + Object deviceGroupsList(DataScope dataScope); + + + /** + * 获取设备列表信息 * * @param wellGroupId * @return */ - Object deviceGroupList(String wellGroupId, DataScope dataScope); + Object groupDeviceListPage(Integer oreder, Page> page, String wellGroupId, DataScope dataScope); + + Object tubeDataHistory(Page> page, String DEVCOE, String beginTime, String endTime); + + + /** + * 获取同一个组设备列表信息 + * + * @param wellGroupId + * @return + */ + Object groupDeviceList(String wellGroupId, DataScope dataScope); /** * 获取详情信息 */ - Object deviceDetail(String id); + Object deviceDetail(String id);; } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java index 8ddf8ff..e30fa7f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.DeviceTubeMapper; @@ -8,8 +9,7 @@ import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Map; +import java.util.*; @Service @Slf4j @@ -43,15 +43,103 @@ } /** - * 获取设备点位的信息 + * 获取组列表信息 + * + * @param dataScope + * @return + */ + public Object deviceGroupsList(DataScope dataScope) { + ResponseData responseData = new ResponseData(); + try { + List> tubeDeviceList = deviceTubeMapper.deviceGroupsList(dataScope); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setData(tubeDeviceList); + } catch (DataAccessException sqlex) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("请求数据异常"); + responseData.setSuccess(true); + log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex); + } + return responseData; + } + + /** + * 分页获取点位信息 + * + * @param oreder + * @param page + * @param wellGroupId + * @param dataScope + * @return + */ + public Object groupDeviceListPage(Integer oreder, Page> page, String wellGroupId, DataScope dataScope) { + ResponseData responseData = new ResponseData(); + try { + List> tubeDeviceList = deviceTubeMapper.groupDeviceListPage(page, wellGroupId, dataScope); + List> tubeDataDeviceList = new ArrayList<>(); + tubeDeviceList.forEach(tubeDevice -> { + Map tubeDeviceData = deviceTubeMapper.dataTubeByDevcode(tubeDevice.get("DEVCODE").toString()); + if (tubeDeviceData == null) { + tubeDeviceData = new HashMap<>(); + initTubeDeviceData(tubeDeviceData, tubeDevice.get("DEVCODE")); + } + tubeDeviceData.put("deviceName", tubeDevice.get("DEVICE_NAME")); + tubeDataDeviceList.add(tubeDeviceData); + } + ); + if (oreder != null && oreder == 0) { + resvertSortStrength(tubeDataDeviceList); + } else { + sortStrength(tubeDataDeviceList); + } + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setData(tubeDataDeviceList); + } catch (DataAccessException sqlex) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("请求数据异常"); + responseData.setSuccess(true); + log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex); + } + return responseData; + } + + /** + * 获取历史记录信息 + * + * @param page + * @param devcode + * @param beginTime + * @param endTime + * @return + */ + public Object tubeDataHistory(Page> page, String devcode, String beginTime, String endTime) { + ResponseData responseData = new ResponseData(); + try { + List> tubeDeviceList = deviceTubeMapper.tubeDataHistory(page, devcode, beginTime, endTime); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setData(tubeDeviceList); + } catch (DataAccessException sqlex) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("请求数据异常"); + responseData.setSuccess(true); + log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex); + } + return responseData; + } + + /** + * 获取设备列表的信息 * * @param wellGroupId * @return */ - public Object deviceGroupList(String wellGroupId, DataScope dataScope) { + public Object groupDeviceList(String wellGroupId, DataScope dataScope) { ResponseData responseData = new ResponseData(); try { - List> tubeDeviceList = deviceTubeMapper.deviceGroupList(wellGroupId, dataScope); + List> tubeDeviceList = deviceTubeMapper.groupDeviceList(wellGroupId, dataScope); responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); responseData.setData(tubeDeviceList); @@ -83,4 +171,32 @@ return responseData; } + private void sortStrength(List> lstMap) { + Collections.sort(lstMap, new Comparator>() { + public int compare(Map o1, Map o2) { + return o1.get("strength").toString().compareTo(o2.get("strength").toString()); + } + }); + } + + private void initTubeDeviceData(Map tubeDeviceData, Object devcode) { + tubeDeviceData.put("deviceCode", devcode); + tubeDeviceData.put("strength", -1); + tubeDeviceData.put("uptime", new Date()); + tubeDeviceData.put("strength", -1); + tubeDeviceData.put("pci", ""); + tubeDeviceData.put("rsrp", ""); + tubeDeviceData.put("snr", ""); + tubeDeviceData.put("cell", ""); + tubeDeviceData.put("id", ""); + } + + private void resvertSortStrength(List> lstMap) { + Collections.sort(lstMap, new Comparator>() { + public int compare(Map o1, Map o2) { + return o2.get("strength").toString().compareTo(o1.get("strength").toString()); + } + }); + } + } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java index d5ee329..12a3907 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceTubeController.java @@ -1,28 +1,32 @@ package com.casic.missiles.modular.system.controller; - +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; +import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.datascope.DataScope; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.modular.system.service.DeviceTubeService; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + @RestController @RequestMapping("/tube") -public class DeviceTubeController { +public class DeviceTubeController extends BaseController { private final DeviceTubeService tubeService; private AbstractPermissionContext permissionService; - public DeviceTubeController(DeviceTubeService tubeService,AbstractPermissionContext permissionService) { + public DeviceTubeController(DeviceTubeService tubeService, AbstractPermissionContext permissionService) { this.tubeService = tubeService; - this.permissionService=permissionService; + this.permissionService = permissionService; } /** - * 获取列表 + * 获取点位列表 */ @RequestMapping(value = "/well/list") @ResponseBody @@ -32,13 +36,44 @@ } /** + * 获取管盯设备组列表信息 + */ + @RequestMapping(value = "/groups/list") + @ResponseBody + public Object DevicesGroupList() { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.deviceGroupsList(dataScope); + } + + /** * 获取列表 */ - @RequestMapping(value = "/group/list") + @RequestMapping(value = "/groupdevice/listpage") @ResponseBody - public Object DeviceGroupList(String wellGroupId) { + public Object DeviceListPage(String wellGroupId, Integer order) { + Page> page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - return tubeService.deviceGroupList(wellGroupId,dataScope); + return tubeService.groupDeviceListPage(order,page, wellGroupId, dataScope); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/groupdevice/history") + @ResponseBody + public Object DeviceHistory(String devcode, String beginTime, String endTime) { + Page> page = PageFactory.defaultPage(); + return tubeService.tubeDataHistory(page,devcode, beginTime, endTime); + } + + /** + * 获取列表 + */ + @RequestMapping(value = "/groupdevice/list") + @ResponseBody + public Object DeviceList(String wellGroupId) { + DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); + return tubeService.groupDeviceList(wellGroupId, dataScope); } @@ -47,7 +82,7 @@ */ @RequestMapping(value = "/detail/{detailId}") @ResponseBody - public Object list(@PathVariable(name = "detailId") String tubeId) { ; + public Object list(@PathVariable(name = "detailId") String tubeId) { return tubeService.deviceDetail(tubeId); } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java index 5f9764f..99ccb28 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceTubeMapper.java @@ -1,9 +1,9 @@ package com.casic.missiles.modular.system.dao; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -13,7 +13,18 @@ List> deviceList(@Param("scope") DataScope dataScope); - List> deviceGroupList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); + List> deviceGroupsList(@Param("scope") DataScope dataScope); + + List> groupDeviceListPage(@Param("page") Page> page, @Param("wellGroupId") String wellGroupId, + @Param("scope") DataScope dataScope); + + Map dataTubeByDevcode(@Param("devcode") String devcode); + + List> tubeDataHistory(@Param("page") Page> page, @Param("devcode") String devcode, + @Param("endTime") String endTime, @Param("beginTime") String beginTime); + + + List> groupDeviceList(@Param("wellGroupId") String wellGroupId, @Param("scope") DataScope dataScope); Map deviceDetail(@Param("id") Long id); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java index 92b3d95..cf71e11 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/DeviceTubeService.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; +import java.util.Map; + public interface DeviceTubeService { /** @@ -12,16 +15,36 @@ Object deviceList(DataScope dataScope); /** - * 获取设备点位的信息 + * 获取设备列表信息 + * + * @param dataScope + * @return + */ + Object deviceGroupsList(DataScope dataScope); + + + /** + * 获取设备列表信息 * * @param wellGroupId * @return */ - Object deviceGroupList(String wellGroupId, DataScope dataScope); + Object groupDeviceListPage(Integer oreder, Page> page, String wellGroupId, DataScope dataScope); + + Object tubeDataHistory(Page> page, String DEVCOE, String beginTime, String endTime); + + + /** + * 获取同一个组设备列表信息 + * + * @param wellGroupId + * @return + */ + Object groupDeviceList(String wellGroupId, DataScope dataScope); /** * 获取详情信息 */ - Object deviceDetail(String id); + Object deviceDetail(String id);; } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java index 8ddf8ff..e30fa7f 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceTubeServiceImpl.java @@ -1,5 +1,6 @@ package com.casic.missiles.modular.system.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.modular.system.dao.DeviceTubeMapper; @@ -8,8 +9,7 @@ import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Map; +import java.util.*; @Service @Slf4j @@ -43,15 +43,103 @@ } /** - * 获取设备点位的信息 + * 获取组列表信息 + * + * @param dataScope + * @return + */ + public Object deviceGroupsList(DataScope dataScope) { + ResponseData responseData = new ResponseData(); + try { + List> tubeDeviceList = deviceTubeMapper.deviceGroupsList(dataScope); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setData(tubeDeviceList); + } catch (DataAccessException sqlex) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("请求数据异常"); + responseData.setSuccess(true); + log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex); + } + return responseData; + } + + /** + * 分页获取点位信息 + * + * @param oreder + * @param page + * @param wellGroupId + * @param dataScope + * @return + */ + public Object groupDeviceListPage(Integer oreder, Page> page, String wellGroupId, DataScope dataScope) { + ResponseData responseData = new ResponseData(); + try { + List> tubeDeviceList = deviceTubeMapper.groupDeviceListPage(page, wellGroupId, dataScope); + List> tubeDataDeviceList = new ArrayList<>(); + tubeDeviceList.forEach(tubeDevice -> { + Map tubeDeviceData = deviceTubeMapper.dataTubeByDevcode(tubeDevice.get("DEVCODE").toString()); + if (tubeDeviceData == null) { + tubeDeviceData = new HashMap<>(); + initTubeDeviceData(tubeDeviceData, tubeDevice.get("DEVCODE")); + } + tubeDeviceData.put("deviceName", tubeDevice.get("DEVICE_NAME")); + tubeDataDeviceList.add(tubeDeviceData); + } + ); + if (oreder != null && oreder == 0) { + resvertSortStrength(tubeDataDeviceList); + } else { + sortStrength(tubeDataDeviceList); + } + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setData(tubeDataDeviceList); + } catch (DataAccessException sqlex) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("请求数据异常"); + responseData.setSuccess(true); + log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex); + } + return responseData; + } + + /** + * 获取历史记录信息 + * + * @param page + * @param devcode + * @param beginTime + * @param endTime + * @return + */ + public Object tubeDataHistory(Page> page, String devcode, String beginTime, String endTime) { + ResponseData responseData = new ResponseData(); + try { + List> tubeDeviceList = deviceTubeMapper.tubeDataHistory(page, devcode, beginTime, endTime); + responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); + responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); + responseData.setData(tubeDeviceList); + } catch (DataAccessException sqlex) { + responseData.setCode(ResponseData.DEFAULT_ERROR_CODE); + responseData.setMessage("请求数据异常"); + responseData.setSuccess(true); + log.error("主题:数据上报保存出现错误,异常信息为{}", sqlex); + } + return responseData; + } + + /** + * 获取设备列表的信息 * * @param wellGroupId * @return */ - public Object deviceGroupList(String wellGroupId, DataScope dataScope) { + public Object groupDeviceList(String wellGroupId, DataScope dataScope) { ResponseData responseData = new ResponseData(); try { - List> tubeDeviceList = deviceTubeMapper.deviceGroupList(wellGroupId, dataScope); + List> tubeDeviceList = deviceTubeMapper.groupDeviceList(wellGroupId, dataScope); responseData.setCode(ResponseData.DEFAULT_SUCCESS_CODE); responseData.setMessage(ResponseData.DEFAULT_SUCCESS_MESSAGE); responseData.setData(tubeDeviceList); @@ -83,4 +171,32 @@ return responseData; } + private void sortStrength(List> lstMap) { + Collections.sort(lstMap, new Comparator>() { + public int compare(Map o1, Map o2) { + return o1.get("strength").toString().compareTo(o2.get("strength").toString()); + } + }); + } + + private void initTubeDeviceData(Map tubeDeviceData, Object devcode) { + tubeDeviceData.put("deviceCode", devcode); + tubeDeviceData.put("strength", -1); + tubeDeviceData.put("uptime", new Date()); + tubeDeviceData.put("strength", -1); + tubeDeviceData.put("pci", ""); + tubeDeviceData.put("rsrp", ""); + tubeDeviceData.put("snr", ""); + tubeDeviceData.put("cell", ""); + tubeDeviceData.put("id", ""); + } + + private void resvertSortStrength(List> lstMap) { + Collections.sort(lstMap, new Comparator>() { + public int compare(Map o1, Map o2) { + return o2.get("strength").toString().compareTo(o1.get("strength").toString()); + } + }); + } + } diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml index aab0124..de05d41 100644 --- a/casic-web/src/main/resources/config/application.yml +++ b/casic-web/src/main/resources/config/application.yml @@ -3,7 +3,7 @@ ########################################################## spring: profiles: - active: dev + active: postgre servlet: multipart: max-file-size: 50MB