diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java new file mode 100644 index 0000000..7741dae --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDataAnalysisService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +@Controller +@RequestMapping("/leakAnalysis") +public class LeakAnalysisController extends BaseController { + @Resource + private IDataAnalysisService dataAnalysisService; + + /** + * 根据管线编号获取阀门信息 + */ + @RequestMapping(value = "/getValvesByPipe", method = RequestMethod.GET) + @ResponseBody + public Object getValvesByPipe(String pipeCode) { + if (ObjectUtil.isEmpty(pipeCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode)); + } + + /** + * 根据阀门信息获取影响区域 + */ + @RequestMapping(value = "/getAreasByValve", method = RequestMethod.GET) + @ResponseBody + public Object getAreasByValve(String valveCode) { + if (ObjectUtil.isEmpty(valveCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getAreasByValve(valveCode)); + } +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java new file mode 100644 index 0000000..7741dae --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDataAnalysisService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +@Controller +@RequestMapping("/leakAnalysis") +public class LeakAnalysisController extends BaseController { + @Resource + private IDataAnalysisService dataAnalysisService; + + /** + * 根据管线编号获取阀门信息 + */ + @RequestMapping(value = "/getValvesByPipe", method = RequestMethod.GET) + @ResponseBody + public Object getValvesByPipe(String pipeCode) { + if (ObjectUtil.isEmpty(pipeCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode)); + } + + /** + * 根据阀门信息获取影响区域 + */ + @RequestMapping(value = "/getAreasByValve", method = RequestMethod.GET) + @ResponseBody + public Object getAreasByValve(String valveCode) { + if (ObjectUtil.isEmpty(valveCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getAreasByValve(valveCode)); + } +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index 0b99b60..c7df2ce 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -6,8 +6,11 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -109,4 +112,21 @@ List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid); + + @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}") + List getValvesByPipe( @Param("pipeCode") String pipeCode); + + @Select("SELECT " + + " bvi.\"VALVE_CODE\" AS valveCode, " + + " bb.\"BLOCK_CODE\" AS blockCode, " + + " bb.\"POSITION\" AS position, " + + " bb.\"NAME\" AS blockName " + + "FROM " + + " bus_valve_info bvi " + + " LEFT JOIN bus_valve_block bvb ON bvi.\"VALVE_CODE\" = bvb.\"VALVE_CODE\" " + + " LEFT JOIN bus_block_information bb ON bvb.\"BLOCK_CODE\" = bb.\"BLOCK_CODE\" " + + "WHERE " + + " bvi.\"VALVE_CODE\" = #{valveCode} ") + List getAreasByValve(@Param("valveCode") String valveCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java new file mode 100644 index 0000000..7741dae --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDataAnalysisService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +@Controller +@RequestMapping("/leakAnalysis") +public class LeakAnalysisController extends BaseController { + @Resource + private IDataAnalysisService dataAnalysisService; + + /** + * 根据管线编号获取阀门信息 + */ + @RequestMapping(value = "/getValvesByPipe", method = RequestMethod.GET) + @ResponseBody + public Object getValvesByPipe(String pipeCode) { + if (ObjectUtil.isEmpty(pipeCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode)); + } + + /** + * 根据阀门信息获取影响区域 + */ + @RequestMapping(value = "/getAreasByValve", method = RequestMethod.GET) + @ResponseBody + public Object getAreasByValve(String valveCode) { + if (ObjectUtil.isEmpty(valveCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getAreasByValve(valveCode)); + } +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index 0b99b60..c7df2ce 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -6,8 +6,11 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -109,4 +112,21 @@ List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid); + + @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}") + List getValvesByPipe( @Param("pipeCode") String pipeCode); + + @Select("SELECT " + + " bvi.\"VALVE_CODE\" AS valveCode, " + + " bb.\"BLOCK_CODE\" AS blockCode, " + + " bb.\"POSITION\" AS position, " + + " bb.\"NAME\" AS blockName " + + "FROM " + + " bus_valve_info bvi " + + " LEFT JOIN bus_valve_block bvb ON bvi.\"VALVE_CODE\" = bvb.\"VALVE_CODE\" " + + " LEFT JOIN bus_block_information bb ON bvb.\"BLOCK_CODE\" = bb.\"BLOCK_CODE\" " + + "WHERE " + + " bvi.\"VALVE_CODE\" = #{valveCode} ") + List getAreasByValve(@Param("valveCode") String valveCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java new file mode 100644 index 0000000..92cf6d2 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class AreaDto { + + private String valveCode; + private String position; + private String blockCode; + private String blockName; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java new file mode 100644 index 0000000..7741dae --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDataAnalysisService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +@Controller +@RequestMapping("/leakAnalysis") +public class LeakAnalysisController extends BaseController { + @Resource + private IDataAnalysisService dataAnalysisService; + + /** + * 根据管线编号获取阀门信息 + */ + @RequestMapping(value = "/getValvesByPipe", method = RequestMethod.GET) + @ResponseBody + public Object getValvesByPipe(String pipeCode) { + if (ObjectUtil.isEmpty(pipeCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode)); + } + + /** + * 根据阀门信息获取影响区域 + */ + @RequestMapping(value = "/getAreasByValve", method = RequestMethod.GET) + @ResponseBody + public Object getAreasByValve(String valveCode) { + if (ObjectUtil.isEmpty(valveCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getAreasByValve(valveCode)); + } +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index 0b99b60..c7df2ce 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -6,8 +6,11 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -109,4 +112,21 @@ List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid); + + @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}") + List getValvesByPipe( @Param("pipeCode") String pipeCode); + + @Select("SELECT " + + " bvi.\"VALVE_CODE\" AS valveCode, " + + " bb.\"BLOCK_CODE\" AS blockCode, " + + " bb.\"POSITION\" AS position, " + + " bb.\"NAME\" AS blockName " + + "FROM " + + " bus_valve_info bvi " + + " LEFT JOIN bus_valve_block bvb ON bvi.\"VALVE_CODE\" = bvb.\"VALVE_CODE\" " + + " LEFT JOIN bus_block_information bb ON bvb.\"BLOCK_CODE\" = bb.\"BLOCK_CODE\" " + + "WHERE " + + " bvi.\"VALVE_CODE\" = #{valveCode} ") + List getAreasByValve(@Param("valveCode") String valveCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java new file mode 100644 index 0000000..92cf6d2 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class AreaDto { + + private String valveCode; + private String position; + private String blockCode; + private String blockName; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java new file mode 100644 index 0000000..7d25168 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class ValveDto { + + private String valveCode; + private String longitude; + private String latitude; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java new file mode 100644 index 0000000..7741dae --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDataAnalysisService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +@Controller +@RequestMapping("/leakAnalysis") +public class LeakAnalysisController extends BaseController { + @Resource + private IDataAnalysisService dataAnalysisService; + + /** + * 根据管线编号获取阀门信息 + */ + @RequestMapping(value = "/getValvesByPipe", method = RequestMethod.GET) + @ResponseBody + public Object getValvesByPipe(String pipeCode) { + if (ObjectUtil.isEmpty(pipeCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode)); + } + + /** + * 根据阀门信息获取影响区域 + */ + @RequestMapping(value = "/getAreasByValve", method = RequestMethod.GET) + @ResponseBody + public Object getAreasByValve(String valveCode) { + if (ObjectUtil.isEmpty(valveCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getAreasByValve(valveCode)); + } +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index 0b99b60..c7df2ce 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -6,8 +6,11 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -109,4 +112,21 @@ List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid); + + @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}") + List getValvesByPipe( @Param("pipeCode") String pipeCode); + + @Select("SELECT " + + " bvi.\"VALVE_CODE\" AS valveCode, " + + " bb.\"BLOCK_CODE\" AS blockCode, " + + " bb.\"POSITION\" AS position, " + + " bb.\"NAME\" AS blockName " + + "FROM " + + " bus_valve_info bvi " + + " LEFT JOIN bus_valve_block bvb ON bvi.\"VALVE_CODE\" = bvb.\"VALVE_CODE\" " + + " LEFT JOIN bus_block_information bb ON bvb.\"BLOCK_CODE\" = bb.\"BLOCK_CODE\" " + + "WHERE " + + " bvi.\"VALVE_CODE\" = #{valveCode} ") + List getAreasByValve(@Param("valveCode") String valveCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java new file mode 100644 index 0000000..92cf6d2 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class AreaDto { + + private String valveCode; + private String position; + private String blockCode; + private String blockName; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java new file mode 100644 index 0000000..7d25168 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class ValveDto { + + private String valveCode; + private String longitude; + private String latitude; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index 9265caa..c5fd1a0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -7,7 +7,9 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import java.util.List; import java.util.Map; @@ -127,4 +129,11 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); + + List getValvesByPipe(String pipeCode); + + List getAreasByValve(String valveCode); + + + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java new file mode 100644 index 0000000..7741dae --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDataAnalysisService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +@Controller +@RequestMapping("/leakAnalysis") +public class LeakAnalysisController extends BaseController { + @Resource + private IDataAnalysisService dataAnalysisService; + + /** + * 根据管线编号获取阀门信息 + */ + @RequestMapping(value = "/getValvesByPipe", method = RequestMethod.GET) + @ResponseBody + public Object getValvesByPipe(String pipeCode) { + if (ObjectUtil.isEmpty(pipeCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode)); + } + + /** + * 根据阀门信息获取影响区域 + */ + @RequestMapping(value = "/getAreasByValve", method = RequestMethod.GET) + @ResponseBody + public Object getAreasByValve(String valveCode) { + if (ObjectUtil.isEmpty(valveCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getAreasByValve(valveCode)); + } +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index 0b99b60..c7df2ce 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -6,8 +6,11 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -109,4 +112,21 @@ List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid); + + @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}") + List getValvesByPipe( @Param("pipeCode") String pipeCode); + + @Select("SELECT " + + " bvi.\"VALVE_CODE\" AS valveCode, " + + " bb.\"BLOCK_CODE\" AS blockCode, " + + " bb.\"POSITION\" AS position, " + + " bb.\"NAME\" AS blockName " + + "FROM " + + " bus_valve_info bvi " + + " LEFT JOIN bus_valve_block bvb ON bvi.\"VALVE_CODE\" = bvb.\"VALVE_CODE\" " + + " LEFT JOIN bus_block_information bb ON bvb.\"BLOCK_CODE\" = bb.\"BLOCK_CODE\" " + + "WHERE " + + " bvi.\"VALVE_CODE\" = #{valveCode} ") + List getAreasByValve(@Param("valveCode") String valveCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java new file mode 100644 index 0000000..92cf6d2 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class AreaDto { + + private String valveCode; + private String position; + private String blockCode; + private String blockName; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java new file mode 100644 index 0000000..7d25168 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class ValveDto { + + private String valveCode; + private String longitude; + private String latitude; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index 9265caa..c5fd1a0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -7,7 +7,9 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import java.util.List; import java.util.Map; @@ -127,4 +129,11 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); + + List getValvesByPipe(String pipeCode); + + List getAreasByValve(String valveCode); + + + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index ad74c38..9ddf7e4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -18,7 +18,9 @@ import com.casic.missiles.modular.system.dto.statistic.DataH2s; import com.casic.missiles.modular.system.enums.HarmfulGasBusiness; import com.casic.missiles.modular.system.enums.TemphumBusiness; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import com.casic.missiles.modular.system.service.IBusDeviceSupportService; import com.casic.missiles.modular.system.service.IDataAnalysisService; import lombok.extern.slf4j.Slf4j; @@ -663,4 +665,14 @@ } return responseData; } + + @Override + public List getValvesByPipe(String pipeCode) { + return this.baseMapper.getValvesByPipe(pipeCode); + } + + @Override + public List getAreasByValve(String valveCode) { + return this.baseMapper.getAreasByValve(valveCode); + } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java new file mode 100644 index 0000000..7741dae --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDataAnalysisService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +@Controller +@RequestMapping("/leakAnalysis") +public class LeakAnalysisController extends BaseController { + @Resource + private IDataAnalysisService dataAnalysisService; + + /** + * 根据管线编号获取阀门信息 + */ + @RequestMapping(value = "/getValvesByPipe", method = RequestMethod.GET) + @ResponseBody + public Object getValvesByPipe(String pipeCode) { + if (ObjectUtil.isEmpty(pipeCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode)); + } + + /** + * 根据阀门信息获取影响区域 + */ + @RequestMapping(value = "/getAreasByValve", method = RequestMethod.GET) + @ResponseBody + public Object getAreasByValve(String valveCode) { + if (ObjectUtil.isEmpty(valveCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getAreasByValve(valveCode)); + } +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index 0b99b60..c7df2ce 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -6,8 +6,11 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -109,4 +112,21 @@ List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid); + + @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}") + List getValvesByPipe( @Param("pipeCode") String pipeCode); + + @Select("SELECT " + + " bvi.\"VALVE_CODE\" AS valveCode, " + + " bb.\"BLOCK_CODE\" AS blockCode, " + + " bb.\"POSITION\" AS position, " + + " bb.\"NAME\" AS blockName " + + "FROM " + + " bus_valve_info bvi " + + " LEFT JOIN bus_valve_block bvb ON bvi.\"VALVE_CODE\" = bvb.\"VALVE_CODE\" " + + " LEFT JOIN bus_block_information bb ON bvb.\"BLOCK_CODE\" = bb.\"BLOCK_CODE\" " + + "WHERE " + + " bvi.\"VALVE_CODE\" = #{valveCode} ") + List getAreasByValve(@Param("valveCode") String valveCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java new file mode 100644 index 0000000..92cf6d2 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class AreaDto { + + private String valveCode; + private String position; + private String blockCode; + private String blockName; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java new file mode 100644 index 0000000..7d25168 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class ValveDto { + + private String valveCode; + private String longitude; + private String latitude; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index 9265caa..c5fd1a0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -7,7 +7,9 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import java.util.List; import java.util.Map; @@ -127,4 +129,11 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); + + List getValvesByPipe(String pipeCode); + + List getAreasByValve(String valveCode); + + + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index ad74c38..9ddf7e4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -18,7 +18,9 @@ import com.casic.missiles.modular.system.dto.statistic.DataH2s; import com.casic.missiles.modular.system.enums.HarmfulGasBusiness; import com.casic.missiles.modular.system.enums.TemphumBusiness; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import com.casic.missiles.modular.system.service.IBusDeviceSupportService; import com.casic.missiles.modular.system.service.IDataAnalysisService; import lombok.extern.slf4j.Slf4j; @@ -663,4 +665,14 @@ } return responseData; } + + @Override + public List getValvesByPipe(String pipeCode) { + return this.baseMapper.getValvesByPipe(pipeCode); + } + + @Override + public List getAreasByValve(String valveCode) { + return this.baseMapper.getAreasByValve(valveCode); + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java new file mode 100644 index 0000000..18922c5 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class pipeLineDTO { + private String pipeCode; + private String startLongitudeGd; + private String endLongitudeGd; + private String startLatitudeGd; + private String endLatitudeGd; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java new file mode 100644 index 0000000..7741dae --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDataAnalysisService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +@Controller +@RequestMapping("/leakAnalysis") +public class LeakAnalysisController extends BaseController { + @Resource + private IDataAnalysisService dataAnalysisService; + + /** + * 根据管线编号获取阀门信息 + */ + @RequestMapping(value = "/getValvesByPipe", method = RequestMethod.GET) + @ResponseBody + public Object getValvesByPipe(String pipeCode) { + if (ObjectUtil.isEmpty(pipeCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode)); + } + + /** + * 根据阀门信息获取影响区域 + */ + @RequestMapping(value = "/getAreasByValve", method = RequestMethod.GET) + @ResponseBody + public Object getAreasByValve(String valveCode) { + if (ObjectUtil.isEmpty(valveCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getAreasByValve(valveCode)); + } +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index 0b99b60..c7df2ce 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -6,8 +6,11 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -109,4 +112,21 @@ List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid); + + @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}") + List getValvesByPipe( @Param("pipeCode") String pipeCode); + + @Select("SELECT " + + " bvi.\"VALVE_CODE\" AS valveCode, " + + " bb.\"BLOCK_CODE\" AS blockCode, " + + " bb.\"POSITION\" AS position, " + + " bb.\"NAME\" AS blockName " + + "FROM " + + " bus_valve_info bvi " + + " LEFT JOIN bus_valve_block bvb ON bvi.\"VALVE_CODE\" = bvb.\"VALVE_CODE\" " + + " LEFT JOIN bus_block_information bb ON bvb.\"BLOCK_CODE\" = bb.\"BLOCK_CODE\" " + + "WHERE " + + " bvi.\"VALVE_CODE\" = #{valveCode} ") + List getAreasByValve(@Param("valveCode") String valveCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java new file mode 100644 index 0000000..92cf6d2 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class AreaDto { + + private String valveCode; + private String position; + private String blockCode; + private String blockName; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java new file mode 100644 index 0000000..7d25168 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class ValveDto { + + private String valveCode; + private String longitude; + private String latitude; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index 9265caa..c5fd1a0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -7,7 +7,9 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import java.util.List; import java.util.Map; @@ -127,4 +129,11 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); + + List getValvesByPipe(String pipeCode); + + List getAreasByValve(String valveCode); + + + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index ad74c38..9ddf7e4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -18,7 +18,9 @@ import com.casic.missiles.modular.system.dto.statistic.DataH2s; import com.casic.missiles.modular.system.enums.HarmfulGasBusiness; import com.casic.missiles.modular.system.enums.TemphumBusiness; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import com.casic.missiles.modular.system.service.IBusDeviceSupportService; import com.casic.missiles.modular.system.service.IDataAnalysisService; import lombok.extern.slf4j.Slf4j; @@ -663,4 +665,14 @@ } return responseData; } + + @Override + public List getValvesByPipe(String pipeCode) { + return this.baseMapper.getValvesByPipe(pipeCode); + } + + @Override + public List getAreasByValve(String valveCode) { + return this.baseMapper.getAreasByValve(valveCode); + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java new file mode 100644 index 0000000..18922c5 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class pipeLineDTO { + private String pipeCode; + private String startLongitudeGd; + private String endLongitudeGd; + private String startLatitudeGd; + private String endLatitudeGd; +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index a4201ec..5e0f496 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -65,17 +65,17 @@ try { //坐标转换 - Map gaodeCoordinate = Utility.convertGaodeAPI(busPipeline.getStartLongitude(), + Map gaodeCoordinate = Utility.convertGaodeAPI(busPipeline.getStartLongitude(), busPipeline.getStartLatitude()); - Map gaodeCoordinateEnd = Utility.convertGaodeAPI(busPipeline.getEndLongitude(), + Map gaodeCoordinateEnd = Utility.convertGaodeAPI(busPipeline.getEndLongitude(), busPipeline.getEndLatitude()); - if(ObjectUtil.isAllNotEmpty(gaodeCoordinate,gaodeCoordinateEnd)) { + if (ObjectUtil.isAllNotEmpty(gaodeCoordinate, gaodeCoordinateEnd)) { busPipeline.setStartLongitudeGd(gaodeCoordinate.get("x").toString()); busPipeline.setStartLatitudeGd(gaodeCoordinate.get("y").toString()); busPipeline.setEndLongitudeGd(gaodeCoordinateEnd.get("x").toString()); busPipeline.setEndLatitudeGd(gaodeCoordinateEnd.get("y").toString()); - }else{ - logger.error("{}高德坐标转换失败",busPipeline.getPipelineCode()); + } else { + logger.error("{}高德坐标转换失败", busPipeline.getPipelineCode()); } busPipelineService.save(busPipeline); } catch (RuntimeException rex) { @@ -106,7 +106,7 @@ @RequestMapping(value = "/detail/{pipelineId}") public Object detail(@PathVariable("pipelineId") String pipelineId) { - if(StringUtils.isEmpty(pipelineId)){ + if (StringUtils.isEmpty(pipelineId)) { return ResponseData.error("查询失败，请传缺少指定对象，请重试！"); } BusPipeline busPipeline = busPipelineService.getById(Long.valueOf(pipelineId)); @@ -153,7 +153,7 @@ } catch (Exception e) { log.error("导入管线列表失败", e); String message = e.getMessage(); - if (message.contains("Duplicate entry '")||message.contains("唯一约束")) { + if (message.contains("Duplicate entry '") || message.contains("唯一约束")) { return new ErrorResponseData("导入管线列表失败，管线编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'PIPELINE_CODE'", "") + "已存在"); } return new ErrorResponseData("导入管线列表失败"); @@ -178,4 +178,15 @@ super.exportExcel(BatchExportPipelineDto.class, list, "管线列表"); } + + /** + * 供app显示管线用 + * + * @return + */ + @RequestMapping("/appList") + public Object appList() { + return new SuccessResponseData(busPipelineService.appList()); + } + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java new file mode 100644 index 0000000..7741dae --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDataAnalysisService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +@Controller +@RequestMapping("/leakAnalysis") +public class LeakAnalysisController extends BaseController { + @Resource + private IDataAnalysisService dataAnalysisService; + + /** + * 根据管线编号获取阀门信息 + */ + @RequestMapping(value = "/getValvesByPipe", method = RequestMethod.GET) + @ResponseBody + public Object getValvesByPipe(String pipeCode) { + if (ObjectUtil.isEmpty(pipeCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode)); + } + + /** + * 根据阀门信息获取影响区域 + */ + @RequestMapping(value = "/getAreasByValve", method = RequestMethod.GET) + @ResponseBody + public Object getAreasByValve(String valveCode) { + if (ObjectUtil.isEmpty(valveCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getAreasByValve(valveCode)); + } +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index 0b99b60..c7df2ce 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -6,8 +6,11 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -109,4 +112,21 @@ List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid); + + @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}") + List getValvesByPipe( @Param("pipeCode") String pipeCode); + + @Select("SELECT " + + " bvi.\"VALVE_CODE\" AS valveCode, " + + " bb.\"BLOCK_CODE\" AS blockCode, " + + " bb.\"POSITION\" AS position, " + + " bb.\"NAME\" AS blockName " + + "FROM " + + " bus_valve_info bvi " + + " LEFT JOIN bus_valve_block bvb ON bvi.\"VALVE_CODE\" = bvb.\"VALVE_CODE\" " + + " LEFT JOIN bus_block_information bb ON bvb.\"BLOCK_CODE\" = bb.\"BLOCK_CODE\" " + + "WHERE " + + " bvi.\"VALVE_CODE\" = #{valveCode} ") + List getAreasByValve(@Param("valveCode") String valveCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java new file mode 100644 index 0000000..92cf6d2 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class AreaDto { + + private String valveCode; + private String position; + private String blockCode; + private String blockName; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java new file mode 100644 index 0000000..7d25168 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class ValveDto { + + private String valveCode; + private String longitude; + private String latitude; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index 9265caa..c5fd1a0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -7,7 +7,9 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import java.util.List; import java.util.Map; @@ -127,4 +129,11 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); + + List getValvesByPipe(String pipeCode); + + List getAreasByValve(String valveCode); + + + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index ad74c38..9ddf7e4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -18,7 +18,9 @@ import com.casic.missiles.modular.system.dto.statistic.DataH2s; import com.casic.missiles.modular.system.enums.HarmfulGasBusiness; import com.casic.missiles.modular.system.enums.TemphumBusiness; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import com.casic.missiles.modular.system.service.IBusDeviceSupportService; import com.casic.missiles.modular.system.service.IDataAnalysisService; import lombok.extern.slf4j.Slf4j; @@ -663,4 +665,14 @@ } return responseData; } + + @Override + public List getValvesByPipe(String pipeCode) { + return this.baseMapper.getValvesByPipe(pipeCode); + } + + @Override + public List getAreasByValve(String valveCode) { + return this.baseMapper.getAreasByValve(valveCode); + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java new file mode 100644 index 0000000..18922c5 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class pipeLineDTO { + private String pipeCode; + private String startLongitudeGd; + private String endLongitudeGd; + private String startLatitudeGd; + private String endLatitudeGd; +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index a4201ec..5e0f496 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -65,17 +65,17 @@ try { //坐标转换 - Map gaodeCoordinate = Utility.convertGaodeAPI(busPipeline.getStartLongitude(), + Map gaodeCoordinate = Utility.convertGaodeAPI(busPipeline.getStartLongitude(), busPipeline.getStartLatitude()); - Map gaodeCoordinateEnd = Utility.convertGaodeAPI(busPipeline.getEndLongitude(), + Map gaodeCoordinateEnd = Utility.convertGaodeAPI(busPipeline.getEndLongitude(), busPipeline.getEndLatitude()); - if(ObjectUtil.isAllNotEmpty(gaodeCoordinate,gaodeCoordinateEnd)) { + if (ObjectUtil.isAllNotEmpty(gaodeCoordinate, gaodeCoordinateEnd)) { busPipeline.setStartLongitudeGd(gaodeCoordinate.get("x").toString()); busPipeline.setStartLatitudeGd(gaodeCoordinate.get("y").toString()); busPipeline.setEndLongitudeGd(gaodeCoordinateEnd.get("x").toString()); busPipeline.setEndLatitudeGd(gaodeCoordinateEnd.get("y").toString()); - }else{ - logger.error("{}高德坐标转换失败",busPipeline.getPipelineCode()); + } else { + logger.error("{}高德坐标转换失败", busPipeline.getPipelineCode()); } busPipelineService.save(busPipeline); } catch (RuntimeException rex) { @@ -106,7 +106,7 @@ @RequestMapping(value = "/detail/{pipelineId}") public Object detail(@PathVariable("pipelineId") String pipelineId) { - if(StringUtils.isEmpty(pipelineId)){ + if (StringUtils.isEmpty(pipelineId)) { return ResponseData.error("查询失败，请传缺少指定对象，请重试！"); } BusPipeline busPipeline = busPipelineService.getById(Long.valueOf(pipelineId)); @@ -153,7 +153,7 @@ } catch (Exception e) { log.error("导入管线列表失败", e); String message = e.getMessage(); - if (message.contains("Duplicate entry '")||message.contains("唯一约束")) { + if (message.contains("Duplicate entry '") || message.contains("唯一约束")) { return new ErrorResponseData("导入管线列表失败，管线编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'PIPELINE_CODE'", "") + "已存在"); } return new ErrorResponseData("导入管线列表失败"); @@ -178,4 +178,15 @@ super.exportExcel(BatchExportPipelineDto.class, list, "管线列表"); } + + /** + * 供app显示管线用 + * + * @return + */ + @RequestMapping("/appList") + public Object appList() { + return new SuccessResponseData(busPipelineService.appList()); + } + } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java index acba708..57cb6e8 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.BatchExportPipelineDto; +import com.casic.missiles.modular.system.dto.pipeLineDTO; import com.casic.missiles.modular.system.model.BusPipeline; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -24,4 +26,7 @@ @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid); + @Select("select t.pipeline_code as pipeCode,t.start_longitude_gaode as startLongitudeGd,t.start_latitude_gaode as startLatitudeGd,t.end_longitude_gaode as endLongitudeGd,t.end_latitude_gaode as endLatitudeGd from bus_pipeline t ") + List appList(); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java new file mode 100644 index 0000000..7741dae --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDataAnalysisService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +@Controller +@RequestMapping("/leakAnalysis") +public class LeakAnalysisController extends BaseController { + @Resource + private IDataAnalysisService dataAnalysisService; + + /** + * 根据管线编号获取阀门信息 + */ + @RequestMapping(value = "/getValvesByPipe", method = RequestMethod.GET) + @ResponseBody + public Object getValvesByPipe(String pipeCode) { + if (ObjectUtil.isEmpty(pipeCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode)); + } + + /** + * 根据阀门信息获取影响区域 + */ + @RequestMapping(value = "/getAreasByValve", method = RequestMethod.GET) + @ResponseBody + public Object getAreasByValve(String valveCode) { + if (ObjectUtil.isEmpty(valveCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getAreasByValve(valveCode)); + } +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index 0b99b60..c7df2ce 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -6,8 +6,11 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -109,4 +112,21 @@ List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid); + + @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}") + List getValvesByPipe( @Param("pipeCode") String pipeCode); + + @Select("SELECT " + + " bvi.\"VALVE_CODE\" AS valveCode, " + + " bb.\"BLOCK_CODE\" AS blockCode, " + + " bb.\"POSITION\" AS position, " + + " bb.\"NAME\" AS blockName " + + "FROM " + + " bus_valve_info bvi " + + " LEFT JOIN bus_valve_block bvb ON bvi.\"VALVE_CODE\" = bvb.\"VALVE_CODE\" " + + " LEFT JOIN bus_block_information bb ON bvb.\"BLOCK_CODE\" = bb.\"BLOCK_CODE\" " + + "WHERE " + + " bvi.\"VALVE_CODE\" = #{valveCode} ") + List getAreasByValve(@Param("valveCode") String valveCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java new file mode 100644 index 0000000..92cf6d2 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class AreaDto { + + private String valveCode; + private String position; + private String blockCode; + private String blockName; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java new file mode 100644 index 0000000..7d25168 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class ValveDto { + + private String valveCode; + private String longitude; + private String latitude; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index 9265caa..c5fd1a0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -7,7 +7,9 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import java.util.List; import java.util.Map; @@ -127,4 +129,11 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); + + List getValvesByPipe(String pipeCode); + + List getAreasByValve(String valveCode); + + + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index ad74c38..9ddf7e4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -18,7 +18,9 @@ import com.casic.missiles.modular.system.dto.statistic.DataH2s; import com.casic.missiles.modular.system.enums.HarmfulGasBusiness; import com.casic.missiles.modular.system.enums.TemphumBusiness; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import com.casic.missiles.modular.system.service.IBusDeviceSupportService; import com.casic.missiles.modular.system.service.IDataAnalysisService; import lombok.extern.slf4j.Slf4j; @@ -663,4 +665,14 @@ } return responseData; } + + @Override + public List getValvesByPipe(String pipeCode) { + return this.baseMapper.getValvesByPipe(pipeCode); + } + + @Override + public List getAreasByValve(String valveCode) { + return this.baseMapper.getAreasByValve(valveCode); + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java new file mode 100644 index 0000000..18922c5 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class pipeLineDTO { + private String pipeCode; + private String startLongitudeGd; + private String endLongitudeGd; + private String startLatitudeGd; + private String endLatitudeGd; +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index a4201ec..5e0f496 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -65,17 +65,17 @@ try { //坐标转换 - Map gaodeCoordinate = Utility.convertGaodeAPI(busPipeline.getStartLongitude(), + Map gaodeCoordinate = Utility.convertGaodeAPI(busPipeline.getStartLongitude(), busPipeline.getStartLatitude()); - Map gaodeCoordinateEnd = Utility.convertGaodeAPI(busPipeline.getEndLongitude(), + Map gaodeCoordinateEnd = Utility.convertGaodeAPI(busPipeline.getEndLongitude(), busPipeline.getEndLatitude()); - if(ObjectUtil.isAllNotEmpty(gaodeCoordinate,gaodeCoordinateEnd)) { + if (ObjectUtil.isAllNotEmpty(gaodeCoordinate, gaodeCoordinateEnd)) { busPipeline.setStartLongitudeGd(gaodeCoordinate.get("x").toString()); busPipeline.setStartLatitudeGd(gaodeCoordinate.get("y").toString()); busPipeline.setEndLongitudeGd(gaodeCoordinateEnd.get("x").toString()); busPipeline.setEndLatitudeGd(gaodeCoordinateEnd.get("y").toString()); - }else{ - logger.error("{}高德坐标转换失败",busPipeline.getPipelineCode()); + } else { + logger.error("{}高德坐标转换失败", busPipeline.getPipelineCode()); } busPipelineService.save(busPipeline); } catch (RuntimeException rex) { @@ -106,7 +106,7 @@ @RequestMapping(value = "/detail/{pipelineId}") public Object detail(@PathVariable("pipelineId") String pipelineId) { - if(StringUtils.isEmpty(pipelineId)){ + if (StringUtils.isEmpty(pipelineId)) { return ResponseData.error("查询失败，请传缺少指定对象，请重试！"); } BusPipeline busPipeline = busPipelineService.getById(Long.valueOf(pipelineId)); @@ -153,7 +153,7 @@ } catch (Exception e) { log.error("导入管线列表失败", e); String message = e.getMessage(); - if (message.contains("Duplicate entry '")||message.contains("唯一约束")) { + if (message.contains("Duplicate entry '") || message.contains("唯一约束")) { return new ErrorResponseData("导入管线列表失败，管线编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'PIPELINE_CODE'", "") + "已存在"); } return new ErrorResponseData("导入管线列表失败"); @@ -178,4 +178,15 @@ super.exportExcel(BatchExportPipelineDto.class, list, "管线列表"); } + + /** + * 供app显示管线用 + * + * @return + */ + @RequestMapping("/appList") + public Object appList() { + return new SuccessResponseData(busPipelineService.appList()); + } + } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java index acba708..57cb6e8 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.BatchExportPipelineDto; +import com.casic.missiles.modular.system.dto.pipeLineDTO; import com.casic.missiles.modular.system.model.BusPipeline; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -24,4 +26,7 @@ @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid); + @Select("select t.pipeline_code as pipeCode,t.start_longitude_gaode as startLongitudeGd,t.start_latitude_gaode as startLatitudeGd,t.end_longitude_gaode as endLongitudeGd,t.end_latitude_gaode as endLatitudeGd from bus_pipeline t ") + List appList(); + } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index fe10182..f5e9c7a 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -66,10 +66,10 @@ FROM bus_well_info w LEFT JOIN ( - SELECT COUNT(1) AS devicecount,well_id + SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id FROM bus_device_well d JOIN bus_device bd ON bd.id=d.device_id - WHERE bd.VALID = '1' + WHERE bd.VALID = '1' and d.valid ='1' GROUP BY well_id ) c ON w.id = c.well_id diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java new file mode 100644 index 0000000..7741dae --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDataAnalysisService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +@Controller +@RequestMapping("/leakAnalysis") +public class LeakAnalysisController extends BaseController { + @Resource + private IDataAnalysisService dataAnalysisService; + + /** + * 根据管线编号获取阀门信息 + */ + @RequestMapping(value = "/getValvesByPipe", method = RequestMethod.GET) + @ResponseBody + public Object getValvesByPipe(String pipeCode) { + if (ObjectUtil.isEmpty(pipeCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode)); + } + + /** + * 根据阀门信息获取影响区域 + */ + @RequestMapping(value = "/getAreasByValve", method = RequestMethod.GET) + @ResponseBody + public Object getAreasByValve(String valveCode) { + if (ObjectUtil.isEmpty(valveCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getAreasByValve(valveCode)); + } +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index 0b99b60..c7df2ce 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -6,8 +6,11 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -109,4 +112,21 @@ List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid); + + @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}") + List getValvesByPipe( @Param("pipeCode") String pipeCode); + + @Select("SELECT " + + " bvi.\"VALVE_CODE\" AS valveCode, " + + " bb.\"BLOCK_CODE\" AS blockCode, " + + " bb.\"POSITION\" AS position, " + + " bb.\"NAME\" AS blockName " + + "FROM " + + " bus_valve_info bvi " + + " LEFT JOIN bus_valve_block bvb ON bvi.\"VALVE_CODE\" = bvb.\"VALVE_CODE\" " + + " LEFT JOIN bus_block_information bb ON bvb.\"BLOCK_CODE\" = bb.\"BLOCK_CODE\" " + + "WHERE " + + " bvi.\"VALVE_CODE\" = #{valveCode} ") + List getAreasByValve(@Param("valveCode") String valveCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java new file mode 100644 index 0000000..92cf6d2 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class AreaDto { + + private String valveCode; + private String position; + private String blockCode; + private String blockName; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java new file mode 100644 index 0000000..7d25168 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class ValveDto { + + private String valveCode; + private String longitude; + private String latitude; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index 9265caa..c5fd1a0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -7,7 +7,9 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import java.util.List; import java.util.Map; @@ -127,4 +129,11 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); + + List getValvesByPipe(String pipeCode); + + List getAreasByValve(String valveCode); + + + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index ad74c38..9ddf7e4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -18,7 +18,9 @@ import com.casic.missiles.modular.system.dto.statistic.DataH2s; import com.casic.missiles.modular.system.enums.HarmfulGasBusiness; import com.casic.missiles.modular.system.enums.TemphumBusiness; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import com.casic.missiles.modular.system.service.IBusDeviceSupportService; import com.casic.missiles.modular.system.service.IDataAnalysisService; import lombok.extern.slf4j.Slf4j; @@ -663,4 +665,14 @@ } return responseData; } + + @Override + public List getValvesByPipe(String pipeCode) { + return this.baseMapper.getValvesByPipe(pipeCode); + } + + @Override + public List getAreasByValve(String valveCode) { + return this.baseMapper.getAreasByValve(valveCode); + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java new file mode 100644 index 0000000..18922c5 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class pipeLineDTO { + private String pipeCode; + private String startLongitudeGd; + private String endLongitudeGd; + private String startLatitudeGd; + private String endLatitudeGd; +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index a4201ec..5e0f496 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -65,17 +65,17 @@ try { //坐标转换 - Map gaodeCoordinate = Utility.convertGaodeAPI(busPipeline.getStartLongitude(), + Map gaodeCoordinate = Utility.convertGaodeAPI(busPipeline.getStartLongitude(), busPipeline.getStartLatitude()); - Map gaodeCoordinateEnd = Utility.convertGaodeAPI(busPipeline.getEndLongitude(), + Map gaodeCoordinateEnd = Utility.convertGaodeAPI(busPipeline.getEndLongitude(), busPipeline.getEndLatitude()); - if(ObjectUtil.isAllNotEmpty(gaodeCoordinate,gaodeCoordinateEnd)) { + if (ObjectUtil.isAllNotEmpty(gaodeCoordinate, gaodeCoordinateEnd)) { busPipeline.setStartLongitudeGd(gaodeCoordinate.get("x").toString()); busPipeline.setStartLatitudeGd(gaodeCoordinate.get("y").toString()); busPipeline.setEndLongitudeGd(gaodeCoordinateEnd.get("x").toString()); busPipeline.setEndLatitudeGd(gaodeCoordinateEnd.get("y").toString()); - }else{ - logger.error("{}高德坐标转换失败",busPipeline.getPipelineCode()); + } else { + logger.error("{}高德坐标转换失败", busPipeline.getPipelineCode()); } busPipelineService.save(busPipeline); } catch (RuntimeException rex) { @@ -106,7 +106,7 @@ @RequestMapping(value = "/detail/{pipelineId}") public Object detail(@PathVariable("pipelineId") String pipelineId) { - if(StringUtils.isEmpty(pipelineId)){ + if (StringUtils.isEmpty(pipelineId)) { return ResponseData.error("查询失败，请传缺少指定对象，请重试！"); } BusPipeline busPipeline = busPipelineService.getById(Long.valueOf(pipelineId)); @@ -153,7 +153,7 @@ } catch (Exception e) { log.error("导入管线列表失败", e); String message = e.getMessage(); - if (message.contains("Duplicate entry '")||message.contains("唯一约束")) { + if (message.contains("Duplicate entry '") || message.contains("唯一约束")) { return new ErrorResponseData("导入管线列表失败，管线编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'PIPELINE_CODE'", "") + "已存在"); } return new ErrorResponseData("导入管线列表失败"); @@ -178,4 +178,15 @@ super.exportExcel(BatchExportPipelineDto.class, list, "管线列表"); } + + /** + * 供app显示管线用 + * + * @return + */ + @RequestMapping("/appList") + public Object appList() { + return new SuccessResponseData(busPipelineService.appList()); + } + } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java index acba708..57cb6e8 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.BatchExportPipelineDto; +import com.casic.missiles.modular.system.dto.pipeLineDTO; import com.casic.missiles.modular.system.model.BusPipeline; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -24,4 +26,7 @@ @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid); + @Select("select t.pipeline_code as pipeCode,t.start_longitude_gaode as startLongitudeGd,t.start_latitude_gaode as startLatitudeGd,t.end_longitude_gaode as endLongitudeGd,t.end_latitude_gaode as endLatitudeGd from bus_pipeline t ") + List appList(); + } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index fe10182..f5e9c7a 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -66,10 +66,10 @@ FROM bus_well_info w LEFT JOIN ( - SELECT COUNT(1) AS devicecount,well_id + SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id FROM bus_device_well d JOIN bus_device bd ON bd.id=d.device_id - WHERE bd.VALID = '1' + WHERE bd.VALID = '1' and d.valid ='1' GROUP BY well_id ) c ON w.id = c.well_id diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java index a00fd71..a9aec94 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.BatchExportPipelineDto; +import com.casic.missiles.modular.system.dto.pipeLineDTO; import com.casic.missiles.modular.system.model.BusPipeline; import java.util.List; @@ -20,4 +21,6 @@ List batchAddPipeline(List results); List getBatchExportData(DataScope dataScope, String pipelineType, String deptid, String keywords); + + List appList(); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java new file mode 100644 index 0000000..7741dae --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/LeakAnalysisController.java @@ -0,0 +1,45 @@ +package com.casic.missiles.modular.system.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.model.exception.ServiceException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IDataAnalysisService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +@Controller +@RequestMapping("/leakAnalysis") +public class LeakAnalysisController extends BaseController { + @Resource + private IDataAnalysisService dataAnalysisService; + + /** + * 根据管线编号获取阀门信息 + */ + @RequestMapping(value = "/getValvesByPipe", method = RequestMethod.GET) + @ResponseBody + public Object getValvesByPipe(String pipeCode) { + if (ObjectUtil.isEmpty(pipeCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getValvesByPipe(pipeCode)); + } + + /** + * 根据阀门信息获取影响区域 + */ + @RequestMapping(value = "/getAreasByValve", method = RequestMethod.GET) + @ResponseBody + public Object getAreasByValve(String valveCode) { + if (ObjectUtil.isEmpty(valveCode)) { + throw new ServiceException(CoreExceptionEnum.REQUEST_NULL); + } + return ResponseData.success(dataAnalysisService.getAreasByValve(valveCode)); + } +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index 0b99b60..c7df2ce 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -6,8 +6,11 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -109,4 +112,21 @@ List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") Long deptid); + + @Select("select \"VALVE_CODE\" as valveCode,\"LONGITUDE\" as longitude,\"LATITUDE\" as latitude from bus_valve_info where \"PIPE_CODE\"=#{pipeCode}") + List getValvesByPipe( @Param("pipeCode") String pipeCode); + + @Select("SELECT " + + " bvi.\"VALVE_CODE\" AS valveCode, " + + " bb.\"BLOCK_CODE\" AS blockCode, " + + " bb.\"POSITION\" AS position, " + + " bb.\"NAME\" AS blockName " + + "FROM " + + " bus_valve_info bvi " + + " LEFT JOIN bus_valve_block bvb ON bvi.\"VALVE_CODE\" = bvb.\"VALVE_CODE\" " + + " LEFT JOIN bus_block_information bb ON bvb.\"BLOCK_CODE\" = bb.\"BLOCK_CODE\" " + + "WHERE " + + " bvi.\"VALVE_CODE\" = #{valveCode} ") + List getAreasByValve(@Param("valveCode") String valveCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java new file mode 100644 index 0000000..92cf6d2 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/AreaDto.java @@ -0,0 +1,13 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class AreaDto { + + private String valveCode; + private String position; + private String blockCode; + private String blockName; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java new file mode 100644 index 0000000..7d25168 --- /dev/null +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/model/ValveDto.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.model; + + +import lombok.Data; + +@Data +public class ValveDto { + + private String valveCode; + private String longitude; + private String latitude; +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index 9265caa..c5fd1a0 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -7,7 +7,9 @@ import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.DataH2s; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import java.util.List; import java.util.Map; @@ -127,4 +129,11 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); + + List getValvesByPipe(String pipeCode); + + List getAreasByValve(String valveCode); + + + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index ad74c38..9ddf7e4 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -18,7 +18,9 @@ import com.casic.missiles.modular.system.dto.statistic.DataH2s; import com.casic.missiles.modular.system.enums.HarmfulGasBusiness; import com.casic.missiles.modular.system.enums.TemphumBusiness; +import com.casic.missiles.modular.system.model.AreaDto; import com.casic.missiles.modular.system.model.BusWellInfo; +import com.casic.missiles.modular.system.model.ValveDto; import com.casic.missiles.modular.system.service.IBusDeviceSupportService; import com.casic.missiles.modular.system.service.IDataAnalysisService; import lombok.extern.slf4j.Slf4j; @@ -663,4 +665,14 @@ } return responseData; } + + @Override + public List getValvesByPipe(String pipeCode) { + return this.baseMapper.getValvesByPipe(pipeCode); + } + + @Override + public List getAreasByValve(String valveCode) { + return this.baseMapper.getAreasByValve(valveCode); + } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java new file mode 100644 index 0000000..18922c5 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/pipeLineDTO.java @@ -0,0 +1,12 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +@Data +public class pipeLineDTO { + private String pipeCode; + private String startLongitudeGd; + private String endLongitudeGd; + private String startLatitudeGd; + private String endLatitudeGd; +} diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java index a4201ec..5e0f496 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusPipelineController.java @@ -65,17 +65,17 @@ try { //坐标转换 - Map gaodeCoordinate = Utility.convertGaodeAPI(busPipeline.getStartLongitude(), + Map gaodeCoordinate = Utility.convertGaodeAPI(busPipeline.getStartLongitude(), busPipeline.getStartLatitude()); - Map gaodeCoordinateEnd = Utility.convertGaodeAPI(busPipeline.getEndLongitude(), + Map gaodeCoordinateEnd = Utility.convertGaodeAPI(busPipeline.getEndLongitude(), busPipeline.getEndLatitude()); - if(ObjectUtil.isAllNotEmpty(gaodeCoordinate,gaodeCoordinateEnd)) { + if (ObjectUtil.isAllNotEmpty(gaodeCoordinate, gaodeCoordinateEnd)) { busPipeline.setStartLongitudeGd(gaodeCoordinate.get("x").toString()); busPipeline.setStartLatitudeGd(gaodeCoordinate.get("y").toString()); busPipeline.setEndLongitudeGd(gaodeCoordinateEnd.get("x").toString()); busPipeline.setEndLatitudeGd(gaodeCoordinateEnd.get("y").toString()); - }else{ - logger.error("{}高德坐标转换失败",busPipeline.getPipelineCode()); + } else { + logger.error("{}高德坐标转换失败", busPipeline.getPipelineCode()); } busPipelineService.save(busPipeline); } catch (RuntimeException rex) { @@ -106,7 +106,7 @@ @RequestMapping(value = "/detail/{pipelineId}") public Object detail(@PathVariable("pipelineId") String pipelineId) { - if(StringUtils.isEmpty(pipelineId)){ + if (StringUtils.isEmpty(pipelineId)) { return ResponseData.error("查询失败，请传缺少指定对象，请重试！"); } BusPipeline busPipeline = busPipelineService.getById(Long.valueOf(pipelineId)); @@ -153,7 +153,7 @@ } catch (Exception e) { log.error("导入管线列表失败", e); String message = e.getMessage(); - if (message.contains("Duplicate entry '")||message.contains("唯一约束")) { + if (message.contains("Duplicate entry '") || message.contains("唯一约束")) { return new ErrorResponseData("导入管线列表失败，管线编号" + message.replaceAll("Duplicate entry '", "").replaceAll("' for key 'PIPELINE_CODE'", "") + "已存在"); } return new ErrorResponseData("导入管线列表失败"); @@ -178,4 +178,15 @@ super.exportExcel(BatchExportPipelineDto.class, list, "管线列表"); } + + /** + * 供app显示管线用 + * + * @return + */ + @RequestMapping("/appList") + public Object appList() { + return new SuccessResponseData(busPipelineService.appList()); + } + } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java index acba708..57cb6e8 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusPipelineMapper.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.BatchExportPipelineDto; +import com.casic.missiles.modular.system.dto.pipeLineDTO; import com.casic.missiles.modular.system.model.BusPipeline; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; @@ -24,4 +26,7 @@ @Param("pipelineType") String pipelineType, @Param("deptid") Long deptid); + @Select("select t.pipeline_code as pipeCode,t.start_longitude_gaode as startLongitudeGd,t.start_latitude_gaode as startLatitudeGd,t.end_longitude_gaode as endLongitudeGd,t.end_latitude_gaode as endLatitudeGd from bus_pipeline t ") + List appList(); + } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index fe10182..f5e9c7a 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -66,10 +66,10 @@ FROM bus_well_info w LEFT JOIN ( - SELECT COUNT(1) AS devicecount,well_id + SELECT COUNT(DISTINCT(d.device_id)) AS devicecount,well_id FROM bus_device_well d JOIN bus_device bd ON bd.id=d.device_id - WHERE bd.VALID = '1' + WHERE bd.VALID = '1' and d.valid ='1' GROUP BY well_id ) c ON w.id = c.well_id diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java index a00fd71..a9aec94 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/IBusPipelineService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.BatchExportPipelineDto; +import com.casic.missiles.modular.system.dto.pipeLineDTO; import com.casic.missiles.modular.system.model.BusPipeline; import java.util.List; @@ -20,4 +21,6 @@ List batchAddPipeline(List results); List getBatchExportData(DataScope dataScope, String pipelineType, String deptid, String keywords); + + List appList(); } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java index 87f77e8..7cff80c 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusPipelineServiceImpl.java @@ -11,6 +11,7 @@ import com.casic.missiles.modular.system.constant.BusWellConst; import com.casic.missiles.modular.system.dao.BusPipelineMapper; import com.casic.missiles.modular.system.dto.BatchExportPipelineDto; +import com.casic.missiles.modular.system.dto.pipeLineDTO; import com.casic.missiles.modular.system.model.BusPipeline; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.modular.system.service.IBusPipelineService; @@ -146,4 +147,9 @@ return list; } + + @Override + public List appList() { + return this.baseMapper.appList(); + } }