chuangte/autosprout
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 调整

Browse Source
This commit is contained in:
邱贞招 2024-04-10 17:57:02 +08:00
parent b8d0c9acb9
commit 00c5f92445
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceServiceImpl.java
View File

@ -205,15 +205,21 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
String pulseModeSwitch = "true".equals(asDevice.getPulseMode()) ? "1" : "0";//脉冲模式开关 String pulseModeSwitch = "true".equals(asDevice.getPulseMode()) ? "1" : "0";//脉冲模式开关
JSONObject pulseModeParamObj = JSON.parseObject(asDevice.getPulseModeParam()); JSONObject pulseModeParamObj = JSON.parseObject(asDevice.getPulseModeParam());
//将‘0分3秒’这样的字符串转换成秒 //将‘0分3秒’这样的字符串转换成秒
int sprayTime1 = convertStringToSeconds(pulseModeParamObj.getString("sprayTime"));//喷洒时间 int sprayTime1 = convertStringToSeconds(pulseModeParamObj.getString("js_sec"));//喷洒时间
int intervalTime = convertStringToSeconds(pulseModeParamObj.getString("intervalTime"));//间隔时间 int intervalTime = convertStringToSeconds(pulseModeParamObj.getString("jg_sec"));//间隔时间
Integer waterIntensity = asDevice.getWaterIntensity(); Integer waterIntensity = asDevice.getWaterIntensity();
String min = asDevice.getScreenRestTime().replace("min", "");//息屏时间转换成秒 String min = asDevice.getScreenRestTime().replace("min", "");//息屏时间转换成秒
String screenRestTime;
if(min.contains("hour")){
String hour = min.replace("hour", "");
Integer hourNum = Integer.parseInt(hour) * 60 * 60;
screenRestTime = hourNum.toString();
}else{
Integer minNum = Integer.parseInt(min) * 60; Integer minNum = Integer.parseInt(min) * 60;
Integer hourNum = Integer.parseInt(min.replace("hour", "")) * 60 * 60; screenRestTime = minNum.toString();
String screenRestTime = min.contains("hour") ? hourNum.toString() : minNum.toString(); }
String screenRestTimeSwitch = "99".equals(asDevice.getScreenRestTime()) ? "0" : "1";//息屏开关 String screenRestTimeSwitch = "99".equals(asDevice.getScreenRestTime()) ? "0" : "1";//息屏开关
StringBuilder command = new StringBuilder() StringBuilder command = new StringBuilder()
.append("qiangdu").append(waterIntensity).append(IotConstants.COMMAND_SEPARATOR) .append("qiangdu").append(waterIntensity).append(IotConstants.COMMAND_SEPARATOR)