添加出栏管理

huimv-smart-management/src/main/java/com/huimv/management/controller/YearPigBaseController.java

@@ -1,11 +1,9 @@
  package com.huimv.management.controller;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
+import com.huimv.management.entity.vo.CountOut;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -147,10 +145,9 @@ public class YearPigBaseController {
     }
 
     /*
-    * 出栏统计
+    * 出栏统计,每天
     */
-    //TODO
-    @RequestMapping("/suchStatistics")
+    @RequestMapping("/suchStatisticsDay")
     public R suchStatistics(@RequestParam Map<String, Object> params){
         String startTime = (String)params.get("startTime");
         String endTime = (String)params.get("endTime");
@@ -158,16 +155,32 @@ public class YearPigBaseController {
         if (StringUtils.isBlank(farmId)) {
             return R.error("牧场信息为空");
         }
-        yearPigBaseService.suchStatistics(startTime,endTime,Integer.parseInt(farmId));
+        List<CountOut> countOuts = yearPigBaseService.suchStatistics(startTime, endTime, Integer.parseInt(farmId));
 
-        return R.ok();
+        return R.ok().put("data",countOuts);
     }
 
+    /*
+     * 出栏统计,每月
+     */
+    @RequestMapping("/suchStatisticsMonth")
+    public R suchStatisticsMonth(@RequestParam Map<String, Object> params){
+        String startTime = (String)params.get("startTime");
+        String endTime = (String)params.get("endTime");
+        String farmId = (String)params.get("formFarmId");
+        if (StringUtils.isBlank(farmId)) {
+            return R.error("牧场信息为空");
+        }
+
+        List<CountOut> countOuts = yearPigBaseService.suchStatisteicsMonth(startTime, endTime, Integer.parseInt(farmId));
+
+        return R.ok().put("data",countOuts);
+    }
 
     @PostMapping("/transferPeriod")
     public R transferPeriod(@RequestBody HashMap<String,Object> map, HttpServletRequest request) {
         yearPigBaseService.transferPeriod(map,request);
         return R.ok();
     }
-}
 
+}

huimv-smart-management/src/main/java/com/huimv/management/dao/YearPigBaseDao.java

@@ -30,4 +30,6 @@ public interface YearPigBaseDao extends BaseMapper<YearPigBaseEntity> {
     IPage<PigBaseVo> list(@Param("page")IPage page, @Param("ew") QueryWrapper<DrinkingWaterVo> queryWrapper);
 
     List<CountOut> suchStatistics(@Param("farmId") Integer farmId,@Param("ew") QueryWrapper<YearPigBaseEntity> wrapper);
+
+    List<CountOut> suchStatisticsMonth(@Param("farmId") Integer farmId,@Param("ew") QueryWrapper<YearPigBaseEntity> wrapper);
 }

huimv-smart-management/src/main/java/com/huimv/management/service/YearPigBaseService.java

@@ -3,6 +3,7 @@ package com.huimv.management.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.management.entity.YearPigBaseEntity;
+import com.huimv.management.entity.vo.CountOut;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.InvocationTargetException;
@@ -43,7 +44,9 @@ public interface YearPigBaseService extends IService<YearPigBaseEntity> {
 
     Integer findByoutFenceStatus(int i, Integer farmId);
 
-    void suchStatistics(String startTime, String endTime, Integer farmId);
+    List<CountOut> suchStatistics(String startTime, String endTime, Integer farmId);
+
+    List<CountOut> suchStatisteicsMonth(String startTime, String endTime, int parseInt);
 
     void transferPeriod(HashMap<String, Object> map, HttpServletRequest request);
 }

huimv-smart-management/src/main/java/com/huimv/management/service/impl/YearPigBaseServiceImpl.java

