diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java new file mode 100644 index 0000000..c62a440 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java @@ -0,0 +1,40 @@ +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.Map; + +/** + * @author lwh + */ +@RequestMapping(value = "/dataStatistic") +public class DataStaticsController extends BaseController { + + @Autowired + private ICommonPermissionService permissionService; + + /** + * 根据权属单位统计闸井数量 + * + * @return + */ + @RequestMapping(value = "/wellStaticsByDept") + @ResponseBody + public Object wellStaticsByDept() { + DataScope dataScope = permissionService.getCurrUserDataScope(); + try { + List> res = null; + return ResponseData.success(res); + } catch (Exception e) { + e.printStackTrace(); + return ResponseData.error("faliure"); + } + } +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java new file mode 100644 index 0000000..c62a440 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java @@ -0,0 +1,40 @@ +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.Map; + +/** + * @author lwh + */ +@RequestMapping(value = "/dataStatistic") +public class DataStaticsController extends BaseController { + + @Autowired + private ICommonPermissionService permissionService; + + /** + * 根据权属单位统计闸井数量 + * + * @return + */ + @RequestMapping(value = "/wellStaticsByDept") + @ResponseBody + public Object wellStaticsByDept() { + DataScope dataScope = permissionService.getCurrUserDataScope(); + try { + List> res = null; + return ResponseData.success(res); + } catch (Exception e) { + e.printStackTrace(); + return ResponseData.error("faliure"); + } + } +} 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 8603a61..29ca1a4 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 @@ -4,11 +4,11 @@ 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.util.Convert; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.apache.commons.lang.StringUtils; -import org.beetl.ext.fn.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,6 +19,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Controller @RequestMapping(value = "/statics") @@ -76,16 +77,17 @@ try { List> res = statisticsService.deviceStaticsByType(dataScope); - String vavleCount = "0"; + Long vavleCount = 0L; for (Map devItem : res) { if (devItem.get("deviceType").toString().contains("水表")) { - vavleCount = devItem.get("deviceCount").toString(); + vavleCount = Convert.toLong(devItem.get("deviceCount")); } if (devItem.get("deviceType").toString().contains("阀门")) { continue; } returnList.add(devItem); } + Map marker = new HashMap<>(); if (!StringUtils.isEmpty(extra) && extra.equals("1")) { marker.put("deviceType", "电子标识"); @@ -96,7 +98,8 @@ returnList.add(marker); returnList.add(vavle); } - return ResponseData.success(returnList); + return ResponseData.success(returnList.stream().filter(map -> !new Long(0).equals(map.get("deviceCount"))).collect(Collectors.toList())); + } catch (Exception e) { e.printStackTrace(); return ResponseData.error("faliure"); diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java new file mode 100644 index 0000000..c62a440 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java @@ -0,0 +1,40 @@ +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.Map; + +/** + * @author lwh + */ +@RequestMapping(value = "/dataStatistic") +public class DataStaticsController extends BaseController { + + @Autowired + private ICommonPermissionService permissionService; + + /** + * 根据权属单位统计闸井数量 + * + * @return + */ + @RequestMapping(value = "/wellStaticsByDept") + @ResponseBody + public Object wellStaticsByDept() { + DataScope dataScope = permissionService.getCurrUserDataScope(); + try { + List> res = null; + return ResponseData.success(res); + } catch (Exception e) { + e.printStackTrace(); + return ResponseData.error("faliure"); + } + } +} 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 8603a61..29ca1a4 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 @@ -4,11 +4,11 @@ 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.util.Convert; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.apache.commons.lang.StringUtils; -import org.beetl.ext.fn.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,6 +19,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Controller @RequestMapping(value = "/statics") @@ -76,16 +77,17 @@ try { List> res = statisticsService.deviceStaticsByType(dataScope); - String vavleCount = "0"; + Long vavleCount = 0L; for (Map devItem : res) { if (devItem.get("deviceType").toString().contains("水表")) { - vavleCount = devItem.get("deviceCount").toString(); + vavleCount = Convert.toLong(devItem.get("deviceCount")); } if (devItem.get("deviceType").toString().contains("阀门")) { continue; } returnList.add(devItem); } + Map marker = new HashMap<>(); if (!StringUtils.isEmpty(extra) && extra.equals("1")) { marker.put("deviceType", "电子标识"); @@ -96,7 +98,8 @@ returnList.add(marker); returnList.add(vavle); } - return ResponseData.success(returnList); + return ResponseData.success(returnList.stream().filter(map -> !new Long(0).equals(map.get("deviceCount"))).collect(Collectors.toList())); + } 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 e49eb95..682df75 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 @@ -2,6 +2,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.dto.NoteForm; import com.casic.missiles.modular.system.service.IGasFlowStatisticsService; import com.casic.missiles.modular.system.service.IWaterNotesService; import org.springframework.beans.factory.annotation.Autowired; @@ -25,10 +26,10 @@ * 根据权属单位统计闸井数量 * @return */ - @RequestMapping(value = "/edit/{type}") + @RequestMapping(value = "/edit") @ResponseBody - public Object edit(@RequestBody(required = true) List> obj, @PathVariable("type") Integer type) { - Boolean commitFlag= type == 1 ? waterNotesService.edit(obj): gasFlowStatisticsService.edit(obj); + public Object edit(@RequestBody NoteForm note) { + Boolean commitFlag= note.getType() == 1 ? waterNotesService.edit(note.getList()): gasFlowStatisticsService.edit(note.getList()); return ResponseData.success(commitFlag); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java new file mode 100644 index 0000000..c62a440 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java @@ -0,0 +1,40 @@ +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.Map; + +/** + * @author lwh + */ +@RequestMapping(value = "/dataStatistic") +public class DataStaticsController extends BaseController { + + @Autowired + private ICommonPermissionService permissionService; + + /** + * 根据权属单位统计闸井数量 + * + * @return + */ + @RequestMapping(value = "/wellStaticsByDept") + @ResponseBody + public Object wellStaticsByDept() { + DataScope dataScope = permissionService.getCurrUserDataScope(); + try { + List> res = null; + return ResponseData.success(res); + } catch (Exception e) { + e.printStackTrace(); + return ResponseData.error("faliure"); + } + } +} 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 8603a61..29ca1a4 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 @@ -4,11 +4,11 @@ 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.util.Convert; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.apache.commons.lang.StringUtils; -import org.beetl.ext.fn.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,6 +19,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Controller @RequestMapping(value = "/statics") @@ -76,16 +77,17 @@ try { List> res = statisticsService.deviceStaticsByType(dataScope); - String vavleCount = "0"; + Long vavleCount = 0L; for (Map devItem : res) { if (devItem.get("deviceType").toString().contains("水表")) { - vavleCount = devItem.get("deviceCount").toString(); + vavleCount = Convert.toLong(devItem.get("deviceCount")); } if (devItem.get("deviceType").toString().contains("阀门")) { continue; } returnList.add(devItem); } + Map marker = new HashMap<>(); if (!StringUtils.isEmpty(extra) && extra.equals("1")) { marker.put("deviceType", "电子标识"); @@ -96,7 +98,8 @@ returnList.add(marker); returnList.add(vavle); } - return ResponseData.success(returnList); + return ResponseData.success(returnList.stream().filter(map -> !new Long(0).equals(map.get("deviceCount"))).collect(Collectors.toList())); + } 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 e49eb95..682df75 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 @@ -2,6 +2,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.dto.NoteForm; import com.casic.missiles.modular.system.service.IGasFlowStatisticsService; import com.casic.missiles.modular.system.service.IWaterNotesService; import org.springframework.beans.factory.annotation.Autowired; @@ -25,10 +26,10 @@ * 根据权属单位统计闸井数量 * @return */ - @RequestMapping(value = "/edit/{type}") + @RequestMapping(value = "/edit") @ResponseBody - public Object edit(@RequestBody(required = true) List> obj, @PathVariable("type") Integer type) { - Boolean commitFlag= type == 1 ? waterNotesService.edit(obj): gasFlowStatisticsService.edit(obj); + public Object edit(@RequestBody NoteForm note) { + Boolean commitFlag= note.getType() == 1 ? waterNotesService.edit(note.getList()): gasFlowStatisticsService.edit(note.getList()); return ResponseData.success(commitFlag); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/NoteForm.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/NoteForm.java new file mode 100644 index 0000000..fff2dbd --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/NoteForm.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * 用水日志提交 + * @author lenovo + */ +@Data +public class NoteForm { + private List> list; + private Integer type; +} diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java new file mode 100644 index 0000000..c62a440 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java @@ -0,0 +1,40 @@ +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.Map; + +/** + * @author lwh + */ +@RequestMapping(value = "/dataStatistic") +public class DataStaticsController extends BaseController { + + @Autowired + private ICommonPermissionService permissionService; + + /** + * 根据权属单位统计闸井数量 + * + * @return + */ + @RequestMapping(value = "/wellStaticsByDept") + @ResponseBody + public Object wellStaticsByDept() { + DataScope dataScope = permissionService.getCurrUserDataScope(); + try { + List> res = null; + return ResponseData.success(res); + } catch (Exception e) { + e.printStackTrace(); + return ResponseData.error("faliure"); + } + } +} 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 8603a61..29ca1a4 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 @@ -4,11 +4,11 @@ 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.util.Convert; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.apache.commons.lang.StringUtils; -import org.beetl.ext.fn.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,6 +19,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Controller @RequestMapping(value = "/statics") @@ -76,16 +77,17 @@ try { List> res = statisticsService.deviceStaticsByType(dataScope); - String vavleCount = "0"; + Long vavleCount = 0L; for (Map devItem : res) { if (devItem.get("deviceType").toString().contains("水表")) { - vavleCount = devItem.get("deviceCount").toString(); + vavleCount = Convert.toLong(devItem.get("deviceCount")); } if (devItem.get("deviceType").toString().contains("阀门")) { continue; } returnList.add(devItem); } + Map marker = new HashMap<>(); if (!StringUtils.isEmpty(extra) && extra.equals("1")) { marker.put("deviceType", "电子标识"); @@ -96,7 +98,8 @@ returnList.add(marker); returnList.add(vavle); } - return ResponseData.success(returnList); + return ResponseData.success(returnList.stream().filter(map -> !new Long(0).equals(map.get("deviceCount"))).collect(Collectors.toList())); + } 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 e49eb95..682df75 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 @@ -2,6 +2,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.dto.NoteForm; import com.casic.missiles.modular.system.service.IGasFlowStatisticsService; import com.casic.missiles.modular.system.service.IWaterNotesService; import org.springframework.beans.factory.annotation.Autowired; @@ -25,10 +26,10 @@ * 根据权属单位统计闸井数量 * @return */ - @RequestMapping(value = "/edit/{type}") + @RequestMapping(value = "/edit") @ResponseBody - public Object edit(@RequestBody(required = true) List> obj, @PathVariable("type") Integer type) { - Boolean commitFlag= type == 1 ? waterNotesService.edit(obj): gasFlowStatisticsService.edit(obj); + public Object edit(@RequestBody NoteForm note) { + Boolean commitFlag= note.getType() == 1 ? waterNotesService.edit(note.getList()): gasFlowStatisticsService.edit(note.getList()); return ResponseData.success(commitFlag); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/NoteForm.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/NoteForm.java new file mode 100644 index 0000000..fff2dbd --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/NoteForm.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * 用水日志提交 + * @author lenovo + */ +@Data +public class NoteForm { + private List> list; + private Integer type; +} diff --git a/casic-web/src/main/build/bin/start.sh b/casic-web/src/main/build/bin/start.sh index c00b1ef..381e179 100644 --- a/casic-web/src/main/build/bin/start.sh +++ b/casic-web/src/main/build/bin/start.sh @@ -1,2 +1 @@ -java -jar ./lib/${project.build.finalName}.jar - +nohup java -jar ./lib/${project.build.finalName}.jar >/dev/null 2>&1 & \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java new file mode 100644 index 0000000..c62a440 --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java @@ -0,0 +1,40 @@ +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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; +import java.util.Map; + +/** + * @author lwh + */ +@RequestMapping(value = "/dataStatistic") +public class DataStaticsController extends BaseController { + + @Autowired + private ICommonPermissionService permissionService; + + /** + * 根据权属单位统计闸井数量 + * + * @return + */ + @RequestMapping(value = "/wellStaticsByDept") + @ResponseBody + public Object wellStaticsByDept() { + DataScope dataScope = permissionService.getCurrUserDataScope(); + try { + List> res = null; + return ResponseData.success(res); + } catch (Exception e) { + e.printStackTrace(); + return ResponseData.error("faliure"); + } + } +} 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 8603a61..29ca1a4 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 @@ -4,11 +4,11 @@ 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.util.Convert; import com.casic.missiles.modular.system.dto.AlarmNowView; import com.casic.missiles.modular.system.service.IAlarmNowViewService; import com.casic.missiles.modular.system.service.IStatisticsService; import org.apache.commons.lang.StringUtils; -import org.beetl.ext.fn.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,6 +19,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Controller @RequestMapping(value = "/statics") @@ -76,16 +77,17 @@ try { List> res = statisticsService.deviceStaticsByType(dataScope); - String vavleCount = "0"; + Long vavleCount = 0L; for (Map devItem : res) { if (devItem.get("deviceType").toString().contains("水表")) { - vavleCount = devItem.get("deviceCount").toString(); + vavleCount = Convert.toLong(devItem.get("deviceCount")); } if (devItem.get("deviceType").toString().contains("阀门")) { continue; } returnList.add(devItem); } + Map marker = new HashMap<>(); if (!StringUtils.isEmpty(extra) && extra.equals("1")) { marker.put("deviceType", "电子标识"); @@ -96,7 +98,8 @@ returnList.add(marker); returnList.add(vavle); } - return ResponseData.success(returnList); + return ResponseData.success(returnList.stream().filter(map -> !new Long(0).equals(map.get("deviceCount"))).collect(Collectors.toList())); + } 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 e49eb95..682df75 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 @@ -2,6 +2,7 @@ import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.response.ResponseData; +import com.casic.missiles.modular.system.dto.NoteForm; import com.casic.missiles.modular.system.service.IGasFlowStatisticsService; import com.casic.missiles.modular.system.service.IWaterNotesService; import org.springframework.beans.factory.annotation.Autowired; @@ -25,10 +26,10 @@ * 根据权属单位统计闸井数量 * @return */ - @RequestMapping(value = "/edit/{type}") + @RequestMapping(value = "/edit") @ResponseBody - public Object edit(@RequestBody(required = true) List> obj, @PathVariable("type") Integer type) { - Boolean commitFlag= type == 1 ? waterNotesService.edit(obj): gasFlowStatisticsService.edit(obj); + public Object edit(@RequestBody NoteForm note) { + Boolean commitFlag= note.getType() == 1 ? waterNotesService.edit(note.getList()): gasFlowStatisticsService.edit(note.getList()); return ResponseData.success(commitFlag); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/NoteForm.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/NoteForm.java new file mode 100644 index 0000000..fff2dbd --- /dev/null +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/NoteForm.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * 用水日志提交 + * @author lenovo + */ +@Data +public class NoteForm { + private List> list; + private Integer type; +} diff --git a/casic-web/src/main/build/bin/start.sh b/casic-web/src/main/build/bin/start.sh index c00b1ef..381e179 100644 --- a/casic-web/src/main/build/bin/start.sh +++ b/casic-web/src/main/build/bin/start.sh @@ -1,2 +1 @@ -java -jar ./lib/${project.build.finalName}.jar - +nohup java -jar ./lib/${project.build.finalName}.jar >/dev/null 2>&1 & \ No newline at end of file diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 3153b54..e7fb806 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -34,7 +34,7 @@ casic: kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockToken,/job/updateSinkJob,/route/sync,/websocket/* + nologin-urls: /user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockToken,/job/updateSinkJob,/route/sync,/websocket/*,/gasflow/data/recv file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload