diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java index ab49c77..b05fbcc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -13,6 +13,9 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/alarm") public class KkjAlarmController extends BaseController { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java index ab49c77..b05fbcc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -13,6 +13,9 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/alarm") public class KkjAlarmController extends BaseController { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java index 5c4800b..9014dad 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java @@ -2,10 +2,8 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.modular.kkj.dto.KkjListDto; -import com.casic.missiles.modular.kkj.dto.WarehouseListDto; +import com.casic.missiles.modular.kkj.dto.KkjListDTO; +import com.casic.missiles.modular.kkj.dto.WarehouseListDTO; import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -15,67 +13,26 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/overview") public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; - @Autowired - private ICommonPermissionService permissionService; - - /** - * 仓库列表 - * - * @return - */ -// @RequestMapping("/warehouseList") -// @ResponseBody -// public Object warehouseList() { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectWareHouseList(dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机列表 - * - * @param id 仓库id - * @return - */ -// @RequestMapping("/kkjList") -// @ResponseBody -// public Object kkjList(String id) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id), dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机详情 - * - * @param keywords 关键词（开孔机编号或二类设备编号） - * @return - */ -// @RequestMapping("/kkjDetail") -// @ResponseBody -// public Object kkjDetail(String keywords, String startDate, String endDate) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjData(keywords, startDate, endDate); -// return ResponseData.success(list); -// } /** * 开孔机列表 * * @param id 仓库id * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjList") @ResponseBody public Object kkjList(String id, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } @@ -84,12 +41,11 @@ * * @param keywords 关键词（开孔机编号或二类设备编号） * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjDetail") @ResponseBody public Object kkjDetail(String keywords, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } @@ -98,25 +54,23 @@ * 仓库列表，地图用 * * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseList") @ResponseBody public Object warehouseListByDate(String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectWarehouseListByDate(date); + List list = deviceKkjService.selectWarehouseListByDate(date); return ResponseData.success(list); } /** * 获取仓库列表接口，下拉菜单用 * - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseSimpleList") @ResponseBody public Object warehouseSimpleList() { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectWareHouseList(); return ResponseData.success(list); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java index ab49c77..b05fbcc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -13,6 +13,9 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/alarm") public class KkjAlarmController extends BaseController { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java index 5c4800b..9014dad 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java @@ -2,10 +2,8 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.modular.kkj.dto.KkjListDto; -import com.casic.missiles.modular.kkj.dto.WarehouseListDto; +import com.casic.missiles.modular.kkj.dto.KkjListDTO; +import com.casic.missiles.modular.kkj.dto.WarehouseListDTO; import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -15,67 +13,26 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/overview") public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; - @Autowired - private ICommonPermissionService permissionService; - - /** - * 仓库列表 - * - * @return - */ -// @RequestMapping("/warehouseList") -// @ResponseBody -// public Object warehouseList() { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectWareHouseList(dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机列表 - * - * @param id 仓库id - * @return - */ -// @RequestMapping("/kkjList") -// @ResponseBody -// public Object kkjList(String id) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id), dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机详情 - * - * @param keywords 关键词（开孔机编号或二类设备编号） - * @return - */ -// @RequestMapping("/kkjDetail") -// @ResponseBody -// public Object kkjDetail(String keywords, String startDate, String endDate) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjData(keywords, startDate, endDate); -// return ResponseData.success(list); -// } /** * 开孔机列表 * * @param id 仓库id * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjList") @ResponseBody public Object kkjList(String id, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } @@ -84,12 +41,11 @@ * * @param keywords 关键词（开孔机编号或二类设备编号） * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjDetail") @ResponseBody public Object kkjDetail(String keywords, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } @@ -98,25 +54,23 @@ * 仓库列表，地图用 * * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseList") @ResponseBody public Object warehouseListByDate(String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectWarehouseListByDate(date); + List list = deviceKkjService.selectWarehouseListByDate(date); return ResponseData.success(list); } /** * 获取仓库列表接口，下拉菜单用 * - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseSimpleList") @ResponseBody public Object warehouseSimpleList() { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectWareHouseList(); return ResponseData.success(list); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java index 5483f33..ae2cc9c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java @@ -19,44 +19,99 @@ */ public interface BusDeviceKkjMapper extends BaseMapper { + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return List> + */ List> selectWareHouseList(); - List> selectKkjByWareHouse( - @Param("wareHouseId") Long wareHouseId, - @Param("dataScope") DataScope dataScope); - - List> selectKkjData( - @Param("keywords") String keywords, - @Param("startDate") String startDate, - @Param("endDate") String endDate); - + /** + * 开孔机列表 + * + * @param devcode 开孔机设备编号 + * @param deptIds 开孔机权属单位集合 + * @param page 分页控制 + * @param dataScope 权限控制 + * @return List> + */ List> selectKkjDeviceListPage( @Param("devcode") String devcode, @Param("deptIds") List deptIds, @Param("datascope") DataScope dataScope, @Param("page") Page> page); - void batchDelete( - @Param("ids") List ids); + /** + * 批量删除开孔机 + * + * @param ids 开孔机id + */ + void batchDelete(@Param("ids") List ids); - Map selectKkjByCode( - @Param("kkjCode") String kkjCode); + /** + * 获取开孔机详情 + * + * @param kkjCode 开孔机编号 + * @return Map < String, Object> + */ + Map selectKkjByCode(@Param("kkjCode") String kkjCode); - List> selectKkj( - @Param("wareHouseId") Long wareHouseId); + /** + * 获取某个仓库下面开孔机列表 + * + * @param wareHouseId 仓库id + * @return List> + */ + List> selectKkj(@Param("wareHouseId") Long wareHouseId); + /** + * 获取开孔机列表接口,地图用 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjByWareHouseAndTime( @Param("wareHouseId") Long wareHouseId, @Param("date") String date); + /** + * 获取开孔机历史位置的详情 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjDetail( @Param("keywords") String keywords, @Param("date") String date); + /** + * 获取所有仓库下面开孔机列表 + * + * @return List> + */ List> selectWarehouseAllKkj(); + /** + * 获取仓库列表接口,地图用 + * + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectWarehouseWarnKkjByTime(@Param("date") String date); + /** + * 某日开孔机报警记录——分页 + * + * @param wareHouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptIds 权属单位id集合 + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + * @param page 分页控制 + * @return List> + */ List> selectKkjRecordsPage( @Param("wareHouseId") String wareHouseId, @Param("kkjCode") String kkjCode, @@ -65,6 +120,13 @@ @Param("endDate") String endDate, @Param("page") Page> page); + /** + * 某日开孔机报警记录——不分页 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjRecords( @Param("wareHouseId") String wareHouseId, @Param("date") String date); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java index ab49c77..b05fbcc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -13,6 +13,9 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/alarm") public class KkjAlarmController extends BaseController { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java index 5c4800b..9014dad 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java @@ -2,10 +2,8 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.modular.kkj.dto.KkjListDto; -import com.casic.missiles.modular.kkj.dto.WarehouseListDto; +import com.casic.missiles.modular.kkj.dto.KkjListDTO; +import com.casic.missiles.modular.kkj.dto.WarehouseListDTO; import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -15,67 +13,26 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/overview") public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; - @Autowired - private ICommonPermissionService permissionService; - - /** - * 仓库列表 - * - * @return - */ -// @RequestMapping("/warehouseList") -// @ResponseBody -// public Object warehouseList() { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectWareHouseList(dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机列表 - * - * @param id 仓库id - * @return - */ -// @RequestMapping("/kkjList") -// @ResponseBody -// public Object kkjList(String id) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id), dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机详情 - * - * @param keywords 关键词（开孔机编号或二类设备编号） - * @return - */ -// @RequestMapping("/kkjDetail") -// @ResponseBody -// public Object kkjDetail(String keywords, String startDate, String endDate) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjData(keywords, startDate, endDate); -// return ResponseData.success(list); -// } /** * 开孔机列表 * * @param id 仓库id * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjList") @ResponseBody public Object kkjList(String id, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } @@ -84,12 +41,11 @@ * * @param keywords 关键词（开孔机编号或二类设备编号） * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjDetail") @ResponseBody public Object kkjDetail(String keywords, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } @@ -98,25 +54,23 @@ * 仓库列表，地图用 * * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseList") @ResponseBody public Object warehouseListByDate(String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectWarehouseListByDate(date); + List list = deviceKkjService.selectWarehouseListByDate(date); return ResponseData.success(list); } /** * 获取仓库列表接口，下拉菜单用 * - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseSimpleList") @ResponseBody public Object warehouseSimpleList() { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectWareHouseList(); return ResponseData.success(list); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java index 5483f33..ae2cc9c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java @@ -19,44 +19,99 @@ */ public interface BusDeviceKkjMapper extends BaseMapper { + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return List> + */ List> selectWareHouseList(); - List> selectKkjByWareHouse( - @Param("wareHouseId") Long wareHouseId, - @Param("dataScope") DataScope dataScope); - - List> selectKkjData( - @Param("keywords") String keywords, - @Param("startDate") String startDate, - @Param("endDate") String endDate); - + /** + * 开孔机列表 + * + * @param devcode 开孔机设备编号 + * @param deptIds 开孔机权属单位集合 + * @param page 分页控制 + * @param dataScope 权限控制 + * @return List> + */ List> selectKkjDeviceListPage( @Param("devcode") String devcode, @Param("deptIds") List deptIds, @Param("datascope") DataScope dataScope, @Param("page") Page> page); - void batchDelete( - @Param("ids") List ids); + /** + * 批量删除开孔机 + * + * @param ids 开孔机id + */ + void batchDelete(@Param("ids") List ids); - Map selectKkjByCode( - @Param("kkjCode") String kkjCode); + /** + * 获取开孔机详情 + * + * @param kkjCode 开孔机编号 + * @return Map < String, Object> + */ + Map selectKkjByCode(@Param("kkjCode") String kkjCode); - List> selectKkj( - @Param("wareHouseId") Long wareHouseId); + /** + * 获取某个仓库下面开孔机列表 + * + * @param wareHouseId 仓库id + * @return List> + */ + List> selectKkj(@Param("wareHouseId") Long wareHouseId); + /** + * 获取开孔机列表接口,地图用 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjByWareHouseAndTime( @Param("wareHouseId") Long wareHouseId, @Param("date") String date); + /** + * 获取开孔机历史位置的详情 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjDetail( @Param("keywords") String keywords, @Param("date") String date); + /** + * 获取所有仓库下面开孔机列表 + * + * @return List> + */ List> selectWarehouseAllKkj(); + /** + * 获取仓库列表接口,地图用 + * + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectWarehouseWarnKkjByTime(@Param("date") String date); + /** + * 某日开孔机报警记录——分页 + * + * @param wareHouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptIds 权属单位id集合 + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + * @param page 分页控制 + * @return List> + */ List> selectKkjRecordsPage( @Param("wareHouseId") String wareHouseId, @Param("kkjCode") String kkjCode, @@ -65,6 +120,13 @@ @Param("endDate") String endDate, @Param("page") Page> page); + /** + * 某日开孔机报警记录——不分页 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjRecords( @Param("wareHouseId") String wareHouseId, @Param("date") String date); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java new file mode 100644 index 0000000..e982a2e --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.kkj.dto; + +import lombok.Data; + +import java.util.Map; + +/** + * @author a203 + */ +@Data +public class KkjListDTO { + private String kkjCode; + private String devcode; + private String id; + private String kkjName; + private String flag = "0"; + + public KkjListDTO(Map objectMap) { + this.id = objectMap.get("id").toString(); + this.kkjCode = objectMap.get("kkjCode").toString(); + this.kkjName = objectMap.get("kkjName").toString(); + this.devcode = objectMap.get("devcode").toString(); + } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java index ab49c77..b05fbcc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -13,6 +13,9 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/alarm") public class KkjAlarmController extends BaseController { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java index 5c4800b..9014dad 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java @@ -2,10 +2,8 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.modular.kkj.dto.KkjListDto; -import com.casic.missiles.modular.kkj.dto.WarehouseListDto; +import com.casic.missiles.modular.kkj.dto.KkjListDTO; +import com.casic.missiles.modular.kkj.dto.WarehouseListDTO; import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -15,67 +13,26 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/overview") public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; - @Autowired - private ICommonPermissionService permissionService; - - /** - * 仓库列表 - * - * @return - */ -// @RequestMapping("/warehouseList") -// @ResponseBody -// public Object warehouseList() { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectWareHouseList(dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机列表 - * - * @param id 仓库id - * @return - */ -// @RequestMapping("/kkjList") -// @ResponseBody -// public Object kkjList(String id) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id), dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机详情 - * - * @param keywords 关键词（开孔机编号或二类设备编号） - * @return - */ -// @RequestMapping("/kkjDetail") -// @ResponseBody -// public Object kkjDetail(String keywords, String startDate, String endDate) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjData(keywords, startDate, endDate); -// return ResponseData.success(list); -// } /** * 开孔机列表 * * @param id 仓库id * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjList") @ResponseBody public Object kkjList(String id, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } @@ -84,12 +41,11 @@ * * @param keywords 关键词（开孔机编号或二类设备编号） * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjDetail") @ResponseBody public Object kkjDetail(String keywords, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } @@ -98,25 +54,23 @@ * 仓库列表，地图用 * * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseList") @ResponseBody public Object warehouseListByDate(String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectWarehouseListByDate(date); + List list = deviceKkjService.selectWarehouseListByDate(date); return ResponseData.success(list); } /** * 获取仓库列表接口，下拉菜单用 * - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseSimpleList") @ResponseBody public Object warehouseSimpleList() { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectWareHouseList(); return ResponseData.success(list); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java index 5483f33..ae2cc9c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java @@ -19,44 +19,99 @@ */ public interface BusDeviceKkjMapper extends BaseMapper { + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return List> + */ List> selectWareHouseList(); - List> selectKkjByWareHouse( - @Param("wareHouseId") Long wareHouseId, - @Param("dataScope") DataScope dataScope); - - List> selectKkjData( - @Param("keywords") String keywords, - @Param("startDate") String startDate, - @Param("endDate") String endDate); - + /** + * 开孔机列表 + * + * @param devcode 开孔机设备编号 + * @param deptIds 开孔机权属单位集合 + * @param page 分页控制 + * @param dataScope 权限控制 + * @return List> + */ List> selectKkjDeviceListPage( @Param("devcode") String devcode, @Param("deptIds") List deptIds, @Param("datascope") DataScope dataScope, @Param("page") Page> page); - void batchDelete( - @Param("ids") List ids); + /** + * 批量删除开孔机 + * + * @param ids 开孔机id + */ + void batchDelete(@Param("ids") List ids); - Map selectKkjByCode( - @Param("kkjCode") String kkjCode); + /** + * 获取开孔机详情 + * + * @param kkjCode 开孔机编号 + * @return Map < String, Object> + */ + Map selectKkjByCode(@Param("kkjCode") String kkjCode); - List> selectKkj( - @Param("wareHouseId") Long wareHouseId); + /** + * 获取某个仓库下面开孔机列表 + * + * @param wareHouseId 仓库id + * @return List> + */ + List> selectKkj(@Param("wareHouseId") Long wareHouseId); + /** + * 获取开孔机列表接口,地图用 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjByWareHouseAndTime( @Param("wareHouseId") Long wareHouseId, @Param("date") String date); + /** + * 获取开孔机历史位置的详情 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjDetail( @Param("keywords") String keywords, @Param("date") String date); + /** + * 获取所有仓库下面开孔机列表 + * + * @return List> + */ List> selectWarehouseAllKkj(); + /** + * 获取仓库列表接口,地图用 + * + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectWarehouseWarnKkjByTime(@Param("date") String date); + /** + * 某日开孔机报警记录——分页 + * + * @param wareHouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptIds 权属单位id集合 + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + * @param page 分页控制 + * @return List> + */ List> selectKkjRecordsPage( @Param("wareHouseId") String wareHouseId, @Param("kkjCode") String kkjCode, @@ -65,6 +120,13 @@ @Param("endDate") String endDate, @Param("page") Page> page); + /** + * 某日开孔机报警记录——不分页 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjRecords( @Param("wareHouseId") String wareHouseId, @Param("date") String date); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java new file mode 100644 index 0000000..e982a2e --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.kkj.dto; + +import lombok.Data; + +import java.util.Map; + +/** + * @author a203 + */ +@Data +public class KkjListDTO { + private String kkjCode; + private String devcode; + private String id; + private String kkjName; + private String flag = "0"; + + public KkjListDTO(Map objectMap) { + this.id = objectMap.get("id").toString(); + this.kkjCode = objectMap.get("kkjCode").toString(); + this.kkjName = objectMap.get("kkjName").toString(); + this.devcode = objectMap.get("devcode").toString(); + } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java deleted file mode 100644 index 0ca84a6..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.missiles.modular.kkj.dto; - -import java.util.Map; - -public class KkjListDto { - private String kkjCode; - private String devcode; - private String id; - private String kkjName; - private String flag = "0"; - - public String getKkjCode() { - return kkjCode; - } - - public void setKkjCode(String kkjCode) { - this.kkjCode = kkjCode; - } - - public String getDevcode() { - return devcode; - } - - public void setDevcode(String devcode) { - this.devcode = devcode; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getKkjName() { - return kkjName; - } - - public void setKkjName(String kkjName) { - this.kkjName = kkjName; - } - - public String getFlag() { - return flag; - } - - public void setFlag(String flag) { - this.flag = flag; - } - - public KkjListDto(Map objectMap) { - this.id = objectMap.get("id").toString(); - this.kkjCode = objectMap.get("kkjCode").toString(); - this.kkjName = objectMap.get("kkjName").toString(); - this.devcode = objectMap.get("devcode").toString(); - } -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java index ab49c77..b05fbcc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -13,6 +13,9 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/alarm") public class KkjAlarmController extends BaseController { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java index 5c4800b..9014dad 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java @@ -2,10 +2,8 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.modular.kkj.dto.KkjListDto; -import com.casic.missiles.modular.kkj.dto.WarehouseListDto; +import com.casic.missiles.modular.kkj.dto.KkjListDTO; +import com.casic.missiles.modular.kkj.dto.WarehouseListDTO; import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -15,67 +13,26 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/overview") public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; - @Autowired - private ICommonPermissionService permissionService; - - /** - * 仓库列表 - * - * @return - */ -// @RequestMapping("/warehouseList") -// @ResponseBody -// public Object warehouseList() { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectWareHouseList(dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机列表 - * - * @param id 仓库id - * @return - */ -// @RequestMapping("/kkjList") -// @ResponseBody -// public Object kkjList(String id) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id), dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机详情 - * - * @param keywords 关键词（开孔机编号或二类设备编号） - * @return - */ -// @RequestMapping("/kkjDetail") -// @ResponseBody -// public Object kkjDetail(String keywords, String startDate, String endDate) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjData(keywords, startDate, endDate); -// return ResponseData.success(list); -// } /** * 开孔机列表 * * @param id 仓库id * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjList") @ResponseBody public Object kkjList(String id, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } @@ -84,12 +41,11 @@ * * @param keywords 关键词（开孔机编号或二类设备编号） * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjDetail") @ResponseBody public Object kkjDetail(String keywords, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } @@ -98,25 +54,23 @@ * 仓库列表，地图用 * * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseList") @ResponseBody public Object warehouseListByDate(String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectWarehouseListByDate(date); + List list = deviceKkjService.selectWarehouseListByDate(date); return ResponseData.success(list); } /** * 获取仓库列表接口，下拉菜单用 * - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseSimpleList") @ResponseBody public Object warehouseSimpleList() { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectWareHouseList(); return ResponseData.success(list); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java index 5483f33..ae2cc9c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java @@ -19,44 +19,99 @@ */ public interface BusDeviceKkjMapper extends BaseMapper { + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return List> + */ List> selectWareHouseList(); - List> selectKkjByWareHouse( - @Param("wareHouseId") Long wareHouseId, - @Param("dataScope") DataScope dataScope); - - List> selectKkjData( - @Param("keywords") String keywords, - @Param("startDate") String startDate, - @Param("endDate") String endDate); - + /** + * 开孔机列表 + * + * @param devcode 开孔机设备编号 + * @param deptIds 开孔机权属单位集合 + * @param page 分页控制 + * @param dataScope 权限控制 + * @return List> + */ List> selectKkjDeviceListPage( @Param("devcode") String devcode, @Param("deptIds") List deptIds, @Param("datascope") DataScope dataScope, @Param("page") Page> page); - void batchDelete( - @Param("ids") List ids); + /** + * 批量删除开孔机 + * + * @param ids 开孔机id + */ + void batchDelete(@Param("ids") List ids); - Map selectKkjByCode( - @Param("kkjCode") String kkjCode); + /** + * 获取开孔机详情 + * + * @param kkjCode 开孔机编号 + * @return Map < String, Object> + */ + Map selectKkjByCode(@Param("kkjCode") String kkjCode); - List> selectKkj( - @Param("wareHouseId") Long wareHouseId); + /** + * 获取某个仓库下面开孔机列表 + * + * @param wareHouseId 仓库id + * @return List> + */ + List> selectKkj(@Param("wareHouseId") Long wareHouseId); + /** + * 获取开孔机列表接口,地图用 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjByWareHouseAndTime( @Param("wareHouseId") Long wareHouseId, @Param("date") String date); + /** + * 获取开孔机历史位置的详情 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjDetail( @Param("keywords") String keywords, @Param("date") String date); + /** + * 获取所有仓库下面开孔机列表 + * + * @return List> + */ List> selectWarehouseAllKkj(); + /** + * 获取仓库列表接口,地图用 + * + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectWarehouseWarnKkjByTime(@Param("date") String date); + /** + * 某日开孔机报警记录——分页 + * + * @param wareHouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptIds 权属单位id集合 + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + * @param page 分页控制 + * @return List> + */ List> selectKkjRecordsPage( @Param("wareHouseId") String wareHouseId, @Param("kkjCode") String kkjCode, @@ -65,6 +120,13 @@ @Param("endDate") String endDate, @Param("page") Page> page); + /** + * 某日开孔机报警记录——不分页 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjRecords( @Param("wareHouseId") String wareHouseId, @Param("date") String date); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java new file mode 100644 index 0000000..e982a2e --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.kkj.dto; + +import lombok.Data; + +import java.util.Map; + +/** + * @author a203 + */ +@Data +public class KkjListDTO { + private String kkjCode; + private String devcode; + private String id; + private String kkjName; + private String flag = "0"; + + public KkjListDTO(Map objectMap) { + this.id = objectMap.get("id").toString(); + this.kkjCode = objectMap.get("kkjCode").toString(); + this.kkjName = objectMap.get("kkjName").toString(); + this.devcode = objectMap.get("devcode").toString(); + } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java deleted file mode 100644 index 0ca84a6..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.missiles.modular.kkj.dto; - -import java.util.Map; - -public class KkjListDto { - private String kkjCode; - private String devcode; - private String id; - private String kkjName; - private String flag = "0"; - - public String getKkjCode() { - return kkjCode; - } - - public void setKkjCode(String kkjCode) { - this.kkjCode = kkjCode; - } - - public String getDevcode() { - return devcode; - } - - public void setDevcode(String devcode) { - this.devcode = devcode; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getKkjName() { - return kkjName; - } - - public void setKkjName(String kkjName) { - this.kkjName = kkjName; - } - - public String getFlag() { - return flag; - } - - public void setFlag(String flag) { - this.flag = flag; - } - - public KkjListDto(Map objectMap) { - this.id = objectMap.get("id").toString(); - this.kkjCode = objectMap.get("kkjCode").toString(); - this.kkjName = objectMap.get("kkjName").toString(); - this.devcode = objectMap.get("devcode").toString(); - } -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java new file mode 100644 index 0000000..f094cbd --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java @@ -0,0 +1,27 @@ +package com.casic.missiles.modular.kkj.dto; + +import lombok.Data; + +import java.util.Map; + +/** + * @author a203 + */ +@Data +public class WarehouseListDTO { + private String lng; + private String name; + private String deptId; + private String id; + private String lat; + private Integer allDevices; + private Integer alarmDevices; + + public WarehouseListDTO(Map objectMap) { + this.lng = objectMap.get("lng").toString(); + this.name = objectMap.get("name").toString(); + this.deptId = objectMap.get("deptId").toString(); + this.setId(objectMap.get("id").toString()); + this.lat = objectMap.get("lat").toString(); + } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java index ab49c77..b05fbcc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -13,6 +13,9 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/alarm") public class KkjAlarmController extends BaseController { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java index 5c4800b..9014dad 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java @@ -2,10 +2,8 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.modular.kkj.dto.KkjListDto; -import com.casic.missiles.modular.kkj.dto.WarehouseListDto; +import com.casic.missiles.modular.kkj.dto.KkjListDTO; +import com.casic.missiles.modular.kkj.dto.WarehouseListDTO; import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -15,67 +13,26 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/overview") public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; - @Autowired - private ICommonPermissionService permissionService; - - /** - * 仓库列表 - * - * @return - */ -// @RequestMapping("/warehouseList") -// @ResponseBody -// public Object warehouseList() { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectWareHouseList(dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机列表 - * - * @param id 仓库id - * @return - */ -// @RequestMapping("/kkjList") -// @ResponseBody -// public Object kkjList(String id) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id), dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机详情 - * - * @param keywords 关键词（开孔机编号或二类设备编号） - * @return - */ -// @RequestMapping("/kkjDetail") -// @ResponseBody -// public Object kkjDetail(String keywords, String startDate, String endDate) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjData(keywords, startDate, endDate); -// return ResponseData.success(list); -// } /** * 开孔机列表 * * @param id 仓库id * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjList") @ResponseBody public Object kkjList(String id, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } @@ -84,12 +41,11 @@ * * @param keywords 关键词（开孔机编号或二类设备编号） * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjDetail") @ResponseBody public Object kkjDetail(String keywords, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } @@ -98,25 +54,23 @@ * 仓库列表，地图用 * * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseList") @ResponseBody public Object warehouseListByDate(String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectWarehouseListByDate(date); + List list = deviceKkjService.selectWarehouseListByDate(date); return ResponseData.success(list); } /** * 获取仓库列表接口，下拉菜单用 * - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseSimpleList") @ResponseBody public Object warehouseSimpleList() { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectWareHouseList(); return ResponseData.success(list); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java index 5483f33..ae2cc9c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java @@ -19,44 +19,99 @@ */ public interface BusDeviceKkjMapper extends BaseMapper { + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return List> + */ List> selectWareHouseList(); - List> selectKkjByWareHouse( - @Param("wareHouseId") Long wareHouseId, - @Param("dataScope") DataScope dataScope); - - List> selectKkjData( - @Param("keywords") String keywords, - @Param("startDate") String startDate, - @Param("endDate") String endDate); - + /** + * 开孔机列表 + * + * @param devcode 开孔机设备编号 + * @param deptIds 开孔机权属单位集合 + * @param page 分页控制 + * @param dataScope 权限控制 + * @return List> + */ List> selectKkjDeviceListPage( @Param("devcode") String devcode, @Param("deptIds") List deptIds, @Param("datascope") DataScope dataScope, @Param("page") Page> page); - void batchDelete( - @Param("ids") List ids); + /** + * 批量删除开孔机 + * + * @param ids 开孔机id + */ + void batchDelete(@Param("ids") List ids); - Map selectKkjByCode( - @Param("kkjCode") String kkjCode); + /** + * 获取开孔机详情 + * + * @param kkjCode 开孔机编号 + * @return Map < String, Object> + */ + Map selectKkjByCode(@Param("kkjCode") String kkjCode); - List> selectKkj( - @Param("wareHouseId") Long wareHouseId); + /** + * 获取某个仓库下面开孔机列表 + * + * @param wareHouseId 仓库id + * @return List> + */ + List> selectKkj(@Param("wareHouseId") Long wareHouseId); + /** + * 获取开孔机列表接口,地图用 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjByWareHouseAndTime( @Param("wareHouseId") Long wareHouseId, @Param("date") String date); + /** + * 获取开孔机历史位置的详情 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjDetail( @Param("keywords") String keywords, @Param("date") String date); + /** + * 获取所有仓库下面开孔机列表 + * + * @return List> + */ List> selectWarehouseAllKkj(); + /** + * 获取仓库列表接口,地图用 + * + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectWarehouseWarnKkjByTime(@Param("date") String date); + /** + * 某日开孔机报警记录——分页 + * + * @param wareHouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptIds 权属单位id集合 + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + * @param page 分页控制 + * @return List> + */ List> selectKkjRecordsPage( @Param("wareHouseId") String wareHouseId, @Param("kkjCode") String kkjCode, @@ -65,6 +120,13 @@ @Param("endDate") String endDate, @Param("page") Page> page); + /** + * 某日开孔机报警记录——不分页 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjRecords( @Param("wareHouseId") String wareHouseId, @Param("date") String date); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java new file mode 100644 index 0000000..e982a2e --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.kkj.dto; + +import lombok.Data; + +import java.util.Map; + +/** + * @author a203 + */ +@Data +public class KkjListDTO { + private String kkjCode; + private String devcode; + private String id; + private String kkjName; + private String flag = "0"; + + public KkjListDTO(Map objectMap) { + this.id = objectMap.get("id").toString(); + this.kkjCode = objectMap.get("kkjCode").toString(); + this.kkjName = objectMap.get("kkjName").toString(); + this.devcode = objectMap.get("devcode").toString(); + } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java deleted file mode 100644 index 0ca84a6..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.missiles.modular.kkj.dto; - -import java.util.Map; - -public class KkjListDto { - private String kkjCode; - private String devcode; - private String id; - private String kkjName; - private String flag = "0"; - - public String getKkjCode() { - return kkjCode; - } - - public void setKkjCode(String kkjCode) { - this.kkjCode = kkjCode; - } - - public String getDevcode() { - return devcode; - } - - public void setDevcode(String devcode) { - this.devcode = devcode; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getKkjName() { - return kkjName; - } - - public void setKkjName(String kkjName) { - this.kkjName = kkjName; - } - - public String getFlag() { - return flag; - } - - public void setFlag(String flag) { - this.flag = flag; - } - - public KkjListDto(Map objectMap) { - this.id = objectMap.get("id").toString(); - this.kkjCode = objectMap.get("kkjCode").toString(); - this.kkjName = objectMap.get("kkjName").toString(); - this.devcode = objectMap.get("devcode").toString(); - } -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java new file mode 100644 index 0000000..f094cbd --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java @@ -0,0 +1,27 @@ +package com.casic.missiles.modular.kkj.dto; + +import lombok.Data; + +import java.util.Map; + +/** + * @author a203 + */ +@Data +public class WarehouseListDTO { + private String lng; + private String name; + private String deptId; + private String id; + private String lat; + private Integer allDevices; + private Integer alarmDevices; + + public WarehouseListDTO(Map objectMap) { + this.lng = objectMap.get("lng").toString(); + this.name = objectMap.get("name").toString(); + this.deptId = objectMap.get("deptId").toString(); + this.setId(objectMap.get("id").toString()); + this.lat = objectMap.get("lat").toString(); + } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDto.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDto.java deleted file mode 100644 index ed17163..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDto.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.modular.kkj.dto; - -import java.util.Map; - -public class WarehouseListDto { - private String lng; - private String name; - private String deptId; - private String id; - private String lat; - private int allDevices; - private int alarmDevices; - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public int getAllDevices() { - return allDevices; - } - - public void setAllDevices(int allDevices) { - this.allDevices = allDevices; - } - - public int getAlarmDevices() { - return alarmDevices; - } - - public void setAlarmDevices(int alarmDevices) { - this.alarmDevices = alarmDevices; - } - - public WarehouseListDto(Map objectMap) { - this.lng = objectMap.get("lng").toString(); - this.name = objectMap.get("name").toString(); - this.deptId = objectMap.get("deptId").toString(); - this.setId(objectMap.get("id").toString()); - this.lat = objectMap.get("lat").toString(); - } -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java index ab49c77..b05fbcc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -13,6 +13,9 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/alarm") public class KkjAlarmController extends BaseController { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java index 5c4800b..9014dad 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java @@ -2,10 +2,8 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.modular.kkj.dto.KkjListDto; -import com.casic.missiles.modular.kkj.dto.WarehouseListDto; +import com.casic.missiles.modular.kkj.dto.KkjListDTO; +import com.casic.missiles.modular.kkj.dto.WarehouseListDTO; import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -15,67 +13,26 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/overview") public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; - @Autowired - private ICommonPermissionService permissionService; - - /** - * 仓库列表 - * - * @return - */ -// @RequestMapping("/warehouseList") -// @ResponseBody -// public Object warehouseList() { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectWareHouseList(dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机列表 - * - * @param id 仓库id - * @return - */ -// @RequestMapping("/kkjList") -// @ResponseBody -// public Object kkjList(String id) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id), dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机详情 - * - * @param keywords 关键词（开孔机编号或二类设备编号） - * @return - */ -// @RequestMapping("/kkjDetail") -// @ResponseBody -// public Object kkjDetail(String keywords, String startDate, String endDate) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjData(keywords, startDate, endDate); -// return ResponseData.success(list); -// } /** * 开孔机列表 * * @param id 仓库id * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjList") @ResponseBody public Object kkjList(String id, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } @@ -84,12 +41,11 @@ * * @param keywords 关键词（开孔机编号或二类设备编号） * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjDetail") @ResponseBody public Object kkjDetail(String keywords, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } @@ -98,25 +54,23 @@ * 仓库列表，地图用 * * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseList") @ResponseBody public Object warehouseListByDate(String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectWarehouseListByDate(date); + List list = deviceKkjService.selectWarehouseListByDate(date); return ResponseData.success(list); } /** * 获取仓库列表接口，下拉菜单用 * - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseSimpleList") @ResponseBody public Object warehouseSimpleList() { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectWareHouseList(); return ResponseData.success(list); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java index 5483f33..ae2cc9c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java @@ -19,44 +19,99 @@ */ public interface BusDeviceKkjMapper extends BaseMapper { + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return List> + */ List> selectWareHouseList(); - List> selectKkjByWareHouse( - @Param("wareHouseId") Long wareHouseId, - @Param("dataScope") DataScope dataScope); - - List> selectKkjData( - @Param("keywords") String keywords, - @Param("startDate") String startDate, - @Param("endDate") String endDate); - + /** + * 开孔机列表 + * + * @param devcode 开孔机设备编号 + * @param deptIds 开孔机权属单位集合 + * @param page 分页控制 + * @param dataScope 权限控制 + * @return List> + */ List> selectKkjDeviceListPage( @Param("devcode") String devcode, @Param("deptIds") List deptIds, @Param("datascope") DataScope dataScope, @Param("page") Page> page); - void batchDelete( - @Param("ids") List ids); + /** + * 批量删除开孔机 + * + * @param ids 开孔机id + */ + void batchDelete(@Param("ids") List ids); - Map selectKkjByCode( - @Param("kkjCode") String kkjCode); + /** + * 获取开孔机详情 + * + * @param kkjCode 开孔机编号 + * @return Map < String, Object> + */ + Map selectKkjByCode(@Param("kkjCode") String kkjCode); - List> selectKkj( - @Param("wareHouseId") Long wareHouseId); + /** + * 获取某个仓库下面开孔机列表 + * + * @param wareHouseId 仓库id + * @return List> + */ + List> selectKkj(@Param("wareHouseId") Long wareHouseId); + /** + * 获取开孔机列表接口,地图用 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjByWareHouseAndTime( @Param("wareHouseId") Long wareHouseId, @Param("date") String date); + /** + * 获取开孔机历史位置的详情 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjDetail( @Param("keywords") String keywords, @Param("date") String date); + /** + * 获取所有仓库下面开孔机列表 + * + * @return List> + */ List> selectWarehouseAllKkj(); + /** + * 获取仓库列表接口,地图用 + * + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectWarehouseWarnKkjByTime(@Param("date") String date); + /** + * 某日开孔机报警记录——分页 + * + * @param wareHouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptIds 权属单位id集合 + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + * @param page 分页控制 + * @return List> + */ List> selectKkjRecordsPage( @Param("wareHouseId") String wareHouseId, @Param("kkjCode") String kkjCode, @@ -65,6 +120,13 @@ @Param("endDate") String endDate, @Param("page") Page> page); + /** + * 某日开孔机报警记录——不分页 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjRecords( @Param("wareHouseId") String wareHouseId, @Param("date") String date); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java new file mode 100644 index 0000000..e982a2e --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.kkj.dto; + +import lombok.Data; + +import java.util.Map; + +/** + * @author a203 + */ +@Data +public class KkjListDTO { + private String kkjCode; + private String devcode; + private String id; + private String kkjName; + private String flag = "0"; + + public KkjListDTO(Map objectMap) { + this.id = objectMap.get("id").toString(); + this.kkjCode = objectMap.get("kkjCode").toString(); + this.kkjName = objectMap.get("kkjName").toString(); + this.devcode = objectMap.get("devcode").toString(); + } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java deleted file mode 100644 index 0ca84a6..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.missiles.modular.kkj.dto; - -import java.util.Map; - -public class KkjListDto { - private String kkjCode; - private String devcode; - private String id; - private String kkjName; - private String flag = "0"; - - public String getKkjCode() { - return kkjCode; - } - - public void setKkjCode(String kkjCode) { - this.kkjCode = kkjCode; - } - - public String getDevcode() { - return devcode; - } - - public void setDevcode(String devcode) { - this.devcode = devcode; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getKkjName() { - return kkjName; - } - - public void setKkjName(String kkjName) { - this.kkjName = kkjName; - } - - public String getFlag() { - return flag; - } - - public void setFlag(String flag) { - this.flag = flag; - } - - public KkjListDto(Map objectMap) { - this.id = objectMap.get("id").toString(); - this.kkjCode = objectMap.get("kkjCode").toString(); - this.kkjName = objectMap.get("kkjName").toString(); - this.devcode = objectMap.get("devcode").toString(); - } -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java new file mode 100644 index 0000000..f094cbd --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java @@ -0,0 +1,27 @@ +package com.casic.missiles.modular.kkj.dto; + +import lombok.Data; + +import java.util.Map; + +/** + * @author a203 + */ +@Data +public class WarehouseListDTO { + private String lng; + private String name; + private String deptId; + private String id; + private String lat; + private Integer allDevices; + private Integer alarmDevices; + + public WarehouseListDTO(Map objectMap) { + this.lng = objectMap.get("lng").toString(); + this.name = objectMap.get("name").toString(); + this.deptId = objectMap.get("deptId").toString(); + this.setId(objectMap.get("id").toString()); + this.lat = objectMap.get("lat").toString(); + } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDto.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDto.java deleted file mode 100644 index ed17163..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDto.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.modular.kkj.dto; - -import java.util.Map; - -public class WarehouseListDto { - private String lng; - private String name; - private String deptId; - private String id; - private String lat; - private int allDevices; - private int alarmDevices; - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public int getAllDevices() { - return allDevices; - } - - public void setAllDevices(int allDevices) { - this.allDevices = allDevices; - } - - public int getAlarmDevices() { - return alarmDevices; - } - - public void setAlarmDevices(int alarmDevices) { - this.alarmDevices = alarmDevices; - } - - public WarehouseListDto(Map objectMap) { - this.lng = objectMap.get("lng").toString(); - this.name = objectMap.get("name").toString(); - this.deptId = objectMap.get("deptId").toString(); - this.setId(objectMap.get("id").toString()); - this.lat = objectMap.get("lat").toString(); - } -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/IBusDeviceKkjService.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/IBusDeviceKkjService.java index 5d19a67..255faef 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/IBusDeviceKkjService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/IBusDeviceKkjService.java @@ -2,9 +2,8 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; -import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.modular.kkj.dto.KkjListDto; -import com.casic.missiles.modular.kkj.dto.WarehouseListDto; +import com.casic.missiles.modular.kkj.dto.KkjListDTO; +import com.casic.missiles.modular.kkj.dto.WarehouseListDTO; import com.casic.missiles.modular.kkj.model.BusDeviceKkj; import org.apache.ibatis.annotations.Param; @@ -21,32 +20,84 @@ */ public interface IBusDeviceKkjService extends IService { + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return List> + */ List> selectWareHouseList(); - List> selectKkjByWareHouse(Long wareHouseId, DataScope dataScope); - - List> selectKkjData(String keywords, String startDate, String endDate); - + /** + * 开孔机列表 + * + * @param devcode 开孔机设备编号 + * @param deptId 开孔机权属单位 + * @param page 分页控制 + * @return List> + */ List> selectKkjDeviceList(String devcode, Long deptId, Page> page); + /** + * 批量删除开孔机 + * + * @param ids 开孔机id + */ void batchDelect(List ids); + /** + * 获取开孔机详情 + * + * @param kkjCode 开孔机编号 + * @return Map < String, Object> + */ Map selectKkjByCode(@Param("kkjCode") String kkjCode); - //获取开孔机列表接口,地图用 - List selectKkjByWareHouseAndTime(Long wareHouseId, String date); + /** + * 获取开孔机列表接口,地图用 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List + */ + List selectKkjByWareHouseAndTime(Long wareHouseId, String date); - //获取开孔机历史位置的详情 + /** + * 获取开孔机历史位置的详情 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjDetail(String keywords, String date); - //获取仓库列表接口,地图用 - List selectWarehouseListByDate(String date); + /** + * 获取仓库列表接口,地图用 + * + * @param date 日期 (格式：yyyy-MM-dd) + * @return List + */ + List selectWarehouseListByDate(String date); - - //开孔机报警记录分页版 + /** + * 某日开孔机报警记录——分页 + * + * @param warehouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptid 权属单位id + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + * @param page 分页控制 + * @return List> + */ List> selectKkjRecordsPage(String warehouseId, String kkjCode, String deptid, String startDate, String endDate, Page> page); - //某日开孔机报警记录，不分页 + /** + * 某日开孔机报警记录——不分页 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjRecords(String wareHouseId, String date); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java index ab49c77..b05fbcc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -13,6 +13,9 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/alarm") public class KkjAlarmController extends BaseController { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java index 5c4800b..9014dad 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjOverviewController.java @@ -2,10 +2,8 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; -import com.casic.missiles.core.common.service.ICommonPermissionService; -import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.modular.kkj.dto.KkjListDto; -import com.casic.missiles.modular.kkj.dto.WarehouseListDto; +import com.casic.missiles.modular.kkj.dto.KkjListDTO; +import com.casic.missiles.modular.kkj.dto.WarehouseListDTO; import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -15,67 +13,26 @@ import java.util.List; import java.util.Map; +/** + * @author a203 + */ @Controller @RequestMapping("/overview") public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; - @Autowired - private ICommonPermissionService permissionService; - - /** - * 仓库列表 - * - * @return - */ -// @RequestMapping("/warehouseList") -// @ResponseBody -// public Object warehouseList() { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectWareHouseList(dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机列表 - * - * @param id 仓库id - * @return - */ -// @RequestMapping("/kkjList") -// @ResponseBody -// public Object kkjList(String id) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id), dataScope); -// return ResponseData.success(list); -// } - - /** - * 开孔机详情 - * - * @param keywords 关键词（开孔机编号或二类设备编号） - * @return - */ -// @RequestMapping("/kkjDetail") -// @ResponseBody -// public Object kkjDetail(String keywords, String startDate, String endDate) { -// DataScope dataScope = permissionService.getCurrUserDataScope(); -// List> list = deviceKkjService.selectKkjData(keywords, startDate, endDate); -// return ResponseData.success(list); -// } /** * 开孔机列表 * * @param id 仓库id * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjList") @ResponseBody public Object kkjList(String id, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } @@ -84,12 +41,11 @@ * * @param keywords 关键词（开孔机编号或二类设备编号） * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/kkjDetail") @ResponseBody public Object kkjDetail(String keywords, String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } @@ -98,25 +54,23 @@ * 仓库列表，地图用 * * @param date 时间 - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseList") @ResponseBody public Object warehouseListByDate(String date) { - DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceKkjService.selectWarehouseListByDate(date); + List list = deviceKkjService.selectWarehouseListByDate(date); return ResponseData.success(list); } /** * 获取仓库列表接口，下拉菜单用 * - * @return + * @return ResponseData.success(list) */ @RequestMapping("/warehouseSimpleList") @ResponseBody public Object warehouseSimpleList() { - DataScope dataScope = permissionService.getCurrUserDataScope(); List> list = deviceKkjService.selectWareHouseList(); return ResponseData.success(list); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java index 5483f33..ae2cc9c 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/BusDeviceKkjMapper.java @@ -19,44 +19,99 @@ */ public interface BusDeviceKkjMapper extends BaseMapper { + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return List> + */ List> selectWareHouseList(); - List> selectKkjByWareHouse( - @Param("wareHouseId") Long wareHouseId, - @Param("dataScope") DataScope dataScope); - - List> selectKkjData( - @Param("keywords") String keywords, - @Param("startDate") String startDate, - @Param("endDate") String endDate); - + /** + * 开孔机列表 + * + * @param devcode 开孔机设备编号 + * @param deptIds 开孔机权属单位集合 + * @param page 分页控制 + * @param dataScope 权限控制 + * @return List> + */ List> selectKkjDeviceListPage( @Param("devcode") String devcode, @Param("deptIds") List deptIds, @Param("datascope") DataScope dataScope, @Param("page") Page> page); - void batchDelete( - @Param("ids") List ids); + /** + * 批量删除开孔机 + * + * @param ids 开孔机id + */ + void batchDelete(@Param("ids") List ids); - Map selectKkjByCode( - @Param("kkjCode") String kkjCode); + /** + * 获取开孔机详情 + * + * @param kkjCode 开孔机编号 + * @return Map < String, Object> + */ + Map selectKkjByCode(@Param("kkjCode") String kkjCode); - List> selectKkj( - @Param("wareHouseId") Long wareHouseId); + /** + * 获取某个仓库下面开孔机列表 + * + * @param wareHouseId 仓库id + * @return List> + */ + List> selectKkj(@Param("wareHouseId") Long wareHouseId); + /** + * 获取开孔机列表接口,地图用 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjByWareHouseAndTime( @Param("wareHouseId") Long wareHouseId, @Param("date") String date); + /** + * 获取开孔机历史位置的详情 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjDetail( @Param("keywords") String keywords, @Param("date") String date); + /** + * 获取所有仓库下面开孔机列表 + * + * @return List> + */ List> selectWarehouseAllKkj(); + /** + * 获取仓库列表接口,地图用 + * + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectWarehouseWarnKkjByTime(@Param("date") String date); + /** + * 某日开孔机报警记录——分页 + * + * @param wareHouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptIds 权属单位id集合 + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + * @param page 分页控制 + * @return List> + */ List> selectKkjRecordsPage( @Param("wareHouseId") String wareHouseId, @Param("kkjCode") String kkjCode, @@ -65,6 +120,13 @@ @Param("endDate") String endDate, @Param("page") Page> page); + /** + * 某日开孔机报警记录——不分页 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjRecords( @Param("wareHouseId") String wareHouseId, @Param("date") String date); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java new file mode 100644 index 0000000..e982a2e --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDTO.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.kkj.dto; + +import lombok.Data; + +import java.util.Map; + +/** + * @author a203 + */ +@Data +public class KkjListDTO { + private String kkjCode; + private String devcode; + private String id; + private String kkjName; + private String flag = "0"; + + public KkjListDTO(Map objectMap) { + this.id = objectMap.get("id").toString(); + this.kkjCode = objectMap.get("kkjCode").toString(); + this.kkjName = objectMap.get("kkjName").toString(); + this.devcode = objectMap.get("devcode").toString(); + } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java deleted file mode 100644 index 0ca84a6..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.casic.missiles.modular.kkj.dto; - -import java.util.Map; - -public class KkjListDto { - private String kkjCode; - private String devcode; - private String id; - private String kkjName; - private String flag = "0"; - - public String getKkjCode() { - return kkjCode; - } - - public void setKkjCode(String kkjCode) { - this.kkjCode = kkjCode; - } - - public String getDevcode() { - return devcode; - } - - public void setDevcode(String devcode) { - this.devcode = devcode; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getKkjName() { - return kkjName; - } - - public void setKkjName(String kkjName) { - this.kkjName = kkjName; - } - - public String getFlag() { - return flag; - } - - public void setFlag(String flag) { - this.flag = flag; - } - - public KkjListDto(Map objectMap) { - this.id = objectMap.get("id").toString(); - this.kkjCode = objectMap.get("kkjCode").toString(); - this.kkjName = objectMap.get("kkjName").toString(); - this.devcode = objectMap.get("devcode").toString(); - } -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java new file mode 100644 index 0000000..f094cbd --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDTO.java @@ -0,0 +1,27 @@ +package com.casic.missiles.modular.kkj.dto; + +import lombok.Data; + +import java.util.Map; + +/** + * @author a203 + */ +@Data +public class WarehouseListDTO { + private String lng; + private String name; + private String deptId; + private String id; + private String lat; + private Integer allDevices; + private Integer alarmDevices; + + public WarehouseListDTO(Map objectMap) { + this.lng = objectMap.get("lng").toString(); + this.name = objectMap.get("name").toString(); + this.deptId = objectMap.get("deptId").toString(); + this.setId(objectMap.get("id").toString()); + this.lat = objectMap.get("lat").toString(); + } +} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDto.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDto.java deleted file mode 100644 index ed17163..0000000 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDto.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.casic.missiles.modular.kkj.dto; - -import java.util.Map; - -public class WarehouseListDto { - private String lng; - private String name; - private String deptId; - private String id; - private String lat; - private int allDevices; - private int alarmDevices; - - public String getLng() { - return lng; - } - - public void setLng(String lng) { - this.lng = lng; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDeptId() { - return deptId; - } - - public void setDeptId(String deptId) { - this.deptId = deptId; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLat() { - return lat; - } - - public void setLat(String lat) { - this.lat = lat; - } - - public int getAllDevices() { - return allDevices; - } - - public void setAllDevices(int allDevices) { - this.allDevices = allDevices; - } - - public int getAlarmDevices() { - return alarmDevices; - } - - public void setAlarmDevices(int alarmDevices) { - this.alarmDevices = alarmDevices; - } - - public WarehouseListDto(Map objectMap) { - this.lng = objectMap.get("lng").toString(); - this.name = objectMap.get("name").toString(); - this.deptId = objectMap.get("deptId").toString(); - this.setId(objectMap.get("id").toString()); - this.lat = objectMap.get("lat").toString(); - } -} diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/IBusDeviceKkjService.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/IBusDeviceKkjService.java index 5d19a67..255faef 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/IBusDeviceKkjService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/IBusDeviceKkjService.java @@ -2,9 +2,8 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; -import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.modular.kkj.dto.KkjListDto; -import com.casic.missiles.modular.kkj.dto.WarehouseListDto; +import com.casic.missiles.modular.kkj.dto.KkjListDTO; +import com.casic.missiles.modular.kkj.dto.WarehouseListDTO; import com.casic.missiles.modular.kkj.model.BusDeviceKkj; import org.apache.ibatis.annotations.Param; @@ -21,32 +20,84 @@ */ public interface IBusDeviceKkjService extends IService { + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return List> + */ List> selectWareHouseList(); - List> selectKkjByWareHouse(Long wareHouseId, DataScope dataScope); - - List> selectKkjData(String keywords, String startDate, String endDate); - + /** + * 开孔机列表 + * + * @param devcode 开孔机设备编号 + * @param deptId 开孔机权属单位 + * @param page 分页控制 + * @return List> + */ List> selectKkjDeviceList(String devcode, Long deptId, Page> page); + /** + * 批量删除开孔机 + * + * @param ids 开孔机id + */ void batchDelect(List ids); + /** + * 获取开孔机详情 + * + * @param kkjCode 开孔机编号 + * @return Map < String, Object> + */ Map selectKkjByCode(@Param("kkjCode") String kkjCode); - //获取开孔机列表接口,地图用 - List selectKkjByWareHouseAndTime(Long wareHouseId, String date); + /** + * 获取开孔机列表接口,地图用 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List + */ + List selectKkjByWareHouseAndTime(Long wareHouseId, String date); - //获取开孔机历史位置的详情 + /** + * 获取开孔机历史位置的详情 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjDetail(String keywords, String date); - //获取仓库列表接口,地图用 - List selectWarehouseListByDate(String date); + /** + * 获取仓库列表接口,地图用 + * + * @param date 日期 (格式：yyyy-MM-dd) + * @return List + */ + List selectWarehouseListByDate(String date); - - //开孔机报警记录分页版 + /** + * 某日开孔机报警记录——分页 + * + * @param warehouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptid 权属单位id + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + * @param page 分页控制 + * @return List> + */ List> selectKkjRecordsPage(String warehouseId, String kkjCode, String deptid, String startDate, String endDate, Page> page); - //某日开孔机报警记录，不分页 + /** + * 某日开孔机报警记录——不分页 + * + * @param wareHouseId 仓库id + * @param date 日期 (格式：yyyy-MM-dd) + * @return List> + */ List> selectKkjRecords(String wareHouseId, String date); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java index a7cd5de..cdfabb5 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/service/impl/BusDeviceKkjServiceImpl.java @@ -7,8 +7,8 @@ import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.util.ToolUtil; import com.casic.missiles.modular.kkj.dao.BusDeviceKkjMapper; -import com.casic.missiles.modular.kkj.dto.KkjListDto; -import com.casic.missiles.modular.kkj.dto.WarehouseListDto; +import com.casic.missiles.modular.kkj.dto.KkjListDTO; +import com.casic.missiles.modular.kkj.dto.WarehouseListDTO; import com.casic.missiles.modular.kkj.model.BusDeviceKkj; import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; @@ -33,30 +33,20 @@ @Override public List> selectWareHouseList() { + DataScope dataScope = permissionService.getCurrUserDataScope(); return this.baseMapper.selectWareHouseList(); } @Override - public List> selectKkjByWareHouse(Long wareHouseId, DataScope dataScope) { - return this.baseMapper.selectKkjByWareHouse(wareHouseId, dataScope); - } - - @Override - public List> selectKkjData(String keywords, String startDate, String endDate) { - return this.baseMapper.selectKkjData(keywords, startDate, endDate); - } - - @Override public List> selectKkjDeviceList(String devcode, Long deptId, Page> page) { DataScope dataScope = permissionService.getCurrUserDataScope(); // 权属单位 / 使用单位 List deptIds = null; if (ToolUtil.isNotEmpty(deptId)) { deptIds = permissionService.getSubDepts(deptId, null); - deptIds.add(Long.valueOf(deptId)); + deptIds.add(deptId); } - List> deviceList = this.baseMapper.selectKkjDeviceListPage(devcode, deptIds, dataScope, page); - return deviceList; + return this.baseMapper.selectKkjDeviceListPage(devcode, deptIds, dataScope, page); } @Override @@ -81,13 +71,14 @@ } @Override - public List selectWarehouseListByDate(String date) { + public List selectWarehouseListByDate(String date) { + DataScope dataScope = permissionService.getCurrUserDataScope(); List> allKkj = this.baseMapper.selectWarehouseAllKkj(); List> warnKkj = this.baseMapper.selectWarehouseWarnKkjByTime(date); - List listDtos = new ArrayList<>(); + List listDtos = new ArrayList<>(); for (Map objectMap : allKkj) { if (objectMap != null) { - WarehouseListDto warehouseListDto = new WarehouseListDto(objectMap); + WarehouseListDTO warehouseListDto = new WarehouseListDTO(objectMap); Object allDevices = objectMap.get("allDevices"); warehouseListDto.setAllDevices(allDevices == null ? 0 : Integer.parseInt(allDevices.toString())); @@ -106,13 +97,14 @@ } @Override - public List selectKkjByWareHouseAndTime(Long wareHouseId, String date) { + public List selectKkjByWareHouseAndTime(Long wareHouseId, String date) { + DataScope dataScope = permissionService.getCurrUserDataScope(); List> allKkj = this.baseMapper.selectKkj(wareHouseId); List> warnKkj = this.baseMapper.selectKkjByWareHouseAndTime(wareHouseId, date); - List listDtos = new ArrayList<>(); + List listDtos = new ArrayList<>(); for (Map objectMap : allKkj) { if (objectMap != null) { - KkjListDto kkjListDto = new KkjListDto(objectMap); + KkjListDTO kkjListDto = new KkjListDTO(objectMap); for (Map warnKkjMap : warnKkj) { if (kkjListDto.getDevcode().equals(warnKkjMap.get("devcode").toString())) { @@ -127,6 +119,7 @@ @Override public List> selectKkjDetail(String keywords, String date) { + DataScope dataScope = permissionService.getCurrUserDataScope(); return this.baseMapper.selectKkjDetail(keywords, date); }