饲料

huimv-farm-datacenter-egg/huimv-farm-environ/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>huimv-farm-datacenter</artifactId>
+        <artifactId>huimv-farm-datacenter-egg</artifactId>
         <groupId>com.huimv</groupId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>

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

@@ -1,9 +1,24 @@
 package com.huimv.environ.eco.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.environ.eco.entity.FeedChange;
+import com.huimv.environ.eco.entity.feedVo.FeedChangeScreenVo;
+import com.huimv.environ.eco.mapper.FeedChangeMapper;
+import com.huimv.environ.eco.service.IFeedChangeService;
+import com.huimv.environ.eco.service.IFeedMaterialService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.Action;
+import java.text.ParseException;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +32,38 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/feed-change")
 public class FeedChangeController {
 
+    @Autowired
+    private IFeedChangeService feedChangeService;
+
+    @Autowired
+    private IFeedMaterialService feedMaterialService;
+
+    @Autowired
+    private FeedChangeMapper feedChangeMapper;
+
+    @PostMapping("/add")
+    public Result add(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> map) throws ParseException {
+        return feedChangeService.add(httpServletRequest,map);
+    }
+
+    @PostMapping("/page")
+    public Result page(@RequestBody Map<String,String> map){
+        return feedChangeService.getPage(map);
+    }
+
+    @PostMapping("/delete")
+    public Result delete(@RequestBody Map<String,String> map){
+        String id = map.get("id");
+        Integer materialId = feedChangeService.getById(id).getMaterialId();
+        feedMaterialService.removeById(materialId);
+        feedChangeService.remove(new QueryWrapper<FeedChange>().lambda().eq(FeedChange::getMaterialId,materialId));
+        return Result.SUCCESS();
+    }
+
+    @PostMapping("/listScreenBuy")
+    public Result listScreenBuy(@RequestBody Map<String,String> map){
+        List<FeedChangeScreenVo> feedChangeScreenVos = feedChangeMapper.listScreenBuy();
+        return new Result(ResultCode.SUCCESS,feedChangeScreenVos);
+    }
+
 }

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

@@ -54,5 +54,10 @@ public class FeedConsumeController {
         return feedConsumeService.analysis(map);
     }
 
+    @PostMapping("/listScreenConsume")
+    public Result listScreenConsume(@RequestBody Map<String,String> map){
+        return feedConsumeService.listScreenConsume(map);
+    }
+
 
 }

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

@@ -1,9 +1,16 @@
 package com.huimv.environ.eco.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.environ.eco.entity.FeedChange;
+import com.huimv.environ.eco.entity.FeedMaterial;
+import com.huimv.environ.eco.service.IFeedMaterialService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +24,26 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/feed-material")
 public class FeedMaterialController {
 
+    @Autowired
+    private IFeedMaterialService feedMaterialService;
+
+    @PostMapping("/add")
+    public Result add(@RequestBody Map<String,String> map){
+        return feedMaterialService.add(map);
+    }
+
+    @PostMapping("/list")
+    public Result list(@RequestBody Map<String,String> map){
+        return new Result(ResultCode.SUCCESS,feedMaterialService.list());
+    }
+
+    @PostMapping("/page")
+    public Result page(@RequestBody Map<String,String> map){
+        String pageNum = map.get("pageNum");
+        String pageSize = map.get("pageSize");
+
+        Page<FeedMaterial> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        Page<FeedMaterial> feedMaterialPage = feedMaterialService.page(page);
+        return new Result(ResultCode.SUCCESS,feedMaterialPage);
+    }
 }

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

@@ -48,6 +48,11 @@ public class FeedUsageController {
         return feedUsageService.listUse(map);
     }
 