@@ -33,7 +33,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.common.utils.PageUtils;
@@ -85,59 +84,60 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         //耳标
         String eartag = (String) params.get("eartag");
         if (StringUtils.isNotEmpty(eartag)) {
-            queryWrapper.like("base.eartag", eartag);
+            queryWrapper.like("base.eartag",eartag);
         }
 
         //性别
         String sex = (String) params.get("sex");
         if (StringUtils.isNotEmpty(sex)) {
-            queryWrapper.eq("base.sex", sex);
+            queryWrapper.eq("base.sex",sex);
         }
 
         //品种
         String breed = (String) params.get("breed");
         if (StringUtils.isNotEmpty(breed)) {
-            queryWrapper.eq("base.breed", breed);
+            queryWrapper.eq("base.breed",breed);
         }
 
         //健康状态
         String healthStatus = (String) params.get("healthStatus");
         if (StringUtils.isNotEmpty(healthStatus)) {
-            queryWrapper.eq("base.health_status", Integer.parseInt(healthStatus));
+            queryWrapper.eq("base.health_status",Integer.parseInt(healthStatus));
         }
 
         //养殖状态
         String outFenceStatus = (String) params.get("outFenceStatus");
         if (StringUtils.isNotEmpty(outFenceStatus)) {
-            queryWrapper.eq("base.out_fence_status", Integer.parseInt(outFenceStatus));
+            queryWrapper.eq("base.out_fence_status",Integer.parseInt(outFenceStatus));
         }
 
         //栏期
         String periodId = (String) params.get("periodId");
         if (StringUtils.isNotEmpty(periodId)) {
-            queryWrapper.eq("base.period_id", Integer.parseInt(periodId));
+            queryWrapper.eq("base.period_id",Integer.parseInt(periodId));
         }
 
         //栋舍
         String pigstyId = (String) params.get("pigstyId");
         if (StringUtils.isNotEmpty(pigstyId)) {
-            queryWrapper.eq("base.pigsty_id", Integer.parseInt(pigstyId));
+            queryWrapper.eq("base.pigsty_id",Integer.parseInt(pigstyId));
         }
         //单元
         String unitId = (String) params.get("unitId");
         if (StringUtils.isNotEmpty(unitId)) {
-            queryWrapper.eq("base.unit_id", Integer.parseInt(unitId));
+            queryWrapper.eq("base.unit_id",Integer.parseInt(unitId));
         }
 
         //牧场
         String farmId = (String) params.get("formFarmId");
         if (StringUtils.isNotEmpty(farmId)) {
-            queryWrapper.eq("base.farm_id", Integer.parseInt(farmId));
+            queryWrapper.eq("base.farm_id",Integer.parseInt(farmId));
         }
         //排除逻辑删除
         queryWrapper.apply(" base.deleted = 0  AND pigsty.deleted = 0 AND period.deleted = 0");
 
-        IPage<PigBaseVo> page = pigBaseDao.list(new Query<>().getPage(params), queryWrapper);
+        IPage<PigBaseVo> page = pigBaseDao.list(new Query<>().getPage(params),queryWrapper);
+
 
 
         return new PageUtils(page);
@@ -145,10 +145,10 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
 
 
     @Override
-    public void batchLairage(String[] eartags, Integer periodId) {
+    public void batchLairage(String[] eartags,Integer periodId) {
         for (String eartag : eartags) {
             UpdateWrapper<YearPigBaseEntity> updateWrapper = new UpdateWrapper<YearPigBaseEntity>();
-            updateWrapper.eq("eartag", eartag).set("period_id", periodId);
+            updateWrapper.eq("eartag",eartag).set("period_id",periodId);
             update(updateWrapper);
         }
     }
@@ -161,60 +161,61 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
     @Override
     public Integer findByoutFenceStatus(int i, Integer farmId) {
         LambdaQueryWrapper<YearPigBaseEntity> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(YearPigBaseEntity::getFarmId, farmId);
-        wrapper.eq(YearPigBaseEntity::getOutFenceStatus, i);
+        wrapper.eq(YearPigBaseEntity::getFarmId,farmId);
+        wrapper.eq(YearPigBaseEntity::getOutFenceStatus,i);
         Integer integer = pigBaseDao.selectCount(wrapper);
         return integer;
     }
 
 
     @Override
-    public Map<String, Object> queryPageByRelationship(Map<String, Object> params) throws IllegalAccessException, NoSuchMethodException, InvocationTargetException {
+    public   Map<String ,Object> queryPageByRelationship(Map<String, Object> params) throws IllegalAccessException, NoSuchMethodException, InvocationTargetException {
 
         Map<String, Object> result = new HashMap<>();
         String eartag_no = (String) params.get("eartag");
         System.out.println(eartag_no);
-        YearPigBaseEntity self = baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, eartag_no));
+        YearPigBaseEntity  self = baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, eartag_no));
         System.out.println(self);
         // result.put("self",   self  );
 
-        System.out.println("父亲ID" + self.getFatherEartag());
-        System.out.println("母亲ID" + self.getMotherEartag());
+        System.out.println("父亲ID"+self.getFatherEartag());   System.out.println("母亲ID"+self.getMotherEartag());
         String math = self.getMotherEartag();
 
-        YearPigBaseEntity father = self.getFatherEartag() == null ? null : baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, self.getFatherEartag()));
-        YearPigBaseEntity mother = self.getMotherEartag() == null ? null : baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, math));
+        YearPigBaseEntity father = self.getFatherEartag() == null ? null :  baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, self.getFatherEartag()));
+        YearPigBaseEntity mother = self.getMotherEartag() == null ? null :  baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, math));
 
 
         //父亲父母
         // result.put("father", father);
         // result.put("mother", mother);
