Newspaper 1 gadu atpakaļ
vecāks
revīzija
ad3458b921
17 mainītis faili ar 135 papildinājumiem un 0 dzēšanām
  1. 5 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BreedController.java
  2. 5 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/controller/DepartureController.java
  3. 5 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/controller/DuckHealthInfoController.java
  4. 5 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/controller/DuckImmunityInfoController.java
  5. 5 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvRegularCallFeedingController.java
  6. 2 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.java
  7. 2 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/service/IBreedService.java
  8. 1 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/service/IDepartureService.java
  9. 1 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/service/IDuckHealthInfoService.java
  10. 2 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/service/IDuckImmunityInfoService.java
  11. 2 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnvRegularCallFeedingService.java
  12. 21 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BreedServiceImpl.java
  13. 19 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/DepartureServiceImpl.java
  14. 13 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/DuckHealthInfoServiceImpl.java
  15. 13 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/DuckImmunityInfoServiceImpl.java
  16. 25 0
      huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallFeedingServiceImpl.java
  17. 9 0
      huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.xml

+ 5 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BreedController.java

@@ -55,6 +55,11 @@ public class BreedController {
         return breedService.listSelect(httpServletRequest, paramsMap);
     }
 
+    @RequestMapping("/listByChiNum")
+    public Result listByChiNum(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return breedService.listByChiNum(httpServletRequest, paramsMap);
+    }
+
     @RequestMapping("/addDuck")
     public Result addDuck(HttpServletRequest httpServletRequest, @RequestBody Breed breed) throws ParseException {
         Date healthDate = breed.getDate();//发病时间

+ 5 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/controller/DepartureController.java

@@ -79,6 +79,11 @@ public class DepartureController {
         return departureService.listSelect(httpServletRequest, paramsMap);
     }
 
+    @RequestMapping("/listByChiNum")
+    public Result listByChiNum(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return departureService.listByChiNum(httpServletRequest, paramsMap);
+    }
+
     @RequestMapping("/addDuck")
     public Result addDuck(HttpServletRequest httpServletRequest, @RequestBody Departure departure) {
         String duckNum = departure.getDuckNum();

+ 5 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/controller/DuckHealthInfoController.java

@@ -66,6 +66,11 @@ public class DuckHealthInfoController {
         return healthInfoService.listSelect(httpServletRequest, paramsMap);
     }
 
+    @RequestMapping("/listByChiNum")
+    public Result listByChiNum(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return healthInfoService.listByChiNum(httpServletRequest, paramsMap);
+    }
+
     @RequestMapping("/listByDuckId")
     public Result listByDuckId(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         String id = paramsMap.get("id");

+ 5 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/controller/DuckImmunityInfoController.java

@@ -63,6 +63,11 @@ public class DuckImmunityInfoController {
         return infoService.listSelect(httpServletRequest, paramsMap);
     }
 
+    @RequestMapping("/listByChiNum")
+    public Result listByChiNum(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return infoService.listByChiNum(httpServletRequest, paramsMap);
+    }
+
     @RequestMapping("/listByDuckId")
     public Result listByDuckId(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         String id = paramsMap.get("id");

+ 5 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvRegularCallFeedingController.java

@@ -41,6 +41,11 @@ public class EnvRegularCallFeedingController {
         return feedingService.listSelect(httpServletRequest, paramsMap);
     }
 
+    @RequestMapping("/listByChiNum")
+    public Result listByChiNum(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
+        return feedingService.listByChiNum(httpServletRequest, paramsMap);
+    }
+
     @RequestMapping("/listSeven")
     public Result listSeven(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return feedingService.listSeven(httpServletRequest, paramsMap);

+ 2 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.java

@@ -51,4 +51,6 @@ public interface EnvRegularCallFeedingMapper extends BaseMapper<EnvRegularCallFe
     FeedingVo FeedTime(@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallFeeding> queryWrapper);
 
     IPage<EnvRegularCallFeeding> listAll(Page<EnvRegularCallFeeding> page,@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallFeeding> queryWrapper);
+
+    IPage<EnvRegularCallFeeding> listSelect2(Page<EnvRegularCallFeeding> page, Date timesMonthmorning, String farmId, String chiNum);
 }

+ 2 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/IBreedService.java

@@ -22,4 +22,6 @@ public interface IBreedService extends IService<Breed> {
     Result listSelect(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
     Result importData(HttpServletRequest httpServletRequest, MultipartFile files);
+
+    Result listByChiNum(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

+ 1 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/IDepartureService.java

@@ -25,4 +25,5 @@ public interface IDepartureService extends IService<Departure> {
 
     Result editBatch(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) throws ParseException;
 
+    Result listByChiNum(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

+ 1 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/IDuckHealthInfoService.java

@@ -27,4 +27,5 @@ public interface IDuckHealthInfoService extends IService<DuckHealthInfo> {
 
     Result listSelect(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
+    Result listByChiNum(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

+ 2 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/IDuckImmunityInfoService.java

@@ -27,4 +27,6 @@ public interface IDuckImmunityInfoService extends IService<DuckImmunityInfo> {
     Result listSelect(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
     Result importData(HttpServletRequest httpServletRequest, MultipartFile files);
+
+    Result listByChiNum(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

+ 2 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnvRegularCallFeedingService.java

@@ -30,4 +30,6 @@ public interface IEnvRegularCallFeedingService extends IService<EnvRegularCallFe
     Result listScreenFeed(Map<String, String> paramsMap);
 
     Result listAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result listByChiNum(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

+ 21 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BreedServiceImpl.java

@@ -121,4 +121,25 @@ public class BreedServiceImpl extends ServiceImpl<BreedMapper, Breed> implements
         }
         return new Result(10000, "保存成功!", true);
     }
+
+    @Override
+    public Result listByChiNum(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String chiNum = paramsMap.get("chiNum");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if (pageNum == null || "".equals(pageNum)) {
+            pageNum = "1";
+        }
+        if (pageSize == null || "".equals(pageSize)) {
+            pageSize = "10";
+        }
+        QueryWrapper<Breed> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("male_chi_num", chiNum)
+                .or()
+                .eq("female_chi_num", chiNum)
+                .orderByDesc("id");
+        Page<Breed> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, breedMapper.selectPage(page, queryWrapper));
+    }
 }

+ 19 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/DepartureServiceImpl.java

@@ -113,4 +113,23 @@ public class DepartureServiceImpl extends ServiceImpl<DepartureMapper, Departure
         }
         return new Result(ResultCode.SUCCESS);
     }
+
+    @Override
+    public Result listByChiNum(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String chiNum = paramsMap.get("chiNum");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if (pageNum == null || "".equals(pageNum)) {
+            pageNum = "1";
+        }
+        if (pageSize == null || "".equals(pageSize)) {
+            pageSize = "10";
+        }
+        QueryWrapper<Departure> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("chi_num", chiNum)
+                .orderByDesc("id");
+        Page<Departure> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, departureMapper.selectPage(page, queryWrapper));
+    }
 }

+ 13 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/DuckHealthInfoServiceImpl.java

@@ -128,4 +128,17 @@ public class DuckHealthInfoServiceImpl extends ServiceImpl<DuckHealthInfoMapper,
         return new Result(ResultCode.SUCCESS, healthInfoMapper.selectPage(page, queryWrapper));
     }
 
+    @Override
+    public Result listByChiNum(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String chiNum = paramsMap.get("chiNum");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        QueryWrapper<DuckHealthInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq(StringUtils.isNotBlank(chiNum),"chi_num", chiNum)
+                .orderByDesc("health_date");
+        Page<DuckHealthInfo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, healthInfoMapper.selectPage(page, queryWrapper));
+    }
+
 }

+ 13 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/DuckImmunityInfoServiceImpl.java

@@ -162,4 +162,17 @@ public class DuckImmunityInfoServiceImpl extends ServiceImpl<DuckImmunityInfoMap
         return new Result(10000, "保存成功!", true);
     }
 
+    @Override
+    public Result listByChiNum(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String chiNum = paramsMap.get("chiNum");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        QueryWrapper<DuckImmunityInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_id", farmId).eq("chi_num", chiNum)
+                .orderByDesc("health_date");
+        Page<DuckImmunityInfo> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        return new Result(ResultCode.SUCCESS, infoMapper.selectPage(page, queryWrapper));
+    }
+
 }

+ 25 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallFeedingServiceImpl.java

@@ -253,4 +253,29 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
         return new Result(ResultCode.SUCCESS, feedingMapper.listAll(page, queryWrapper));
     }
 
+    @Override
+    public Result listByChiNum(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String chiNum = paramsMap.get("chiNum");
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        if (pageNum == null || "".equals(pageNum)) {
+            pageNum = "1";
+        }
+        if (pageSize == null || "".equals(pageSize)) {
+            pageSize = "10";
+        }
+        Date timesMonthmorning = DataUill.getTimesmorning();
+        Page<EnvRegularCallFeeding> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        IPage<EnvRegularCallFeeding> regularCallFeedingIPage =  feedingMapper.listSelect2(page, timesMonthmorning, farmId, chiNum);
+        List<EnvRegularCallFeeding> records = regularCallFeedingIPage.getRecords();
+        for (int i = 0; i < records.size(); i++) {
+            if ("".equals(records.get(i).getCallCode()) || null == records.get(i).getCallCode()) {
+                records.remove(i);
+                regularCallFeedingIPage.setTotal(regularCallFeedingIPage.getTotal()-1);
+            }
+        }
+        return new Result(ResultCode.SUCCESS, regularCallFeedingIPage);
+    }
+
 }

+ 9 - 0
huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.xml

@@ -161,4 +161,13 @@ ORDER BY b.callDate DESC
         GROUP BY DATE_FORMAT(create_date,'%Y-%m-%d')
         ORDER BY create_date ASC
     </select>
+    <select id="listSelect2" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
+        SELECT a.duck_num duckNum,a.unit_name unitName,a.id duckId,IFNULL(b.duckWeight,'0') duckWeight,IFNULL(b.callDate,#{timesMonthmorning}) callDate  ,b.callCode callCode,
+a.chi_num chiNum,a.jiao_num jiaoNum,a.batch_num batchNum
+from base_duck_info a right JOIN
+(select IFNULL(SUM(duck_weight),0) duckWeight,duck_num duckNum,duck_id duckId,call_date callDate ,call_code callCode,
+ chi_num chiNum,jiao_num jiaoNum,batch_num batchNum,unit_name unitName from env_regular_call_feeding where call_date>#{timesMonthmorning} and farm_id=#{farmId} GROUP BY call_code) b ON a.id=b.duckId
+where farm_id=#{farmId} and a.is_cage='0' and a.chi_num = #{chiNum}
+ORDER BY b.callDate DESC
+    </select>
 </mapper>