From 391e6917fb430a7132dc678ddf8a4e3d6afa62e9 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期三, 29 十一月 2023 17:28:41 +0800
Subject: [PATCH] 交直流配电柜遥调控制
---
src/main/java/com/whyc/service/CKPowerDevAlmParamService.java | 65 ++++++--------------------------
1 files changed, 13 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/whyc/service/CKPowerDevAlmParamService.java b/src/main/java/com/whyc/service/CKPowerDevAlmParamService.java
index ad9db60..32d6681 100644
--- a/src/main/java/com/whyc/service/CKPowerDevAlmParamService.java
+++ b/src/main/java/com/whyc/service/CKPowerDevAlmParamService.java
@@ -2,11 +2,14 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.whyc.constant.CMD_Constant;
import com.whyc.dto.Response;
import com.whyc.mapper.CKPowerDevAlmParamMapper;
import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevAlmParam;
+import com.whyc.pojo.db_ckpwrdev_data_rt.CKPowerDevRtSet;
+import com.whyc.util.OpCmdUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -15,58 +18,18 @@
@Autowired(required = false)
private CKPowerDevAlmParamMapper mapper;
- //鍙戦�佸懡浠�
- public boolean sendCmd(int cmd,int powerDeviceId)
- {
- int ack = cmd;
- int stopTime=40;
- switch(cmd) {
- case CMD_Constant.CMD_GetAlarmParam: ack =CMD_Constant.CMD_GetAlarmParam_ACK ; break;
- case CMD_Constant.CMD_SetAlarmParam: ack =CMD_Constant.CMD_SetAlarmParam_ACK ; break;
- default:
- return false;
- }
- UpdateWrapper updateWrapper=new UpdateWrapper();
- updateWrapper.set("op_cmd",cmd);
- updateWrapper.eq("power_device_id",powerDeviceId);
- int flag=mapper.update(null,updateWrapper);
- boolean res_exe = false;
- if(flag>0)
- {
- PageHelper.startPage(1,1);
- QueryWrapper queryWrapper=new QueryWrapper();
- queryWrapper.eq("power_device_id",powerDeviceId);
- for(int n=0; n<stopTime; n++)
- {
- CKPowerDevAlmParam param=mapper.selectOne(queryWrapper);
- if(param!=null){
- if (param.getOpCmd() == ack) {
- res_exe = true;
- break;
- }
- try {
- Thread.sleep(250);
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- } else {
- break;
- }
- }
- }
- return res_exe;
- }
//璇诲彇鍛婅鎺у埗
public Response getAlmParam(int powerDeviceId) {
- boolean bl=sendCmd(CMD_Constant.CMD_GetAlarmParam,powerDeviceId);
- if(bl){
+ //璇诲彇opCmd杩斿洖鏄惁鎴愬姛
+ QueryWrapper<CKPowerDevAlmParam> query = Wrappers.query();
+ Response res=OpCmdUtil.getOpStatus(mapper,query, CMD_Constant.CMD_GetAlarmParam,20);
+ if((Boolean) res.getData()){
QueryWrapper queryWrapper=new QueryWrapper();
queryWrapper.eq("power_device_id",powerDeviceId);
CKPowerDevAlmParam param=mapper.selectOne(queryWrapper);
- return new Response().setII(1,bl,param,"璇诲彇鎴愬姛杩斿洖鏁版嵁");
+ return new Response().setII(1,res.getData(),param,"璇诲彇鎴愬姛杩斿洖鏁版嵁");
}else{
- return new Response().set(1,bl,"璇诲彇澶辫触");
+ return new Response().set(1,res.getData(),"璇诲彇澶辫触");
}
}
@@ -74,11 +37,9 @@
public Response setAlmParam(CKPowerDevAlmParam almParam) {
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.eq("power_device_id",almParam.getPowerDeviceId());
- int flag = mapper.update(almParam,wrapper);
- boolean bl = false;
- if (flag>0) {
- bl = sendCmd(almParam.getOpCmd().intValue(),almParam.getPowerDeviceId());
- }
- return new Response().set(1, bl, bl == true ? "淇敼鍙傛暟鎴愬姛!" : "璁剧疆鍛婅鍙傛暟澶辫触,璇锋鏌ョ綉缁�!");
+ mapper.update(almParam,wrapper);
+ //璇诲彇opCmd杩斿洖鏄惁鎴愬姛
+ QueryWrapper<CKPowerDevAlmParam> query = Wrappers.query();
+ return OpCmdUtil.getOpStatus(mapper,query, CMD_Constant.CMD_SetAlarmParam,20);
}
}
--
Gitblit v1.9.1