Merge branch 'master' of D:\huimv.farm.datacenter with conflicts.

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/EcoDeviceFlowServiceImpl.java

@@ -1,23 +1,24 @@
 package com.huimv.environ.eco.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
+import com.huimv.environ.eco.entity.BaseRoom;
+import com.huimv.environ.eco.entity.EcoDevice;
 import com.huimv.environ.eco.entity.EcoDeviceFlow;
 import com.huimv.environ.eco.entity.dto.LastFlowDto;
+import com.huimv.environ.eco.entity.eggvo.EcoDeviceDto;
 import com.huimv.environ.eco.mapper.EcoDeviceFlowMapper;
 import com.huimv.environ.eco.mapper.EcoDeviceMapper;
 import com.huimv.environ.eco.service.EcoDeviceFlowService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huimv.environ.env.utils.DateUtil;
-import org.apache.commons.lang3.StringUtils;
+import freemarker.template.utility.StringUtil;
+import org.aspectj.weaver.ast.Var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.text.ParseException;
 
 
 /**
@@ -33,44 +34,12 @@ public class EcoDeviceFlowServiceImpl extends ServiceImpl<EcoDeviceFlowMapper, E
 
     @Autowired
     private EcoDeviceFlowMapper ecoDeviceFlowMapper;
+    @Autowired
+    private EcoDeviceMapper ecoDeviceMapper;
 
     @Override
     public Result getLastFlow(HttpServletRequest request) {
         String farmId = request.getHeader("farmId");
         return new Result(ResultCode.SUCCESS,ecoDeviceFlowMapper.getLastFlow(farmId));
     }
-
-    @Override
-    public void save(JSONObject dataJo) throws ParseException {
-        DateUtil dateUtil = new DateUtil();
-        EcoDeviceFlow ecoDeviceFlow = new EcoDeviceFlow();
-        ecoDeviceFlow.setDeviceCode(dataJo.getString("deviceKey"));
-        ecoDeviceFlow.setDeviceName(dataJo.getString("deviceName"));
-        ecoDeviceFlow.setDeviceStatus(Integer.parseInt(dataJo.getString("deviceStatus")));
-        ecoDeviceFlow.setDeviceOpen(dataJo.getBoolean("deviceDisabled"));
-        //温/湿度数据
-        JSONArray realTimeDataJa = dataJo.getJSONArray("realTimeData");
-        JSONObject id1Jo = realTimeDataJa.getJSONObject(0);
-        ecoDeviceFlow.setId1Name(id1Jo.getString("dataName"));
-        //
-        String id1Value = id1Jo.getString("dataValue");
-        if(StringUtils.isBlank(id1Value)){
-            id1Value = "0";
-        }
-        ecoDeviceFlow.setId1Value(id1Value);
-        ecoDeviceFlow.setId1AlarmStatus(id1Jo.getBoolean("isAlarm"));
-        ecoDeviceFlow.setId1AlarmMsg(id1Jo.getString("alarmMsg"));
-        JSONObject id2Jo = realTimeDataJa.getJSONObject(1);
-        ecoDeviceFlow.setId2Name(id2Jo.getString("dataName"));
-        String id2Value = id2Jo.getString("dataValue");
-        //
-        if(StringUtils.isBlank(id2Value)){
-            id2Value = "0";
-        }
-        ecoDeviceFlow.setId2Value(id2Value);
-        ecoDeviceFlow.setId2AlarmStatus(id2Jo.getBoolean("isAlarm"));
-        ecoDeviceFlow.setId2AlarmMsg(id2Jo.getString("alarmMsg"));
-        ecoDeviceFlow.setAddTime(dateUtil.getTodayDateTime());
-        ecoDeviceFlowMapper.insert(ecoDeviceFlow);
-    }
 }