浦江大屏修改

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

@@ -1,10 +1,17 @@
 package com.huimv.admin.controller;
 
 
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.service.IPjDataService;
+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 java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -15,6 +22,14 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/pj-data")
+@CrossOrigin
 public class PjDataController {
 
+    @Autowired
+    private IPjDataService pjDataService;
+
+    @RequestMapping("/listPjData")
+    public Result list(@RequestBody Map<String,String> paramsMap) {
+        return pjDataService.listPjData(paramsMap);
+    }
 }

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

@@ -42,8 +42,8 @@ public class ReceiveController {
     @PostMapping("/feed")
     public Result list(HttpServletRequest httpServletRequest, @RequestBody FeedVo feedVo) throws ParseException {
         try {
-            if (ObjectUtil.isEmpty(feedVo)){
-                return new Result(10002,"数据格式不正确",false);
+            if (ObjectUtil.isEmpty(feedVo)) {
+                return new Result(10002, "数据格式不正确", false);
             }
             StringBuilder stringBuilder = new StringBuilder();
             stringBuilder.append(feedVo.getDateTime())
@@ -58,17 +58,17 @@ public class ReceiveController {
             String mac = feedVo.getMac();
             String s = DigestUtils.md5DigestAsHex(stringBuilder.toString().getBytes()).toLowerCase();
             System.out.println(s);
-            if (!s.equals(mac)){
-                return new Result(10001,"序列校验不通过",false);
+            if (!s.equals(mac)) {
+                return new Result(10001, "序列校验不通过", false);
             }
             System.out.println(feedVo.toString());
             String id = feedVo.getId();
-            if (StringUtils.isBlank(id)){
-                return new Result(10004,"唯一字段ID为空",false);
+            if (StringUtils.isBlank(id)) {
+                return new Result(10004, "唯一字段ID为空", false);
             }
             int ids = energyFeedService.count(new QueryWrapper<EnergyFeed>().eq("IDS", id));
-            if (ids >0 ){
-                return new Result(10005,"该数据已上传，请勿重复上传",false);
+            if (ids > 0) {
+                return new Result(10005, "该数据已上传，请勿重复上传", false);
             }
             System.out.println();
             EnergyFeed energyFeed = new EnergyFeed();
@@ -93,24 +93,21 @@ public class ReceiveController {
             data.setWeight(feedVo.getWeight());
             pjDataService.save(data);
 
-            QueryWrapper<PigUnit> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("farm_id", 23).eq("pig_id", feedVo.getPigStyId());
-            PigUnit pigUnit = pigUnitService.getOne(queryWrapper);
-            if (ObjectUtil.isNotEmpty(pigUnit)) {
-                EnergyData energyData = new EnergyData();
-                energyData.setElectricityValue("0");
-                energyData.setWaterValue("0");
-                energyData.setGasValue("0");
-                energyData.setUnitId(pigUnit.getUnitId());
-                energyData.setFarmId(pigUnit.getFarmId());
-                energyData.setCreateDate(new Date());
-                energyData.setFeedValue(feedVo.getWeight());
-                dataService.save(energyData);
-            }
-            return new Result(10000,"操作成功",true);
-        }catch (Exception e){
+
+            EnergyData energyData = new EnergyData();
+            energyData.setElectricityValue("0");
+            energyData.setWaterValue("0");
+            energyData.setGasValue("0");
+            energyData.setUnitId(225);
+            energyData.setFarmId(23);
+            energyData.setCreateDate(new Date());
+            energyData.setFeedValue(feedVo.getWeight());
+            dataService.save(energyData);
+
+            return new Result(10000, "操作成功", true);
+        } catch (Exception e) {
             System.out.println(e);
-            return new Result(10003,"其它错误",false);
+            return new Result(10003, "其它错误", false);
         }
 
     }
@@ -123,7 +120,7 @@ public class ReceiveController {
     }
 
     @PostMapping("/update")
-    public Result update(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap) {
+    public Result update(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         String farmId = paramsMap.get("farmId");
         QueryWrapper<EnergyData> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_id", farmId);

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

@@ -1,7 +1,14 @@
 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.EnergyData;
 import com.huimv.admin.entity.PjData;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.entity.vo.EnergyAllDataVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +20,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface PjDataMapper extends BaseMapper<PjData> {
 
+    List<EnergyAllDataVo> listDayGas(@Param(Constants.WRAPPER) QueryWrapper<PjData> queryWrapper);
 }

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

@@ -1,8 +1,11 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.PjData;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -12,5 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2023-08-07
  */
 public interface IPjDataService extends IService<PjData> {
-
+    Result listPjData(Map<String,String> paramsMap);
 }

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

@@ -1,14 +1,23 @@
 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.PjData;
+import com.huimv.admin.entity.vo.EnergyAllDataVo;
 import com.huimv.admin.mapper.PjDataMapper;
 import com.huimv.admin.service.IPjDataService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author author
@@ -17,4 +26,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class PjDataServiceImpl extends ServiceImpl<PjDataMapper, PjData> implements IPjDataService {
 
+    @Autowired
+    private PjDataMapper pjDataMapper;
+
+    @Override
+    public Result listPjData(Map<String, String> paramsMap) {
+
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<PjData> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId);
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
+        queryWrapper.ge("date_time", calendar.getTime());
+        List<EnergyAllDataVo> energyGasDataVos = pjDataMapper.listDayGas(queryWrapper);
+        return new Result(ResultCode.SUCCESS, energyGasDataVos);
+
+    }
 }

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

@@ -2,4 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huimv.admin.mapper.PjDataMapper">
 
+    <select id="listDayGas" resultType="com.huimv.admin.entity.vo.EnergyAllDataVo">
+        SELECT Convert((IFNUll(sum(weight),'0')),DECIMAL(10,2)) 'value',date_time 'createDate' FROM `pj_data`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(date_time,'%Y-%m-%d')
+        ORDER BY date_time ASC
+    </select>
 </mapper>