From a2d5f396dcee51917d333e42a977a544091e5389 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 10 二月 2025 14:02:57 +0800
Subject: [PATCH] 大屏展示--昨日农户用水前5名统计，昨日取水口用水统计前5名统计实现
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java | 25 ++--
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSpecial/SpecialMapper.java | 5
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml | 5
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java | 46 +++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoAbnormalCloseValve.java | 2
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoTopXIntake.java | 53 ++++++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoTopXClient.java | 55 +++++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ls4StatisticsMapper.xml | 48 ++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsSv.java | 29 ++++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoLargeScreen/Ls4StatisticsMapper.java | 25 ++++
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialCtrl.java | 12 +-
11 files changed, 280 insertions(+), 25 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoLargeScreen/Ls4StatisticsMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoLargeScreen/Ls4StatisticsMapper.java
index ebf5a7c..450fd42 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoLargeScreen/Ls4StatisticsMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoLargeScreen/Ls4StatisticsMapper.java
@@ -1,10 +1,13 @@
package com.dy.pipIrrGlobal.daoLargeScreen;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.voSpecial.VoTopXClient;
+import com.dy.pipIrrGlobal.voSpecial.VoTopXIntake;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
+import java.util.List;
/**
* @Author: liurunyu
@@ -118,4 +121,26 @@
*/
Integer mTotalCountOfNeverAlarm() ;
+
+
+
+ /**
+ * 鏌愭棩鍐滄埛鐢ㄦ按鍓峏鍚�
+ * @param idStart 璧峰id
+ * @param idEnd 鎴id
+ * @param count 鍓嶅嚑鍚�
+ * @return 瀹炰綋闆嗗悎
+ */
+ List<VoTopXClient> topXClientAtCertainDay(@Param("idStart") Long idStart, @Param("idEnd") Long idEnd, @Param("count") int count) ;
+
+ /**
+ * 鏌愭棩鍙栨按鍙ｇ敤姘村墠X鍚�
+ * @param idStart 璧峰id
+ * @param idEnd 鎴id
+ * @param count 鍓嶅嚑鍚�
+ * @return 瀹炰綋闆嗗悎
+ */
+ List<VoTopXIntake> topXIntakeAtCertainDay(@Param("idStart") Long idStart, @Param("idEnd") Long idEnd, @Param("count") int count) ;
+
+
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSpecial/SpecialMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSpecial/SpecialMapper.java
index 6b6197d..c2a3881 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSpecial/SpecialMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSpecial/SpecialMapper.java
@@ -1,10 +1,9 @@
package com.dy.pipIrrGlobal.daoSpecial;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.voSpecial.CoAbnormalCloseValve;
+import com.dy.pipIrrGlobal.voSpecial.VoAbnormalCloseValve;
import com.dy.pipIrrGlobal.voSpecial.VoSteal;
import org.apache.ibatis.annotations.Mapper;
-
import java.util.List;
import java.util.Map;
@@ -42,6 +41,6 @@
* @param params 鏌ヨ鏉′欢
* @return 瀹炰綋闆嗗悎
*/
- List<CoAbnormalCloseValve> selectAbnormalCloseValveSome(Map<?, ?> params) ;
+ List<VoAbnormalCloseValve> selectAbnormalCloseValveSome(Map<?, ?> params) ;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/CoAbnormalCloseValve.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoAbnormalCloseValve.java
similarity index 93%
rename from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/CoAbnormalCloseValve.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoAbnormalCloseValve.java
index 8cc3c23..0567f49 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/CoAbnormalCloseValve.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoAbnormalCloseValve.java
@@ -30,6 +30,6 @@
"thisMoney",
"thisTime"
})
-public class CoAbnormalCloseValve extends VoSteal{
+public class VoAbnormalCloseValve extends VoSteal{
private static final long serialVersionUID = 202502081128001L;
}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoTopXClient.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoTopXClient.java
new file mode 100644
index 0000000..0bbc58a
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoTopXClient.java
@@ -0,0 +1,55 @@
+package com.dy.pipIrrGlobal.voSpecial;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/2/10 8:52
+ * @Description
+ */
+
+@Data
+@JsonPropertyOrder({"id",
+ "clientId",
+ "clientName",
+ "clientNum",
+ "clientAddress",
+ "amount"
+})
+public class VoTopXClient {
+ private static final long serialVersionUID = 202502100853001L;
+ /**
+ * 鏁版嵁璁板綍id(寮�鍏抽榾璁板綍)
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long id ;
+
+ /**
+ * 鍐滄埛ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long clientId;
+ /**
+ * 鍐滄埛濮撳悕
+ */
+ public String clientName;
+
+ /**
+ * 鍐滄埛缂栧彿
+ */
+ public String clientNum;
+
+ /**
+ * 鍐滄埛鍦板潃
+ */
+ public String clientAddress;
+
+ /**
+ * 鐢ㄦ按閲�
+ */
+ public Double amount;
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoTopXIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoTopXIntake.java
new file mode 100644
index 0000000..6777a4a
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSpecial/VoTopXIntake.java
@@ -0,0 +1,53 @@
+package com.dy.pipIrrGlobal.voSpecial;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.Data;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2025/2/10 9:13
+ * @Description
+ */
+
+@Data
+@JsonPropertyOrder({"id",
+ "intakeId",
+ "intakeNum",
+ "intakeLng",
+ "intakeLat",
+ "amount"
+})
+public class VoTopXIntake {
+ private static final long serialVersionUID = 202502100913001L;
+ /**
+ * 鏁版嵁璁板綍id(寮�鍏抽榾璁板綍)
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long id ;
+
+ /**
+ * 鍐滄埛ID
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long intakeId;
+ /**
+ * 鍙栨按鍙ｇ紪鍙�
+ */
+ public String intakeNum;
+ /**
+ * 鍙栨按鍙ｇ粡搴�
+ */
+ public Double intakeLng;
+ /**
+ * 鍙栨按鍙ｇ含搴�
+ */
+ public Double intakeLat;
+
+ /**
+ * 鐢ㄦ按閲�
+ */
+ public Double amount;
+
+}
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ls4StatisticsMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ls4StatisticsMapper.xml
index 70353ff..dc355db 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ls4StatisticsMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ls4StatisticsMapper.xml
@@ -268,4 +268,52 @@
where temTb.intake_id is null
</select>
+
+
+
+ <select id="topXClientAtCertainDay" resultType="com.dy.pipIrrGlobal.voSpecial.VoTopXClient">
+ select mTb.id as id, mTb.client_id as clientId,
+ scTb.name as clientName, scTb.clientNum as clientNum, scTb.address as clientAddress,
+ mTb.amount as amount
+ from rm_client_amount_day mTb
+ left join se_client scTb on scTb.id = mTb.client_id
+ <where>
+ <if test = "idStart != null">
+ mTb.id <![CDATA[>=]]> #{idStart, javaType=LONG, jdbcType=BIGINT}
+ </if>
+ <if test = "idEnd != null">
+ and mTb.id <![CDATA[<=]]> #{idEnd, javaType=LONG, jdbcType=BIGINT}
+ </if>
+ </where>
+ order by mTb.amount DESC
+ <trim prefix="limit " >
+ <if test="count != null">
+ 0, #{count,javaType=Integer, jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+
+
+ <select id="topXIntakeAtCertainDay" resultType="com.dy.pipIrrGlobal.voSpecial.VoTopXIntake">
+ select mTb.id as id, mTb.intake_id as intakeId,
+ piTb.name as intakeNum, piTb.lng as intakeLng, piTb.lat as intakeLat,
+ mTb.amount as amount
+ from rm_intake_amount_day mTb
+ left join pr_intake piTb on piTb.id = mTb.intake_id
+ <where>
+ <if test = "idStart != null">
+ mTb.id <![CDATA[>=]]> #{idStart, javaType=LONG, jdbcType=BIGINT}
+ </if>
+ <if test = "idEnd != null">
+ and mTb.id <![CDATA[<=]]> #{idEnd, javaType=LONG, jdbcType=BIGINT}
+ </if>
+ </where>
+ order by mTb.amount DESC
+ <trim prefix="limit " >
+ <if test="count != null">
+ 0, #{count,javaType=Integer, jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
index 9d6d8ec..01a5a70 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
@@ -28,6 +28,7 @@
</trim>
</select>
+
<select id="selectStealSome" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voSpecial.VoSteal">
select mTb.id as id, mTb.intake_id as intakeId, mTb.client_id as clientId,
piTb.name as intakeNum, piTb.lng as intakeLng, piTb.lat as intakeLat,
@@ -65,7 +66,6 @@
</select>
-
<select id="selectAbnormalCloseValveTotal" parameterType="java.util.Map" resultType="java.lang.Long">
select
count(*)
@@ -92,7 +92,8 @@
</trim>
</select>
- <select id="selectAbnormalCloseValveSome" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voSpecial.CoAbnormalCloseValve">
+
+ <select id="selectAbnormalCloseValveSome" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voSpecial.VoAbnormalCloseValve">
select mTb.id as id, mTb.intake_id as intakeId, mTb.client_id as clientId,
piTb.name as intakeNum, piTb.lng as intakeLng, piTb.lat as intakeLat,
scTb.name as clientName, scTb.clientNum as clientNum,
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java
index fdd99cf..5c35c16 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java
@@ -8,6 +8,8 @@
import com.dy.pipIrrGlobal.voLargeScreen.VoBaseInfo;
import com.dy.pipIrrGlobal.voLargeScreen.VoCurrentInfo;
import com.dy.pipIrrGlobal.voLargeScreen.VoMonitorInfo;
+import com.dy.pipIrrGlobal.voSpecial.VoTopXClient;
+import com.dy.pipIrrGlobal.voSpecial.VoTopXIntake;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -22,6 +24,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
+import java.util.List;
/**
* @Author: liurunyu
@@ -109,4 +112,47 @@
return BaseResponseUtils.buildSuccess(res);
}
+
+
+ /**
+ * 鏄ㄦ棩鍐滄埛鐢ㄦ按鍓�5鍚�
+ * @return 鏁版嵁闆嗗悎
+ */
+ @Operation(summary = "鏄ㄦ棩鍐滄埛鐢ㄦ按鍓�5鍚�", description = "鏄ㄦ棩鍐滄埛鐢ㄦ按鍓�5鍚嶇粺璁�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鏄ㄦ棩鍐滄埛鐢ㄦ按鍓�5鍚嶇粺璁★紙BaseResponse.content:[VoTopXClient{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = VoTopXClient.class))}
+ )
+ })
+ @GetMapping(path = "top5ClientYesterday")
+ @SsoAop()
+ public BaseResponse<List<VoTopXClient>> top5ClientYesterday(){
+ List<VoTopXClient> res = this.sv.top5ClientYesterday();
+ return BaseResponseUtils.buildSuccess(res);
+ }
+
+ /**
+ * 鏄ㄦ棩鍙栨按鍙ｇ敤姘村墠5鍚�
+ * @return 鏁版嵁闆嗗悎
+ */
+ @Operation(summary = "鏄ㄦ棩鍙栨按鍙ｇ敤姘村墠5鍚�", description = "鏄ㄦ棩鍙栨按鍙ｇ敤姘村墠5鍚嶇粺璁�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鏄ㄦ棩鍙栨按鍙ｇ敤姘村墠5鍚嶇粺璁★紙BaseResponse.content:[VoTopXIntake{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = VoTopXIntake.class))}
+ )
+ })
+ @GetMapping(path = "top5IntakeYesterday")
+ @SsoAop()
+ public BaseResponse<List<VoTopXIntake>> top5IntakeYesterday(){
+ List<VoTopXIntake> res = this.sv.top5IntakeYesterday();
+ return BaseResponseUtils.buildSuccess(res);
+ }
+
+
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsSv.java
index 09d573f..b45bb83 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsSv.java
@@ -5,6 +5,7 @@
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.CommandBackParam;
import com.dy.common.util.DateTime;
+import com.dy.common.util.IDLongGenerator;
import com.dy.common.webUtil.BaseResponse;
import com.dy.pipIrrGlobal.daoLargeScreen.Ls4StatisticsMapper;
import com.dy.pipIrrGlobal.rtuMw.CodeLocal;
@@ -12,6 +13,8 @@
import com.dy.pipIrrGlobal.voLargeScreen.VoBaseInfo;
import com.dy.pipIrrGlobal.voLargeScreen.VoCurrentInfo;
import com.dy.pipIrrGlobal.voLargeScreen.VoMonitorInfo;
+import com.dy.pipIrrGlobal.voSpecial.VoTopXClient;
+import com.dy.pipIrrGlobal.voSpecial.VoTopXIntake;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
@@ -19,6 +22,7 @@
import org.springframework.web.client.RestTemplate;
import java.util.Date;
+import java.util.List;
/**
* @Author: liurunyu
@@ -138,4 +142,29 @@
}
return result ;
}
+
+
+
+ /**
+ * 鏄ㄦ棩鍐滄埛鐢ㄦ按鍓�5鍚嶇粺璁�
+ * @return 鏁版嵁闆嗗悎
+ */
+ public List<VoTopXClient> top5ClientYesterday() {
+ int[] yesterday = DateTime.yyyy_MM_dd_2_ymdGroup(DateTime.lastXDay_yyyy_MM_dd(1)) ;
+ Long idStart = IDLongGenerator.generateOneDayStartId(yesterday[0], yesterday[1], yesterday[2]) ;
+ Long idEnd = IDLongGenerator.generateOneDayEndId(yesterday[0], yesterday[1], yesterday[2]) ;
+ return this.dao.topXClientAtCertainDay(idStart, idEnd, 5) ;
+ }
+
+ /**
+ * 鏄ㄦ棩鍙栨按鍙ｇ敤姘村墠5鍚嶇粺璁�
+ * @return 鏁版嵁闆嗗悎
+ */
+ public List<VoTopXIntake> top5IntakeYesterday() {
+ int[] yesterday = DateTime.yyyy_MM_dd_2_ymdGroup(DateTime.lastXDay_yyyy_MM_dd(1)) ;
+ Long idStart = IDLongGenerator.generateOneDayStartId(yesterday[0], yesterday[1], yesterday[2]) ;
+ Long idEnd = IDLongGenerator.generateOneDayEndId(yesterday[0], yesterday[1], yesterday[2]) ;
+ return this.dao.topXIntakeAtCertainDay(idStart, idEnd, 5) ;
+ }
+
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialCtrl.java
index 8df2bf7..0c5cdcf 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialCtrl.java
@@ -5,7 +5,7 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
-import com.dy.pipIrrGlobal.voSpecial.CoAbnormalCloseValve;
+import com.dy.pipIrrGlobal.voSpecial.VoAbnormalCloseValve;
import com.dy.pipIrrGlobal.voSpecial.VoSteal;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
@@ -47,7 +47,7 @@
/**
* 娑夊珜鍋锋按
- * @return
+ * @return 鏁版嵁闆嗗悎
*/
@Operation(summary = "娑夊珜鍋锋按", description = "娑夊珜鍋锋按缁熻")
@ApiResponses(value = {
@@ -70,7 +70,7 @@
/**
* 寮傚父鍏抽榾
- * @return
+ * @return 鏁版嵁闆嗗悎
*/
@Operation(summary = "寮傚父鍏抽榾", description = "寮傚父鍏抽榾缁熻")
@ApiResponses(value = {
@@ -78,16 +78,16 @@
responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
description = "寮傚父鍏抽榾缁熻锛圔aseResponse.content:QueryResultVo{[VoSteal{}]}锛�",
content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
- schema = @Schema(implementation = CoAbnormalCloseValve.class))}
+ schema = @Schema(implementation = VoAbnormalCloseValve.class))}
)
})
@GetMapping(path = "abnormalCloseValve")
@SsoAop()
- public BaseResponse<QueryResultVo<List<CoAbnormalCloseValve>>> abnormalCloseValve(@Valid QoAbnormalCloseValve qo, BindingResult bindingResult) throws Exception {
+ public BaseResponse<QueryResultVo<List<VoAbnormalCloseValve>>> abnormalCloseValve(@Valid QoAbnormalCloseValve qo, BindingResult bindingResult) throws Exception {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- QueryResultVo<List<CoAbnormalCloseValve>> res = this.sv.abnormalCloseValve(qo);
+ QueryResultVo<List<VoAbnormalCloseValve>> res = this.sv.abnormalCloseValve(qo);
return BaseResponseUtils.buildSuccess(res);
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java
index e2c5cb5..def6e7b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java
@@ -4,13 +4,12 @@
import com.dy.common.util.DateTime;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoSpecial.SpecialMapper;
-import com.dy.pipIrrGlobal.voSpecial.CoAbnormalCloseValve;
+import com.dy.pipIrrGlobal.voSpecial.VoAbnormalCloseValve;
import com.dy.pipIrrGlobal.voSpecial.VoSteal;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -32,11 +31,11 @@
/**
* 娑夊珜鍋锋按缁熻
- * @param qo
- * @return
+ * @param qo 鏌ヨ鍙傛暟
+ * @return 鏁版嵁闆嗗悎
*/
public QueryResultVo<List<VoSteal>> steal(QoSteal qo) throws Exception {
- if(qo.fromDt != null && qo.fromDt != "") {
+ if(qo.fromDt != null && !qo.fromDt.trim().equals("")) {
qo.fromDate = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(qo.fromDt + " 00:00:00") ;
}
@@ -62,12 +61,12 @@
/**
- * 娑夊珜鍋锋按缁熻
- * @param qo
- * @return
+ * 寮傚父鍏抽榾缁熻
+ * @param qo 鏌ヨ鍙傛暟
+ * @return 鏁版嵁闆嗗悎
*/
- public QueryResultVo<List<CoAbnormalCloseValve>> abnormalCloseValve(QoAbnormalCloseValve qo) throws Exception {
- if(qo.atDt != null && qo.atDt != "") {
+ public QueryResultVo<List<VoAbnormalCloseValve>> abnormalCloseValve(QoAbnormalCloseValve qo) throws Exception {
+ if(qo.atDt != null && !qo.atDt.trim().equals("")) {
qo.atDateStart = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(qo.atDt + " 00:00:00") ;
qo.atDateEnd = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(qo.atDt + " 23:59:59") ;
}
@@ -76,14 +75,14 @@
Long itemTotal = Optional.ofNullable(this.dao.selectAbnormalCloseValveTotal(params)).orElse(0L);
- QueryResultVo<List<CoAbnormalCloseValve>> rsVo = new QueryResultVo<>() ;
+ QueryResultVo<List<VoAbnormalCloseValve>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = qo.pageSize ;
rsVo.pageCurr = qo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
- List<CoAbnormalCloseValve> list = this.dao.selectAbnormalCloseValveSome(params) ;
+ List<VoAbnormalCloseValve> list = this.dao.selectAbnormalCloseValveSome(params) ;
if (list != null && list.size() > 0) {
- for (CoAbnormalCloseValve vo : list) {
+ for (VoAbnormalCloseValve vo : list) {
vo.openType = CommonV1.openCloseValveType(vo.opType) ;
vo.closeType = CommonV1.openCloseValveType(vo.clType) ;
}
--
Gitblit v1.8.0