From 3c221b43ce4ef67ad3c4639ade6f1167862c9a03 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 11 六月 2024 10:19:26 +0800
Subject: [PATCH] 1、重构靳总协议实现中上行数据的包路径为upVos； 2、增加log4j2中的日志编码； 3、pipIrrMwTestWeb中增加测试项。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java | 348 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 292 insertions(+), 56 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
index e986f2e..a71c8f8 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
@@ -3,16 +3,28 @@
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
+import com.dy.common.mw.protocol.Command;
+import com.dy.common.mw.protocol.Data;
+import com.dy.common.mw.protocol.p206V202404.CodeV202404;
+import com.dy.common.mw.protocol.p206V202404.downVos.ComCd92_A2Vo;
+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.ResultCodeMsg;
+import com.dy.pipIrrGlobal.daoPr.PrWaterPriceMapper;
+import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
+import com.dy.pipIrrGlobal.pojoPr.PrController;
+import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
+import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
+import com.dy.pipIrrGlobal.voRm.VoUnclosedValve;
+import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
+import com.dy.pipIrrRemote.common.ComSupport;
+import com.dy.pipIrrRemote.common.CommandSv;
+import com.dy.pipIrrRemote.common.dto.ValveClose;
+import com.dy.pipIrrRemote.common.dto.ValveOpen;
+import com.dy.pipIrrRemote.result.RemoteResultCode;
import com.dy.pipIrrRemote.utils.RestTemplateUtils;
-import com.dy.pipIrrRemote.valve.dto.DTOValve;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import com.dy.pipIrrSell.virtualCard.enums.LastOperateENUM;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
@@ -22,13 +34,12 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
-import java.util.Map;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.List;
import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.Random;
/**
* @author ZhuBaoMin
@@ -38,71 +49,296 @@
*/
@Slf4j
-@Tag(name = "鍒嗘按鎴跨鐞�", description = "鍒嗘按鎴挎搷浣�")
+@Tag(name = "闃�闂ㄧ鐞�", description = "闃�闂ㄦ搷浣�")
@RestController
@RequestMapping(path="valve")
@RequiredArgsConstructor
-public class ValveCtrl {
+public class ValveCtrl extends ComSupport {
private final RestTemplateUtils restTemplateUtils;
-
- private CompletableFuture<String> futureValue = new CompletableFuture<>();
+ private final CommandSv commandSv;
+ private final SeVirtualCardMapper seVirtualCardMapper;
+ private final PrWaterPriceMapper prWaterPriceMapper;
+ private final IDLongGenerator idLongGenerator;
/**
- * 杩滅▼寮�鍏抽榾
- * @param po 寮�鍏抽榾浼犲叆瀵硅薄
+ * 杩滅▼寮�闃�锛堝钩鍙般�丄PP锛�
+ * @param valve
* @param bindingResult
* @return
*/
- @Operation(summary = "杩滅▼寮�鍏抽榾", description = "杩滅▼寮�鍏抽榾")
- @ApiResponses(value = {
- @ApiResponse(
- responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�",
- content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
- schema = @Schema(implementation = Boolean.class))}
- )
- })
- @PostMapping(path = "operate", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @PostMapping(path = "open", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> open(@RequestBody @Valid DTOValve po, BindingResult bindingResult) throws ExecutionException, InterruptedException {
+ public BaseResponse<Boolean> open(@RequestBody @Valid ValveOpen valve, BindingResult bindingResult) {
+ DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyMMddHHmmss");
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- String a = null;
- try {
- a = futureValue.get(10, TimeUnit.SECONDS);
- } catch (TimeoutException e) {
- return BaseResponseUtils.buildFail("1鍒嗛挓鍚庡幓鏌ョ湅缁撴灉");
+ Long intakeId = valve.getIntakeId();
+ Long vcId = valve.getVcId();
+ Integer userType = valve.getUserType();
+ Long operator = valve.getOperator();
+ Long comId = idLongGenerator.generate();
+
+ // 鑾峰彇绯荤粺鍙傛暟
+ if(!setuped) {
+ setUp();
}
- futureValue = new CompletableFuture<>();
- Map<String, Object> param = new HashMap<>();
- param.put("controllerType", "01");
- param.put("projectNo", 100);
- param.put("rtuNewAddr", "202405061656120001");
+ // 铏氭嫙鍗D鎹㈣櫄鎷熷崱瀵硅薄
+ VoVirtualCard vc = seVirtualCardMapper.getVcById(vcId);
+ // 鑾峰彇姘翠环
+ Double waterPrice = prWaterPriceMapper.getPrice();
- Map<String, Object> postParams = new HashMap<>();
- postParams.put("id", 2024050616450001L);
- postParams.put("protocol", "p1");
- postParams.put("rtuAddr", "20001");
- postParams.put("type", "outerCommand");
- postParams.put("code", "10");
- postParams.put("noRtMwDealRes", false);
- postParams.put("rtuResultSendWebUrl", "127.0.0.1/remote/");
- postParams.put("param", param);
+ // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
+ PrController prController = commandSv.getControllerByIntakeId(intakeId);
+ if(prController == null) {
+ return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage());
+ }
+ String rtuAddr = prController.getRtuAddr();
+ String protocol = prController.getProtocol();
- Map<String, String> headerParams = new HashMap<>();
+ // 鐢熸垚璁㈠崟鍙�
+ LocalDateTime dateTime = LocalDateTime.now();
+ Random random = new Random();
+ String CHARACTERS = "0123456789";
+ StringBuilder sb = new StringBuilder(4);
+ for (int i = 0; i < 4; i++) {
+ int index = random.nextInt(CHARACTERS.length());
+ sb.append(CHARACTERS.charAt(index));
+ }
+ String orderNo = dtf.format(dateTime) + sb.toString();
- JSONObject job_result = restTemplateUtils.post("http://localhost:8070/accMw/com/send", JSON.toJSONString(postParams), headerParams);
+ String commandCode = null;
+ if(protocol.equals("p206V202404")) {
+ // 鑾峰彇鍔熻兘鐮�
+ if(userType == 1) {
+ // 骞冲彴寮�闃�
+ commandCode = CodeV202404.cd_92;
+ }else {
+ // APP寮�闃�
+ commandCode = CodeV202404.cd_A2;
+ }
- return BaseResponseUtils.buildSuccess(a) ;
+ // 鍒涘缓瑙嗗浘
+ ComCd92_A2Vo param = new ComCd92_A2Vo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
+ param.icCardNo = vc.getVcNum();
+ param.waterRemain = 0.0;
+ param.moneyRemain = vc.getMoney();
+ param.waterPrice = waterPrice;
+ param.elePrice = 0.0;
+ param.orderNo = orderNo;
+
+ // 鏋勯�犲懡浠�
+ Command com = command(comId, commandCode, rtuAddr, protocol, param);
+
+ // 鍙戦�佸懡浠�
+ JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com));
+ if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) {
+ //if(1 > 0) {
+ // 璇锋眰鎴愬姛
+
+ // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
+ RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator);
+ commandSv.insert(rmCommandHistory);
+
+ // 澶勭悊鍥炶皟
+ BaseResponse response_CallBack = dealWithCallBack(comId);
+ if(!response_CallBack.getCode().equals("0001")) {
+ return BaseResponseUtils.buildError(RemoteResultCode.GET_RESULT_ERROR.getMessage());
+ }
+
+ // 鏇存敼铏氭嫙鍗＄姸鎬侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
+ SeVirtualCard virtualCard = new SeVirtualCard();
+ virtualCard.setId(vcId);
+ virtualCard.setInUse((byte) 1);
+ virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ virtualCard.setLastOperateTime(new Date());
+ seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+
+ // 鍥炶皟杩斿洖鐨勫唴瀹�
+ Data myData = (Data)response_CallBack.getContent();
+ return BaseResponseUtils.buildSuccess(myData) ;
+ } else {
+ // 璇锋眰澶辫触
+ JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
+ return BaseResponseUtils.buildFail(job_param.getString("message"));
+ }
+ } else {
+ // 鑾峰彇鍔熻兘鐮�
+ if(userType == 1) {
+ // 骞冲彴寮�闃�
+ commandCode = "92";
+ }else {
+ // APP寮�闃�
+ commandCode = "97";
+ }
+
+ // 鍒涘缓瑙嗗浘
+ ComCd92_A2Vo param = new ComCd92_A2Vo();
+
+ // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
+ //RmCommandHistory rmCommandHistory = getComHistory(commandCode, rtuAddr, protocol, param, operator);
+ //comId = commandSv.insert(rmCommandHistory);
+
+ // 鏋勯�犲苟鍙戦�佸懡浠�
+ Command com = command(comId, commandCode, rtuAddr, protocol, param);
+ sendCom2Mw(com);
+
+ return BaseResponseUtils.buildSuccess();
+ }
}
- @GetMapping("/setValue")
- public String setValue(String name) {
- futureValue.complete(name);
- return "Value set";
+ /**
+ * 杩滅▼鍏抽榾锛堝钩鍙般�丄PP锛�
+ * @param valve
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "close", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ public BaseResponse<Boolean> close(@RequestBody @Valid ValveClose valve, BindingResult bindingResult) {
+ DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyMMddHHmmss");
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ String rtuAddr = valve.getRtuAddr();
+ String vcNum = valve.getVcNum();
+ String orderNo = valve.getOrderNo();
+ Integer userType = valve.getUserType();
+ Long operator = valve.getOperator();
+ Long comId = idLongGenerator.generate();
+
+ // 鑾峰彇绯荤粺鍙傛暟
+ if(!setuped) {
+ setUp();
+ }
+
+ // 闃�鎺у櫒鍦板潃鎹㈠彇姘村彛ID鍜岄�氳鍗忚
+ PrController prController = commandSv.getControllerByRtuAddr(rtuAddr);
+ if(prController == null) {
+ return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage());
+ }
+ Long intakeId = prController.getIntakeId();
+ String protocol = prController.getProtocol();
+
+ String commandCode = null;
+ if(protocol.equals("p206V202404")) {
+ // 鑾峰彇鍔熻兘鐮�
+ if (userType == 1) {
+ // 骞冲彴鍏抽榾
+ commandCode = CodeV202404.cd_93;
+ } else {
+ // APP鍏抽榾
+ commandCode = CodeV202404.cd_A3;
+ }
+
+ // 鍒涘缓瑙嗗浘
+ ComCd93_A3Vo param = new ComCd93_A3Vo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
+ param.icCardNo = vcNum;
+ param.orderNo = orderNo;
+
+ // 鏋勯�犲懡浠�
+ Command com = command(comId, commandCode, rtuAddr, protocol, param);
+
+ // 鍙戦�佸懡浠�
+ JSONObject response_SendCom= (JSONObject) JSON.toJSON(sendCom2Mw(com));
+ if(response_SendCom != null && response_SendCom.getString("code").equals("0001")) {
+ // 璇锋眰鎴愬姛
+
+ // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
+ RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator);
+ commandSv.insert(rmCommandHistory);
+
+ // 澶勭悊鍥炶皟
+ BaseResponse response_CallBack = dealWithCallBack(comId);
+ if(!response_CallBack.getCode().equals("0001")) {
+ return BaseResponseUtils.buildError(RemoteResultCode.GET_RESULT_ERROR.getMessage());
+ }
+
+ // 鏇存敼铏氭嫙鍗＄姸鎬侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
+ Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
+ SeVirtualCard virtualCard = new SeVirtualCard();
+ virtualCard.setId(vcId);
+ virtualCard.setInUse((byte) 1);
+ virtualCard.setLastOperate(LastOperateENUM.OPEN_VALVE.getCode());
+ virtualCard.setLastOperateTime(new Date());
+ seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+
+ // 鍥炶皟杩斿洖鐨勫唴瀹�
+ Data myData = (Data)response_CallBack.getContent();
+ return BaseResponseUtils.buildSuccess(myData) ;
+ } else {
+ // 璇锋眰澶辫触
+ JSONObject job_param = response_SendCom.getJSONObject("content").getJSONObject("param");
+ return BaseResponseUtils.buildFail(job_param.getString("message"));
+ }
+ } else {
+ // 鑾峰彇鍔熻兘鐮�
+ if (userType == 1) {
+ // 骞冲彴鍏抽榾
+ commandCode = "93";
+ } else {
+ // APP鍏抽榾
+ commandCode = "98";
+ }
+
+ // 鍒涘缓瑙嗗浘
+ ComCd93_A3Vo param = new ComCd93_A3Vo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
+ param.icCardNo = vcNum;
+ param.orderNo = orderNo;
+
+ // 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
+ RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator);
+ comId = commandSv.insert(rmCommandHistory);
+
+ // 鏋勯�犲苟鍙戦�佸懡浠�
+ Command com = command(comId, commandCode, rtuAddr, protocol, param);
+ sendCom2Mw(com);
+ }
+
+ // 澶勭悊鍥炶皟
+ BaseResponse response = dealWithCallBack(comId);
+ if(!response.getCode().equals("0001")) {
+ return BaseResponseUtils.buildError(RemoteResultCode.GET_RESULT_ERROR.getMessage());
+ }
+
+ // 鏇存敼铏氭嫙鍗＄姸鎬侊細鏄惁浣跨敤涓�佹渶鍚庢搷浣溿�佹渶鍚庢搷浣滄椂闂�
+ Long vcId = seVirtualCardMapper.getVcIdByNum(vcNum);
+ SeVirtualCard virtualCard = new SeVirtualCard();
+ virtualCard.setId(vcId);
+ virtualCard.setInUse((byte) 0);
+ virtualCard.setLastOperate(LastOperateENUM.CLOSE_VALVE.getCode());
+ virtualCard.setLastOperateTime(new Date());
+ seVirtualCardMapper.updateByPrimaryKeySelective(virtualCard);
+
+ Data myData = (Data)response.getContent();
+ return BaseResponseUtils.buildSuccess(myData) ;
+ }
+
+ /**
+ * 鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍
+ * @param operator
+ * @return
+ */
+ @GetMapping(path = "/get")
+ @SsoAop()
+ public BaseResponse<List<VoUnclosedValve>> getUnclosedValves(@RequestParam Long operator){
+ try {
+ List<VoUnclosedValve> res = commandSv.getUnclosedValves(operator);
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇鏈叧闃�璁板綍寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
}
}
--
Gitblit v1.8.0