diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 3a8b4e2..8c3be3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -87,7 +87,7 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String maxCell) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); @@ -97,7 +97,7 @@ deptIds.add(Long.valueOf(deptid)); } - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, Float.parseFloat(maxCell)); page.setRecords(list); @@ -217,7 +217,7 @@ @Permission @ResponseBody public void batchExport(String keywords, String deviceType, String deptid, String beginTime, - String endTime, String isOnline, HttpServletResponse response) { + String endTime, String isOnline, String maxCell, HttpServletResponse response) { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); @@ -228,7 +228,7 @@ deptIds = permissionService.getSubDepts(deptid, null); deptIds.add(Long.valueOf(deptid)); } - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, Float.parseFloat(maxCell)); ExcelUtils.exportutils(list, "闸井设备列表", "闸井设备列表", DeviceDto.class, "deviceExcel", response); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 3a8b4e2..8c3be3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -87,7 +87,7 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String maxCell) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); @@ -97,7 +97,7 @@ deptIds.add(Long.valueOf(deptid)); } - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, Float.parseFloat(maxCell)); page.setRecords(list); @@ -217,7 +217,7 @@ @Permission @ResponseBody public void batchExport(String keywords, String deviceType, String deptid, String beginTime, - String endTime, String isOnline, HttpServletResponse response) { + String endTime, String isOnline, String maxCell, HttpServletResponse response) { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); @@ -228,7 +228,7 @@ deptIds = permissionService.getSubDepts(deptid, null); deptIds.add(Long.valueOf(deptid)); } - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, Float.parseFloat(maxCell)); ExcelUtils.exportutils(list, "闸井设备列表", "闸井设备列表", DeviceDto.class, "deviceExcel", response); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index d01bbd5..e6f1aca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -21,7 +21,7 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List deptIds,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 3a8b4e2..8c3be3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -87,7 +87,7 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String maxCell) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); @@ -97,7 +97,7 @@ deptIds.add(Long.valueOf(deptid)); } - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, Float.parseFloat(maxCell)); page.setRecords(list); @@ -217,7 +217,7 @@ @Permission @ResponseBody public void batchExport(String keywords, String deviceType, String deptid, String beginTime, - String endTime, String isOnline, HttpServletResponse response) { + String endTime, String isOnline, String maxCell, HttpServletResponse response) { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); @@ -228,7 +228,7 @@ deptIds = permissionService.getSubDepts(deptid, null); deptIds.add(Long.valueOf(deptid)); } - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, Float.parseFloat(maxCell)); ExcelUtils.exportutils(list, "闸井设备列表", "闸井设备列表", DeviceDto.class, "deviceExcel", response); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index d01bbd5..e6f1aca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -21,7 +21,7 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List deptIds,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); 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 513f833..1ddfa1e 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 @@ -86,6 +86,9 @@ and onlineState = #{isOnline} + + and cast(cell as DECIMAL) #{maxCell} + and installDate < diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 3a8b4e2..8c3be3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -87,7 +87,7 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String maxCell) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); @@ -97,7 +97,7 @@ deptIds.add(Long.valueOf(deptid)); } - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, Float.parseFloat(maxCell)); page.setRecords(list); @@ -217,7 +217,7 @@ @Permission @ResponseBody public void batchExport(String keywords, String deviceType, String deptid, String beginTime, - String endTime, String isOnline, HttpServletResponse response) { + String endTime, String isOnline, String maxCell, HttpServletResponse response) { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); @@ -228,7 +228,7 @@ deptIds = permissionService.getSubDepts(deptid, null); deptIds.add(Long.valueOf(deptid)); } - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, Float.parseFloat(maxCell)); ExcelUtils.exportutils(list, "闸井设备列表", "闸井设备列表", DeviceDto.class, "deviceExcel", response); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index d01bbd5..e6f1aca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -21,7 +21,7 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List deptIds,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); 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 513f833..1ddfa1e 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 @@ -86,6 +86,9 @@ and onlineState = #{isOnline} + + and cast(cell as DECIMAL) #{maxCell} + and installDate < diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 6ee7572..71eea35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,7 +31,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List deptIds, String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List deptIds, String isOnline, float maxCell); /** * 根据闸井编号查询闸井ID diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 3a8b4e2..8c3be3d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -87,7 +87,7 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String maxCell) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); @@ -97,7 +97,7 @@ deptIds.add(Long.valueOf(deptid)); } - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, Float.parseFloat(maxCell)); page.setRecords(list); @@ -217,7 +217,7 @@ @Permission @ResponseBody public void batchExport(String keywords, String deviceType, String deptid, String beginTime, - String endTime, String isOnline, HttpServletResponse response) { + String endTime, String isOnline, String maxCell, HttpServletResponse response) { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); @@ -228,7 +228,7 @@ deptIds = permissionService.getSubDepts(deptid, null); deptIds.add(Long.valueOf(deptid)); } - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, null, beginTime, endTime, keywords, deptIds, isOnline, Float.parseFloat(maxCell)); ExcelUtils.exportutils(list, "闸井设备列表", "闸井设备列表", DeviceDto.class, "deviceExcel", response); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index d01bbd5..e6f1aca 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -21,7 +21,7 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List deptIds,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); 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 513f833..1ddfa1e 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 @@ -86,6 +86,9 @@ and onlineState = #{isOnline} + + and cast(cell as DECIMAL) #{maxCell} + and installDate < diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 6ee7572..71eea35 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -31,7 +31,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List deptIds, String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List deptIds, String isOnline, float maxCell); /** * 根据闸井编号查询闸井ID diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 915abe2..3f9d47d 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -210,8 +210,8 @@ @Transactional(rollbackFor = Exception.class) @Override - public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List deptIds, String isOnline) { - List list = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, deptIds, isOnline); + public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List deptIds, String isOnline, float maxCell) { + List list = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, deptIds, isOnline, maxCell); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));