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 new file mode 100644 index 0000000..ab49c77 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.kkj.controller; + +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/alarm") +public class KkjAlarmController extends BaseController { + @Autowired + private IBusDeviceKkjService deviceKkjService; + + /** + * 开孔机报警记录分页版 + * + * @param warehouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptid 权属单位id + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + */ + @RequestMapping("/kkjRecordsPage") + @ResponseBody + public Object kkjRecordsPage(String warehouseId, String kkjCode, String deptid, String startDate, String endDate) { + Page> page = new PageFactory>().defaultPage(); + List> list = deviceKkjService.selectKkjRecordsPage(warehouseId, + kkjCode, deptid, startDate, endDate, page); + page.setRecords(list); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 开孔机报警记录不分页 + * + * @param warehouseId 仓库id + * @param date 时间 + */ + @RequestMapping("/kkjRecords") + @ResponseBody + public Object kkjRecords(String warehouseId, String date) { + List> list = deviceKkjService.selectKkjRecords(warehouseId, date); + 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 new file mode 100644 index 0000000..ab49c77 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.kkj.controller; + +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/alarm") +public class KkjAlarmController extends BaseController { + @Autowired + private IBusDeviceKkjService deviceKkjService; + + /** + * 开孔机报警记录分页版 + * + * @param warehouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptid 权属单位id + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + */ + @RequestMapping("/kkjRecordsPage") + @ResponseBody + public Object kkjRecordsPage(String warehouseId, String kkjCode, String deptid, String startDate, String endDate) { + Page> page = new PageFactory>().defaultPage(); + List> list = deviceKkjService.selectKkjRecordsPage(warehouseId, + kkjCode, deptid, startDate, endDate, page); + page.setRecords(list); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 开孔机报警记录不分页 + * + * @param warehouseId 仓库id + * @param date 时间 + */ + @RequestMapping("/kkjRecords") + @ResponseBody + public Object kkjRecords(String warehouseId, String date) { + List> list = deviceKkjService.selectKkjRecords(warehouseId, date); + return ResponseData.success(list); + } +} 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 39144db..5c4800b 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 @@ -1,8 +1,11 @@ package com.casic.missiles.modular.kkj.controller; +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.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -14,7 +17,7 @@ @Controller @RequestMapping("/overview") -public class KkjOverviewController { +public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; @Autowired @@ -22,42 +25,99 @@ /** * 仓库列表 + * * @return */ - @RequestMapping("/warehouseList") - @ResponseBody - public Object warehouseList(){ - DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectWareHouseList(dataScope); - return ResponseData.success(list); - } +// @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 + */ @RequestMapping("/kkjList") @ResponseBody - public Object kkjList(String id){ + public Object kkjList(String id, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id),dataScope); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } /** * 开孔机详情 - * @param keywords 关键词（开孔机编号或二类设备编号） - * @param date 日期 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 时间 * @return */ @RequestMapping("/kkjDetail") @ResponseBody - public Object kkjDetail(String keywords,String startDate, String endDate){ + public Object kkjDetail(String keywords, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjData(keywords, startDate,endDate); + List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } + /** + * 仓库列表，地图用 + * + * @param date 时间 + * @return + */ + @RequestMapping("/warehouseList") + @ResponseBody + public Object warehouseListByDate(String date) { + DataScope dataScope = permissionService.getCurrUserDataScope(); + List list = deviceKkjService.selectWarehouseListByDate(date); + return ResponseData.success(list); + } + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return + */ + @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 new file mode 100644 index 0000000..ab49c77 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.kkj.controller; + +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/alarm") +public class KkjAlarmController extends BaseController { + @Autowired + private IBusDeviceKkjService deviceKkjService; + + /** + * 开孔机报警记录分页版 + * + * @param warehouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptid 权属单位id + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + */ + @RequestMapping("/kkjRecordsPage") + @ResponseBody + public Object kkjRecordsPage(String warehouseId, String kkjCode, String deptid, String startDate, String endDate) { + Page> page = new PageFactory>().defaultPage(); + List> list = deviceKkjService.selectKkjRecordsPage(warehouseId, + kkjCode, deptid, startDate, endDate, page); + page.setRecords(list); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 开孔机报警记录不分页 + * + * @param warehouseId 仓库id + * @param date 时间 + */ + @RequestMapping("/kkjRecords") + @ResponseBody + public Object kkjRecords(String warehouseId, String date) { + List> list = deviceKkjService.selectKkjRecords(warehouseId, date); + return ResponseData.success(list); + } +} 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 39144db..5c4800b 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 @@ -1,8 +1,11 @@ package com.casic.missiles.modular.kkj.controller; +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.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -14,7 +17,7 @@ @Controller @RequestMapping("/overview") -public class KkjOverviewController { +public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; @Autowired @@ -22,42 +25,99 @@ /** * 仓库列表 + * * @return */ - @RequestMapping("/warehouseList") - @ResponseBody - public Object warehouseList(){ - DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectWareHouseList(dataScope); - return ResponseData.success(list); - } +// @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 + */ @RequestMapping("/kkjList") @ResponseBody - public Object kkjList(String id){ + public Object kkjList(String id, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id),dataScope); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } /** * 开孔机详情 - * @param keywords 关键词（开孔机编号或二类设备编号） - * @param date 日期 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 时间 * @return */ @RequestMapping("/kkjDetail") @ResponseBody - public Object kkjDetail(String keywords,String startDate, String endDate){ + public Object kkjDetail(String keywords, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjData(keywords, startDate,endDate); + List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } + /** + * 仓库列表，地图用 + * + * @param date 时间 + * @return + */ + @RequestMapping("/warehouseList") + @ResponseBody + public Object warehouseListByDate(String date) { + DataScope dataScope = permissionService.getCurrUserDataScope(); + List list = deviceKkjService.selectWarehouseListByDate(date); + return ResponseData.success(list); + } + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return + */ + @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 58d7d98..5483f33 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,17 +19,53 @@ */ public interface BusDeviceKkjMapper extends BaseMapper { - List> selectWareHouseList(@Param("dataScope")DataScope dataScope); + List> selectWareHouseList(); - List> selectKkjByWareHouse(@Param("wareHouseId")Long wareHouseId, @Param("dataScope")DataScope dataScope); + List> selectKkjByWareHouse( + @Param("wareHouseId") Long wareHouseId, + @Param("dataScope") DataScope dataScope); - List> selectKkjData(@Param("keywords")String keywords,@Param("startDate")String startDate, @Param("endDate") String endDate); + List> selectKkjData( + @Param("keywords") String keywords, + @Param("startDate") String startDate, + @Param("endDate") String endDate); - List> selectKkjDeviceListPage(@Param("devcode")String devcode,@Param("deptIds")ListdeptIds,@Param("datascope")DataScope dataScope,@Param("page") Page page); + List> selectKkjDeviceListPage( + @Param("devcode") String devcode, + @Param("deptIds") List deptIds, + @Param("datascope") DataScope dataScope, + @Param("page") Page> page); - void batchDelete(@Param("ids")List ids); + void batchDelete( + @Param("ids") List ids); - Map selectKkjByCode(@Param("kkjCode")String kkjCode); + Map selectKkjByCode( + @Param("kkjCode") String kkjCode); + List> selectKkj( + @Param("wareHouseId") Long wareHouseId); + List> selectKkjByWareHouseAndTime( + @Param("wareHouseId") Long wareHouseId, + @Param("date") String date); + + List> selectKkjDetail( + @Param("keywords") String keywords, + @Param("date") String date); + + List> selectWarehouseAllKkj(); + + List> selectWarehouseWarnKkjByTime(@Param("date") String date); + + List> selectKkjRecordsPage( + @Param("wareHouseId") String wareHouseId, + @Param("kkjCode") String kkjCode, + @Param("deptIds") List deptIds, + @Param("startDate") String startDate, + @Param("endDate") String endDate, + @Param("page") Page> page); + + 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 new file mode 100644 index 0000000..ab49c77 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.kkj.controller; + +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/alarm") +public class KkjAlarmController extends BaseController { + @Autowired + private IBusDeviceKkjService deviceKkjService; + + /** + * 开孔机报警记录分页版 + * + * @param warehouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptid 权属单位id + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + */ + @RequestMapping("/kkjRecordsPage") + @ResponseBody + public Object kkjRecordsPage(String warehouseId, String kkjCode, String deptid, String startDate, String endDate) { + Page> page = new PageFactory>().defaultPage(); + List> list = deviceKkjService.selectKkjRecordsPage(warehouseId, + kkjCode, deptid, startDate, endDate, page); + page.setRecords(list); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 开孔机报警记录不分页 + * + * @param warehouseId 仓库id + * @param date 时间 + */ + @RequestMapping("/kkjRecords") + @ResponseBody + public Object kkjRecords(String warehouseId, String date) { + List> list = deviceKkjService.selectKkjRecords(warehouseId, date); + return ResponseData.success(list); + } +} 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 39144db..5c4800b 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 @@ -1,8 +1,11 @@ package com.casic.missiles.modular.kkj.controller; +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.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -14,7 +17,7 @@ @Controller @RequestMapping("/overview") -public class KkjOverviewController { +public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; @Autowired @@ -22,42 +25,99 @@ /** * 仓库列表 + * * @return */ - @RequestMapping("/warehouseList") - @ResponseBody - public Object warehouseList(){ - DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectWareHouseList(dataScope); - return ResponseData.success(list); - } +// @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 + */ @RequestMapping("/kkjList") @ResponseBody - public Object kkjList(String id){ + public Object kkjList(String id, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id),dataScope); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } /** * 开孔机详情 - * @param keywords 关键词（开孔机编号或二类设备编号） - * @param date 日期 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 时间 * @return */ @RequestMapping("/kkjDetail") @ResponseBody - public Object kkjDetail(String keywords,String startDate, String endDate){ + public Object kkjDetail(String keywords, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjData(keywords, startDate,endDate); + List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } + /** + * 仓库列表，地图用 + * + * @param date 时间 + * @return + */ + @RequestMapping("/warehouseList") + @ResponseBody + public Object warehouseListByDate(String date) { + DataScope dataScope = permissionService.getCurrUserDataScope(); + List list = deviceKkjService.selectWarehouseListByDate(date); + return ResponseData.success(list); + } + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return + */ + @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 58d7d98..5483f33 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,17 +19,53 @@ */ public interface BusDeviceKkjMapper extends BaseMapper { - List> selectWareHouseList(@Param("dataScope")DataScope dataScope); + List> selectWareHouseList(); - List> selectKkjByWareHouse(@Param("wareHouseId")Long wareHouseId, @Param("dataScope")DataScope dataScope); + List> selectKkjByWareHouse( + @Param("wareHouseId") Long wareHouseId, + @Param("dataScope") DataScope dataScope); - List> selectKkjData(@Param("keywords")String keywords,@Param("startDate")String startDate, @Param("endDate") String endDate); + List> selectKkjData( + @Param("keywords") String keywords, + @Param("startDate") String startDate, + @Param("endDate") String endDate); - List> selectKkjDeviceListPage(@Param("devcode")String devcode,@Param("deptIds")ListdeptIds,@Param("datascope")DataScope dataScope,@Param("page") Page page); + List> selectKkjDeviceListPage( + @Param("devcode") String devcode, + @Param("deptIds") List deptIds, + @Param("datascope") DataScope dataScope, + @Param("page") Page> page); - void batchDelete(@Param("ids")List ids); + void batchDelete( + @Param("ids") List ids); - Map selectKkjByCode(@Param("kkjCode")String kkjCode); + Map selectKkjByCode( + @Param("kkjCode") String kkjCode); + List> selectKkj( + @Param("wareHouseId") Long wareHouseId); + List> selectKkjByWareHouseAndTime( + @Param("wareHouseId") Long wareHouseId, + @Param("date") String date); + + List> selectKkjDetail( + @Param("keywords") String keywords, + @Param("date") String date); + + List> selectWarehouseAllKkj(); + + List> selectWarehouseWarnKkjByTime(@Param("date") String date); + + List> selectKkjRecordsPage( + @Param("wareHouseId") String wareHouseId, + @Param("kkjCode") String kkjCode, + @Param("deptIds") List deptIds, + @Param("startDate") String startDate, + @Param("endDate") String endDate, + @Param("page") Page> page); + + List> selectKkjRecords( + @Param("wareHouseId") String wareHouseId, + @Param("date") String date); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml index 9c14246..c2232ea 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml @@ -4,40 +4,39 @@ - - - - - - - - - - + + + + + + + + + + - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version, KKJ_ID AS kkjId + ID + AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version, KKJ_ID AS kkjId @@ -101,11 +100,154 @@ + + + + + + + + + + + + + + + + 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 new file mode 100644 index 0000000..ab49c77 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.kkj.controller; + +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/alarm") +public class KkjAlarmController extends BaseController { + @Autowired + private IBusDeviceKkjService deviceKkjService; + + /** + * 开孔机报警记录分页版 + * + * @param warehouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptid 权属单位id + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + */ + @RequestMapping("/kkjRecordsPage") + @ResponseBody + public Object kkjRecordsPage(String warehouseId, String kkjCode, String deptid, String startDate, String endDate) { + Page> page = new PageFactory>().defaultPage(); + List> list = deviceKkjService.selectKkjRecordsPage(warehouseId, + kkjCode, deptid, startDate, endDate, page); + page.setRecords(list); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 开孔机报警记录不分页 + * + * @param warehouseId 仓库id + * @param date 时间 + */ + @RequestMapping("/kkjRecords") + @ResponseBody + public Object kkjRecords(String warehouseId, String date) { + List> list = deviceKkjService.selectKkjRecords(warehouseId, date); + return ResponseData.success(list); + } +} 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 39144db..5c4800b 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 @@ -1,8 +1,11 @@ package com.casic.missiles.modular.kkj.controller; +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.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -14,7 +17,7 @@ @Controller @RequestMapping("/overview") -public class KkjOverviewController { +public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; @Autowired @@ -22,42 +25,99 @@ /** * 仓库列表 + * * @return */ - @RequestMapping("/warehouseList") - @ResponseBody - public Object warehouseList(){ - DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectWareHouseList(dataScope); - return ResponseData.success(list); - } +// @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 + */ @RequestMapping("/kkjList") @ResponseBody - public Object kkjList(String id){ + public Object kkjList(String id, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id),dataScope); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } /** * 开孔机详情 - * @param keywords 关键词（开孔机编号或二类设备编号） - * @param date 日期 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 时间 * @return */ @RequestMapping("/kkjDetail") @ResponseBody - public Object kkjDetail(String keywords,String startDate, String endDate){ + public Object kkjDetail(String keywords, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjData(keywords, startDate,endDate); + List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } + /** + * 仓库列表，地图用 + * + * @param date 时间 + * @return + */ + @RequestMapping("/warehouseList") + @ResponseBody + public Object warehouseListByDate(String date) { + DataScope dataScope = permissionService.getCurrUserDataScope(); + List list = deviceKkjService.selectWarehouseListByDate(date); + return ResponseData.success(list); + } + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return + */ + @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 58d7d98..5483f33 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,17 +19,53 @@ */ public interface BusDeviceKkjMapper extends BaseMapper { - List> selectWareHouseList(@Param("dataScope")DataScope dataScope); + List> selectWareHouseList(); - List> selectKkjByWareHouse(@Param("wareHouseId")Long wareHouseId, @Param("dataScope")DataScope dataScope); + List> selectKkjByWareHouse( + @Param("wareHouseId") Long wareHouseId, + @Param("dataScope") DataScope dataScope); - List> selectKkjData(@Param("keywords")String keywords,@Param("startDate")String startDate, @Param("endDate") String endDate); + List> selectKkjData( + @Param("keywords") String keywords, + @Param("startDate") String startDate, + @Param("endDate") String endDate); - List> selectKkjDeviceListPage(@Param("devcode")String devcode,@Param("deptIds")ListdeptIds,@Param("datascope")DataScope dataScope,@Param("page") Page page); + List> selectKkjDeviceListPage( + @Param("devcode") String devcode, + @Param("deptIds") List deptIds, + @Param("datascope") DataScope dataScope, + @Param("page") Page> page); - void batchDelete(@Param("ids")List ids); + void batchDelete( + @Param("ids") List ids); - Map selectKkjByCode(@Param("kkjCode")String kkjCode); + Map selectKkjByCode( + @Param("kkjCode") String kkjCode); + List> selectKkj( + @Param("wareHouseId") Long wareHouseId); + List> selectKkjByWareHouseAndTime( + @Param("wareHouseId") Long wareHouseId, + @Param("date") String date); + + List> selectKkjDetail( + @Param("keywords") String keywords, + @Param("date") String date); + + List> selectWarehouseAllKkj(); + + List> selectWarehouseWarnKkjByTime(@Param("date") String date); + + List> selectKkjRecordsPage( + @Param("wareHouseId") String wareHouseId, + @Param("kkjCode") String kkjCode, + @Param("deptIds") List deptIds, + @Param("startDate") String startDate, + @Param("endDate") String endDate, + @Param("page") Page> page); + + List> selectKkjRecords( + @Param("wareHouseId") String wareHouseId, + @Param("date") String date); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml index 9c14246..c2232ea 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml @@ -4,40 +4,39 @@ - - - - - - - - - - + + + + + + + + + + - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version, KKJ_ID AS kkjId + ID + AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version, KKJ_ID AS kkjId @@ -101,11 +100,154 @@ + + + + + + + + + + + + + + + + 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..0ca84a6 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java @@ -0,0 +1,58 @@ +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 new file mode 100644 index 0000000..ab49c77 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.kkj.controller; + +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/alarm") +public class KkjAlarmController extends BaseController { + @Autowired + private IBusDeviceKkjService deviceKkjService; + + /** + * 开孔机报警记录分页版 + * + * @param warehouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptid 权属单位id + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + */ + @RequestMapping("/kkjRecordsPage") + @ResponseBody + public Object kkjRecordsPage(String warehouseId, String kkjCode, String deptid, String startDate, String endDate) { + Page> page = new PageFactory>().defaultPage(); + List> list = deviceKkjService.selectKkjRecordsPage(warehouseId, + kkjCode, deptid, startDate, endDate, page); + page.setRecords(list); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 开孔机报警记录不分页 + * + * @param warehouseId 仓库id + * @param date 时间 + */ + @RequestMapping("/kkjRecords") + @ResponseBody + public Object kkjRecords(String warehouseId, String date) { + List> list = deviceKkjService.selectKkjRecords(warehouseId, date); + return ResponseData.success(list); + } +} 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 39144db..5c4800b 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 @@ -1,8 +1,11 @@ package com.casic.missiles.modular.kkj.controller; +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.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -14,7 +17,7 @@ @Controller @RequestMapping("/overview") -public class KkjOverviewController { +public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; @Autowired @@ -22,42 +25,99 @@ /** * 仓库列表 + * * @return */ - @RequestMapping("/warehouseList") - @ResponseBody - public Object warehouseList(){ - DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectWareHouseList(dataScope); - return ResponseData.success(list); - } +// @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 + */ @RequestMapping("/kkjList") @ResponseBody - public Object kkjList(String id){ + public Object kkjList(String id, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id),dataScope); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } /** * 开孔机详情 - * @param keywords 关键词（开孔机编号或二类设备编号） - * @param date 日期 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 时间 * @return */ @RequestMapping("/kkjDetail") @ResponseBody - public Object kkjDetail(String keywords,String startDate, String endDate){ + public Object kkjDetail(String keywords, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjData(keywords, startDate,endDate); + List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } + /** + * 仓库列表，地图用 + * + * @param date 时间 + * @return + */ + @RequestMapping("/warehouseList") + @ResponseBody + public Object warehouseListByDate(String date) { + DataScope dataScope = permissionService.getCurrUserDataScope(); + List list = deviceKkjService.selectWarehouseListByDate(date); + return ResponseData.success(list); + } + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return + */ + @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 58d7d98..5483f33 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,17 +19,53 @@ */ public interface BusDeviceKkjMapper extends BaseMapper { - List> selectWareHouseList(@Param("dataScope")DataScope dataScope); + List> selectWareHouseList(); - List> selectKkjByWareHouse(@Param("wareHouseId")Long wareHouseId, @Param("dataScope")DataScope dataScope); + List> selectKkjByWareHouse( + @Param("wareHouseId") Long wareHouseId, + @Param("dataScope") DataScope dataScope); - List> selectKkjData(@Param("keywords")String keywords,@Param("startDate")String startDate, @Param("endDate") String endDate); + List> selectKkjData( + @Param("keywords") String keywords, + @Param("startDate") String startDate, + @Param("endDate") String endDate); - List> selectKkjDeviceListPage(@Param("devcode")String devcode,@Param("deptIds")ListdeptIds,@Param("datascope")DataScope dataScope,@Param("page") Page page); + List> selectKkjDeviceListPage( + @Param("devcode") String devcode, + @Param("deptIds") List deptIds, + @Param("datascope") DataScope dataScope, + @Param("page") Page> page); - void batchDelete(@Param("ids")List ids); + void batchDelete( + @Param("ids") List ids); - Map selectKkjByCode(@Param("kkjCode")String kkjCode); + Map selectKkjByCode( + @Param("kkjCode") String kkjCode); + List> selectKkj( + @Param("wareHouseId") Long wareHouseId); + List> selectKkjByWareHouseAndTime( + @Param("wareHouseId") Long wareHouseId, + @Param("date") String date); + + List> selectKkjDetail( + @Param("keywords") String keywords, + @Param("date") String date); + + List> selectWarehouseAllKkj(); + + List> selectWarehouseWarnKkjByTime(@Param("date") String date); + + List> selectKkjRecordsPage( + @Param("wareHouseId") String wareHouseId, + @Param("kkjCode") String kkjCode, + @Param("deptIds") List deptIds, + @Param("startDate") String startDate, + @Param("endDate") String endDate, + @Param("page") Page> page); + + List> selectKkjRecords( + @Param("wareHouseId") String wareHouseId, + @Param("date") String date); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml index 9c14246..c2232ea 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml @@ -4,40 +4,39 @@ - - - - - - - - - - + + + + + + + + + + - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version, KKJ_ID AS kkjId + ID + AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version, KKJ_ID AS kkjId @@ -101,11 +100,154 @@ + + + + + + + + + + + + + + + + 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..0ca84a6 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java @@ -0,0 +1,58 @@ +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..ed17163 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDto.java @@ -0,0 +1,77 @@ +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 new file mode 100644 index 0000000..ab49c77 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.kkj.controller; + +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/alarm") +public class KkjAlarmController extends BaseController { + @Autowired + private IBusDeviceKkjService deviceKkjService; + + /** + * 开孔机报警记录分页版 + * + * @param warehouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptid 权属单位id + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + */ + @RequestMapping("/kkjRecordsPage") + @ResponseBody + public Object kkjRecordsPage(String warehouseId, String kkjCode, String deptid, String startDate, String endDate) { + Page> page = new PageFactory>().defaultPage(); + List> list = deviceKkjService.selectKkjRecordsPage(warehouseId, + kkjCode, deptid, startDate, endDate, page); + page.setRecords(list); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 开孔机报警记录不分页 + * + * @param warehouseId 仓库id + * @param date 时间 + */ + @RequestMapping("/kkjRecords") + @ResponseBody + public Object kkjRecords(String warehouseId, String date) { + List> list = deviceKkjService.selectKkjRecords(warehouseId, date); + return ResponseData.success(list); + } +} 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 39144db..5c4800b 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 @@ -1,8 +1,11 @@ package com.casic.missiles.modular.kkj.controller; +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.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -14,7 +17,7 @@ @Controller @RequestMapping("/overview") -public class KkjOverviewController { +public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; @Autowired @@ -22,42 +25,99 @@ /** * 仓库列表 + * * @return */ - @RequestMapping("/warehouseList") - @ResponseBody - public Object warehouseList(){ - DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectWareHouseList(dataScope); - return ResponseData.success(list); - } +// @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 + */ @RequestMapping("/kkjList") @ResponseBody - public Object kkjList(String id){ + public Object kkjList(String id, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id),dataScope); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } /** * 开孔机详情 - * @param keywords 关键词（开孔机编号或二类设备编号） - * @param date 日期 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 时间 * @return */ @RequestMapping("/kkjDetail") @ResponseBody - public Object kkjDetail(String keywords,String startDate, String endDate){ + public Object kkjDetail(String keywords, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjData(keywords, startDate,endDate); + List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } + /** + * 仓库列表，地图用 + * + * @param date 时间 + * @return + */ + @RequestMapping("/warehouseList") + @ResponseBody + public Object warehouseListByDate(String date) { + DataScope dataScope = permissionService.getCurrUserDataScope(); + List list = deviceKkjService.selectWarehouseListByDate(date); + return ResponseData.success(list); + } + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return + */ + @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 58d7d98..5483f33 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,17 +19,53 @@ */ public interface BusDeviceKkjMapper extends BaseMapper { - List> selectWareHouseList(@Param("dataScope")DataScope dataScope); + List> selectWareHouseList(); - List> selectKkjByWareHouse(@Param("wareHouseId")Long wareHouseId, @Param("dataScope")DataScope dataScope); + List> selectKkjByWareHouse( + @Param("wareHouseId") Long wareHouseId, + @Param("dataScope") DataScope dataScope); - List> selectKkjData(@Param("keywords")String keywords,@Param("startDate")String startDate, @Param("endDate") String endDate); + List> selectKkjData( + @Param("keywords") String keywords, + @Param("startDate") String startDate, + @Param("endDate") String endDate); - List> selectKkjDeviceListPage(@Param("devcode")String devcode,@Param("deptIds")ListdeptIds,@Param("datascope")DataScope dataScope,@Param("page") Page page); + List> selectKkjDeviceListPage( + @Param("devcode") String devcode, + @Param("deptIds") List deptIds, + @Param("datascope") DataScope dataScope, + @Param("page") Page> page); - void batchDelete(@Param("ids")List ids); + void batchDelete( + @Param("ids") List ids); - Map selectKkjByCode(@Param("kkjCode")String kkjCode); + Map selectKkjByCode( + @Param("kkjCode") String kkjCode); + List> selectKkj( + @Param("wareHouseId") Long wareHouseId); + List> selectKkjByWareHouseAndTime( + @Param("wareHouseId") Long wareHouseId, + @Param("date") String date); + + List> selectKkjDetail( + @Param("keywords") String keywords, + @Param("date") String date); + + List> selectWarehouseAllKkj(); + + List> selectWarehouseWarnKkjByTime(@Param("date") String date); + + List> selectKkjRecordsPage( + @Param("wareHouseId") String wareHouseId, + @Param("kkjCode") String kkjCode, + @Param("deptIds") List deptIds, + @Param("startDate") String startDate, + @Param("endDate") String endDate, + @Param("page") Page> page); + + List> selectKkjRecords( + @Param("wareHouseId") String wareHouseId, + @Param("date") String date); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml index 9c14246..c2232ea 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml @@ -4,40 +4,39 @@ - - - - - - - - - - + + + + + + + + + + - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version, KKJ_ID AS kkjId + ID + AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version, KKJ_ID AS kkjId @@ -101,11 +100,154 @@ + + + + + + + + + + + + + + + + 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..0ca84a6 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java @@ -0,0 +1,58 @@ +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..ed17163 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDto.java @@ -0,0 +1,77 @@ +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 366865a..5d19a67 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 @@ -3,6 +3,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.model.BusDeviceKkj; import org.apache.ibatis.annotations.Param; @@ -19,15 +21,32 @@ */ public interface IBusDeviceKkjService extends IService { - List> selectWareHouseList(DataScope dataScope); + List> selectWareHouseList(); - List> selectKkjByWareHouse(Long wareHouseId, DataScope dataScope); + List> selectKkjByWareHouse(Long wareHouseId, DataScope dataScope); - List> selectKkjData(String keywords,String startDate, String endDate); + List> selectKkjData(String keywords, String startDate, String endDate); - List> selectKkjDeviceList(String devcode, Long deptId, Page page); + List> selectKkjDeviceList(String devcode, Long deptId, Page> page); void batchDelect(List ids); - Map selectKkjByCode(@Param("kkjCode")String kkjCode); + Map selectKkjByCode(@Param("kkjCode") String kkjCode); + + //获取开孔机列表接口,地图用 + List selectKkjByWareHouseAndTime(Long wareHouseId, String date); + + //获取开孔机历史位置的详情 + List> selectKkjDetail(String keywords, String date); + + //获取仓库列表接口,地图用 + List selectWarehouseListByDate(String date); + + + //开孔机报警记录分页版 + List> selectKkjRecordsPage(String warehouseId, String kkjCode, String deptid, + String startDate, String endDate, Page> page); + + //某日开孔机报警记录，不分页 + 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 new file mode 100644 index 0000000..ab49c77 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.kkj.controller; + +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/alarm") +public class KkjAlarmController extends BaseController { + @Autowired + private IBusDeviceKkjService deviceKkjService; + + /** + * 开孔机报警记录分页版 + * + * @param warehouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptid 权属单位id + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + */ + @RequestMapping("/kkjRecordsPage") + @ResponseBody + public Object kkjRecordsPage(String warehouseId, String kkjCode, String deptid, String startDate, String endDate) { + Page> page = new PageFactory>().defaultPage(); + List> list = deviceKkjService.selectKkjRecordsPage(warehouseId, + kkjCode, deptid, startDate, endDate, page); + page.setRecords(list); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 开孔机报警记录不分页 + * + * @param warehouseId 仓库id + * @param date 时间 + */ + @RequestMapping("/kkjRecords") + @ResponseBody + public Object kkjRecords(String warehouseId, String date) { + List> list = deviceKkjService.selectKkjRecords(warehouseId, date); + return ResponseData.success(list); + } +} 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 39144db..5c4800b 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 @@ -1,8 +1,11 @@ package com.casic.missiles.modular.kkj.controller; +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.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -14,7 +17,7 @@ @Controller @RequestMapping("/overview") -public class KkjOverviewController { +public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; @Autowired @@ -22,42 +25,99 @@ /** * 仓库列表 + * * @return */ - @RequestMapping("/warehouseList") - @ResponseBody - public Object warehouseList(){ - DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectWareHouseList(dataScope); - return ResponseData.success(list); - } +// @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 + */ @RequestMapping("/kkjList") @ResponseBody - public Object kkjList(String id){ + public Object kkjList(String id, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id),dataScope); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } /** * 开孔机详情 - * @param keywords 关键词（开孔机编号或二类设备编号） - * @param date 日期 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 时间 * @return */ @RequestMapping("/kkjDetail") @ResponseBody - public Object kkjDetail(String keywords,String startDate, String endDate){ + public Object kkjDetail(String keywords, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjData(keywords, startDate,endDate); + List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } + /** + * 仓库列表，地图用 + * + * @param date 时间 + * @return + */ + @RequestMapping("/warehouseList") + @ResponseBody + public Object warehouseListByDate(String date) { + DataScope dataScope = permissionService.getCurrUserDataScope(); + List list = deviceKkjService.selectWarehouseListByDate(date); + return ResponseData.success(list); + } + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return + */ + @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 58d7d98..5483f33 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,17 +19,53 @@ */ public interface BusDeviceKkjMapper extends BaseMapper { - List> selectWareHouseList(@Param("dataScope")DataScope dataScope); + List> selectWareHouseList(); - List> selectKkjByWareHouse(@Param("wareHouseId")Long wareHouseId, @Param("dataScope")DataScope dataScope); + List> selectKkjByWareHouse( + @Param("wareHouseId") Long wareHouseId, + @Param("dataScope") DataScope dataScope); - List> selectKkjData(@Param("keywords")String keywords,@Param("startDate")String startDate, @Param("endDate") String endDate); + List> selectKkjData( + @Param("keywords") String keywords, + @Param("startDate") String startDate, + @Param("endDate") String endDate); - List> selectKkjDeviceListPage(@Param("devcode")String devcode,@Param("deptIds")ListdeptIds,@Param("datascope")DataScope dataScope,@Param("page") Page page); + List> selectKkjDeviceListPage( + @Param("devcode") String devcode, + @Param("deptIds") List deptIds, + @Param("datascope") DataScope dataScope, + @Param("page") Page> page); - void batchDelete(@Param("ids")List ids); + void batchDelete( + @Param("ids") List ids); - Map selectKkjByCode(@Param("kkjCode")String kkjCode); + Map selectKkjByCode( + @Param("kkjCode") String kkjCode); + List> selectKkj( + @Param("wareHouseId") Long wareHouseId); + List> selectKkjByWareHouseAndTime( + @Param("wareHouseId") Long wareHouseId, + @Param("date") String date); + + List> selectKkjDetail( + @Param("keywords") String keywords, + @Param("date") String date); + + List> selectWarehouseAllKkj(); + + List> selectWarehouseWarnKkjByTime(@Param("date") String date); + + List> selectKkjRecordsPage( + @Param("wareHouseId") String wareHouseId, + @Param("kkjCode") String kkjCode, + @Param("deptIds") List deptIds, + @Param("startDate") String startDate, + @Param("endDate") String endDate, + @Param("page") Page> page); + + List> selectKkjRecords( + @Param("wareHouseId") String wareHouseId, + @Param("date") String date); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml index 9c14246..c2232ea 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml @@ -4,40 +4,39 @@ - - - - - - - - - - + + + + + + + + + + - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version, KKJ_ID AS kkjId + ID + AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version, KKJ_ID AS kkjId @@ -101,11 +100,154 @@ + + + + + + + + + + + + + + + + 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..0ca84a6 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java @@ -0,0 +1,58 @@ +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..ed17163 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDto.java @@ -0,0 +1,77 @@ +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 366865a..5d19a67 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 @@ -3,6 +3,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.model.BusDeviceKkj; import org.apache.ibatis.annotations.Param; @@ -19,15 +21,32 @@ */ public interface IBusDeviceKkjService extends IService { - List> selectWareHouseList(DataScope dataScope); + List> selectWareHouseList(); - List> selectKkjByWareHouse(Long wareHouseId, DataScope dataScope); + List> selectKkjByWareHouse(Long wareHouseId, DataScope dataScope); - List> selectKkjData(String keywords,String startDate, String endDate); + List> selectKkjData(String keywords, String startDate, String endDate); - List> selectKkjDeviceList(String devcode, Long deptId, Page page); + List> selectKkjDeviceList(String devcode, Long deptId, Page> page); void batchDelect(List ids); - Map selectKkjByCode(@Param("kkjCode")String kkjCode); + Map selectKkjByCode(@Param("kkjCode") String kkjCode); + + //获取开孔机列表接口,地图用 + List selectKkjByWareHouseAndTime(Long wareHouseId, String date); + + //获取开孔机历史位置的详情 + List> selectKkjDetail(String keywords, String date); + + //获取仓库列表接口,地图用 + List selectWarehouseListByDate(String date); + + + //开孔机报警记录分页版 + List> selectKkjRecordsPage(String warehouseId, String kkjCode, String deptid, + String startDate, String endDate, Page> page); + + //某日开孔机报警记录，不分页 + 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 e60818a..a7cd5de 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,11 +7,14 @@ 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.model.BusDeviceKkj; import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -29,8 +32,8 @@ private ICommonPermissionService permissionService; @Override - public List> selectWareHouseList(DataScope dataScope) { - return this.baseMapper.selectWareHouseList(dataScope); + public List> selectWareHouseList() { + return this.baseMapper.selectWareHouseList(); } @Override @@ -40,19 +43,19 @@ @Override public List> selectKkjData(String keywords, String startDate, String endDate) { - return this.baseMapper.selectKkjData(keywords, startDate,endDate); + return this.baseMapper.selectKkjData(keywords, startDate, endDate); } @Override - public List> selectKkjDeviceList(String devcode, Long deptId, Page page) { + 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); + if (ToolUtil.isNotEmpty(deptId)) { + deptIds = permissionService.getSubDepts(deptId, null); deptIds.add(Long.valueOf(deptId)); } - List> deviceList = this.baseMapper.selectKkjDeviceListPage(devcode,deptIds,dataScope,page); + List> deviceList = this.baseMapper.selectKkjDeviceListPage(devcode, deptIds, dataScope, page); return deviceList; } @@ -63,17 +66,86 @@ @Override public Map selectKkjByCode(String kkjCode) { - Map kkj = this.baseMapper.selectKkjByCode(kkjCode); - if(ToolUtil.isNotEmpty(kkj)){ - if(ToolUtil.isNotEmpty(kkj.get("deptId"))){ + Map kkj = this.baseMapper.selectKkjByCode(kkjCode); + if (ToolUtil.isNotEmpty(kkj)) { + if (ToolUtil.isNotEmpty(kkj.get("deptId"))) { Long deptId = Long.valueOf(String.valueOf(kkj.get("deptId"))); List parentDepts = permissionService.getParentDeptIds(deptId); - if(ToolUtil.isNotEmpty(parentDepts)){ - Long companyId = parentDepts.get(parentDepts.size()-1); - kkj.put("companyId",companyId); + if (ToolUtil.isNotEmpty(parentDepts)) { + Long companyId = parentDepts.get(parentDepts.size() - 1); + kkj.put("companyId", companyId); } } } return kkj; } + + @Override + public List selectWarehouseListByDate(String date) { + List> allKkj = this.baseMapper.selectWarehouseAllKkj(); + List> warnKkj = this.baseMapper.selectWarehouseWarnKkjByTime(date); + List listDtos = new ArrayList<>(); + for (Map objectMap : allKkj) { + if (objectMap != null) { + WarehouseListDto warehouseListDto = new WarehouseListDto(objectMap); + Object allDevices = objectMap.get("allDevices"); + warehouseListDto.setAllDevices(allDevices == null ? 0 : Integer.parseInt(allDevices.toString())); + + for (Map warnKkjMap : warnKkj) { + if (warnKkjMap != null) { + if (warehouseListDto.getDeptId().equals(warnKkjMap.get("deptId").toString())) { + Object alarmDevices = warnKkjMap.get("alarmDevices"); + warehouseListDto.setAlarmDevices(alarmDevices == null ? 0 : Integer.parseInt(alarmDevices.toString())); + } + } + } + listDtos.add(warehouseListDto); + } + } + return listDtos; + } + + @Override + public List selectKkjByWareHouseAndTime(Long wareHouseId, String date) { + List> allKkj = this.baseMapper.selectKkj(wareHouseId); + List> warnKkj = this.baseMapper.selectKkjByWareHouseAndTime(wareHouseId, date); + List listDtos = new ArrayList<>(); + for (Map objectMap : allKkj) { + if (objectMap != null) { + KkjListDto kkjListDto = new KkjListDto(objectMap); + + for (Map warnKkjMap : warnKkj) { + if (kkjListDto.getDevcode().equals(warnKkjMap.get("devcode").toString())) { + kkjListDto.setFlag("1"); + } + } + listDtos.add(kkjListDto); + } + } + return listDtos; + } + + @Override + public List> selectKkjDetail(String keywords, String date) { + return this.baseMapper.selectKkjDetail(keywords, date); + } + + @Override + public List> selectKkjRecordsPage(String warehouseId, String kkjCode, String deptid, + String startDate, String endDate, Page> page) { + DataScope dataScope = permissionService.getCurrUserDataScope(); + // 权属单位 / 使用单位 + List deptIds = null; + if (ToolUtil.isNotEmpty(deptid)) { + deptIds = permissionService.getSubDepts(deptid, null); + deptIds.add(Long.valueOf(deptid)); + } + return this.baseMapper.selectKkjRecordsPage(warehouseId, kkjCode, deptIds, startDate, endDate, page); + } + + @Override + public List> selectKkjRecords(String wareHouseId, String date) { + DataScope dataScope = permissionService.getCurrUserDataScope(); + return this.baseMapper.selectKkjRecords(wareHouseId, 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 new file mode 100644 index 0000000..ab49c77 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/controller/KkjAlarmController.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.kkj.controller; + +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.core.common.constant.factory.PageFactory; +import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.Map; + +@Controller +@RequestMapping("/alarm") +public class KkjAlarmController extends BaseController { + @Autowired + private IBusDeviceKkjService deviceKkjService; + + /** + * 开孔机报警记录分页版 + * + * @param warehouseId 仓库id + * @param kkjCode 开孔机编号 + * @param deptid 权属单位id + * @param startDate 开始日期 (格式：yyyy-MM-dd) + * @param endDate 结束日期 (格式：yyyy-MM-dd) + */ + @RequestMapping("/kkjRecordsPage") + @ResponseBody + public Object kkjRecordsPage(String warehouseId, String kkjCode, String deptid, String startDate, String endDate) { + Page> page = new PageFactory>().defaultPage(); + List> list = deviceKkjService.selectKkjRecordsPage(warehouseId, + kkjCode, deptid, startDate, endDate, page); + page.setRecords(list); + return ResponseData.success(super.packForBT(page)); + } + + /** + * 开孔机报警记录不分页 + * + * @param warehouseId 仓库id + * @param date 时间 + */ + @RequestMapping("/kkjRecords") + @ResponseBody + public Object kkjRecords(String warehouseId, String date) { + List> list = deviceKkjService.selectKkjRecords(warehouseId, date); + return ResponseData.success(list); + } +} 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 39144db..5c4800b 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 @@ -1,8 +1,11 @@ package com.casic.missiles.modular.kkj.controller; +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.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -14,7 +17,7 @@ @Controller @RequestMapping("/overview") -public class KkjOverviewController { +public class KkjOverviewController extends BaseController { @Autowired private IBusDeviceKkjService deviceKkjService; @Autowired @@ -22,42 +25,99 @@ /** * 仓库列表 + * * @return */ - @RequestMapping("/warehouseList") - @ResponseBody - public Object warehouseList(){ - DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectWareHouseList(dataScope); - return ResponseData.success(list); - } +// @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 + */ @RequestMapping("/kkjList") @ResponseBody - public Object kkjList(String id){ + public Object kkjList(String id, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjByWareHouse(Long.valueOf(id),dataScope); + List list = deviceKkjService.selectKkjByWareHouseAndTime(Long.valueOf(id), date); return ResponseData.success(list); } /** * 开孔机详情 - * @param keywords 关键词（开孔机编号或二类设备编号） - * @param date 日期 + * + * @param keywords 关键词（开孔机编号或二类设备编号） + * @param date 时间 * @return */ @RequestMapping("/kkjDetail") @ResponseBody - public Object kkjDetail(String keywords,String startDate, String endDate){ + public Object kkjDetail(String keywords, String date) { DataScope dataScope = permissionService.getCurrUserDataScope(); - List> list = deviceKkjService.selectKkjData(keywords, startDate,endDate); + List> list = deviceKkjService.selectKkjDetail(keywords, date); return ResponseData.success(list); } + /** + * 仓库列表，地图用 + * + * @param date 时间 + * @return + */ + @RequestMapping("/warehouseList") + @ResponseBody + public Object warehouseListByDate(String date) { + DataScope dataScope = permissionService.getCurrUserDataScope(); + List list = deviceKkjService.selectWarehouseListByDate(date); + return ResponseData.success(list); + } + /** + * 获取仓库列表接口，下拉菜单用 + * + * @return + */ + @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 58d7d98..5483f33 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,17 +19,53 @@ */ public interface BusDeviceKkjMapper extends BaseMapper { - List> selectWareHouseList(@Param("dataScope")DataScope dataScope); + List> selectWareHouseList(); - List> selectKkjByWareHouse(@Param("wareHouseId")Long wareHouseId, @Param("dataScope")DataScope dataScope); + List> selectKkjByWareHouse( + @Param("wareHouseId") Long wareHouseId, + @Param("dataScope") DataScope dataScope); - List> selectKkjData(@Param("keywords")String keywords,@Param("startDate")String startDate, @Param("endDate") String endDate); + List> selectKkjData( + @Param("keywords") String keywords, + @Param("startDate") String startDate, + @Param("endDate") String endDate); - List> selectKkjDeviceListPage(@Param("devcode")String devcode,@Param("deptIds")ListdeptIds,@Param("datascope")DataScope dataScope,@Param("page") Page page); + List> selectKkjDeviceListPage( + @Param("devcode") String devcode, + @Param("deptIds") List deptIds, + @Param("datascope") DataScope dataScope, + @Param("page") Page> page); - void batchDelete(@Param("ids")List ids); + void batchDelete( + @Param("ids") List ids); - Map selectKkjByCode(@Param("kkjCode")String kkjCode); + Map selectKkjByCode( + @Param("kkjCode") String kkjCode); + List> selectKkj( + @Param("wareHouseId") Long wareHouseId); + List> selectKkjByWareHouseAndTime( + @Param("wareHouseId") Long wareHouseId, + @Param("date") String date); + + List> selectKkjDetail( + @Param("keywords") String keywords, + @Param("date") String date); + + List> selectWarehouseAllKkj(); + + List> selectWarehouseWarnKkjByTime(@Param("date") String date); + + List> selectKkjRecordsPage( + @Param("wareHouseId") String wareHouseId, + @Param("kkjCode") String kkjCode, + @Param("deptIds") List deptIds, + @Param("startDate") String startDate, + @Param("endDate") String endDate, + @Param("page") Page> page); + + List> selectKkjRecords( + @Param("wareHouseId") String wareHouseId, + @Param("date") String date); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml index 9c14246..c2232ea 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dao/mapping/BusDeviceKkjMapper.xml @@ -4,40 +4,39 @@ - - - - - - - - - - + + + + + + + + + + - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version, KKJ_ID AS kkjId + ID + AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version, KKJ_ID AS kkjId @@ -101,11 +100,154 @@ + + + + + + + + + + + + + + + + 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..0ca84a6 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/KkjListDto.java @@ -0,0 +1,58 @@ +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..ed17163 --- /dev/null +++ b/casic-device/src/main/java/com/casic/missiles/modular/kkj/dto/WarehouseListDto.java @@ -0,0 +1,77 @@ +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 366865a..5d19a67 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 @@ -3,6 +3,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.model.BusDeviceKkj; import org.apache.ibatis.annotations.Param; @@ -19,15 +21,32 @@ */ public interface IBusDeviceKkjService extends IService { - List> selectWareHouseList(DataScope dataScope); + List> selectWareHouseList(); - List> selectKkjByWareHouse(Long wareHouseId, DataScope dataScope); + List> selectKkjByWareHouse(Long wareHouseId, DataScope dataScope); - List> selectKkjData(String keywords,String startDate, String endDate); + List> selectKkjData(String keywords, String startDate, String endDate); - List> selectKkjDeviceList(String devcode, Long deptId, Page page); + List> selectKkjDeviceList(String devcode, Long deptId, Page> page); void batchDelect(List ids); - Map selectKkjByCode(@Param("kkjCode")String kkjCode); + Map selectKkjByCode(@Param("kkjCode") String kkjCode); + + //获取开孔机列表接口,地图用 + List selectKkjByWareHouseAndTime(Long wareHouseId, String date); + + //获取开孔机历史位置的详情 + List> selectKkjDetail(String keywords, String date); + + //获取仓库列表接口,地图用 + List selectWarehouseListByDate(String date); + + + //开孔机报警记录分页版 + List> selectKkjRecordsPage(String warehouseId, String kkjCode, String deptid, + String startDate, String endDate, Page> page); + + //某日开孔机报警记录，不分页 + 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 e60818a..a7cd5de 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,11 +7,14 @@ 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.model.BusDeviceKkj; import com.casic.missiles.modular.kkj.service.IBusDeviceKkjService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -29,8 +32,8 @@ private ICommonPermissionService permissionService; @Override - public List> selectWareHouseList(DataScope dataScope) { - return this.baseMapper.selectWareHouseList(dataScope); + public List> selectWareHouseList() { + return this.baseMapper.selectWareHouseList(); } @Override @@ -40,19 +43,19 @@ @Override public List> selectKkjData(String keywords, String startDate, String endDate) { - return this.baseMapper.selectKkjData(keywords, startDate,endDate); + return this.baseMapper.selectKkjData(keywords, startDate, endDate); } @Override - public List> selectKkjDeviceList(String devcode, Long deptId, Page page) { + 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); + if (ToolUtil.isNotEmpty(deptId)) { + deptIds = permissionService.getSubDepts(deptId, null); deptIds.add(Long.valueOf(deptId)); } - List> deviceList = this.baseMapper.selectKkjDeviceListPage(devcode,deptIds,dataScope,page); + List> deviceList = this.baseMapper.selectKkjDeviceListPage(devcode, deptIds, dataScope, page); return deviceList; } @@ -63,17 +66,86 @@ @Override public Map selectKkjByCode(String kkjCode) { - Map kkj = this.baseMapper.selectKkjByCode(kkjCode); - if(ToolUtil.isNotEmpty(kkj)){ - if(ToolUtil.isNotEmpty(kkj.get("deptId"))){ + Map kkj = this.baseMapper.selectKkjByCode(kkjCode); + if (ToolUtil.isNotEmpty(kkj)) { + if (ToolUtil.isNotEmpty(kkj.get("deptId"))) { Long deptId = Long.valueOf(String.valueOf(kkj.get("deptId"))); List parentDepts = permissionService.getParentDeptIds(deptId); - if(ToolUtil.isNotEmpty(parentDepts)){ - Long companyId = parentDepts.get(parentDepts.size()-1); - kkj.put("companyId",companyId); + if (ToolUtil.isNotEmpty(parentDepts)) { + Long companyId = parentDepts.get(parentDepts.size() - 1); + kkj.put("companyId", companyId); } } } return kkj; } + + @Override + public List selectWarehouseListByDate(String date) { + List> allKkj = this.baseMapper.selectWarehouseAllKkj(); + List> warnKkj = this.baseMapper.selectWarehouseWarnKkjByTime(date); + List listDtos = new ArrayList<>(); + for (Map objectMap : allKkj) { + if (objectMap != null) { + WarehouseListDto warehouseListDto = new WarehouseListDto(objectMap); + Object allDevices = objectMap.get("allDevices"); + warehouseListDto.setAllDevices(allDevices == null ? 0 : Integer.parseInt(allDevices.toString())); + + for (Map warnKkjMap : warnKkj) { + if (warnKkjMap != null) { + if (warehouseListDto.getDeptId().equals(warnKkjMap.get("deptId").toString())) { + Object alarmDevices = warnKkjMap.get("alarmDevices"); + warehouseListDto.setAlarmDevices(alarmDevices == null ? 0 : Integer.parseInt(alarmDevices.toString())); + } + } + } + listDtos.add(warehouseListDto); + } + } + return listDtos; + } + + @Override + public List selectKkjByWareHouseAndTime(Long wareHouseId, String date) { + List> allKkj = this.baseMapper.selectKkj(wareHouseId); + List> warnKkj = this.baseMapper.selectKkjByWareHouseAndTime(wareHouseId, date); + List listDtos = new ArrayList<>(); + for (Map objectMap : allKkj) { + if (objectMap != null) { + KkjListDto kkjListDto = new KkjListDto(objectMap); + + for (Map warnKkjMap : warnKkj) { + if (kkjListDto.getDevcode().equals(warnKkjMap.get("devcode").toString())) { + kkjListDto.setFlag("1"); + } + } + listDtos.add(kkjListDto); + } + } + return listDtos; + } + + @Override + public List> selectKkjDetail(String keywords, String date) { + return this.baseMapper.selectKkjDetail(keywords, date); + } + + @Override + public List> selectKkjRecordsPage(String warehouseId, String kkjCode, String deptid, + String startDate, String endDate, Page> page) { + DataScope dataScope = permissionService.getCurrUserDataScope(); + // 权属单位 / 使用单位 + List deptIds = null; + if (ToolUtil.isNotEmpty(deptid)) { + deptIds = permissionService.getSubDepts(deptid, null); + deptIds.add(Long.valueOf(deptid)); + } + return this.baseMapper.selectKkjRecordsPage(warehouseId, kkjCode, deptIds, startDate, endDate, page); + } + + @Override + public List> selectKkjRecords(String wareHouseId, String date) { + DataScope dataScope = permissionService.getCurrUserDataScope(); + return this.baseMapper.selectKkjRecords(wareHouseId, date); + } } 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 bb0508e..ef1a9a9 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 @@ -20,21 +20,30 @@ as INSTALLDATE - DATE_FORMAT(INSTALLDATE,'%Y-%m-%d') + DATE_FORMAT + (INSTALLDATE,'%Y-%m-%d') - to_char(INSTALLDATE,'yyyy-MM-dd') + to_char + (INSTALLDATE,'yyyy-MM-dd') - ID AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version + ID + AS id, DEVCODE AS devcode, DEVICE_NAME AS deviceName, ONLINE_STATE AS onlineState, DEVICE_TYPE AS deviceType, VALID AS valid, INSTALL_DATE AS installDate, LOGTIME AS logtime, VERSION AS version - - DATE_FORMAT(LOGTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(LOGTIME,'yyyy-mm-dd hh24:mi:ss') - - - DATE_FORMAT(UPTIME,'%Y-%m-%d %H:%i:%S') - - - to_char(UPTIME,'yyyy-mm-dd hh24:mi:ss') - + + + + DATE_FORMAT + (LOGTIME,'%Y-%m-%d %H:%i:%S') + + + to_char + (LOGTIME,'yyyy-mm-dd hh24:mi:ss') + + + DATE_FORMAT + (UPTIME,'%Y-%m-%d %H:%i:%S') + + + to_char + (UPTIME,'yyyy-mm-dd hh24:mi:ss') + - + - SELECT - glview.DEVCODE AS devcode , - bd.DEVICE_TYPE AS deviceType, - bdt.TYPE_NAME AS deviceTypeName, - bwi.DEPTID AS deptid, - glview.WELL_CODE AS wellCode, - glview.DESCN AS descn, - glview.CELL AS cell, - DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, - DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, - glview.DATA AS data + glview.DEVCODE AS devcode , + bd.DEVICE_TYPE AS deviceType, + bdt.TYPE_NAME AS deviceTypeName, + bwi.DEPTID AS deptid, + glview.WELL_CODE AS wellCode, + glview.DESCN AS descn, + glview.CELL AS cell, + DATE_FORMAT(glview.UPTIME,'%Y-%m-%d %H:%i:%S') AS uptime, + DATE_FORMAT(glview.LOGTIME,'%Y-%m-%d %H:%i:%S') AS logtime, + glview.DATA AS data FROM - gasliquid_view glview - INNER JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE - INNER JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE - INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID + gasliquid_view glview + INNER JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + INNER JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE + INNER JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' and glview.TYPE = #{sensorType} - + and bwi.DEPTID in @@ -303,7 +316,7 @@ ORDER BY glview.UPTIME DESC - SELECT glview.DEVCODE AS devcode , bd.DEVICE_TYPE AS deviceType, @@ -349,7 +362,7 @@ ORDER BY glview.UPTIME DESC - SELECT glview.DEVCODE AS devcode , bd.DEVICE_TYPE AS deviceType, @@ -419,7 +432,7 @@ bwi.VALID = '1' - + and bwi.DEPTID in @@ -466,7 +479,7 @@ bwi.VALID = '1' - + and bwi.DEPTID in @@ -517,7 +530,7 @@ bwi.VALID = '1' - + and bwi.DEPTID in @@ -564,7 +577,7 @@ bwi.VALID = '1' - + and bwi.DEPTID in @@ -592,160 +605,160 @@ - + select count(*) from bus_device a - left join bus_device_well b on a.ID = b.DEVICE_ID - LEFT JOIN bus_well_info c on b.WELL_ID = c.ID - LEFT JOIN sys_dept d on c.DEPTID = d.id - WHERE a.VALID = '1' and b.VALID = '1' and c.VALID = '1' - and (d.id = #{deptId} or d.pid = #{deptId}) + left join bus_device_well b on a.ID = b.DEVICE_ID + LEFT JOIN bus_well_info c on b.WELL_ID = c.ID + LEFT JOIN sys_dept d on c.DEPTID = d.id + WHERE a.VALID = '1' + and b.VALID = '1' + and c.VALID = '1' + and (d.id = #{deptId} or d.pid = #{deptId}) - '%' || #{keywords}|| '%' + '%' || + #{keywords} + || + '%' - CONCAT('%',#{keywords},'%') + CONCAT + ('%', + #{keywords}, + '%' + ) - TO_DATE(#{beginTime},'yyyy-mm-dd hh24:mi:ss') + TO_DATE + ( + #{beginTime}, + 'yyyy-mm-dd hh24:mi:ss' + ) - TO_DATE(#{endTime},'yyyy-mm-dd hh24:mi:ss') + TO_DATE + ( + #{endTime}, + 'yyyy-mm-dd hh24:mi:ss' + ) #{endTime} - #{beginTime} + #{beginTime} - update bus_device set JOB_GENERATION_TYPE =#{jobGenerationType} where id=#{id} + update bus_device + set JOB_GENERATION_TYPE =#{jobGenerationType} + where id = #{id} - update bus_device set JOB_GENERATION_TYPE =#{jobGenerationType} + update bus_device + set JOB_GENERATION_TYPE =#{jobGenerationType}