后台大屏数据

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

@@ -0,0 +1,43 @@
+package com.huimv.admin.controller;
+
+
+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.ProdCount;
+import com.huimv.admin.service.IProdCountService;
+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 javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-15
+ */
+@RestController
+@RequestMapping("/prod-count")
+@CrossOrigin
+public class ProdCountController {
+
+    @Autowired
+    private IProdCountService countService;
+
+    @RequestMapping("/listScreen")
+    public Result listScreen(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<ProdCount> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        ProdCount prodCount = countService.getOne(queryWrapper);
+        return new Result(ResultCode.SUCCESS,prodCount);
+    }
+}

huimv-admin/src/main/java/com/huimv/admin/entity/ProdCount.java

@@ -0,0 +1,53 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("prod_count")
+public class ProdCount implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 保育成活率
+     */
+    private String bychl;
+
+    /**
+     * 育肥成活率
+     */
+    private String yfchl;
+
+    /**
+     *  每日喂料量
+     */
+    private String mrwll;
+
+    /**
+     * 日增重
+     */
+    private String rzz;
+
+    private String farmId;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.ProdCount;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-15
+ */
+public interface ProdCountMapper extends BaseMapper<ProdCount> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.ProdCount;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-15
+ */
+public interface IProdCountService extends IService<ProdCount> {
+
+}

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

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 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.Result;
 import com.huimv.admin.common.utils.ResultCode;
@@ -238,7 +239,12 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                     idList.add(item.getId());
                 });//某一层所有单元的id
                 QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                dataQueryWrapper.eq("farm_id", farmId).in("unit_id", idList);
+                if (ObjectUtil.isNotEmpty(idList)) {
+                    dataQueryWrapper.eq("farm_id", farmId).in("unit_id", idList);
+                } else {
+                    dataQueryWrapper.eq("farm_id", farmId);
+                }
+
 
                 if ("4".equals(timeType)) {
                     //自定义
@@ -355,7 +361,12 @@ public class EnergyDataServiceImpl extends ServiceImpl<EnergyDataMapper, EnergyD
                     idList.add(item.getId());
                 });//某一层所有单元的id
                 QueryWrapper<EnergyData> dataQueryWrapper = new QueryWrapper<>();
-                dataQueryWrapper.eq("farm_id", farmId).in("unit_id", idList);
+                if (ObjectUtil.isNotEmpty(idList)) {
+                    dataQueryWrapper.eq("farm_id", farmId).in(("unit_id"), idList);
+                } else {
+                    dataQueryWrapper.eq("farm_id", farmId);
+                }
+
 
                 dataQueryWrapper.select(
                         "IFNULL(SUM(water_value),0) waterValue,IFNULL(SUM(gas_value),0) gasValue" +

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.ProdCount;
+import com.huimv.admin.mapper.ProdCountMapper;
+import com.huimv.admin.service.IProdCountService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-15
+ */
+@Service
+public class ProdCountServiceImpl extends ServiceImpl<ProdCountMapper, ProdCount> implements IProdCountService {
+
+}

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

@@ -33,6 +33,7 @@ public class EnergyTimer {
 
     //    能耗数据
     @Scheduled(cron = "0 0 */1 * * ? ")
+//    @Scheduled(cron = "0 */1 * * * ? ")
     private void getShenChan() throws Exception {
         List<EnergyEnvDevice> energyEnvDevices = deviceMapper.selectList(null);
 

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

@@ -344,7 +344,7 @@ public class EnvTimer {
                 envDeviceOnline = new EnvDeviceOnline();
                 envDeviceOnline.setCreatTime(date);
                 envDeviceOnline.setDeviceOff(count1);
-                envDeviceOnline.setDeviceOn(count1);
+                envDeviceOnline.setDeviceOn(OnDeviceCount);
                 envDeviceOnline.setFarmId(farmId + "");
                 envDeviceOnline.setOnlineRate(onDeviceRate);
                 envDeviceOnline.setNowMonth(beginOfMonth.month());
@@ -354,7 +354,7 @@ public class EnvTimer {
                 envDeviceOnline = new EnvDeviceOnline();
                 envDeviceOnline.setCreatTime(date);
                 envDeviceOnline.setDeviceOff(count1);
-                envDeviceOnline.setDeviceOn(count1);
+                envDeviceOnline.setDeviceOn(OnDeviceCount);
                 envDeviceOnline.setFarmId(farmId + "");
                 envDeviceOnline.setOnlineRate(onDeviceRate);
                 envDeviceOnline.setNowMonth(beginOfMonth.month());

huimv-admin/src/main/resources/mapper/ProdCountMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.admin.mapper.ProdCountMapper">
+
+</mapper>