大屏修改

huimv-admin/src/main/java/com/huimv/admin/controller/EartagDataController.java

@@ -30,17 +30,17 @@ public class EartagDataController {
 
     @PostMapping("/add")
     public void add(@RequestBody Map<String, String> paramsMap) {
-        Double min = 37.0;
-        Double max = 40.0;
+        Double min = 37.5;
+        Double max = 39.0;
         String farmId = paramsMap.get("farmId");
         for (int i = 0; i < 100; i++) {
             EartagData eartagData = new EartagData();
             eartagData.setFarmId(Integer.parseInt(farmId));
             eartagData.setTemp(NumberUtils.getNumFloat(min, max));
-            eartagData.setDayNum("100");
+            eartagData.setDayNum("273");
             eartagData.setAct(NumberUtils.getNum(0, 500, 0));
-            eartagData.setBat(NumberUtils.getNum(90, 100, 0));
-            eartagData.setEartag(String.valueOf(15484251 + i));
+            eartagData.setBat(NumberUtils.getNum(90, 93, 0));
+            eartagData.setEartag(String.valueOf(15484250 + i));
             dataService.save(eartagData);
         }
     }

huimv-admin/src/main/java/com/huimv/admin/controller/EnvDeviceOnlineController.java

@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 
@@ -33,9 +34,7 @@ public class EnvDeviceOnlineController {
     private IEnvDeviceOnlineService envDeviceOnlineService;
     @RequestMapping("/list")
     public Result list(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
-        String farmId = paramsMap.get("farmId");
-        List<EnvDeviceOnline> list = envDeviceOnlineService.list(new QueryWrapper<EnvDeviceOnline>().eq("farm_id", farmId).orderByAsc("creat_time"));
-        return  new Result(ResultCode.SUCCESS,list);
+        return  envDeviceOnlineService.listOnline(httpServletRequest,paramsMap);
     }
 
 

huimv-admin/src/main/java/com/huimv/admin/mapper/EnvDataMapper.java

@@ -22,6 +22,8 @@ import java.util.List;
 public interface EnvDataMapper extends BaseMapper<EnvData> {
     List<EnvData> listDay(@Param(Constants.WRAPPER) QueryWrapper<EnvData> queryWrapper);
 
+    List<EnvData> listDay2(@Param(Constants.WRAPPER) QueryWrapper<EnvData> queryWrapper);
+
     List<EnvData> listNow(@Param(Constants.WRAPPER) QueryWrapper<EnvData> queryWrapper);
 
     List<EnvDataVo> listPigpenAll(@Param("farmId") String farmId);

huimv-admin/src/main/java/com/huimv/admin/mapper/EnvDeviceOnlineMapper.java

@@ -1,7 +1,13 @@
 package com.huimv.admin.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.huimv.admin.entity.BillPersonnelAdmission;
 import com.huimv.admin.entity.EnvDeviceOnline;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2023-03-02
  */
 public interface EnvDeviceOnlineMapper extends BaseMapper<EnvDeviceOnline> {
-
+    List<EnvDeviceOnline> list(/*String farmId,String dateTime*/@Param(Constants.WRAPPER) QueryWrapper<EnvDeviceOnline> queryWrapper);
 }

huimv-admin/src/main/java/com/huimv/admin/mapper/WriteEnvDataMapper.java

@@ -21,5 +21,7 @@ import java.util.List;
 public interface WriteEnvDataMapper extends BaseMapper<WriteEnvData> {
     List<WriteEnvDataVo> listDay(@Param(Constants.WRAPPER) QueryWrapper<WriteEnvData> queryWrapper);
 
+    List<WriteEnvDataVo> listDay2(@Param(Constants.WRAPPER) QueryWrapper<WriteEnvData> queryWrapper);
+
     List<WriteEnvDataVo> listNow(@Param(Constants.WRAPPER) QueryWrapper<WriteEnvData> queryWrapper);
 }

huimv-admin/src/main/java/com/huimv/admin/service/IEnvDeviceOnlineService.java

@@ -1,8 +1,13 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.EnvDeviceOnline;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -12,5 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2023-03-02
  */
 public interface IEnvDeviceOnlineService extends IService<EnvDeviceOnline> {
-
+    Result listOnline(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnvDeviceOnlineServiceImpl.java

@@ -1,11 +1,22 @@
 package com.huimv.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.EnvDeviceOnline;
 import com.huimv.admin.mapper.EnvDeviceOnlineMapper;
 import com.huimv.admin.service.IEnvDeviceOnlineService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +28,18 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnvDeviceOnlineServiceImpl extends ServiceImpl<EnvDeviceOnlineMapper, EnvDeviceOnline> implements IEnvDeviceOnlineService {
 
+    @Autowired
+    private EnvDeviceOnlineMapper onlineMapper;
+
+    @Override
+    public Result listOnline(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        QueryWrapper<EnvDeviceOnline> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).ge("creat_time", sdf.format(calendar.getTime()));
+        List<EnvDeviceOnline> list = onlineMapper.selectList(queryWrapper);
+        return new Result(ResultCode.SUCCESS,list);
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnvDeviceServiceImpl.java

@@ -253,6 +253,17 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             QueryWrapper<EnvData> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("unit_id", id).eq("farm_id", farmId);
 
+            //展示某一天
+            if ("5".equals(type)) {
+                startTime = startTime + " 00:00:00";
+                endTime = endTime + " 23:59:59";
+                queryWrapper.between("create_time", startTime, endTime);
+                List<EnvData> envData = dataMapper.listDay2(queryWrapper);
+
+                map.put("location", basePigpen.getBuildName());
+                map.put("data", envData);
+            }
+
             //自定义查询
             if ("4".equals(type)) {
                 startTime = startTime + " 00:00:00";
@@ -297,6 +308,17 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             QueryWrapper<WriteEnvData> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("unit_id", id).eq("farm_id", farmId);
 
+            //展示某一天
+            if ("5".equals(type)) {
+                startTime = startTime + " 00:00:00";
+                endTime = endTime + " 23:59:59";
+                queryWrapper.between("create_time", startTime, endTime);
+                List<WriteEnvDataVo> writeEnvData = writeEnvDataMapper.listDay2(queryWrapper);
+
+                map.put("location", basePigpen.getBuildName());
+                map.put("data", writeEnvData);
+            }
+
             //自定义查询
             if ("4".equals(type)) {
                 startTime = startTime + " 00:00:00";

huimv-admin/src/main/java/com/huimv/admin/timer/EnvTimer.java

@@ -10,6 +10,7 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.admin.common.utils.DataUill;
 import com.huimv.admin.common.utils.HttpClientSSLUtils;
 import com.huimv.admin.common.utils.NumberUtils;
 import com.huimv.admin.entity.*;
@@ -30,6 +31,7 @@ import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -380,10 +382,11 @@ public class EnvTimer {
         return Base64.encode(token.getUserId() + "_" + token.getToken());
     }
 
-    @Scheduled(cron = "0 0 0 * * ? ")
+    @Scheduled(cron = "0 0/5 * * * ? ")
     public void update() throws Exception {
         Date date = new Date();
         DateTime beginOfMonth = DateUtil.beginOfMonth(date);
+        Date timesmorning = DataUill.getTimesmorning();
         List<Farm> list = farmService.list();
         for (Farm farm : list) {
             Integer farmId = farm.getId();
@@ -400,13 +403,15 @@ public class EnvTimer {
             numberFormat.setMaximumFractionDigits(2);
             String onDeviceRate = numberFormat.format((float) OnDeviceCount / (float) count * 100);
 
-            EnvDeviceOnline envDeviceOnline = envDeviceOnlineService.getOne(new QueryWrapper<EnvDeviceOnline>().eq("farm_id", farmId).ge("creat_time", beginOfMonth));
+            EnvDeviceOnline envDeviceOnline = envDeviceOnlineService.getOne(new QueryWrapper<EnvDeviceOnline>().eq("farm_id", farmId).ge("creat_time", timesmorning));
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             if (ObjectUtil.isEmpty(envDeviceOnline)) {
                 envDeviceOnline = new EnvDeviceOnline();
                 envDeviceOnline.setCreatTime(date);
                 envDeviceOnline.setDeviceOff(count1);
                 envDeviceOnline.setDeviceOn(OnDeviceCount);
                 envDeviceOnline.setFarmId(farmId + "");
+                envDeviceOnline.setOhter1(sdf.format(new Date()));
                 envDeviceOnline.setOnlineRate(onDeviceRate);
                 envDeviceOnline.setNowMonth(beginOfMonth.month());
                 envDeviceOnline.setNowYear(beginOfMonth.year());
@@ -417,6 +422,7 @@ public class EnvTimer {
                 envDeviceOnline.setDeviceOff(count1);
                 envDeviceOnline.setDeviceOn(OnDeviceCount);
                 envDeviceOnline.setFarmId(farmId + "");
+                envDeviceOnline.setOhter1(sdf.format(new Date()));
                 envDeviceOnline.setOnlineRate(onDeviceRate);
                 envDeviceOnline.setNowMonth(beginOfMonth.month());
                 envDeviceOnline.setNowYear(beginOfMonth.year());

huimv-admin/src/main/resources/com/huimv/admin/mapper/EnvDataMapper.xml

@@ -24,6 +24,13 @@
     ORDER BY create_time ASC
     </select>
 
+    <select id="listDay2" resultType="com.huimv.admin.entity.EnvData">
+    SELECT Convert((IFNULL(AVG(env_temp),'0')),DECIMAL(10,2)) 'envTemp',Convert((IFNULL(AVG(env_hum),'0')),DECIMAL(10,2)) 'envHum',create_time FROM env_data
+    ${ew.customSqlSegment}
+    group BY DATE_FORMAT(create_time,'%Y-%m-%d %H')
+    ORDER BY create_time ASC
+    </select>
+
     <select id="listNow" resultType="com.huimv.admin.entity.EnvData">
     SELECT Convert((IFNULL(env_temp,'0')),DECIMAL(10,2)) 'envTemp',Convert((IFNULL(env_hum,'0')),DECIMAL(10,2)) 'envHum',create_time FROM env_data
     ${ew.customSqlSegment}

huimv-admin/src/main/resources/com/huimv/admin/mapper/EnvDeviceOnlineMapper.xml

@@ -17,4 +17,14 @@
         <result column="ohter3" property="ohter3" />
     </resultMap>
 
+    <select id="list" resultType="com.huimv.admin.entity.EnvDeviceOnline">
+        SELECT a.*  FROM `env_device_online` a
+--         INNER JOIN
+--         (select max(creat_time) da FROM `env_device_online` where farm_id='${farmId}' and
+--         creat_time >'${dateTime}'
+        ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(creat_time,'%Y-%m-%d'))
+        order creat_time asc
+--         AS b ON a.creat_time=b.da
+    </select>
 </mapper>

huimv-admin/src/main/resources/com/huimv/admin/mapper/WriteEnvDataMapper.xml

@@ -9,6 +9,14 @@
     ORDER BY create_time ASC
     </select>
 
+
+    <select id="listDay2" resultType="com.huimv.admin.entity.vo.WriteEnvDataVo">
+    SELECT Convert((IFNULL(AVG(temp),'0')),DECIMAL(10,2)) 'envTemp',Convert((IFNULL(AVG(hum),'0')),DECIMAL(10,2)) 'envHum',create_time FROM write_env_data
+    ${ew.customSqlSegment}
+    group BY DATE_FORMAT(create_time,'%Y-%m-%d %H')
+    ORDER BY create_time ASC
+    </select>
+
     <select id="listNow" resultType="com.huimv.admin.entity.vo.WriteEnvDataVo">
     SELECT Convert((IFNULL(temp,'0')),DECIMAL(10,2)) 'envTemp',Convert((IFNULL(hum,'0')),DECIMAL(10,2)) 'envHum',create_time FROM write_env_data
     ${ew.customSqlSegment}