+    @PostMapping("/listScreenUse")
+    public Result listScreenUse(@RequestBody Map<String,String> map){
+        return feedUsageService.listScreenUse(map);
+    }
+
     @PostMapping("/listChartUse")
     public Result listChartUse(@RequestBody Map<String,String> map){
         return feedUsageService.listChartUse(map);

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

@@ -1,10 +1,15 @@
 package com.huimv.environ.eco.entity;
 
 import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -32,6 +37,12 @@ public class FeedChange implements Serializable {
     private Integer id;
 
     /**
+     * 日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm" ,timezone = "GMT+8")
+    private Date date;
+
+    /**
      * 原料id
      */
     private Integer materialId;
@@ -59,6 +70,12 @@ public class FeedChange implements Serializable {
     /**
      * 操作人
      */
+    private Integer userId;
+
+    /**
+     * 操作人
+     */
+    @TableField(exist = false)
     private String userName;
 
 

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

@@ -1,7 +1,15 @@
 package com.huimv.environ.eco.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.environ.eco.entity.FeedChange;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.environ.eco.entity.feedVo.FeedChangeScreenVo;
+import com.huimv.environ.eco.entity.feedVo.FeedChangeVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface FeedChangeMapper extends BaseMapper<FeedChange> {
 
+    Page<FeedChangeVo> page(Page<FeedChange> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+
+    List<FeedChangeScreenVo> listScreenBuy();
 }

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

@@ -3,10 +3,7 @@ package com.huimv.environ.eco.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.environ.eco.entity.FeedConsume;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huimv.environ.eco.entity.feedVo.FeedConsumeChartVo;
-import com.huimv.environ.eco.entity.feedVo.FeedConsumeVo;
-import com.huimv.environ.eco.entity.feedVo.FeedFormVo;
-import com.huimv.environ.eco.entity.feedVo.FeedUsedChartVo;
+import com.huimv.environ.eco.entity.feedVo.*;
 
 import java.util.Date;
 import java.util.List;
@@ -36,4 +33,6 @@ public interface FeedConsumeMapper extends BaseMapper<FeedConsume> {
     List<FeedFormVo> listFeedGroupByMonth(String startDate);
 
     List<FeedFormVo> listFeedGroupByYear(String startDate);
+
+    List<FeedConsumeScreenVo> listScreenConsume();
 }

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

@@ -33,4 +33,6 @@ public interface FeedUsageMapper extends BaseMapper<FeedUsage> {
     List<FeedVo> listFeedGroupByYear(String startDate, String unitName);
 
     List<BuildFeedVo> getAnalysis(String startDate, String endDate);
+
+    List<FeedUsage> listScreenUse(String startDate);
 }

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

@@ -1,8 +1,13 @@
 package com.huimv.environ.eco.service;
 
+import com.huimv.common.utils.Result;
 import com.huimv.environ.eco.entity.FeedChange;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +18,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IFeedChangeService extends IService<FeedChange> {
 
+    Result add(HttpServletRequest httpServletRequest, Map<String, String> map) throws ParseException;
+
+    Result getPage(Map<String, String> map);
 }

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

@@ -28,4 +28,6 @@ public interface IFeedConsumeService extends IService<FeedConsume> {
     Result listBuild(Map<String, String> map);
 
     Result analysis(Map<String, String> map);
+
+    Result listScreenConsume(Map<String, String> map);
 }

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

@@ -1,8 +1,11 @@
 package com.huimv.environ.eco.service;
 
+import com.huimv.common.utils.Result;
 import com.huimv.environ.eco.entity.FeedMaterial;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * <p>
  * 原料库存 服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IFeedMaterialService extends IService<FeedMaterial> {
 
+    Result add(Map<String, String> map);
 }

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

@@ -20,4 +20,6 @@ public interface IFeedUsageService extends IService<FeedUsage> {
     Result listUse(Map<String, String> map);
 
     Result listChartUse(Map<String, String> map);
+
+    Result listScreenUse(Map<String, String> map);
 }

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

@@ -1,10 +1,28 @@
 package com.huimv.environ.eco.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.common.token.TokenSign;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import com.huimv.environ.eco.entity.FeedChange;
+import com.huimv.environ.eco.entity.FeedMaterial;
+import com.huimv.environ.eco.entity.feedVo.FeedChangeVo;
 import com.huimv.environ.eco.mapper.FeedChangeMapper;
+import com.huimv.environ.eco.mapper.FeedMaterialMapper;
 import com.huimv.environ.eco.service.IFeedChangeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +35,69 @@ import org.springframework.stereotype.Service;
 @Service
 public class FeedChangeServiceImpl extends ServiceImpl<FeedChangeMapper, FeedChange> implements IFeedChangeService {
 
+    @Resource
+    private FeedMaterialMapper feedMaterialMapper;
+
+    @Resource
+    private FeedChangeMapper feedChangeMapper;
+
+    @Override
+    @Transactional
+    public Result add(HttpServletRequest httpServletRequest, Map<String, String> map) throws ParseException {
+        String date = map.get("date");
+        String materialId = map.get("materialId");
+        String changeQuantity = map.get("changeQuantity");
+        String type = map.get("type");
+        String notes = map.get("notes");
+
+        BigDecimal value = BigDecimal.valueOf(Long.parseLong(changeQuantity));
+
+        FeedMaterial feedMaterial = feedMaterialMapper.selectById(materialId);
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+        FeedChange feedChange = new FeedChange();
+        feedChange.setMaterialId(Integer.valueOf(materialId));
+        feedChange.setChangeQuantity(value);
+        feedChange.setDate(sdf.parse(date));
+        feedChange.setNotes(notes);
+        feedChange.setUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));
+        feedChange.setType(Integer.valueOf(type));
+        if ("0".equals(type)){
+            BigDecimal add = feedMaterial.getInventory().add(value);
+            feedChange.setRemainder(add);
+            feedMaterial.setInventory(add);
+        }else if ("1".equals(type)){
+            feedChange.setRemainder(value);
+            feedMaterial.setInventory(value);
+        }else {
+            if (value.compareTo(feedMaterial.getInventory()) > 0){
+                return new Result(10001,"出库量不能大于库存!",false);
+            }
+            BigDecimal subtract = feedMaterial.getInventory().subtract(value);
+            feedChange.setRemainder(subtract);
+            feedMaterial.setInventory(subtract);
+        }
+        this.save(feedChange);
+        feedMaterialMapper.updateById(feedMaterial);
+        return Result.SUCCESS();
+    }
+
+    @Override
+    public Result getPage(Map<String, String> map) {
+        String pageNum = map.get("pageNum");
+        String pageSize = map.get("pageSize");
+        String materialId = map.get("materialId");
+        String type = map.get("type");
+        String date = map.get("date");
+
+        Page<FeedChange> page = new Page<>(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+        QueryWrapper queryWrapper = new QueryWrapper<FeedChange>()
+                .eq(ObjectUtil.isNotEmpty(materialId), "c.material_id", materialId)
+                .eq(ObjectUtil.isNotEmpty(type), "c.type",type)
+                .eq(ObjectUtil.isNotEmpty(date), "c.date",date)
+                .orderByDesc("c.id");
+        Page<FeedChangeVo> feedChangePage = feedChangeMapper.page(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS,feedChangePage);
+    }
 }

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

@@ -187,4 +187,10 @@ public class FeedConsumeServiceImpl extends ServiceImpl<FeedConsumeMapper, FeedC
         }
         return new Result(ResultCode.SUCCESS,feedAnalysisVo);
     }
+
+    @Override
+    public Result listScreenConsume(Map<String, String> map) {
+        List<FeedConsumeScreenVo> feedConsumeScreenVos = feedConsumeMapper.listScreenConsume();
+        return new Result(ResultCode.SUCCESS,feedConsumeScreenVos);
+    }
 }

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

