精准饲喂修改

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/controller/FeedingEnvController.java

@@ -37,6 +37,7 @@ import vip.xiaonuo.modular.feed.feedingenv.service.FeedingEnvService;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -61,9 +62,9 @@ public class FeedingEnvController {
      * @date  2023/12/28 11:26
      */
     @ApiOperationSupport(order = 1)
-    @ApiOperation("获取精准饲喂设备分页")
+    @ApiOperation("获取精准饲喂设备列表")
     @GetMapping("/feed/feedingenv/page")
-    public CommonResult<Page<FeedingEnv>> page(FeedingEnvPageParam feedingEnvPageParam) {
+    public CommonResult<List<FeedingEnv>> page(FeedingEnvPageParam feedingEnvPageParam) {
         return CommonResult.data(feedingEnvService.page(feedingEnvPageParam));
     }
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/param/FeedingEnvPageParam.java

@@ -28,28 +28,9 @@ import java.util.Date;
 @Setter
 public class FeedingEnvPageParam {
 
-    /** 当前页 */
-    @ApiModelProperty(value = "当前页码")
-    private Integer current;
+    /** 组织id */
+    @ApiModelProperty(value = "组织id")
+    private String  orgId;
 
-    /** 每页条数 */
-    @ApiModelProperty(value = "每页条数")
-    private Integer size;
-
-    /** 排序字段 */
-    @ApiModelProperty(value = "排序字段，字段驼峰名称，如：userName")
-    private String sortField;
-
-    /** 排序方式 */
-    @ApiModelProperty(value = "排序方式，升序：ASCEND；降序：DESCEND")
-    private String sortOrder;
-
-    /** 关键词 */
-    @ApiModelProperty(value = "关键词")
-    private String searchKey;
-
-    /** 安装位置id */
-    @ApiModelProperty(value = "安装位置id")
-    private String unitId;
 
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/service/FeedingEnvService.java

@@ -38,7 +38,7 @@ public interface FeedingEnvService extends IService<FeedingEnv> {
      * @author wang
      * @date  2023/12/28 11:26
      */
-    Page<FeedingEnv> page(FeedingEnvPageParam feedingEnvPageParam);
+    List<FeedingEnv> page(FeedingEnvPageParam feedingEnvPageParam);
 
     /**
      * 添加精准饲喂设备

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/service/impl/FeedingEnvServiceImpl.java

@@ -52,19 +52,11 @@ public class FeedingEnvServiceImpl extends ServiceImpl<FeedingEnvMapper, Feeding
     private FeedingEnvMapper envMapper;
 
     @Override
-    public Page<FeedingEnv> page(FeedingEnvPageParam feedingEnvPageParam) {
+    public List<FeedingEnv> page(FeedingEnvPageParam feedingEnvPageParam) {
         QueryWrapper<FeedingEnv> queryWrapper = new QueryWrapper<>();
-        if (ObjectUtil.isNotEmpty(feedingEnvPageParam.getUnitId())) {
-            queryWrapper.lambda().eq(FeedingEnv::getUnitId, feedingEnvPageParam.getUnitId());
-        }
-        if (ObjectUtil.isAllNotEmpty(feedingEnvPageParam.getSortField(), feedingEnvPageParam.getSortOrder())) {
-            CommonSortOrderEnum.validate(feedingEnvPageParam.getSortOrder());
-            queryWrapper.orderBy(true, feedingEnvPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
-                    StrUtil.toUnderlineCase(feedingEnvPageParam.getSortField()));
-        } else {
-            queryWrapper.lambda().orderByAsc(FeedingEnv::getId);
-        }
-        return this.page(CommonPageRequest.defaultPage(), queryWrapper);
+        queryWrapper.eq("org_id", feedingEnvPageParam.getOrgId());
+        List<FeedingEnv> feedingEnvs = envMapper.selectList(queryWrapper);
+        return feedingEnvs;
     }
 
     @Transactional(rollbackFor = Exception.class)