修改门卫室通道

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/FeedChangeController.java

@@ -0,0 +1,20 @@
+package com.huimv.environ.eco.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-25
+ */
+@RestController
+@RequestMapping("/feed-change")
+public class FeedChangeController {
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/FeedMaterialController.java

@@ -0,0 +1,20 @@
+package com.huimv.environ.eco.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 原料库存 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-25
+ */
+@RestController
+@RequestMapping("/feed-material")
+public class FeedMaterialController {
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/entity/FeedChange.java

@@ -0,0 +1,65 @@
+package com.huimv.environ.eco.entity;
+
+import java.math.BigDecimal;
+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 2024-01-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("feed_change")
+public class FeedChange implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 原料id
+     */
+    private Integer materialId;
+
+    /**
+     * 修改数量
+     */
+    private BigDecimal changeQuantity;
+
+    /**
+     * 修改后数量
+     */
+    private BigDecimal remainder;
+
+    /**
+     * 类型 0:采购 1:盘点 2:出库
+     */
+    private Integer type;
+
+    /**
+     * 备注
+     */
+    private String notes;
+
+    /**
+     * 操作人
+     */
+    private String userName;
+
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/entity/FeedMaterial.java

@@ -0,0 +1,55 @@
+package com.huimv.environ.eco.entity;
+
+import java.math.BigDecimal;
+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 2024-01-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("feed_material")
+public class FeedMaterial implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 原料名称
+     */
+    private String materialName;
+
+    /**
+     * 数量
+     */
+    private BigDecimal inventory;
+
+    /**
+     * 规格
+     */
+    private String standards;
+
+    /**
+     * 删除标志 0:未删除 1:已删除
+     */
+    private Integer deleteFlag;
+
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/mapper/FeedChangeMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.environ.eco.mapper;
+
+import com.huimv.environ.eco.entity.FeedChange;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-25
+ */
+public interface FeedChangeMapper extends BaseMapper<FeedChange> {
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/mapper/FeedMaterialMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.environ.eco.mapper;
+
+import com.huimv.environ.eco.entity.FeedMaterial;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 原料库存 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-25
+ */
+public interface FeedMaterialMapper extends BaseMapper<FeedMaterial> {
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/IFeedChangeService.java

@@ -0,0 +1,16 @@
+package com.huimv.environ.eco.service;
+
+import com.huimv.environ.eco.entity.FeedChange;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-25
+ */
+public interface IFeedChangeService extends IService<FeedChange> {
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/IFeedMaterialService.java

@@ -0,0 +1,16 @@
+package com.huimv.environ.eco.service;
+
+import com.huimv.environ.eco.entity.FeedMaterial;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 原料库存 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-25
+ */
+public interface IFeedMaterialService extends IService<FeedMaterial> {
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/BaseRoomServiceImpl.java

@@ -158,18 +158,21 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
                 maxWater = Math.max(eggVo.getWtrTdy(), maxWater);
             }
         }
-
-        screenDto.setDayWater(String.format("%.2f",maxWater));
-        QueryWrapper<EggData> wrapper1 = new QueryWrapper<>();
-        wrapper1.ge("upload_time", DateUtil.beginOfMonth(now));
-        List<EggVo> list1 =  eggDataMapper.getAllWeek(wrapper1);
-        double maxWater1 = 0.0;
-        if (ObjectUtil.isNotEmpty(list1)){
-            for (EggVo eggVo : list1) {
-                maxWater1 += eggVo.getWtrTdy();
+        if (ObjectUtil.isNotEmpty(screenDto)) {
+            screenDto.setDayWater(String.format("%.2f", maxWater));
+            QueryWrapper<EggData> wrapper1 = new QueryWrapper<>();
+            wrapper1.ge("upload_time", DateUtil.beginOfMonth(now));
+            List<EggVo> list1 = eggDataMapper.getAllWeek(wrapper1);
+            double maxWater1 = 0.0;
+            if (ObjectUtil.isNotEmpty(list1)) {
+                for (EggVo eggVo : list1) {
+                    maxWater1 += eggVo.getWtrTdy();
+                }
             }
+            screenDto.setMonthWater(String.format("%.2f", maxWater1));
+        }else {
+            screenDto = new ScreenDto();
         }
-        screenDto.setMonthWater(String.format("%.2f",maxWater1));
         return new Result(ResultCode.SUCCESS,screenDto);
 
     }

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/FeedChangeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.environ.eco.service.impl;
+
+import com.huimv.environ.eco.entity.FeedChange;
+import com.huimv.environ.eco.mapper.FeedChangeMapper;
+import com.huimv.environ.eco.service.IFeedChangeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-25
+ */
+@Service
+public class FeedChangeServiceImpl extends ServiceImpl<FeedChangeMapper, FeedChange> implements IFeedChangeService {
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/FeedMaterialServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.environ.eco.service.impl;
+
+import com.huimv.environ.eco.entity.FeedMaterial;
+import com.huimv.environ.eco.mapper.FeedMaterialMapper;
+import com.huimv.environ.eco.service.IFeedMaterialService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 原料库存 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2024-01-25
+ */
+@Service
+public class FeedMaterialServiceImpl extends ServiceImpl<FeedMaterialMapper, FeedMaterial> implements IFeedMaterialService {
+
+}

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/resources/mapper/FeedChangeMapper.xml

@@ -0,0 +1,16 @@
+<?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.environ.eco.mapper.FeedChangeMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.environ.eco.entity.FeedChange">
+        <id column="id" property="id" />
+        <result column="material_id" property="materialId" />
+        <result column="change_quantity" property="changeQuantity" />
+        <result column="remainder" property="remainder" />
+        <result column="type" property="type" />
+        <result column="notes" property="notes" />
+        <result column="user_name" property="userName" />
+    </resultMap>
+
+</mapper>

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/resources/mapper/FeedMaterialMapper.xml

@@ -0,0 +1,14 @@
+<?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.environ.eco.mapper.FeedMaterialMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.environ.eco.entity.FeedMaterial">
+        <id column="id" property="id" />
+        <result column="material_name" property="materialName" />
+        <result column="inventory" property="inventory" />
+        <result column="standards" property="standards" />
+        <result column="delete_flag" property="deleteFlag" />
+    </resultMap>
+
+</mapper>

huimv-farm-datacenter-egg/pom.xml

@@ -19,9 +19,9 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.huimv</groupId>
-    <artifactId>huimv-farm-datacenter</artifactId>
+    <artifactId>huimv-farm-datacenter-egg</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>huimv-farm-datacenter</name>
+    <name>huimv-farm-datacenter-egg</name>
     <description>Demo project for Spring Boot</description>
     <properties>
         <java.version>1.8</java.version>