氨气

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvAmmoniaController.java

@@ -1,13 +1,20 @@
 package com.huimv.env.manage.controller;
 
 
+import com.huimv.env.manage.service.IEnvAmmoniaService;
+import com.huimv.env.manage.utils.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.CrossOrigin;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author author
@@ -17,5 +24,11 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 @CrossOrigin
 @RequestMapping("/env-ammonia")
 public class EnvAmmoniaController {
+    @Autowired
+    private IEnvAmmoniaService envAmmoniaService;
 
+    @RequestMapping("/ammoniaList")
+    public Result ammoniaList(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return envAmmoniaService.list(httpServletRequest,paramsMap);
+    }
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/entity/dto/AllDataDto.java

@@ -14,6 +14,7 @@ public class AllDataDto {
     private String temp;
     private String envHumi;
     private String envPh;
+    private String envAmmonia;
     private String envElectricityMeter;
     private String envWaterMeter;
 }

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

@@ -2,6 +2,10 @@ package com.huimv.env.manage.service;
 
 import com.huimv.env.manage.entity.EnvAmmonia;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.env.manage.utils.Result;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
 
 /**
  * <p>
@@ -12,5 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-08-18
  */
 public interface IEnvAmmoniaService extends IService<EnvAmmonia> {
-
+    Result list(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
 }

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

@@ -1,11 +1,22 @@
 package com.huimv.env.manage.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.env.manage.entity.EnvAmmonia;
 import com.huimv.env.manage.mapper.EnvAmmoniaMapper;
 import com.huimv.env.manage.service.IEnvAmmoniaService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.env.manage.utils.Result;
+import com.huimv.env.manage.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +28,26 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnvAmmoniaServiceImpl extends ServiceImpl<EnvAmmoniaMapper, EnvAmmonia> implements IEnvAmmoniaService {
 
+    @Autowired
+    private EnvAmmoniaMapper ammoniaMapper;
+    @Override
+    public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String deviceCode = paramsMap.get("deviceCode");
+        QueryWrapper<EnvAmmonia> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("device_code", 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) {
+            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);
+        }
+        return new Result(ResultCode.SUCCESS,list);
+    }
 }

huimv-env-platform/huimv-env-manage/src/main/resources/com/huimv/env/manage/mapper/EnvDeviceRegisterMapper.xml

@@ -43,6 +43,7 @@ LEFT JOIN    base_pigpen bp ON bp.id = edr.pigpen_id
        SELECT  ifnull((SELECT temp.temp FROM `env_temp`  temp WHERE device_code = #{deviceCode} ORDER BY id DESC LIMIT 1), "0.0")temp,
 	ifnull( (SELECT humi.humi FROM  `env_humi` humi WHERE device_code = #{deviceCode}  ORDER BY id DESC LIMIT 1) , "0.0")  envHumi ,
 	 ifnull((SELECT ph.ph FROM  `env_ph` ph WHERE device_code = #{deviceCode}  ORDER BY id DESC LIMIT 1) , "0.0")  envPh ,
+	 ifnull((SELECT ammonia.ammonia FROM  `env_ammonia` ammonia WHERE device_code = #{deviceCode}  ORDER BY id DESC LIMIT 1) , "0.0")  envAmmonia ,
 	ifnull((SELECT SUM(ewm.water_meter) FROM  `env_water_meter` ewm  WHERE device_code = #{deviceCode}   AND add_time >=  #{beginOfDay} ) , "0.0") envWaterMeter  ,
 	 ifnull((SELECT SUM(eem.electricity_meter) FROM   `env_electricity_meter`  eem  WHERE device_code = #{deviceCode}   AND add_time  >=  #{beginOfDay}  ), "0.0")  envElectricityMeter