From b15920d5a66d379c9fd9cb15fcc48f0f078e7c77 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 28 十月 2024 14:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/ManagerCard.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml | 4
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java | 12 +-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagerCard.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java | 54 +++----------
pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/fm/FileNameIdUtil.java | 5 -
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/QueryVo.java | 12 ---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd84Vo.java | 2
pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml | 59 ++++----------
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java | 5 -
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 14 +--
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java | 14 ++-
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java | 6
pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml | 4
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java | 6 -
15 files changed, 64 insertions(+), 137 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
index 8de6bb7..02f388b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
@@ -147,7 +147,7 @@
return b ;
}
/**
- * 寰楀埌IC鍗＄被鍨嬪悕绉� 锛� 鍗＄被鍨�(1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬紑鍏抽榾鍗★紱5锛氭竻绌哄崱)锛�
+ * 寰楀埌IC鍗＄被鍨嬪悕绉� 锛� 鍗＄被鍨�(1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬贰妫�鍗★紱5锛氭竻绌哄崱)锛�
* @param type 瀛楄妭
* @return 鍚嶇О
*/
@@ -157,7 +157,7 @@
case 1 -> "鐢ㄦ埛鍗�";
case 2 -> "绠＄悊鍛樺崱";
case 3 -> "璋冭瘯鍗�";
- case 4 -> "寮�鍏抽榾鍗�";
+ case 4 -> "宸℃鍗�";
case 5 -> "娓呯┖鍗�";
default -> "鏈煡";
};
@@ -175,8 +175,8 @@
* 7:绱ф�ュ叧闂紱
* 8:鐢ㄦ埛杩滅▼寮�闃�锛�
* 9:鐢ㄦ埛杩滅▼鍏抽榾锛�
- * 10:寮�鍏抽榾鍗″叧闃�锛�
- * 11:寮�鍏抽榾鍗″埛鍗″崱寮�闃�锛�
+ * 10:宸℃鍗″叧闃�锛�
+ * 11:宸℃鍗″埛鍗″崱寮�闃�锛�
* 12:榛戝悕鍗曞懡浠ゅ叧闃�锛�
* 13:杩滅▼瀹氭椂鍏抽榾锛�
* 14:杩滅▼瀹氶噺鍏抽榾锛�
@@ -195,8 +195,8 @@
case 7 -> "绱ф�ュ叧闃�";
case 8 -> "鐢ㄦ埛杩滅▼寮�闃�";
case 9 -> "鐢ㄦ埛杩滅▼鍏抽榾";
- case 10 -> "寮�鍏抽榾鍗″叧闃�";
- case 11 -> "寮�鍏抽榾鍗″紑闃�";
+ case 10 -> "宸℃鍗″叧闃�";
+ case 11 -> "宸℃鍗″紑闃�";
case 12 -> "榛戝悕鍗曞懡浠ゅ叧闃�";
case 13 -> "杩滅▼瀹氭椂鍏抽榾";
case 14 -> "杩滅▼瀹氶噺鍏抽榾";
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
index 1592fc1..d6fdf2c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
@@ -124,9 +124,12 @@
//鐢ㄦ按鎴风敤姘村紑濮嬫椂闂达細6瀛楄妭BCD鐮侊紝椤哄簭鏄勾鏈堟棩鏃跺垎绉掞紝鍏朵腑鍏厓骞�=2000+骞淬��
cdData.openDt = GlParse.parseTp(bs, index) ;
- index += 6 ;
+ //index += 6 ;
//鎺у埗鍣ㄦ椂閽�
- cdData.rtuDt = GlParse.parseTp(bs, index) ;
+ //cdData.rtuDt = GlParse.parseTp(bs, index) ;
+ //2024-10-27 鍒樻鼎鐜夛細鑻忔湁鍕嬫妸鍗忚涓殑鎺у埗鍣ㄦ椂閽熺粰鍒犻櫎鎺変簡锛堢洰鐨勬槸鑺傜害瀛樺偍绌洪棿锛�
+ //澶勭悊鍔炴硶鏄妸寮�闃�鏃堕棿浣滀负鎺у埗鍣ㄦ椂閽燂紝杩欎袱涓椂闂寸浉宸笉鍒颁竴鍒嗛挓
+ cdData.rtuDt = cdData.openDt;
//index += 6 ;
}
@@ -188,9 +191,12 @@
index += 2 ;
cdData.cardType = bs[index] ;
- index++ ;
+ //index++ ;
//鎺у埗鍣ㄦ椂閽�
- cdData.rtuDt = GlParse.parseTp(bs, index) ;
+ //cdData.rtuDt = GlParse.parseTp(bs, index) ;
+ //2024-10-27 鍒樻鼎鐜夛細鑻忔湁鍕嬫妸鍗忚涓殑鎺у埗鍣ㄦ椂閽熺粰鍒犻櫎鎺変簡锛堢洰鐨勬槸鑺傜害瀛樺偍绌洪棿锛�
+ //澶勭悊鍔炴硶鏄妸鍏抽榾鏃堕棿浣滀负鎺у埗鍣ㄦ椂閽燂紝杩欎袱涓椂闂寸浉宸笉鍒颁竴鍒嗛挓
+ //cdData.rtuDt = cdData.closeDt ;
//index += 6 ;
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd84Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd84Vo.java
index dbfc32c..a9bbcb4 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd84Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd84Vo.java
@@ -11,7 +11,7 @@
public class DataCd84Vo implements UpDataVo {
public Byte opType;
- public Byte cardType ;//鍗＄被鍨�(0:鏃犲崱锛�1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬紑鍏抽榾鍗★紱5锛氭竻绌哄崱)
+ public Byte cardType ;//鍗＄被鍨�(0:鏃犲崱锛�1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬贰妫�鍗★紱5锛氭竻绌哄崱)
public String cardAddr ;//IC鍗″湴鍧�锛�8浣嶅瓧绗︼級
public String cardNo ;//IC鍗＄紪鍙�
public Double remainMoney ;//鍓╀綑閲戦锛氱敤鎴蜂綑棰�4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏�
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagerCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagerCard.java
index 6bf4d99..932ba30 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagerCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagerCard.java
@@ -53,7 +53,7 @@
private String cardNum;
/**
- * 鍗＄墖绫诲瀷;2-绠＄悊绉戯紝4-寮�鍏抽榾鍗★紝5娓呯┖鍗�
+ * 鍗＄墖绫诲瀷;2-绠＄悊绉戯紝4-宸℃鍗★紝5娓呯┖鍗�
*/
@NotNull(message = "鍗＄墖绫诲瀷涓嶈兘涓虹┖")
private Byte cardType;
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
index 6b902c9..3626863 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
@@ -110,12 +110,6 @@
@ColumnWidth(20)
private Date findDt;
- /**
- * 鏄惁鍦ㄧ嚎
- */
- @ExcelIgnore
- private Boolean isOnLine;
-
@Schema(title = "缁戝畾娆℃暟")
@ExcelProperty(value = {"${title}", "缁戝畾娆℃暟"})
@ColumnWidth(10)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
index 6fcfe5d..329b4be 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrIntakeMapper.xml
@@ -231,14 +231,9 @@
LEFT JOIN ba_district town ON ge.townId = town.id
LEFT JOIN ba_district village ON ge.villageId = village.id
LEFT JOIN pr_controller cont ON ge.id = cont.intakeId
- left JOIN JSON_TABLE(
- <!--'[{"rtuAddr":"37142501020100215","isOnLine":true},{"rtuAddr":"4000004","isOnLine":true},{"rtuAddr":"dy20240325","isOnLine":false}]',-->
- #{onLineMap},
- '$[*]' COLUMNS(
- rtuAddr VARCHAR(20) PATH '$.rtuAddr',
- isOnLine BOOLEAN PATH '$.isOnLine'
- )
- ) rtus ON cont.rtuAddr = rtus.rtuAddr
+ <if test = "bindNumber != null and bindNumber > 0">
+ JOIN (SELECT intakeId, COUNT(*) num FROM pr_intake_controller WHERE operateType = 1 group by intakeId) AS bindNumTb on bindNumTb.intakeId= ge.id
+ </if>
<where>
ge.deleted = 0
AND divi.deleted = 0
@@ -255,10 +250,10 @@
AND blo.id = #{blockId}
</if>
- <if test="isBinded == 0">
+ <if test="isBinded != null and isBinded == 0">
AND ge.id NOT IN (SELECT intakeId FROM pr_controller where deleted = 0)
</if>
- <if test="isBinded == 1">
+ <if test="isBinded != null and isBinded == 1">
AND ge.id IN (SELECT intakeId FROM pr_controller where deleted = 0)
</if>
<if test="isBinded == null">
@@ -269,21 +264,20 @@
<if test = "rtuAddr != null and rtuAddr !=''">
AND cont.rtuAddr like CONCAT('%',#{rtuAddr},'%')
</if>
- <if test="isOnLine != null and isOnLine !='' ">
- AND rtus.isOnLine = #{isOnLine}
- </if>
<if test="protocol != null and protocol !='' ">
AND cont.protocol = #{protocol}
</if>
<if test = "bindNumber != null and bindNumber > 0">
- AND (SELECT COUNT(*) FROM pr_intake_controller WHERE intakeId = ge.id AND operateType = 1) = #{bindNumber}
+ AND bindNumTb.num = #{bindNumber}
</if>
</where>
</select>
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鍙栨按鍙ｈ褰�-->
<select id="getIntakes" resultType="com.dy.pipIrrGlobal.voPr.VoIntake">
- SELECT CAST(ge.id AS char) AS intakeId,
+ WITH intakeIds AS(SELECT intakeId FROM pr_controller where deleted = 0)
+
+ SELECT CAST(ge.id AS char) AS intakeId,
ge.`name` AS intakeName,
CAST(divi.id AS char) AS divideId,
divi.`name` AS divideName,
@@ -293,18 +287,14 @@
cont.rtuAddr AS rtuAddr,
cont.protocol AS protocol,
cont.findDt AS findDt,
- rtus.isOnLine AS isOnLine,
- (SELECT COUNT(*) FROM pr_intake_controller WHERE intakeId = ge.id AND operateType = 1) AS bindNumber,
+ bindNumTb.num AS bindNumber,
ge.lng,
ge.lat,
ge.remarks,
ge.operator,
ge.operateDt As operateDt,
- (CASE
- WHEN ge.id NOT IN (SELECT intakeId FROM pr_controller where deleted = 0) THEN '鏈粦瀹�'
- WHEN ge.id IN (SELECT intakeId FROM pr_controller where deleted = 0) THEN '宸茬粦瀹�'
- END) AS isBind,
- CONCAT(country.`name`, town.`name`, village.`name`) AS address
+ IF(ge.id IN (SELECT intakeId FROM intakeIds),'宸茬粦瀹�','鏈粦瀹�') AS isBind,
+ CONCAT(country.`name`, town.`name`, village.`name`) AS address
FROM pr_intake ge
INNER JOIN pr_divide divi ON ge.divideId = divi.id
INNER JOIN ba_block blo ON divi.blockId = blo.id
@@ -312,14 +302,7 @@
LEFT JOIN ba_district town ON ge.townId = town.id
LEFT JOIN ba_district village ON ge.villageId = village.id
LEFT JOIN pr_controller cont ON ge.id = cont.intakeId
- left JOIN JSON_TABLE(
- <!--'[{"rtuAddr":"37142501020100215","isOnLine":true},{"rtuAddr":"4000004","isOnLine":true},{"rtuAddr":"dy20240325","isOnLine":false}]',-->
- #{onLineMap},
- '$[*]' COLUMNS(
- rtuAddr VARCHAR(20) PATH '$.rtuAddr',
- isOnLine BOOLEAN PATH '$.isOnLine'
- )
- ) rtus ON cont.rtuAddr = rtus.rtuAddr
+ JOIN (SELECT intakeId, COUNT(*) num FROM pr_intake_controller WHERE operateType = 1 group by intakeId) AS bindNumTb on bindNumTb.intakeId= ge.id
<where>
ge.deleted = 0
AND divi.deleted = 0
@@ -327,19 +310,16 @@
<if test="intakeName != null and intakeName != ''">
AND ge.name LIKE CONCAT('%', #{intakeName}, '%')
</if>
-
<if test="divideId != null and divideId != ''">
AND divi.id = #{divideId}
</if>
-
<if test="blockId != null and blockId != ''">
AND blo.id = #{blockId}
</if>
-
- <if test="isBinded == 0">
+ <if test="isBinded != null and isBinded == 0">
AND ge.id NOT IN (SELECT intakeId FROM pr_controller where deleted = 0)
</if>
- <if test="isBinded == 1">
+ <if test="isBinded != null and isBinded == 1">
AND ge.id IN (SELECT intakeId FROM pr_controller where deleted = 0)
</if>
<if test="isBinded == null">
@@ -347,17 +327,14 @@
<if test="address != null and address != ''">
AND CONCAT(country.`name`, town.`name`, village.`name`) LIKE CONCAT('%', #{address}, '%')
</if>
- <if test = "rtuAddr != null and rtuAddr !=''">
+ <if test="rtuAddr != null and rtuAddr !=''">
AND cont.rtuAddr like CONCAT('%',#{rtuAddr},'%')
- </if>
- <if test="isOnLine != null and isOnLine !='' ">
- AND rtus.isOnLine = #{isOnLine}
</if>
<if test="protocol != null and protocol !='' ">
AND cont.protocol = #{protocol}
</if>
- <if test = "bindNumber != null and bindNumber > 0">
- AND (SELECT COUNT(*) FROM pr_intake_controller WHERE intakeId = ge.id AND operateType = 1) = #{bindNumber}
+ <if test="bindNumber != null and bindNumber > 0">
+ AND bindNumTb.num = #{bindNumber}
</if>
</where>
ORDER BY ge.operateDt DESC
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
index 42a788f..65e7dd0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveHistoryMapper.xml
@@ -476,7 +476,7 @@
WHEN oh.op_type = 3 THEN '涓績绔欏紑闃�'
WHEN oh.op_type = 5 THEN '浣欓涓嶈冻鍏抽榾'
WHEN oh.op_type = 8 THEN '鐢ㄦ埛杩滅▼寮�闃�'
- WHEN oh.op_type = 11 THEN '寮�鍏抽榾鍗″紑闃�'
+ WHEN oh.op_type = 11 THEN '宸℃鍗″紑闃�'
ELSE '鏈煡'
END AS openType,
oh.op_order_no AS openOrderNo,
@@ -494,7 +494,7 @@
WHEN oh.cl_type = 6 THEN '娴侀噺璁℃晠闅滃叧闃�'
WHEN oh.cl_type = 7 THEN '绱ф�ュ叧闂�'
WHEN oh.cl_type = 9 THEN '鐢ㄦ埛杩滅▼鍏抽榾'
- WHEN oh.cl_type = 10 THEN '寮�鍏抽榾鍗″叧闃�'
+ WHEN oh.cl_type = 10 THEN '宸℃鍗″叧闃�'
WHEN oh.cl_type = 12 THEN '榛戝悕鍗曞懡浠ゅ叧闃�'
WHEN oh.cl_type = 13 THEN '鐢ㄦ埛杩滅▼瀹氭椂鍏抽榾'
WHEN oh.cl_type = 14 THEN '鐢ㄦ埛杩滅▼瀹氶噺鍏抽榾'
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
index a58f814..d77590b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmOpenCloseValveLastMapper.xml
@@ -495,7 +495,7 @@
WHEN oh.op_type = 3 THEN '涓績绔欏紑闃�'
WHEN oh.op_type = 5 THEN '浣欓涓嶈冻鍏抽榾'
WHEN oh.op_type = 8 THEN '鐢ㄦ埛杩滅▼寮�闃�'
- WHEN oh.op_type = 11 THEN '寮�鍏抽榾鍗″紑闃�'
+ WHEN oh.op_type = 11 THEN '宸℃鍗″紑闃�'
ELSE '鏈煡'
END AS openType,
oh.op_order_no AS openOrderNo,
@@ -513,7 +513,7 @@
WHEN oh.cl_type = 6 THEN '娴侀噺璁℃晠闅滃叧闃�'
WHEN oh.cl_type = 7 THEN '绱ф�ュ叧闂�'
WHEN oh.cl_type = 9 THEN '鐢ㄦ埛杩滅▼鍏抽榾'
- WHEN oh.cl_type = 10 THEN '寮�鍏抽榾鍗″叧闃�'
+ WHEN oh.cl_type = 10 THEN '宸℃鍗″叧闃�'
WHEN oh.cl_type = 12 THEN '榛戝悕鍗曞懡浠ゅ叧闃�'
WHEN oh.cl_type = 13 THEN '鐢ㄦ埛杩滅▼瀹氭椂鍏抽榾'
WHEN oh.cl_type = 14 THEN '鐢ㄦ埛杩滅▼瀹氶噺鍏抽榾'
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java
index 1752409..5f0657c 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java
@@ -3,15 +3,10 @@
import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83CloseVo;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83OpenVo;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd84Vo;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCdC0Vo;
import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoRm.RmClientAmountDay;
import com.dy.pipIrrGlobal.pojoRm.RmClientAmountDayLast;
-import com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDay;
-import com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDayLast;
import com.dy.pipIrrGlobal.pojoSe.SeClient;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/fm/FileNameIdUtil.java b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/fm/FileNameIdUtil.java
index ca41cfb..96be7b7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/fm/FileNameIdUtil.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-file/src/main/java/com/dy/pipIrrWebFile/fm/FileNameIdUtil.java
@@ -10,11 +10,8 @@
private static long last = 0 ;
//鍚庣紑
- //鍦ㄥ垎甯冨紡绯荤粺涓紝渚嬪澶氫釜涓氬姟涓棿浠禿ataMw锛屽涓郴缁熼兘浼氬悜鏁版嵁搴撲腑鎻掑叆鏁版嵁锛岀敤鐨勯兘鏄ID鐢熸垚鍣紝
- //姝D鐢熸垚鍣ㄥ湪鍚勪釜瀛愮郴缁熶腑闅惧厤涓哄悓涓�绫绘暟鎹敓鎴愮浉鍚岀殑ID锛岄�犳垚鏁版嵁搴撴彃鍏ュ洜涓婚敭鐩稿悓鑰屾姤閿�,
- //鎵�浠ヨ璁℃鍚庣紑锛屾瘡涓瓙绯荤粺鍚庣紑涓嶅悓
private static String suffix = "0" ;
-
+
static {
last = current() ;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
index 57b5513..5753595 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -12,7 +12,6 @@
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
-import com.dy.pipIrrProject.intake.qo.OnLineIntakesQO;
import com.dy.pipIrrProject.result.ProjectResultCode;
import com.taobao.api.ApiException;
import io.swagger.v3.oas.annotations.Operation;
@@ -290,14 +289,13 @@
}
/**
+ * 姝ゅ姛鑳藉凡缍撶Щ妞嶅埌remote妯″鐨凪onitroCtrl涓�
* 鑾峰彇鍙栨按鍙ｅ垪琛紙鍦ㄧ嚎鍜屼笉鍦ㄧ嚎锛�
- *
* @param qo
* @return
- */
- @GetMapping(path = "all_intakes")
- @SsoAop()
- public BaseResponse<QueryResultVo<List<VoOnLineIntake>>> getAllIntakes(OnLineIntakesQO qo) {
+ @GetMapping(path = "all_intakes")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoOnLineIntake>>> getAllIntakes(OnLineIntakesQO qo) {
try {
QueryResultVo<List<VoOnLineIntake>> res = intakeSv.selectOnLineIntakes(qo);
return BaseResponseUtils.buildSuccess(res);
@@ -305,8 +303,8 @@
log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage());
}
- }
-
+ }
+ */
/**
* 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛锛堝湪绾垮拰涓嶅湪绾匡級
*
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
index 1bbe943..876cc0c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java
@@ -134,44 +134,15 @@
* @return 鍙栨按鍙ｈ褰曞垪琛�
*/
public QueryResultVo<List<VoIntake>> getIntakes(QueryVo queryVo) {
- Command com = new Command();
- com.id = Command.defaultId;
- com.code = "LCD0001";
- com.type = "innerCommand";
- comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
- BaseResponse baseResponse = sendCom2Mw(com);
- JSONObject response = (JSONObject) JSON.toJSON(baseResponse);
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+ Long itemTotal = prIntakeMapper.getRecordCount(params);
- if (response != null && response.getString("code").equals("0001")) {
- JSONObject attachment = response.getJSONObject("content").getJSONObject("attachment").getJSONObject("onLineMap");
-
- JSONArray jsonArray = new JSONArray();
-
- if(attachment != null) {
- HashMap<String, Boolean> onLineMap = JSON.parseObject(attachment.toJSONString(), HashMap.class);
- for (Map.Entry<String, Boolean> entry : onLineMap.entrySet()) {
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("rtuAddr", entry.getKey());
- jsonObject.put("isOnLine", entry.getValue());
- jsonArray.add(jsonObject);
- }
- }
-
- queryVo.setOnLineMap(jsonArray.toJSONString());
-
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
- Long itemTotal = prIntakeMapper.getRecordCount(params);
-
- QueryResultVo<List<VoIntake>> rsVo = new QueryResultVo<>();
- rsVo.pageSize = queryVo.pageSize;
- rsVo.pageCurr = queryVo.pageCurr;
- rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = prIntakeMapper.getIntakes(params);
- return rsVo;
- } else {
- QueryResultVo<List<VoIntake>> rsVo = new QueryResultVo<>();
- return rsVo;
- }
+ QueryResultVo<List<VoIntake>> rsVo = new QueryResultVo<>();
+ rsVo.pageSize = queryVo.pageSize;
+ rsVo.pageCurr = queryVo.pageCurr;
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = prIntakeMapper.getIntakes(params);
+ return rsVo;
}
/**
@@ -249,11 +220,12 @@
}
/**
+ * 姝ゅ姛鑳藉凡缍撶Щ妞嶅埌remote妯″鐨凪onitroSv涓�
+ *
* 鑾峰彇鍙栨按鍙ｅ垪琛�
*
* @return
- */
- public QueryResultVo<List<VoOnLineIntake>> selectOnLineIntakes(OnLineIntakesQO qo) {
+ public QueryResultVo<List<VoOnLineIntake>> selectOnLineIntakes(OnLineIntakesQO qo) {
Command com = new Command();
com.id = Command.defaultId;
com.code = "LCD0001";
@@ -287,8 +259,8 @@
QueryResultVo<List<VoOnLineIntake>> rsVo = new QueryResultVo<>();
return rsVo;
}
- }
-
+ }
+ */
/**
* 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛
*
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/QueryVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/QueryVo.java
index d12f140..d2ce43e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/QueryVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/QueryVo.java
@@ -40,18 +40,6 @@
@Schema(description = "鎺у埗鍣ㄥ湴鍧�")
private String rtuAddr;
- /**
- * 涓棿浠惰繑鍥炵殑RTU鍦ㄧ嚎鎯呭喌瀵硅薄鏁扮粍
- */
- private String onLineMap;
-
- /**
- * 鏄惁鍦ㄧ嚎
- */
- @Max(value = 1,message = "鏄惁鍦ㄧ嚎浠呭厑璁镐负鐪熸垨鍋�")
- @Min(value = 0,message = "鏄惁鍦ㄧ嚎浠呭厑璁镐负鐪熸垨鍋�")
- private Boolean isOnLine;
-
@Schema(description = "閫氫俊鍗忚")
private String protocol;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/ManagerCard.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/ManagerCard.java
index 0b28e12..eea4342 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/ManagerCard.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cardOperate/dto/ManagerCard.java
@@ -21,7 +21,7 @@
private String cardAddr;
/**
- * 鍗＄墖绫诲瀷锛�2-绠＄悊绉戯紝4-寮�鍏抽榾鍗★紝5-娓呯┖鍗�
+ * 鍗＄墖绫诲瀷锛�2-绠＄悊绉戯紝4-宸℃鍗★紝5-娓呯┖鍗�
*/
private Byte cardType;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
index f0d7ddf..98a7e5f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
@@ -342,10 +342,10 @@
openTypeName = "鐢ㄦ埛杩滅▼寮�闃�";
break;
case 11:
- openTypeName = "寮�鍏抽榾鍗″紑闃�";
+ openTypeName = "宸℃鍗″紑闃�";
break;
case 13:
- openTypeName = "寮�鍏抽榾鍗″紑闃�";
+ openTypeName = "宸℃鍗″紑闃�";
break;
default:
openTypeName = "涓嶇煡閬撴偍瑕佹煡閭ｇ寮�闃�绫诲瀷";
@@ -412,7 +412,7 @@
closeTypeName = "鐢ㄦ埛杩滅▼鍏抽榾";
break;
case 10:
- closeTypeName = "寮�鍏抽榾鍗″叧闃�";
+ closeTypeName = "宸℃鍗″叧闃�";
break;
case 12:
closeTypeName = "榛戝悕鍗曞懡浠ゅ叧闃�";
--
Gitblit v1.8.0