氨气修改

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/impl/EnvAmmoniaServiceImpl.java

@@ -2,6 +2,7 @@ package com.huimv.env.manage.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.env.manage.entity.EnvAmmonia;
 import com.huimv.env.manage.mapper.EnvAmmoniaMapper;
@@ -19,7 +20,7 @@ import java.util.*;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author author
@@ -30,24 +31,32 @@ public class EnvAmmoniaServiceImpl extends ServiceImpl<EnvAmmoniaMapper, EnvAmmo
 
     @Autowired
     private EnvAmmoniaMapper ammoniaMapper;
+
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
-        String deviceCode = paramsMap.get("deviceCode");
+        String deviceCode = paramsMap.get("unitCode");
         QueryWrapper<EnvAmmonia> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("device_code", deviceCode);
+        queryWrapper.eq("unit_id", deviceCode);
         DateTime dateTime = DateUtil.beginOfDay(new Date());
         queryWrapper.ge("add_time", dateTime);
         queryWrapper.orderByAsc("add_time");
         List<EnvAmmonia> envAmmonias = ammoniaMapper.selectList(queryWrapper);
         List<Map> list = new ArrayList<>();
-        for (EnvAmmonia envAmmonia : envAmmonias) {
+        if (ObjectUtil.isNotEmpty(envAmmonias)) {
+            for (EnvAmmonia envAmmonia : envAmmonias) {
+                Map map = new HashMap();
+                map.put("dataValue", envAmmonia.getAmmonia());
+                Date addTime = envAmmonia.getAddTime();
+                SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                map.put("time", df.format(addTime));
+                list.add(map);
+            }
+        } else {
             Map map = new HashMap();
-            map.put("dataValue", envAmmonia.getAmmonia());
-            Date addTime = envAmmonia.getAddTime();
-            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            map.put("time", df.format(addTime));
+            map.put("dataValue", 0);
+            map.put("time", 0);
             list.add(map);
         }
-        return new Result(ResultCode.SUCCESS,list);
+        return new Result(ResultCode.SUCCESS, list);
     }
 }