精准饲喂母猪修改

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/controller/FeedingFatController.java

@@ -66,9 +66,9 @@ public class FeedingFatController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("肥猪采食")
-    @GetMapping("/feed/feedinglist/listFat")
-    public CommonResult<FeedingFatVo> listFat(@RequestBody Map<String,String> paramsMap) {
-        return CommonResult.data(feedingFatService.listFat(paramsMap));
+    @PostMapping("/feed/feedinglist/listFat")
+    public CommonResult<FeedingFatVo> listFat(@RequestBody @Valid FeedingFatAddParam feedingFatAddParam) {
+        return CommonResult.data(feedingFatService.listFat(feedingFatAddParam));
     }
 
     /**
@@ -79,9 +79,9 @@ public class FeedingFatController {
      */
     @ApiOperationSupport(order = 2)
     @ApiOperation("获取料塔曲线")
-    @GetMapping("/feed/feedinglist/fatPage")
-    public CommonResult<IPage<FeedingFatVo>> fatPage(@RequestBody Map<String,String> paramsMap) {
-        return CommonResult.data(feedingFatService.fatPage(paramsMap));
+    @PostMapping("/feed/feedinglist/fatPage")
+    public CommonResult<IPage<FeedingFatVo>> fatPage(@RequestBody @Valid FeedingFatPageParam feedingFatPageParam) {
+        return CommonResult.data(feedingFatService.fatPage(feedingFatPageParam));
     }
 
 
@@ -91,11 +91,11 @@ public class FeedingFatController {
      * @author wang
      * @date  2023/12/27 15:34
      */
-    @ApiOperationSupport(order = 2)
+    @ApiOperationSupport(order = 3)
     @ApiOperation("采食曲线")
-    @GetMapping("/feed/feedinglist/listDetail")
-    public CommonResult<List<FeedingFatVo2>> listDetail(@RequestBody Map<String,String> paramsMap) {
-        return CommonResult.data(feedingFatService.listDetail(paramsMap));
+    @PostMapping("/feed/feedinglist/listDetail")
+    public CommonResult<List<FeedingFatVo2>> listDetail(@RequestBody @Valid FeedingFatEditParam feedingFatEditParam) {
+        return CommonResult.data(feedingFatService.listDetail(feedingFatEditParam));
     }
 
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/param/FeedingFatAddParam.java

@@ -32,46 +32,10 @@ import java.util.Date;
 public class FeedingFatAddParam {
 
     /** 栋舍id */
-    @ApiModelProperty(value = "栋舍id", position = 2)
-    private String unitId;
-
-    /** 栋舍名称 */
-    @ApiModelProperty(value = "栋舍名称", position = 3)
-    private String unitName;
-
-    /** 母猪耳标号 */
-    @ApiModelProperty(value = "母猪耳标号", position = 4)
-    private String eartagNum;
-
-    /** 饮水量 */
-    @ApiModelProperty(value = "饮水量", position = 5)
-    private String waterValue;
-
-    /** 采食量 */
-    @ApiModelProperty(value = "采食量", position = 6)
-    private String feedValue;
-
-    /** 体重 */
-    @ApiModelProperty(value = "体重", position = 7)
-    private String weigthValue;
-
-    /** 上传时间 */
-    @ApiModelProperty(value = "上传时间", position = 9)
-    private Date uploadTime;
-
-    /** 设备编号 */
-    @ApiModelProperty(value = "设备编号", position = 10)
-    private String deviceCode;
-
-    /** 组织id */
-    @ApiModelProperty(value = "组织id", position = 11)
+    @ApiModelProperty(value = "组织id")
     private String orgId;
 
-    /** 运动量 */
-    @ApiModelProperty(value = "运动量", position = 12)
-    private String feedAct;
-
     /** 体温 */
-    @ApiModelProperty(value = "体温", position = 13)
-    private String temp;
+    @ApiModelProperty(value = "单元id")
+    private String unitId;
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/param/FeedingFatEditParam.java

@@ -31,45 +31,34 @@ import java.util.Date;
 @Setter
 public class FeedingFatEditParam {
 
-    /** ID */
-    @ApiModelProperty(value = "ID", required = true, position = 1)
-    @NotNull(message = "id不能为空")
-    private Integer id;
 
-    /** 栋舍id */
-    @ApiModelProperty(value = "栋舍id", position = 2)
-    private String unitId;
 
-    /** 栋舍名称 */
-    @ApiModelProperty(value = "栋舍名称", position = 3)
-    private String unitName;
 
     /** 母猪耳标号 */
-    @ApiModelProperty(value = "母猪耳标号", position = 4)
+    @ApiModelProperty(value = "母猪耳标号")
     private String eartagNum;
 
     /** 饮水量 */
-    @ApiModelProperty(value = "饮水量", position = 5)
-    private String waterValue;
+    @ApiModelProperty(value = "数据类型 1为采食 2为体温 3为活跃量 4为膘体")
+    private String dataType;
 
     /** 采食量 */
-    @ApiModelProperty(value = "采食量", position = 6)
-    private String feedValue;
+    @ApiModelProperty(value = "时间类型 1为今日 2为本周 3为本月 4为自定义")
+    private String timeType;
 
     /** 体重 */
-    @ApiModelProperty(value = "体重", position = 7)
-    private String weigthValue;
+    @ApiModelProperty(value = "自定义开始时间，不带时分秒",required = false)
+    private String startTime;
 
-    /** 上传时间 */
-    @ApiModelProperty(value = "上传时间", position = 9)
-    private Date uploadTime;
+    /**
+     * 上传时间
+     */
+    @ApiModelProperty(value = "自定义结束时间，不带时分秒", required = false)
+    private Date endTime;
 
-    /** 设备编号 */
-    @ApiModelProperty(value = "设备编号", position = 10)
-    private String deviceCode;
 
     /** 组织id */
-    @ApiModelProperty(value = "组织id", position = 11)
+    @ApiModelProperty(value = "组织id")
     private String orgId;
 
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/param/FeedingFatPageParam.java

@@ -30,22 +30,20 @@ public class FeedingFatPageParam {
 
     /** 当前页 */
     @ApiModelProperty(value = "当前页码")
-    private Integer current;
+    private Integer pageNum;
 
     /** 每页条数 */
     @ApiModelProperty(value = "每页条数")
-    private Integer size;
-
-    /** 排序字段 */
-    @ApiModelProperty(value = "排序字段，字段驼峰名称，如：userName")
-    private String sortField;
+    private Integer pageSize;
 
     /** 排序方式 */
-    @ApiModelProperty(value = "排序方式，升序：ASCEND；降序：DESCEND")
-    private String sortOrder;
-
-    /** 关键词 */
-    @ApiModelProperty(value = "关键词")
-    private String searchKey;
+    @ApiModelProperty(value = "组织id")
+    private String orgId;
+
+    /**
+     * 关键词
+     */
+    @ApiModelProperty(value = "母猪耳标号", required = false)
+    private String eartagNum;
 
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/service/FeedingFatService.java

@@ -34,9 +34,9 @@ import java.util.Map;
  **/
 public interface FeedingFatService extends IService<FeedingFat> {
 
-    FeedingFatVo listFat(Map<String,String> paramsMap);
+    FeedingFatVo listFat(FeedingFatAddParam feedingFatAddParam);
 
-    IPage<FeedingFatVo> fatPage(Map<String,String> paramsMap);
+    IPage<FeedingFatVo> fatPage(FeedingFatPageParam feedingFatPageParam);
 
-    List<FeedingFatVo2> listDetail(Map<String,String> paramsMap);
+    List<FeedingFatVo2> listDetail(FeedingFatEditParam feedingFatEditParam);
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/service/impl/FeedingFatServiceImpl.java

@@ -71,9 +71,9 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
 
 
     @Override
-    public FeedingFatVo listFat(Map<String, String> paramsMap) {
-        String orgId = paramsMap.get("orgId");
-        String unitId = paramsMap.get("unitId");
+    public FeedingFatVo listFat(FeedingFatAddParam feedingFatAddParam) {
+        String orgId = feedingFatAddParam.getOrgId();
+        String unitId = feedingFatAddParam.getUnitId();
         QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", orgId).like("pids", unitId).ne("id", unitId);
         List<BasePigpen> basePigpens = pigpenMapper.selectList(queryWrapper);
@@ -99,30 +99,24 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
     }
 
     @Override
-    public IPage<FeedingFatVo> fatPage(Map<String, String> paramsMap) {
-        String orgId = paramsMap.get("orgId");
-        String pageNum = paramsMap.get("pageNum");
-        String pageSize = paramsMap.get("pageSize");
-        String eartagNum = paramsMap.get("eartagNum");
-        if ("".equals(pageNum) || null == pageNum) {
-            pageNum = "1";
-        }
-        if ("".equals(pageSize) || null == pageSize) {
-            pageSize = "10";
-        }
+    public IPage<FeedingFatVo> fatPage(FeedingFatPageParam feedingFatPageParam) {
+        String orgId =feedingFatPageParam.getOrgId();
+        Integer pageNum = feedingFatPageParam.getPageNum();
+        Integer pageSize = feedingFatPageParam.getPageSize();
+        String eartagNum = feedingFatPageParam.getEartagNum();
         QueryWrapper<FeedingFat> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", orgId).eq(StringUtils.isNotBlank(eartagNum), "eartag_num", eartagNum);
-        Page<FeedingFat> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
+        Page<FeedingFat> page = new Page<>(pageNum,pageSize);
         IPage<FeedingFatVo> fatVoIPage = fatMapper.listPage(page, queryWrapper);
         return fatVoIPage;
     }
 
     @Override
-    public List<FeedingFatVo2> listDetail(Map<String, String> paramsMap) {
-        String orgId = paramsMap.get("orgId");
-        String eartagNum = paramsMap.get("eartagNum");
-        String dataType = paramsMap.get("dataType");//数据类型 1为采食 2为体温 3为活跃量 4为膘体
-        String timeType = paramsMap.get("timeType");//时间类型 1为今日 2为本周 3为本月 4为自定义
+    public List<FeedingFatVo2> listDetail(FeedingFatEditParam feedingFatEditParam) {
+        String orgId = feedingFatEditParam.getOrgId();
+        String eartagNum =feedingFatEditParam.getEartagNum();
+        String dataType = feedingFatEditParam.getDataType();//数据类型 1为采食 2为体温 3为活跃量 4为膘体
+        String timeType = feedingFatEditParam.getTimeType();//时间类型 1为今日 2为本周 3为本月 4为自定义
         if ("".equals(timeType) || null == timeType) {
             timeType = "1";
         }
@@ -151,8 +145,8 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
                 list = fatMapper.listFeedDetail(queryWrapper);
             }
             else if ("4".equals(timeType)){
-                String startTime = paramsMap.get("startTime") + " 00:00:00";
-                String endTime = paramsMap.get("endTime") + " 23:59:59";
+                String startTime = feedingFatEditParam.getStartTime() + " 00:00:00";
+                String endTime = feedingFatEditParam.getEndTime() + " 23:59:59";
                 queryWrapper.between("create_time", startTime,endTime);
                 list = fatMapper.listFeedDetail(queryWrapper);
             }
@@ -176,8 +170,8 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
                 list = fatMapper.listTempDetail(queryWrapper);
             }
             else if ("4".equals(timeType)){
-                String startTime = paramsMap.get("startTime") + " 00:00:00";
-                String endTime = paramsMap.get("endTime") + " 23:59:59";
+                String startTime = feedingFatEditParam.getStartTime() + " 00:00:00";
+                String endTime = feedingFatEditParam.getEndTime() + " 23:59:59";
                 queryWrapper.between("create_time", startTime,endTime);
                 list = fatMapper.listTempDetail(queryWrapper);
             }
@@ -201,8 +195,8 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
                 list = fatMapper.listActDetail(queryWrapper);
             }
             else if ("4".equals(timeType)){
-                String startTime = paramsMap.get("startTime") + " 00:00:00";
-                String endTime = paramsMap.get("endTime") + " 23:59:59";
+                String startTime = feedingFatEditParam.getStartTime() + " 00:00:00";
+                String endTime = feedingFatEditParam.getEndTime() + " 23:59:59";
                 queryWrapper.between("create_time", startTime,endTime);
                 list = fatMapper.listActDetail(queryWrapper);
             }
@@ -226,8 +220,8 @@ public class FeedingFatServiceImpl extends ServiceImpl<FeedingFatMapper, Feeding
                 list = fatMapper.listWeightDetail(queryWrapper);
             }
             else if ("4".equals(timeType)){
-                String startTime = paramsMap.get("startTime") + " 00:00:00";
-                String endTime = paramsMap.get("endTime") + " 23:59:59";
+                String startTime = feedingFatEditParam.getStartTime() + " 00:00:00";
+                String endTime = feedingFatEditParam.getEndTime() + " 23:59:59";
                 queryWrapper.between("create_time", startTime,endTime);
                 list = fatMapper.listWeightDetail(queryWrapper);
             }

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/vo/FeedingFatVo.java

@@ -1,28 +1,40 @@
 package vip.xiaonuo.modular.feed.feedingfat.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
 public class FeedingFatVo {
+
+    @ApiModelProperty(value = "饲养头数")
     private Integer fatCount;
 
+    @ApiModelProperty(value = "今日总采食量")
     private String todayFeed;
 
+    @ApiModelProperty(value = "今日总饮水量")
     private String todayWater;
 
+    @ApiModelProperty(value = "昨日总采食量")
     private String yesterdayFeed;
 
+    @ApiModelProperty(value = "昨日总饮水量")
     private String yesterdayWater;
 
+    @ApiModelProperty(value = "日增重")
     private String dayWeight;
 
+    @ApiModelProperty(value = "环肉比")
     private String rank;
 
+    @ApiModelProperty(value = "创建时间")
     private Date createDate;
 
+    @ApiModelProperty(value = "耳标号")
     private String eartagNum;
 
+    @ApiModelProperty(value = "设备编号")
     private String deviceCode;
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/vo/FeedingFatVo2.java

@@ -1,5 +1,6 @@
 package vip.xiaonuo.modular.feed.feedingfat.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -7,8 +8,10 @@ import java.util.Date;
 @Data
 public class FeedingFatVo2 {
 
+    @ApiModelProperty(value = "数值")
     private String value;
 
+    @ApiModelProperty(value = "时间")
     private Date createDate;
 
 }