diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index 160484c..1a1605d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -1,16 +1,20 @@ package com.casic.missiles.modular.system.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.core.exception.GunsException; import com.casic.missiles.core.exception.GunsExceptionEnum; import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dto.AlarmNowView; +import com.casic.missiles.modular.system.dto.DeviceDto; import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IBusWellInfoService; +import com.casic.missiles.modular.system.service.IDeviceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -42,6 +46,9 @@ @Autowired private IBusWellInfoService busWellInfoService; + @Autowired + private IDeviceService deviceService; + /** * 获取当前全部告警列表 */ @@ -106,4 +113,19 @@ return successResult; } + /** + * 获取闸井信息及其关联设备信息 + */ + @RequestMapping(value = "/wellMapping", method = RequestMethod.GET) + @ResponseBody + public Object wellMapping(String devType, String keywords) { + List list = deviceService.selectDeviceForMap(devType, keywords); +// list.forEach(deviceDto -> { +// deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); +// deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); +// }); + + return ResponseData.success(list); + } + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index 160484c..1a1605d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -1,16 +1,20 @@ package com.casic.missiles.modular.system.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.core.exception.GunsException; import com.casic.missiles.core.exception.GunsExceptionEnum; import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dto.AlarmNowView; +import com.casic.missiles.modular.system.dto.DeviceDto; import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IBusWellInfoService; +import com.casic.missiles.modular.system.service.IDeviceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -42,6 +46,9 @@ @Autowired private IBusWellInfoService busWellInfoService; + @Autowired + private IDeviceService deviceService; + /** * 获取当前全部告警列表 */ @@ -106,4 +113,19 @@ return successResult; } + /** + * 获取闸井信息及其关联设备信息 + */ + @RequestMapping(value = "/wellMapping", method = RequestMethod.GET) + @ResponseBody + public Object wellMapping(String devType, String keywords) { + List list = deviceService.selectDeviceForMap(devType, keywords); +// list.forEach(deviceDto -> { +// deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); +// deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); +// }); + + return ResponseData.success(list); + } + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 30ea081..691b103 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -67,9 +68,31 @@ @ResponseBody public Object deviceStaticsByType(){ DataScope dataScope = permissionService.getCurrUserDataScope(); + List> returnList = new ArrayList<>(); try{ List> res = statisticsService.deviceStaticsByType(dataScope); - return ResponseData.success(res); + + String vavleCount = "0"; + for (Map devItem : res) { + if (devItem.get("deviceType").toString().contains("水表")) { + vavleCount = devItem.get("deviceCount").toString(); + } + if (devItem.get("deviceType").toString().contains("阀门")) { + continue; + } + + returnList.add(devItem); + } + Map marker = new HashMap<>(); + marker.put("deviceType", "电子标识"); + marker.put("deviceCount", "10"); + Map vavle = new HashMap<>(); + vavle.put("deviceType", "阀门"); + vavle.put("deviceCount", vavleCount); + + returnList.add(marker); + returnList.add(vavle); + return ResponseData.success(returnList); }catch (Exception e){ e.printStackTrace(); return ResponseData.error("faliure"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index 160484c..1a1605d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -1,16 +1,20 @@ package com.casic.missiles.modular.system.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.core.exception.GunsException; import com.casic.missiles.core.exception.GunsExceptionEnum; import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dto.AlarmNowView; +import com.casic.missiles.modular.system.dto.DeviceDto; import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IBusWellInfoService; +import com.casic.missiles.modular.system.service.IDeviceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -42,6 +46,9 @@ @Autowired private IBusWellInfoService busWellInfoService; + @Autowired + private IDeviceService deviceService; + /** * 获取当前全部告警列表 */ @@ -106,4 +113,19 @@ return successResult; } + /** + * 获取闸井信息及其关联设备信息 + */ + @RequestMapping(value = "/wellMapping", method = RequestMethod.GET) + @ResponseBody + public Object wellMapping(String devType, String keywords) { + List list = deviceService.selectDeviceForMap(devType, keywords); +// list.forEach(deviceDto -> { +// deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); +// deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); +// }); + + return ResponseData.success(list); + } + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 30ea081..691b103 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -67,9 +68,31 @@ @ResponseBody public Object deviceStaticsByType(){ DataScope dataScope = permissionService.getCurrUserDataScope(); + List> returnList = new ArrayList<>(); try{ List> res = statisticsService.deviceStaticsByType(dataScope); - return ResponseData.success(res); + + String vavleCount = "0"; + for (Map devItem : res) { + if (devItem.get("deviceType").toString().contains("水表")) { + vavleCount = devItem.get("deviceCount").toString(); + } + if (devItem.get("deviceType").toString().contains("阀门")) { + continue; + } + + returnList.add(devItem); + } + Map marker = new HashMap<>(); + marker.put("deviceType", "电子标识"); + marker.put("deviceCount", "10"); + Map vavle = new HashMap<>(); + vavle.put("deviceType", "阀门"); + vavle.put("deviceCount", vavleCount); + + returnList.add(marker); + returnList.add(vavle); + return ResponseData.success(returnList); }catch (Exception e){ e.printStackTrace(); return ResponseData.error("faliure"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java index 47f2af1..c9f96ab 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; import java.util.Map; @Controller @@ -23,7 +24,7 @@ */ @RequestMapping(value = "/edit") @ResponseBody - public Object edit(@RequestBody(required = true) Map obj) { + public Object edit(@RequestBody(required = true) List> obj) { return ResponseData.success(waterNotesService.edit(obj)); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index 160484c..1a1605d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -1,16 +1,20 @@ package com.casic.missiles.modular.system.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.core.exception.GunsException; import com.casic.missiles.core.exception.GunsExceptionEnum; import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dto.AlarmNowView; +import com.casic.missiles.modular.system.dto.DeviceDto; import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IBusWellInfoService; +import com.casic.missiles.modular.system.service.IDeviceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -42,6 +46,9 @@ @Autowired private IBusWellInfoService busWellInfoService; + @Autowired + private IDeviceService deviceService; + /** * 获取当前全部告警列表 */ @@ -106,4 +113,19 @@ return successResult; } + /** + * 获取闸井信息及其关联设备信息 + */ + @RequestMapping(value = "/wellMapping", method = RequestMethod.GET) + @ResponseBody + public Object wellMapping(String devType, String keywords) { + List list = deviceService.selectDeviceForMap(devType, keywords); +// list.forEach(deviceDto -> { +// deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); +// deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); +// }); + + return ResponseData.success(list); + } + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 30ea081..691b103 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -67,9 +68,31 @@ @ResponseBody public Object deviceStaticsByType(){ DataScope dataScope = permissionService.getCurrUserDataScope(); + List> returnList = new ArrayList<>(); try{ List> res = statisticsService.deviceStaticsByType(dataScope); - return ResponseData.success(res); + + String vavleCount = "0"; + for (Map devItem : res) { + if (devItem.get("deviceType").toString().contains("水表")) { + vavleCount = devItem.get("deviceCount").toString(); + } + if (devItem.get("deviceType").toString().contains("阀门")) { + continue; + } + + returnList.add(devItem); + } + Map marker = new HashMap<>(); + marker.put("deviceType", "电子标识"); + marker.put("deviceCount", "10"); + Map vavle = new HashMap<>(); + vavle.put("deviceType", "阀门"); + vavle.put("deviceCount", vavleCount); + + returnList.add(marker); + returnList.add(vavle); + return ResponseData.success(returnList); }catch (Exception e){ e.printStackTrace(); return ResponseData.error("faliure"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java index 47f2af1..c9f96ab 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; import java.util.Map; @Controller @@ -23,7 +24,7 @@ */ @RequestMapping(value = "/edit") @ResponseBody - public Object edit(@RequestBody(required = true) Map obj) { + public Object edit(@RequestBody(required = true) List> obj) { return ResponseData.success(waterNotesService.edit(obj)); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java index fd4a1d3..10178db 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.service; +import java.util.List; import java.util.Map; public interface IWaterNotesService { Map list(); - boolean edit(Map obj); + boolean edit(List> obj); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index 160484c..1a1605d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -1,16 +1,20 @@ package com.casic.missiles.modular.system.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.core.exception.GunsException; import com.casic.missiles.core.exception.GunsExceptionEnum; import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dto.AlarmNowView; +import com.casic.missiles.modular.system.dto.DeviceDto; import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IBusWellInfoService; +import com.casic.missiles.modular.system.service.IDeviceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -42,6 +46,9 @@ @Autowired private IBusWellInfoService busWellInfoService; + @Autowired + private IDeviceService deviceService; + /** * 获取当前全部告警列表 */ @@ -106,4 +113,19 @@ return successResult; } + /** + * 获取闸井信息及其关联设备信息 + */ + @RequestMapping(value = "/wellMapping", method = RequestMethod.GET) + @ResponseBody + public Object wellMapping(String devType, String keywords) { + List list = deviceService.selectDeviceForMap(devType, keywords); +// list.forEach(deviceDto -> { +// deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); +// deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); +// }); + + return ResponseData.success(list); + } + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 30ea081..691b103 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -67,9 +68,31 @@ @ResponseBody public Object deviceStaticsByType(){ DataScope dataScope = permissionService.getCurrUserDataScope(); + List> returnList = new ArrayList<>(); try{ List> res = statisticsService.deviceStaticsByType(dataScope); - return ResponseData.success(res); + + String vavleCount = "0"; + for (Map devItem : res) { + if (devItem.get("deviceType").toString().contains("水表")) { + vavleCount = devItem.get("deviceCount").toString(); + } + if (devItem.get("deviceType").toString().contains("阀门")) { + continue; + } + + returnList.add(devItem); + } + Map marker = new HashMap<>(); + marker.put("deviceType", "电子标识"); + marker.put("deviceCount", "10"); + Map vavle = new HashMap<>(); + vavle.put("deviceType", "阀门"); + vavle.put("deviceCount", vavleCount); + + returnList.add(marker); + returnList.add(vavle); + return ResponseData.success(returnList); }catch (Exception e){ e.printStackTrace(); return ResponseData.error("faliure"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java index 47f2af1..c9f96ab 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; import java.util.Map; @Controller @@ -23,7 +24,7 @@ */ @RequestMapping(value = "/edit") @ResponseBody - public Object edit(@RequestBody(required = true) Map obj) { + public Object edit(@RequestBody(required = true) List> obj) { return ResponseData.success(waterNotesService.edit(obj)); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java index fd4a1d3..10178db 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.service; +import java.util.List; import java.util.Map; public interface IWaterNotesService { Map list(); - boolean edit(Map obj); + boolean edit(List> obj); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java index 1ad245b..7fe4aaa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java @@ -1,10 +1,12 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.fastjson.JSONArray; import com.casic.missiles.modular.system.dao.WaterNotesMapper; import com.casic.missiles.modular.system.service.IWaterNotesService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; import java.util.Map; @Service @@ -18,8 +20,8 @@ } @Override - public boolean edit(Map obj) { - waterNotesMapper.edit(obj.get("list").toString()); + public boolean edit(List> obj) { + waterNotesMapper.edit(JSONArray.toJSON(obj).toString()); return true; } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index 160484c..1a1605d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -1,16 +1,20 @@ package com.casic.missiles.modular.system.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.core.exception.GunsException; import com.casic.missiles.core.exception.GunsExceptionEnum; import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dto.AlarmNowView; +import com.casic.missiles.modular.system.dto.DeviceDto; import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IBusWellInfoService; +import com.casic.missiles.modular.system.service.IDeviceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -42,6 +46,9 @@ @Autowired private IBusWellInfoService busWellInfoService; + @Autowired + private IDeviceService deviceService; + /** * 获取当前全部告警列表 */ @@ -106,4 +113,19 @@ return successResult; } + /** + * 获取闸井信息及其关联设备信息 + */ + @RequestMapping(value = "/wellMapping", method = RequestMethod.GET) + @ResponseBody + public Object wellMapping(String devType, String keywords) { + List list = deviceService.selectDeviceForMap(devType, keywords); +// list.forEach(deviceDto -> { +// deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); +// deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); +// }); + + return ResponseData.success(list); + } + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 30ea081..691b103 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -67,9 +68,31 @@ @ResponseBody public Object deviceStaticsByType(){ DataScope dataScope = permissionService.getCurrUserDataScope(); + List> returnList = new ArrayList<>(); try{ List> res = statisticsService.deviceStaticsByType(dataScope); - return ResponseData.success(res); + + String vavleCount = "0"; + for (Map devItem : res) { + if (devItem.get("deviceType").toString().contains("水表")) { + vavleCount = devItem.get("deviceCount").toString(); + } + if (devItem.get("deviceType").toString().contains("阀门")) { + continue; + } + + returnList.add(devItem); + } + Map marker = new HashMap<>(); + marker.put("deviceType", "电子标识"); + marker.put("deviceCount", "10"); + Map vavle = new HashMap<>(); + vavle.put("deviceType", "阀门"); + vavle.put("deviceCount", vavleCount); + + returnList.add(marker); + returnList.add(vavle); + return ResponseData.success(returnList); }catch (Exception e){ e.printStackTrace(); return ResponseData.error("faliure"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java index 47f2af1..c9f96ab 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; import java.util.Map; @Controller @@ -23,7 +24,7 @@ */ @RequestMapping(value = "/edit") @ResponseBody - public Object edit(@RequestBody(required = true) Map obj) { + public Object edit(@RequestBody(required = true) List> obj) { return ResponseData.success(waterNotesService.edit(obj)); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java index fd4a1d3..10178db 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.service; +import java.util.List; import java.util.Map; public interface IWaterNotesService { Map list(); - boolean edit(Map obj); + boolean edit(List> obj); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java index 1ad245b..7fe4aaa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java @@ -1,10 +1,12 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.fastjson.JSONArray; import com.casic.missiles.modular.system.dao.WaterNotesMapper; import com.casic.missiles.modular.system.service.IWaterNotesService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; import java.util.Map; @Service @@ -18,8 +20,8 @@ } @Override - public boolean edit(Map obj) { - waterNotesMapper.edit(obj.get("list").toString()); + public boolean edit(List> obj) { + waterNotesMapper.edit(JSONArray.toJSON(obj).toString()); return true; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index 17556c7..9215168 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -56,21 +56,21 @@ if (dayMeter == null) { deviceDto.setDayCount("0"); } else { - deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString()); + deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE") == null ? "0" : dayMeter.get("FLOW_ACC_DATE").toString()); } Map monthMeter = deviceService.selectWaterMeterMonth(deviceDto.getDevcode(), date.substring(0, 7)); if (monthMeter == null) { deviceDto.setMonthCount("0"); } else { - deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString()); + deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH") == null ? "0" : monthMeter.get("FLOW_ACC_MONTH").toString()); } Map totalMeter = deviceService.selectWaterMeterTotal(deviceDto.getDevcode(), date.substring(0, 4)); if (totalMeter == null) { deviceDto.setTotalCount("0"); } else { - deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString()); + deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL") == null ? "0" : totalMeter.get("FLOW_ACC_TOTAL").toString()); } Map meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode()); @@ -78,7 +78,7 @@ deviceDto.setWatchNum("0"); deviceDto.setUptime(sdf4.format(new Date())); } else { - deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString()); + deviceDto.setWatchNum(meterRec.get("FLOW_ACC") == null ? "0" : meterRec.get("FLOW_ACC").toString()); deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME"))); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index 160484c..1a1605d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -1,16 +1,20 @@ package com.casic.missiles.modular.system.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.core.exception.GunsException; import com.casic.missiles.core.exception.GunsExceptionEnum; import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dto.AlarmNowView; +import com.casic.missiles.modular.system.dto.DeviceDto; import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IBusWellInfoService; +import com.casic.missiles.modular.system.service.IDeviceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -42,6 +46,9 @@ @Autowired private IBusWellInfoService busWellInfoService; + @Autowired + private IDeviceService deviceService; + /** * 获取当前全部告警列表 */ @@ -106,4 +113,19 @@ return successResult; } + /** + * 获取闸井信息及其关联设备信息 + */ + @RequestMapping(value = "/wellMapping", method = RequestMethod.GET) + @ResponseBody + public Object wellMapping(String devType, String keywords) { + List list = deviceService.selectDeviceForMap(devType, keywords); +// list.forEach(deviceDto -> { +// deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); +// deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); +// }); + + return ResponseData.success(list); + } + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 30ea081..691b103 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -67,9 +68,31 @@ @ResponseBody public Object deviceStaticsByType(){ DataScope dataScope = permissionService.getCurrUserDataScope(); + List> returnList = new ArrayList<>(); try{ List> res = statisticsService.deviceStaticsByType(dataScope); - return ResponseData.success(res); + + String vavleCount = "0"; + for (Map devItem : res) { + if (devItem.get("deviceType").toString().contains("水表")) { + vavleCount = devItem.get("deviceCount").toString(); + } + if (devItem.get("deviceType").toString().contains("阀门")) { + continue; + } + + returnList.add(devItem); + } + Map marker = new HashMap<>(); + marker.put("deviceType", "电子标识"); + marker.put("deviceCount", "10"); + Map vavle = new HashMap<>(); + vavle.put("deviceType", "阀门"); + vavle.put("deviceCount", vavleCount); + + returnList.add(marker); + returnList.add(vavle); + return ResponseData.success(returnList); }catch (Exception e){ e.printStackTrace(); return ResponseData.error("faliure"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java index 47f2af1..c9f96ab 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; import java.util.Map; @Controller @@ -23,7 +24,7 @@ */ @RequestMapping(value = "/edit") @ResponseBody - public Object edit(@RequestBody(required = true) Map obj) { + public Object edit(@RequestBody(required = true) List> obj) { return ResponseData.success(waterNotesService.edit(obj)); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java index fd4a1d3..10178db 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.service; +import java.util.List; import java.util.Map; public interface IWaterNotesService { Map list(); - boolean edit(Map obj); + boolean edit(List> obj); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java index 1ad245b..7fe4aaa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java @@ -1,10 +1,12 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.fastjson.JSONArray; import com.casic.missiles.modular.system.dao.WaterNotesMapper; import com.casic.missiles.modular.system.service.IWaterNotesService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; import java.util.Map; @Service @@ -18,8 +20,8 @@ } @Override - public boolean edit(Map obj) { - waterNotesMapper.edit(obj.get("list").toString()); + public boolean edit(List> obj) { + waterNotesMapper.edit(JSONArray.toJSON(obj).toString()); return true; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index 17556c7..9215168 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -56,21 +56,21 @@ if (dayMeter == null) { deviceDto.setDayCount("0"); } else { - deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString()); + deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE") == null ? "0" : dayMeter.get("FLOW_ACC_DATE").toString()); } Map monthMeter = deviceService.selectWaterMeterMonth(deviceDto.getDevcode(), date.substring(0, 7)); if (monthMeter == null) { deviceDto.setMonthCount("0"); } else { - deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString()); + deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH") == null ? "0" : monthMeter.get("FLOW_ACC_MONTH").toString()); } Map totalMeter = deviceService.selectWaterMeterTotal(deviceDto.getDevcode(), date.substring(0, 4)); if (totalMeter == null) { deviceDto.setTotalCount("0"); } else { - deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString()); + deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL") == null ? "0" : totalMeter.get("FLOW_ACC_TOTAL").toString()); } Map meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode()); @@ -78,7 +78,7 @@ deviceDto.setWatchNum("0"); deviceDto.setUptime(sdf4.format(new Date())); } else { - deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString()); + deviceDto.setWatchNum(meterRec.get("FLOW_ACC") == null ? "0" : meterRec.get("FLOW_ACC").toString()); deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME"))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index fd6bc31..c226fb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -21,6 +21,7 @@ public interface DeviceMapper extends BaseMapper { List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId); + List selectDeviceForMap(@Param("devType") String devType, @Param("keywords") String keywords); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); DeviceWellDto selectWellByDevcode(@Param("devcode") String devcode); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java index 160484c..1a1605d 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java @@ -1,16 +1,20 @@ package com.casic.missiles.modular.system.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.core.exception.GunsException; import com.casic.missiles.core.exception.GunsExceptionEnum; import com.casic.missiles.core.base.response.SuccessResponseData; import com.casic.missiles.core.util.ToolUtil; +import com.casic.missiles.modular.system.constant.ModularDictConst; import com.casic.missiles.modular.system.dto.AlarmNowView; +import com.casic.missiles.modular.system.dto.DeviceDto; import com.casic.missiles.modular.system.model.BusWellInfo; import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IBusWellInfoService; +import com.casic.missiles.modular.system.service.IDeviceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -42,6 +46,9 @@ @Autowired private IBusWellInfoService busWellInfoService; + @Autowired + private IDeviceService deviceService; + /** * 获取当前全部告警列表 */ @@ -106,4 +113,19 @@ return successResult; } + /** + * 获取闸井信息及其关联设备信息 + */ + @RequestMapping(value = "/wellMapping", method = RequestMethod.GET) + @ResponseBody + public Object wellMapping(String devType, String keywords) { + List list = deviceService.selectDeviceForMap(devType, keywords); +// list.forEach(deviceDto -> { +// deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); +// deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); +// }); + + return ResponseData.success(list); + } + } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java index 30ea081..691b103 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/StaticsController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -67,9 +68,31 @@ @ResponseBody public Object deviceStaticsByType(){ DataScope dataScope = permissionService.getCurrUserDataScope(); + List> returnList = new ArrayList<>(); try{ List> res = statisticsService.deviceStaticsByType(dataScope); - return ResponseData.success(res); + + String vavleCount = "0"; + for (Map devItem : res) { + if (devItem.get("deviceType").toString().contains("水表")) { + vavleCount = devItem.get("deviceCount").toString(); + } + if (devItem.get("deviceType").toString().contains("阀门")) { + continue; + } + + returnList.add(devItem); + } + Map marker = new HashMap<>(); + marker.put("deviceType", "电子标识"); + marker.put("deviceCount", "10"); + Map vavle = new HashMap<>(); + vavle.put("deviceType", "阀门"); + vavle.put("deviceCount", vavleCount); + + returnList.add(marker); + returnList.add(vavle); + return ResponseData.success(returnList); }catch (Exception e){ e.printStackTrace(); return ResponseData.error("faliure"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java index 47f2af1..c9f96ab 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/WaterNotesController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.List; import java.util.Map; @Controller @@ -23,7 +24,7 @@ */ @RequestMapping(value = "/edit") @ResponseBody - public Object edit(@RequestBody(required = true) Map obj) { + public Object edit(@RequestBody(required = true) List> obj) { return ResponseData.success(waterNotesService.edit(obj)); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java index fd4a1d3..10178db 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IWaterNotesService.java @@ -1,8 +1,9 @@ package com.casic.missiles.modular.system.service; +import java.util.List; import java.util.Map; public interface IWaterNotesService { Map list(); - boolean edit(Map obj); + boolean edit(List> obj); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java index 1ad245b..7fe4aaa 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/WaterNotesServiceImpl.java @@ -1,10 +1,12 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.fastjson.JSONArray; import com.casic.missiles.modular.system.dao.WaterNotesMapper; import com.casic.missiles.modular.system.service.IWaterNotesService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; import java.util.Map; @Service @@ -18,8 +20,8 @@ } @Override - public boolean edit(Map obj) { - waterNotesMapper.edit(obj.get("list").toString()); + public boolean edit(List> obj) { + waterNotesMapper.edit(JSONArray.toJSON(obj).toString()); return true; } } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java index 17556c7..9215168 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/WaterMeterDataController.java @@ -56,21 +56,21 @@ if (dayMeter == null) { deviceDto.setDayCount("0"); } else { - deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE").toString()); + deviceDto.setDayCount(dayMeter.get("FLOW_ACC_DATE") == null ? "0" : dayMeter.get("FLOW_ACC_DATE").toString()); } Map monthMeter = deviceService.selectWaterMeterMonth(deviceDto.getDevcode(), date.substring(0, 7)); if (monthMeter == null) { deviceDto.setMonthCount("0"); } else { - deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH").toString()); + deviceDto.setMonthCount(monthMeter.get("FLOW_ACC_MONTH") == null ? "0" : monthMeter.get("FLOW_ACC_MONTH").toString()); } Map totalMeter = deviceService.selectWaterMeterTotal(deviceDto.getDevcode(), date.substring(0, 4)); if (totalMeter == null) { deviceDto.setTotalCount("0"); } else { - deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL").toString()); + deviceDto.setTotalCount(totalMeter.get("FLOW_ACC_TOTAL") == null ? "0" : totalMeter.get("FLOW_ACC_TOTAL").toString()); } Map meterRec = deviceService.selectLatestWaterMeter(deviceDto.getDevcode()); @@ -78,7 +78,7 @@ deviceDto.setWatchNum("0"); deviceDto.setUptime(sdf4.format(new Date())); } else { - deviceDto.setWatchNum(meterRec.get("FLOW_ACC").toString()); + deviceDto.setWatchNum(meterRec.get("FLOW_ACC") == null ? "0" : meterRec.get("FLOW_ACC").toString()); deviceDto.setUptime(sdf4.format((Date) meterRec.get("UPTIME"))); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index fd6bc31..c226fb9 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -21,6 +21,7 @@ public interface DeviceMapper extends BaseMapper { List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline, @Param("areaId") String areaId); + List selectDeviceForMap(@Param("devType") String devType, @Param("keywords") String keywords); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); DeviceWellDto selectWellByDevcode(@Param("devcode") String devcode); 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 99e9f5b..17b12d1 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 @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId,COORDINATE_X AS LONGITUDE, COORDINATE_Y AS LATITUDE, as INSTALLDATE @@ -119,6 +119,19 @@ ORDER BY INSTALLDATE DESC + DATE_FORMAT (LOGTIME,'%Y-%m-%d %H:%i:%S') @@ -967,11 +980,12 @@ + DATE_FORMAT (LOGTIME,'%Y-%m-%d %H:%i:%S') @@ -967,11 +980,12 @@ + DATE_FORMAT (LOGTIME,'%Y-%m-%d %H:%i:%S') @@ -967,11 +980,12 @@ + DATE_FORMAT (LOGTIME,'%Y-%m-%d %H:%i:%S') @@ -967,11 +980,12 @@ + DATE_FORMAT (LOGTIME,'%Y-%m-%d %H:%i:%S') @@ -967,11 +980,12 @@