对饲料接口和部分代码进行优化

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/FeedDayController.java

@@ -31,21 +31,35 @@ public class FeedDayController {
     private FeedDayService feedDayService;
 
     //查询
-    @PostMapping("/getFeedCount")
+    @PostMapping("/getDayFeed")
     public Result getFeedCount(@RequestBody Map<String, String> paramsMap) throws ParseException {
         //
         return feedDayService.getFeedCount(paramsMap);
     }
 
+    //删除
+    @PostMapping("/list")
+    public Result listDayFeed(@RequestBody Map<String,String> paramsMap) {
+        //
+        return feedDayService.listDayFeed(paramsMap);
+    }
+
+    //添加
+    @PostMapping("/new")
+    public Result newFeedCount(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        //
+        return feedDayService.newDayFeed(paramsMap);
+    }
+
     //添加
-    @PostMapping("/newFeedCount")
+    @PostMapping("/newFeedCount_old")
     public Result newFeedCount(@RequestBody List<FeedDay> list) throws ParseException {
         //
         return feedDayService.newFeedCount(list);
     }
 
     //删除
-    @PostMapping("/removeFeedCount")
+    @PostMapping("/remove")
     public Result removeFeedCount(@RequestBody Map<String,String> paramsMap) throws ParseException {
         //
         return feedDayService.removeFeedCount(paramsMap);

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/controller/FeedMonthController.java

@@ -23,23 +23,37 @@ import java.util.Map;
  * @since 2022-11-03
  */
 @RestController
-@RequestMapping("/feed-month")
+@RequestMapping("/v1.0.0/feedMonth")
 public class FeedMonthController {
     @Autowired
     private FeedMonthService feedMonthService;
 
     //添加
-    @PostMapping("/newFeedMonthCount")
+    @PostMapping("/new")
+    public Result newMonthFeed(@RequestBody Map<String, String> paramsMap) {
+        //
+        return feedMonthService.newMonthFeed(paramsMap);
+    }
+
+    //添加
+    @PostMapping("/newMonthFeed_old")
     public Result newFeedMonthCount(@RequestBody List<FeedMonth> list) {
         //
         return feedMonthService.newFeedMonthCount(list);
     }
 
     //删除
-    @PostMapping("/removeMonthCount")
+    @PostMapping("/remove")
     public Result removeMonthCount(@RequestBody Map<String,String> paramsMap) {
         //
         return feedMonthService.removeMonthCount(paramsMap);
     }
+
+    //删除
+    @PostMapping("/list")
+    public Result listMonthFeed(@RequestBody Map<String,String> paramsMap) {
+        //
+        return feedMonthService.listMonthFeed(paramsMap);
+    }
 }
 

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/service/FeedDayService.java

@@ -23,4 +23,8 @@ public interface FeedDayService extends IService<FeedDay> {
     Result newFeedCount(List<FeedDay> list);
 
     Result removeFeedCount(Map<String,String> paramSMap);
+
+    Result newDayFeed(Map<String, String> paramsMap);
+
+    Result listDayFeed(Map<String, String> paramsMap);
 }

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/service/FeedMonthService.java

@@ -23,5 +23,7 @@ public interface FeedMonthService extends IService<FeedMonth> {
 
     Result removeMonthCount(Map<String,String> paramsMap);
 
+    Result newMonthFeed(Map<String, String> paramsMap);
 
+    Result listMonthFeed(Map<String, String> paramsMap);
 }

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/service/impl/FeedDayServiceImpl.java

@@ -110,11 +110,8 @@ public class FeedDayServiceImpl extends ServiceImpl<FeedDayMapper, FeedDay> impl
         return new Result(ResultCode.SUCCESS, resultJo);
     }
 
-
     @Override
     public Result newFeedCount(List<FeedDay> list) {
-
-
         QueryWrapper<FeedDay> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_code", globalFarmCode);
         feedDayMapper.delete(queryWrapper);
@@ -129,14 +126,40 @@ public class FeedDayServiceImpl extends ServiceImpl<FeedDayMapper, FeedDay> impl
         return new Result(ResultCode.SUCCESS);
     }
 
-
     @Override
     public Result removeFeedCount(Map<String, String> paramSMap) {
         String ids = paramSMap.get("ids");
         String[] idArray = ids.split(",");
         List<String> idList = Arrays.asList(idArray);
         feedDayMapper.deleteBatchIds(idList);
-        return new Result(ResultCode.SUCCESS, feedDayMapper.deleteBatchIds(idList));
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @Override
+    public Result newDayFeed(Map<String, String> paramsMap) {
+        QueryWrapper<FeedDay> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", globalFarmCode);
+        feedDayMapper.delete(queryWrapper);
+        String list = paramsMap.get("list");
+        JSONArray listJa = JSONArray.parseArray(list);
+        for (int i = 0; i <listJa.size(); i++) {
+            FeedDay feedDay = new FeedDay();
+            JSONObject listJo = listJa.getJSONObject(i);
+            feedDay.setConsumption(listJo.getBigDecimal("consumption"));
+            feedDay.setAddDate(listJo.getDate("addDate"));
+            feedDay.setFarmCode(globalFarmCode);
+            feedDayMapper.insert(feedDay);
+        }
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @Override
+    public Result listDayFeed(Map<String, String> paramsMap) {
+        QueryWrapper<FeedDay> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", globalFarmCode);
+        queryWrapper.orderByAsc("add_date").orderByAsc("id");
+        List<FeedDay> feedMonthList = feedDayMapper.selectList(queryWrapper);
+        return new Result(ResultCode.SUCCESS,feedMonthList);
     }
 
 

huimv-env-platform/huimv-env-produce/src/main/java/com/huimv/env/produce/service/impl/FeedMonthServiceImpl.java

@@ -42,7 +42,37 @@ public class FeedMonthServiceImpl extends ServiceImpl<FeedMonthMapper, FeedMonth
         String[] idArray = ids.split(",");
         List<String> idList = Arrays.asList(idArray);
         feedMonthMapper.deleteBatchIds(idList);
-        return new Result(ResultCode.SUCCESS, feedMonthMapper.deleteBatchIds(idList));
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @Override
+    public Result newMonthFeed(Map<String, String> paramsMap) {
+        QueryWrapper<FeedMonth> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", globalFarmCode);
+        feedMonthMapper.delete(queryWrapper);
+        String list = paramsMap.get("list");
+        JSONArray listJa = JSONArray.parseArray(list);
+        for (int i = 0; i <listJa.size(); i++) {
+            FeedMonth feedMonth = new FeedMonth();
+            JSONObject listJo = listJa.getJSONObject(i);
+            feedMonth.setConsumption(listJo.getBigDecimal("consumption"));
+            String addDate = listJo.getString("addDate");
+            String[]  addDateArray = addDate.split("-");
+            feedMonth.setYear(Integer.parseInt(addDateArray[0]));
+            feedMonth.setMonth(Integer.parseInt(addDateArray[1]));
+            feedMonth.setFarmCode(globalFarmCode);
+            feedMonthMapper.insert(feedMonth);
+        }
+        return new Result(ResultCode.SUCCESS);
+    }
+
+    @Override
+    public Result listMonthFeed(Map<String, String> paramsMap) {
+        QueryWrapper<FeedMonth> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", globalFarmCode);
+        queryWrapper.orderByAsc("year").orderByAsc("month");
+        List<FeedMonth> feedMonthList = feedMonthMapper.selectList(queryWrapper);
+        return new Result(ResultCode.SUCCESS,feedMonthList);
     }
 
     @Override