@@ -1,11 +1,18 @@
 package com.huimv.environ.eco.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 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;
 
+import java.math.BigDecimal;
+import java.util.Map;
+
 /**
  * <p>
  * 原料库存 服务实现类
@@ -17,4 +24,19 @@ import org.springframework.stereotype.Service;
 @Service
 public class FeedMaterialServiceImpl extends ServiceImpl<FeedMaterialMapper, FeedMaterial> implements IFeedMaterialService {
 
+    @Override
+    public Result add(Map<String, String> map) {
+        String materialName = map.get("materialName");
+        String standards = map.get("standards");
+
+        FeedMaterial feedMaterial = new FeedMaterial();
+        feedMaterial.setMaterialName(materialName);
+        feedMaterial.setStandards(standards);
+        if (this.count(new QueryWrapper<FeedMaterial>().lambda().eq(FeedMaterial::getMaterialName,materialName)) > 0) {
+            return new Result(10001,"原料名称已存在!",false);
+        }
+        feedMaterial.setInventory(BigDecimal.ZERO);
+        this.save(feedMaterial);
+        return Result.SUCCESS();
+    }
 }

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

@@ -79,4 +79,11 @@ public class FeedUsageServiceImpl extends ServiceImpl<FeedUsageMapper, FeedUsage
         }
         return new Result(ResultCode.SUCCESS,feedUsedVo);
     }
+
+    @Override
+    public Result listScreenUse(Map<String, String> map) {
+        String startDate = map.get("startDate");
+        List<FeedUsage> feedUsages = feedUsageMapper.listScreenUse(startDate);
+        return new Result(ResultCode.SUCCESS,feedUsages);
+    }
 }

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/resources/com/huimv/environ/eco/mapper/FeedConsumeMapper.xml

@@ -71,5 +71,11 @@
         ORDER BY
             m.month;
     </select>
+    <select id="listScreenConsume" resultType="com.huimv.environ.eco.entity.feedVo.FeedConsumeScreenVo">
+        SELECT TRIM(BOTH '"' FROM DATE) AS 'date',TRIM(BOTH '"' FROM TYPE) AS TYPE,ROUND(SUM(reality), 2) AS 'value'
+        FROM `feed_consume`
+        WHERE TRIM(BOTH '"' FROM DATE) BETWEEN CURDATE() - INTERVAL 6 DAY AND NOW()
+        GROUP BY TRIM(BOTH '"' FROM DATE),TRIM(BOTH '"' FROM TYPE)
+    </select>
 
 </mapper>

huimv-farm-datacenter-egg/huimv-farm-environ/src/main/resources/com/huimv/environ/eco/mapper/FeedUsageMapper.xml

@@ -69,5 +69,10 @@
         WHERE used_date BETWEEN '${startDate}' AND '${endDate}'
         GROUP BY unit_name
     </select>
+    <select id="listScreenUse" resultType="com.huimv.environ.eco.entity.FeedUsage">
+        SELECT unit_name as 'unitName',ROUND(SUM(total_consume)/1000,2) as 'totalConsume',ROUND(AVG(single_consume),2) as 'singleConsume' FROM `feed_usage`
+        WHERE used_date LIKE CONCAT(#{startDate}, '%')
+        GROUP BY unit_name
+    </select>
 
 </mapper>

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

@@ -12,5 +12,17 @@
         <result column="notes" property="notes" />
         <result column="user_name" property="userName" />
     </resultMap>
+    <select id="page" resultType="com.huimv.environ.eco.entity.feedVo.FeedChangeVo">
+        select c.id,c.date,c.material_id,m.material_name,m.standards,c.change_quantity,c.remainder,c.type,c.notes,a.user_name
+        FROM `feed_change` c LEFT JOIN `feed_material` m ON c.material_id = m.id
+        LEFT JOIN `sys_account_multilevel` a ON c.user_id = a.id
+        ${ew.customSqlSegment}
+    </select>
+    <select id="listScreenBuy" resultType="com.huimv.environ.eco.entity.feedVo.FeedChangeScreenVo">
+        SELECT m.material_name as 'name',SUM(c.change_quantity) AS 'value',m.standards
+        FROM `feed_change` c LEFT JOIN `feed_material` m ON c.material_id = m.id
+        WHERE c.date BETWEEN CURDATE() - INTERVAL 6 DAY AND NOW() AND c.type = 0
+        GROUP BY c.material_id
+    </select>
 
 </mapper>