From 44eb64bef08ce231ac95d5ee482b046014dc8afa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 08 九月 2025 11:29:26 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java | 117 +---------------------------------------------------------
1 files changed, 2 insertions(+), 115 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
index 8e2a50c..f4df780 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
@@ -17,7 +17,6 @@
import com.dy.common.mw.protocol.p206V202404.downVos.ComCd93_A3Vo;
import com.dy.common.util.IDLongGenerator;
import com.dy.common.webUtil.BaseResponse;
-import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.command.ComSupport;
import com.dy.pipIrrGlobal.command.dto.Param;
@@ -41,7 +40,6 @@
import com.dy.pipIrrWechat.command.dto.AutomaticClose;
import com.dy.pipIrrWechat.command.dto.ValveClose;
import com.dy.pipIrrWechat.command.dto.ValveOpen;
-import com.dy.pipIrrWechat.irrigatePlan.IrrigatePlanSv;
import com.dy.pipIrrWechat.irrigation.IrrigationSv;
import com.dy.pipIrrWechat.result.WechatResultCode;
import lombok.RequiredArgsConstructor;
@@ -105,28 +103,16 @@
this.irrigationSv = irrigationSv;
this.prIntakeControllerMapper = prIntakeControllerMapper;
}
- /**
- * 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
- * @param vcId
- * @return
- */
+
public VoVirtualCard getVcById(Long vcId) {
return seVirtualCardMapper.getVcById(vcId);
}
- /**
- * 鑾峰彇姘翠环
- * @return
- */
+
public Double getPrice() {
return prWaterPriceMapper.getPrice();
}
- /**
- * 鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍锛堝寘鍚湪绾挎儏鍐碉級
- * @param operator
- * @return
- */
public List<VoUnclosedValve> getUnclosedValves(Long operator) {
Command com = new Command() ;
com.id = Command.defaultId;
@@ -150,10 +136,6 @@
//System.out.println(jsonArray.toJSONString());
}
- /**
- * 鑾峰彇鏈叧闃�鐨凴TU鍦板潃鍜岃櫄鎷熷崱缂栧彿瀵规暟缁�
- * 閬嶅巻鏁扮粍鑾峰彇鏈�鍚庡懡浠ゆ棩蹇桰D闆嗗悎
- */
List<VoRtuAndVc> rtus = rmCommandHistoryMapper.getUnclosedRtus(operator);
String comIds = "";
if(rtus != null && rtus.size() > 0) {
@@ -175,78 +157,37 @@
return new ArrayList<>();
}
- /**
- * 涓烘寚瀹氾紙闃�鎺у櫒鍦板潃銆佹按鍗＄紪鍙枫�佹棤鍏抽榾璁板綍锛夊紑鍏抽榾鏈�鏂拌褰曟坊鍔犲叧闃�鏃堕棿锛屼娇涔嬩笉鍦ㄦ湭鍏抽榾璁板綍涓樉绀�
- * @param rtuAddr
- * @param icCardNo
- * @return
- */
public Integer addClostTime(String rtuAddr, String icCardNo) {
return rmOpenCloseValveLastMapper.addCloseTime(rtuAddr, icCardNo);
}
- /**
- * 鏍规嵁鍙栨按鍙D鑾峰彇涓庝箣缁戝畾铏氭嫙鍗D
- * @param intakeId
- * @return
- */
public Long getVcIdByIntakeId(Long intakeId) {
return prIntakeVcMapper.getVcIdByIntakeId(intakeId);
}
- /**
- * 鏍规嵁姘村崱缂栧彿鑾峰彇姘村崱瀵硅薄锛岃繙绋嬪厖鍊间娇鐢�
- * @param cardId
- * @return
- */
public SeClientCard geClientCardByCardId(Long cardId) {
return seClientCardMapper.selectByPrimaryKey(cardId);
}
- /**
- * 娣诲姞鍛戒护鏃ュ織
- * @param po 鍛戒护鏃ュ織瀵硅薄
- * @return 瀛楃涓茬被鍨嬬殑涓婚敭
- */
public Long insert(RmCommandHistory po) {
rmCommandHistoryMapper.insert(po);
return po.getComId();
}
- /**
- * 淇敼鍛戒护鏃ュ織淇℃伅
- * @param po 鍛戒护鏃ュ織瀵硅薄
- * @return 褰卞搷璁板綍鏁伴噺
- */
public Integer update(RmCommandHistory po) {
return rmCommandHistoryMapper.updateByPrimaryKeySelective(po);
}
- /**
- * 鍙栨按鍙ｅ悕绉版崲鍙栨按鍙D锛屾壂鐮佸紑闃�浣跨敤
- * @param intakeName
- * @return
- */
public Long getIntakeIdByName(String intakeName) {
return prIntakeMapper.getIntakeIdByName(intakeName);
}
- /**
- * 鏍规嵁閰嶇疆绫诲瀷鑾峰彇閰嶇疆鍊�
- * @param type
- * @return
- */
QueryResultVo<List<VoIrrigaterProfile>> getIrrPro(Integer type) {
QueryResultVo<List<VoIrrigaterProfile>> rsVo = new QueryResultVo<>() ;
rsVo.obj = rmIrrigateProfileMapper.getIrrPro(type);
return rsVo ;
}
- /**
- * 娣诲姞鍙栨按鍙ｆ搷浣滆褰曪紝杞亴杩囩▼鍛戒护涓嬪彂鏃朵娇鐢�
- * @param po
- * @return
- */
public Long addIntakeOperate(IrIntakeOperate po) {
irIntakeOperateMapper.insert(po);
return po.getId();
@@ -262,11 +203,6 @@
// return irIntakeOperateMapper.updateByCommandId(commandId, commandResult);
//}
- /**
- * 瀹氭椂鍏抽榾寮忚鍒掑紑闃�
- * @param automaticClose
- * @return
- */
@Transactional(rollbackFor = Exception.class)
public Map planedOpenTimedClose(AutomaticClose automaticClose, Long planId, Byte operatetype, Date startTime, Integer duration) {
Long intakeId = automaticClose.getIntakeId();
@@ -305,11 +241,6 @@
Integer hour = Integer.parseInt(String.format("%tH", plannedOpenTime));
Integer minute = Integer.parseInt(String.format("%tM", plannedOpenTime));
- /**
- * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
- * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
- * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
- */
if(vcId == null) {
vcId = getVcIdByIntakeId(intakeId);
if(vcId == null) {
@@ -419,11 +350,6 @@
param.setMinute(minute);
param.setOrderNo(orderNo);
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)1);
@@ -465,13 +391,6 @@
}
}
- /**
- * 灏忕▼搴忚繙绋嬪紑闃�
- * @param valve
- * @param planId
- * @param operatetype
- * @return
- */
public Map openWx(ValveOpen valve, Long planId, Byte operatetype) {
Long intakeId = valve.getIntakeId();
String intakeName = valve.getIntakeName();
@@ -525,11 +444,6 @@
}
}
- /**
- * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
- * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
- * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
- */
if (vcId == null) {
vcId = getVcIdByIntakeId(intakeId);
if (vcId == null) {
@@ -628,11 +542,6 @@
param.elePrice = 0.0;
param.orderNo = orderNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)1);
@@ -671,11 +580,6 @@
param.waterPrice = waterPrice;
param.orderNo = orderNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)1);
@@ -708,13 +612,6 @@
}
}
- /**
- * 灏忕▼搴忚繙绋嬪叧闃�
- * @param valve
- * @param planId
- * @param operatetype
- * @return
- */
@Transactional(rollbackFor = Exception.class)
public Map closeWx(ValveClose valve, Long planId, Byte operatetype) {
String rtuAddr = valve.getRtuAddr();
@@ -773,11 +670,6 @@
param.icCardNo = vcNum;
param.orderNo = orderNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)2);
@@ -807,11 +699,6 @@
param.icCardNo = vcNum;
param.orderNo = orderNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)2);
--
Gitblit v1.8.0