Sfoglia il codice sorgente

修改下发喷雾除臭配置(将开关时长*60秒)。

zhuoning 2 anni fa
parent
commit
67106c3eed

+ 14 - 3
huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/SprayTimeServiceImpl.java

@@ -3,6 +3,7 @@ package com.huimv.env.common.service.impl;
 import com.huimv.env.common.dao.entity.EnvSprayTimeEntity;
 import com.huimv.env.common.dao.repo.EnvSprayTimeEntityRepo;
 import com.huimv.env.common.service.ISprayTimeService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.stereotype.Service;
@@ -21,6 +22,7 @@ import java.util.Optional;
  * @Create : 2020-12-25
  **/
 @Service
+@Slf4j
 public class SprayTimeServiceImpl implements ISprayTimeService {
     @Autowired
     private EnvSprayTimeEntityRepo envSprayTimeEntityRepo;
@@ -33,12 +35,14 @@ public class SprayTimeServiceImpl implements ISprayTimeService {
         List<EnvSprayTimeEntity> envSprayTimeEntityList = envSprayTimeEntityRepo.findAll(example);
         StringBuilder timeBuilder = new StringBuilder();
         for(EnvSprayTimeEntity sprayTimeEntity:envSprayTimeEntityList){
-            //开始分秒
+            //开始时间(分秒)
             if(sprayTimeEntity.getOpenTime() != null && sprayTimeEntity.getOpenTime().trim().length() > 0){
                 if(timeBuilder.length()>0){
                     timeBuilder.append(",");
                 }
                 timeBuilder.append(sprayTimeEntity.getOpenTime());
+            }else{
+                log.error("开始时间为null或为空.");
             }
             //持续时间
             if(sprayTimeEntity.getDuration() != null && sprayTimeEntity.getDuration() > 0){
@@ -46,13 +50,20 @@ public class SprayTimeServiceImpl implements ISprayTimeService {
                     timeBuilder.append(",");
                 }
                 timeBuilder.append(sprayTimeEntity.getDuration());
+            }else{
+                log.error("持续时间为null或为空.");
             }
-            //
+            //开关时长
             if(sprayTimeEntity.getOpenMode() != null && sprayTimeEntity.getOpenMode().trim().length() > 0){
                 if(timeBuilder.length()>0){
                     timeBuilder.append(",");
                 }
-                timeBuilder.append(sprayTimeEntity.getOpenMode());
+                String openMode = sprayTimeEntity.getOpenMode();
+                String[] openModeArray = openMode.split(",");
+                //second
+                timeBuilder.append(String.valueOf(Integer.parseInt(openModeArray[0])*60)+","+String.valueOf(Integer.parseInt(openModeArray[1])*60));
+            }else{
+                log.error("开始时长为null或为空.");
             }
         }
         return timeBuilder.toString();