增加栋舍list方法

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/config/MybatisPlusConfig.java

@@ -0,0 +1,44 @@
+package com.huimv.eartag2.manage2.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Project : huimv.shiwan
+ * @Package : com.huimv.biosafety.uface.controller
+ * @Description : TODO
+ * @Version : 1.0
+ * @Author : ZhuoNing
+ * @Create : 2020-12-25
+ **/
+@Configuration
+public class MybatisPlusConfig {
+    /**
+     * 注册插件
+     */
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        // 添加分页插件
+        PaginationInnerInterceptor pageInterceptor = new PaginationInnerInterceptor();
+        // 设置请求的页面大于最大页后操作，true调回到首页，false继续请求。默认false
+        pageInterceptor.setOverflow(false);
+        // 单页分页条数限制，默认无限制
+        pageInterceptor.setMaxLimit(500L);
+        // 设置数据库类型
+        pageInterceptor.setDbType(DbType.MYSQL);
+
+        interceptor.addInnerInterceptor(pageInterceptor);
+        return interceptor;
+
+//        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+//        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+//        return interceptor;
+
+
+    }
+}

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/BasePigpenController.java

@@ -23,6 +23,34 @@ public class BasePigpenController {
     @Autowired
     private BasePigpenService basePigpenService;
 
+    @RequestMapping(value = "/list",method = RequestMethod.POST)
+    public Result list(@RequestBody Map<String, Object> paramsMap) {
+        System.out.println("paramsMap>>"+paramsMap.toString());
+        String pageNo = paramsMap.get("pageNo")+"";
+        if (pageNo == null) {
+            pageNo = "1";
+        }
+        String pageSize = paramsMap.get("pageSize")+"";
+        if (pageSize == null) {
+            pageSize = "10";
+        }
+        String farmCode = "";
+        if (paramsMap.get("farmCode") != null) {
+            farmCode = paramsMap.get("farmCode")+"";
+        }
+        String stageCode = "";
+        if (paramsMap.get("stageCode") != null) {
+            stageCode = paramsMap.get("stageCode")+"";
+        }
+        String pigpenName = "";
+        if (paramsMap.get("pigpenName") != null) {
+            pigpenName = paramsMap.get("pigpenName")+"";
+        }
+        return basePigpenService.list(farmCode,pigpenName,stageCode,Integer.parseInt(pageNo), Integer.parseInt(pageSize));
+    }
+
+
+
     // 添加栋舍
     /**
      * @Method      : addBuilding
@@ -46,9 +74,9 @@ public class BasePigpenController {
         String stageCode = paramsMap.get("stageCode")+"";
         // 排序
         String sort = paramsMap.get("sort")+"";
-        if(sort == null){
-            sort = "1";
-        }
+//        if(sort == null){
+//            sort = "1";
+//        }
         // 类型
         Integer type = 1;
         //

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/BasePigpenService.java

@@ -23,4 +23,6 @@ public interface BasePigpenService extends IService<BasePigpen> {
     Result remove(String ids);
 
     Result editUnit(String id, String parentId, String unitName, String unitCode, String stageCode, Integer sort, Integer type);
+
+    Result list(String farmCode, String pigpenName, String stageCode, Integer pageNo, Integer pageSize);
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/BasePigpenServiceImpl.java

@@ -1,5 +1,7 @@
 package com.huimv.eartag2.manage2.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
 import com.huimv.eartag2.manage2.pojo.BasePigpen;
@@ -8,6 +10,7 @@ import com.huimv.eartag2.manage2.service.BasePigpenService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.eartag2.manage2.utils.IDUtil;
 import com.huimv.eartag2.manage2.utils.ResultUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -96,4 +99,20 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
             return resultUtil.result(basePigpenMapper.updateById(basePigpen));
         }
     }
+
+    @Override
+    public Result list(String farmCode, String pigpenName, String stageCode, Integer pageNo, Integer pageSize) {
+        if(pageNo == 0){
+            pageNo = 1;
+        }
+        Page<BasePigpen> page = new Page<>(pageNo, pageSize);
+        QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(pigpenName),"pigpen_name", pigpenName);
+        queryWrapper.like(StringUtils.isNotBlank(stageCode),"stage_code", stageCode);
+        queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
+        //创建排序
+//        queryWrapper.orderByAsc("sort");
+        Page<BasePigpen> pageBasePigpen = basePigpenMapper.selectPage(page, queryWrapper);
+        return new Result(ResultCode.SUCCESS,pageBasePigpen);
+    }
 }