pipIrr-platform/pipIrr-common/pom.xml
@@ -139,6 +139,11 @@ <groupId>cn.hutool</groupId> <artifactId>hutool-all</artifactId> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> <version>2.17.2</version> </dependency> </dependencies> <build> pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrFlowmeterMapper.java
@@ -1,6 +1,7 @@ package com.dy.pipIrrGlobal.daoPr; import com.dy.pipIrrGlobal.pojoPr.PrFlowmeter; import com.dy.pipIrrGlobal.pojoPr.PrIntake; import com.dy.pipIrrGlobal.voPr.VoFlowMeter; import com.dy.pipIrrGlobal.voPr.VoFlowMonitoring; import org.apache.ibatis.annotations.Param; @@ -56,4 +57,10 @@ * @return 实体集合 */ List<VoFlowMeter> getFlowMeters(Map<?, ?> params); /** * 得到全部实体 * @return 全部实体 * */ List<PrFlowmeter> selectAll(); } pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoFlowMeter.java
@@ -24,7 +24,7 @@ @Schema(title = "ID") @ExcelProperty("ID") @ColumnWidth(10) private Long id; private String id; @Schema(title = "管网流量计编号") @ExcelProperty("管网流量计编号") pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrFlowmeterMapper.xml
@@ -172,38 +172,40 @@ SELECT COUNT(*) AS recordCountOfFlowmeter FROM pr_flowmeter WHERE deleted = 0 AND id = ${flowmeterId} </select> <!--根据流量计编号 或者 在线状态 获取未删除的流量计数量 --> <!--根据流量计编号 或者 在线状态 获取未删除的绑定的流量计数量 --> <select id="getRecordCountOfFlowMeterByOthers" resultType="_integer"> SELECT COUNT(*) AS recordCountOfFlowmeter FROM pr_flowmeter SELECT COUNT(*) AS recordCountOfFlowmeter from pr_flowmeter pfm Left join pr_monitoring_flowmeter pmofl on pmofl.flowmeterId = pfm.id Left join pr_flow_monitoring pfmt on pfmt.id = pmofl.monitoringId <where> deleted = 0 AND <if test="code != null"> code = #{code,jdbcType=VARCHAR}, pfm.deleted = 0 AND pfmt.deleted = 0 <if test = "code != null and code !=''"> AND pfm.code like CONCAT('%',#{code},'%') </if> <if test="onlineState != null "> onlineState = #{onlineState,jdbcType=TINYINT} AND pfm.onlineState = #{onlineState} </if> </where> </where> </select> <!--根据流量计编号 或者 在线状态 获取未删除的流量计记录 --> <!--根据流量计编号 或者 在线状态 获取未删除的绑定的流量计记录 --> <select id="getFlowMeters" resultType="com.dy.pipIrrGlobal.voPr.VoFlowMeter"> select (@i:=@i+1) AS id, select CAST(pfm.id AS char) AS id, pfm.code AS code, pfm.onlineState AS onlineState, pfmt.`name` AS `name`, pfm.operateDt AS operateDt from pr_flowmeter pfm inner join pr_monitoring_flowmeter pmofl on pmofl.flowmeterId = pfm.id inner join pr_flow_monitoring pfmt on pfmt.id = pmofl.monitoringId, (SELECT @i:=0) AS itable Left join pr_monitoring_flowmeter pmofl on pmofl.flowmeterId = pfm.id Left join pr_flow_monitoring pfmt on pfmt.id = pmofl.monitoringId <where> pfm.deleted = 0 AND pfmt.deleted = 0 AND pmofl.operateType = 1 <if test="code != null"> AND code = #{code,jdbcType=VARCHAR} pfm.deleted = 0 AND pfmt.deleted = 0 <if test = "code != null and code !=''"> AND pfm.code like CONCAT('%',#{code},'%') </if> <if test="onlineState != null "> AND onlineState = #{onlineState,jdbcType=TINYINT} AND pfm.onlineState = #{onlineState} </if> </where> ORDER BY pfm.operateDt DESC @@ -213,4 +215,12 @@ </if> </trim> </select> <select id="selectAll" resultMap="BaseResultMap"> <!--@mbg.generated--> select <include refid="Base_Column_List"/> from pr_flowmeter pfm where deleted != 1 </select> </mapper> pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterCtrl.java
@@ -108,18 +108,41 @@ schema = @Schema(implementation = PrFlowmeter.class))} ) }) @GetMapping(path = "getFlowMeters", consumes = MediaType.APPLICATION_JSON_VALUE) @GetMapping(path = "getFlowMeters") @SsoAop() public BaseResponse<QueryResultVo<List<VoFlowMeter>>> getFlowMeters(@RequestBody @Parameter(description = "查询form表单json数据", required = true) QueryVoFlowMeter vo) { public BaseResponse<QueryResultVo<List<VoFlowMeter>>> getFlowMeters(QueryVoFlowMeter vo) { try { QueryResultVo<List<VoFlowMeter>> res = flowmeterSv.getFlowMeters(vo); if (res == null) { return BaseResponseUtils.buildFail(ProjectResultCode.NO_FLOWMETERS.getMessage()); if (res.itemTotal != null && res.itemTotal > 0) { return BaseResponseUtils.buildSuccess(res); } return BaseResponseUtils.buildSuccess(res); return BaseResponseUtils.buildFail(ProjectResultCode.NO_FLOWMETERS.getMessage()); } catch (Exception e) { log.error("获取流量计记录异常", e); return BaseResponseUtils.buildException(e.getMessage()); } } @Operation(summary = "获得全部流量计", description = "返回全部流量计") @ApiResponses(value = { @ApiResponse( responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE, description = "返回全部流量计（BaseResponse.content:QueryResultVo[{}]）", content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE, schema = @Schema(implementation = PrFlowmeter.class))} ) }) @GetMapping(path = "all") @SsoAop() public BaseResponse<List<PrFlowmeter>> getFlowMeterAll() { try { List<PrFlowmeter> res = flowmeterSv.getFlowMeterAll(); if (res != null && res.size() > 0) { return BaseResponseUtils.buildSuccess(res); } return BaseResponseUtils.buildFail(ProjectResultCode.NO_DATA.getMessage()); } catch (Exception e) { log.error("获取流量计数据异常", e); return BaseResponseUtils.buildException(e.getMessage()); } } } pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java
@@ -60,16 +60,24 @@ */ public QueryResultVo<List<VoFlowMeter>> getFlowMeters(QueryVoFlowMeter queryVo){ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ; Integer itemTotal = prFlowmeterMapper.getRecordCountOfFlowMeterByOthers(params); QueryResultVo<List<VoFlowMeter>> rsVo = new QueryResultVo<>() ; rsVo.pageSize = queryVo.pageSize ; rsVo.pageCurr = queryVo.pageCurr ; // 计算符合条件的记录数 Integer itemTotal = prFlowmeterMapper.getRecordCountOfFlowMeterByOthers(params); rsVo.calculateAndSet(itemTotal.longValue(), params); rsVo.obj = prFlowmeterMapper.getFlowMeters(params); return rsVo ; } /** * 得到全部流量计 * @return */ public List<PrFlowmeter> getFlowMeterAll(){ List<PrFlowmeter> all = prFlowmeterMapper.selectAll(); return all; } } pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/result/ProjectResultCode.java
@@ -63,6 +63,7 @@ ADD_FLOWMETER_FAIL(60001, "流量计添加失败"), DELETE_FLOWMETER_FAIL(60002, "流量计删除失败"), NO_FLOWMETERS(60003, "没有符合条件流量计数据"), NO_DATA(60004, "没有找到流量计数据"), /** * 流量监测站、流量计关联