-        YearPigBaseEntity fathermother = father == null ? null : baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, father.getFatherEartag()));
-        YearPigBaseEntity fatherfather = father == null ? null : baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, father.getMotherEartag()));
+        YearPigBaseEntity fathermother = father == null ? null :  baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, father.getFatherEartag()));
+        YearPigBaseEntity fatherfather = father == null ? null :  baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, father.getMotherEartag()));
         //  result.put("fathermother", fathermother);
         // result.put("fatherfather", fatherfather);
         //母亲父母
-        YearPigBaseEntity mothermother = mother == null ? null : baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, mother.getFatherEartag()));
-        YearPigBaseEntity motherfather = mother == null ? null : baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, mother.getMotherEartag()));
+        YearPigBaseEntity mothermother = mother == null ? null :  baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, mother.getFatherEartag()));
+        YearPigBaseEntity  motherfather = mother == null ? null :  baseMapper.selectOne(Wrappers.<YearPigBaseEntity>lambdaQuery().eq(YearPigBaseEntity::getEartag, mother.getMotherEartag()));
         //  result.put("mothermother", mothermother);
         // result.put("motherfather", motherfather);
 
 
+
+
         Object[] intArr = new Object[7];
         Map<String, String> selfmap = BeanUtils.describe(self);
-        selfmap.put("name", "self");
+        selfmap.put("name","self");
         Map<String, String> fathermap = BeanUtils.describe(father);
-        fathermap.put("name", "father");
+        fathermap.put("name","father");
         Map<String, String> mothermap = BeanUtils.describe(mother);
-        mothermap.put("name", "mother");
+        mothermap.put("name","mother");
         Map<String, String> fathermothermap = BeanUtils.describe(fathermother);
-        fathermothermap.put("name", "fathermother");
+        fathermothermap.put("name","fathermother");
         Map<String, String> fatherfatherself = BeanUtils.describe(fatherfather);
-        fatherfatherself.put("name", "fatherfather");
+        fatherfatherself.put("name","fatherfather");
         Map<String, String> mothermotherself = BeanUtils.describe(mothermother);
-        mothermotherself.put("name", "mothermother");
+        mothermotherself.put("name","mothermother");
         Map<String, String> motherfatherself = BeanUtils.describe(motherfather);
-        motherfatherself.put("name", "motherfather");
+        motherfatherself.put("name","motherfather");
 
 
         intArr[0] = selfmap;
@@ -225,12 +226,12 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         intArr[5] = mothermotherself;
         intArr[6] = motherfatherself;
 
-        result.put("value", intArr);
-        return result;
+        result.put("value",intArr);
+        return   result;
     }
 
     @Override
-    public void suchStatistics(String startTime, String endTime, Integer farmId) {
+    public List<CountOut> suchStatistics(String startTime, String endTime, Integer farmId) {
         QueryWrapper<YearPigBaseEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("farm_id", farmId);
 
@@ -244,8 +245,28 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         }
         wrapper.apply("deleted = 0 AND out_fence_status = 1 ");
 
-        List<CountOut> endList = pigBaseDao.suchStatistics(farmId, wrapper);
-        System.out.println(endList);
+        List<CountOut> endList  = pigBaseDao.suchStatistics(farmId,wrapper);
+        return endList;
+    }
+
+    @Override
+    public List<CountOut> suchStatisteicsMonth(String startTime, String endTime, int farmId) {
+
+        QueryWrapper<YearPigBaseEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_id", farmId);
+
+        //开始时间
+        if (StringUtils.isNotEmpty(startTime)) {
+            wrapper.ge("out_fence_time", startTime);
+        }
+        //开始时间
+        if (StringUtils.isNotEmpty(endTime)) {
+            wrapper.le("out_fence_time", endTime);
+        }
+        wrapper.apply("deleted = 0 AND out_fence_status = 1 ");
+
+        List<CountOut> endList  = pigBaseDao.suchStatisticsMonth(farmId,wrapper);
+        return endList;
     }
 
     @Autowired
@@ -322,4 +343,6 @@ public class YearPigBaseServiceImpl extends ServiceImpl<YearPigBaseDao, YearPigB
         }
         transferPeriodLogDao.batchInsert(logEntityList);
     }
+
+    }
 }

huimv-smart-management/src/main/resources/mapper/management/YearPigBaseDao.xml

@@ -65,4 +65,11 @@
         ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(out_fence_time,"%Y-%m-%d")
     </select>
+
+    <select id="suchStatisticsMonth" resultType="com.huimv.management.entity.vo.CountOut">
+        SELECT DATE_FORMAT(out_fence_time,"%Y-%m") DATE,COUNT(*) total
+        FROM `mgt_year_pig_base`
+        ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(out_fence_time,"%Y-%m")
+    </select>
 </mapper>