浦江料塔数据接收修改

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-07
+ */
+@RestController
+@RequestMapping("/pig-unit")
+public class PigUnitController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-07
+ */
+@RestController
+@RequestMapping("/pj-data")
+public class PjDataController {
+
+}

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

@@ -1,24 +1,45 @@
 package com.huimv.admin.controller;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.controller.feedVo.FeedVo;
+import com.huimv.admin.entity.EnergyData;
+import com.huimv.admin.entity.EnergyFeed;
+import com.huimv.admin.entity.PigUnit;
+import com.huimv.admin.entity.PjData;
+import com.huimv.admin.service.IEnergyDataService;
+import com.huimv.admin.service.IEnergyFeedService;
+import com.huimv.admin.service.IPigUnitService;
+import com.huimv.admin.service.IPjDataService;
+import io.netty.util.internal.StringUtil;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.DigestUtils;
-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.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.Action;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Map;
 
 @RestController
 @RequestMapping("/receive")
 @CrossOrigin
 public class ReceiveController {
+    @Autowired
+    private IEnergyFeedService energyFeedService;
+    @Autowired
+    private IPjDataService pjDataService;
+    @Autowired
+    private IPigUnitService pigUnitService;
+    @Autowired
+    private IEnergyDataService dataService;
 
-    @RequestMapping("/feed")
-    public Result list(HttpServletRequest httpServletRequest, @RequestBody FeedVo feedVo) {
+    @PostMapping("/feed")
+    public Result list(HttpServletRequest httpServletRequest, @RequestBody FeedVo feedVo) throws ParseException {
         try {
             if (ObjectUtil.isEmpty(feedVo)){
                 return new Result(10002,"数据格式不正确",false);
@@ -29,9 +50,9 @@ public class ReceiveController {
                     .append(feedVo.getFarmId())
                     .append(feedVo.getPigStyName())
                     .append(feedVo.getPigStyId())
-                    .append(feedVo.getFloorName())
-                    .append(feedVo.getFloorId())
+//                    .append(feedVo.getFloorName())
                     .append(feedVo.getFeedName())
+//                    .append(feedVo.getFloorId())
                     .append(feedVo.getWeight());
             String mac = feedVo.getMac();
             String s = DigestUtils.md5DigestAsHex(stringBuilder.toString().getBytes()).toLowerCase();
@@ -40,6 +61,51 @@ public class ReceiveController {
                 return new Result(10001,"序列校验不通过",false);
             }
             System.out.println(feedVo.toString());
+            String id = feedVo.getId();
+            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);
+            }
+            System.out.println();
+            EnergyFeed energyFeed = new EnergyFeed();
+            String dateTime = feedVo.getDateTime();
+            SimpleDateFormat st = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            energyFeed.setCreateDate(st.parse(dateTime));
+            energyFeed.setFarmId(23);
+            energyFeed.setFeedValue(feedVo.getWeight());
+            energyFeed.setOriginalDate(feedVo.getWeight());
+            energyFeed.setOriginalValue(feedVo.getWeight());
+            energyFeed.setUnitId(225);
+            energyFeed.setIds(id);
+            energyFeedService.save(energyFeed);
+
+            PjData data = new PjData();
+            data.setDateTime(st.parse(dateTime));
+            data.setFarmId("23");
+            data.setFarmName("浦江");
+            data.setPigStyId(feedVo.getPigStyId());
+            data.setPigStyName(feedVo.getPigStyName());
+            data.setFeedName(feedVo.getFeedName());
+            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){
             System.out.println(e);
@@ -47,4 +113,11 @@ public class ReceiveController {
         }
 
     }
+
+    public static void main(String[] args) {
+        String s = "10010203";
+        System.out.println(s.substring(0, 4));
+        System.out.println(s.substring(4, 6));
+        System.out.println(s.substring(6, 8));
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/controller/feedVo/FeedVo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 public class FeedVo {
 
     private String  dateTime;
+    private String  id;
     private String  farmName;
     private String  farmId;
     private String  pigStyName;
@@ -15,4 +16,5 @@ public class FeedVo {
     private String  feedName;
     private String  weight;
     private String  mac;
+
 }

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

@@ -61,4 +61,6 @@ public class EnergyFeed implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
     private Date createDate;
 
+    private String ids;
+
 }

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

@@ -0,0 +1,48 @@
+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-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("pig_unit")
+public class PigUnit implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单元id
+     */
+    private Integer unitId;
+
+    /**
+     * 猪场单元id
+     */
+    private String pigId;
+
+    /**
+     * 牧场id
+     */
+    private Integer farmId;
+
+    /**
+     * 单元名称
+     */
+    private String unitName;
+
+
+}

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

@@ -0,0 +1,71 @@
+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.time.LocalDate;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("pj_data")
+public class PjData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 时间
+     */
+    private Date dateTime;
+
+    /**
+     * 猪场名称
+     */
+    private String farmName;
+
+    /**
+     * 猪场id
+     */
+    private String farmId;
+
+    /**
+     * 猪舍名称
+     */
+    private String pigStyName;
+
+    /**
+     * 猪舍id
+     */
+    private String pigStyId;
+
+    /**
+     * 打料编号品名
+     */
+    private String feedName;
+
+    /**
+     * 重量
+     */
+    private String weight;
+
+
+}

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

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

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

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

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

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

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

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

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

@@ -491,10 +491,10 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
             queryWrapper.eq("bill_status", 0);
         }
         if ("2".equals(type)) {
-            queryWrapper.eq("bill_status", 1);
+            queryWrapper.in("bill_status", 1,2);
         }
         if ("3".equals(type)) {
-            queryWrapper.in("bill_status", 2, 3);
+            queryWrapper.eq("bill_status",  3);
         }
         return new Result(ResultCode.SUCCESS, isolateMapper.selectPage(page, queryWrapper));
     }
@@ -515,6 +515,7 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         isolate.setIsolateEndDate(endDate);
         isolate.setIsolateDayNum(dayNum);
         isolate.setBillStatus(1);
+        isolateMapper.updateById(isolate);
         ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(10);
         Runnable task = new Runnable() {
             @Override
@@ -578,7 +579,6 @@ public class BillPersonnelAdmissionServiceImpl extends ServiceImpl<BillPersonnel
         long delay = 60 * 60 * 24 * dayNum;
         // 执行定时任务
         scheduler.schedule(task, delay, TimeUnit.SECONDS);
-        isolateMapper.updateById(isolate);
         return new Result(10000, "提交成功！", true);
     }
 

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.PigUnit;
+import com.huimv.admin.mapper.PigUnitMapper;
+import com.huimv.admin.service.IPigUnitService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-07
+ */
+@Service
+public class PigUnitServiceImpl extends ServiceImpl<PigUnitMapper, PigUnit> implements IPigUnitService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.PjData;
+import com.huimv.admin.mapper.PjDataMapper;
+import com.huimv.admin.service.IPjDataService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-08-07
+ */
+@Service
+public class PjDataServiceImpl extends ServiceImpl<PjDataMapper, PjData> implements IPjDataService {
+
+}

huimv-admin/src/main/resources/mapper/PigUnitMapper.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.PigUnitMapper">
+
+</mapper>

huimv-admin/src/main/resources/mapper/PjDataMapper.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.PjDataMapper">
+
+</mapper>