修改分页插件

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/config/MybatisPlusConfig.java

@@ -0,0 +1,26 @@
+package com.huimv.admin.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;
+
+@Configuration
+public class MybatisPlusConfig {
+
+    /**
+     * 分页插件
+     */
+//    @Bean
+//    public PaginationInterceptor paginationInterceptor() {
+//        return new PaginationInterceptor();
+//    }
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+}

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/controller/ProdFarmNameController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -32,11 +33,11 @@ public class ProdFarmNameController {
         return new Result(10000,"同步成功",true);
     }
 
-    @PostMapping("/add")
+   /* @PostMapping("/add")
     public Result add(@RequestBody ProdFarmName farm){
         farmNameService.save(farm);
         return new Result(10000,"添加成功",true);
-    }
+    }*/
 
     @PostMapping("/edit")
     public Result edit(@RequestBody ProdFarmName farm){
@@ -51,8 +52,8 @@ public class ProdFarmNameController {
         return new Result(10000,"删除成功",true);
     }
 
-    @GetMapping("/listFarmName")
-    public Result listFarmName(){
-        return new Result(ResultCode.SUCCESS,farmNameService.list());
+    @PostMapping("/listFarmName")
+    public Result listFarmName(@RequestBody Map map){
+        return farmNameService.listPage(map);
     }
 }

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/IProdFarmNameService.java

@@ -2,6 +2,10 @@ package com.huimv.admin.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.admin.entity.ProdFarmName;
+import com.huimv.common.utils.Result;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -14,4 +18,7 @@ import com.huimv.admin.entity.ProdFarmName;
 public interface IProdFarmNameService extends IService<ProdFarmName> {
 
     void updatName();
+
+
+    Result listPage(Map map);
 }

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/impl/AuthorizeServiceImpl.java

@@ -67,7 +67,7 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
          * Step2:再添加新的账号权限组关联菜单数据；
          */
         groupMenuMapper.removeGroupMenu(groupId);
-        if (StringUtils.isNotEmpty(menuIds)){
+        if (StringUtils.isNotBlank(menuIds)){
             String[] menuIdsArray = menuIds.split(",");
             for (int a = 0; a < menuIdsArray.length; a++) {
 

huimv-farm-v2/huimv-admin/src/main/java/com/huimv/admin/service/impl/ProdFarmNameServiceImpl.java

@@ -1,15 +1,22 @@
 package com.huimv.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.admin.entity.Farm;
 import com.huimv.admin.entity.ProdFarmName;
 import com.huimv.admin.mapper.FarmMapper;
 import com.huimv.admin.mapper.ProdFarmNameMapper;
 import com.huimv.admin.service.IProdFarmNameService;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -33,4 +40,22 @@ public class ProdFarmNameServiceImpl extends ServiceImpl<ProdFarmNameMapper, Pro
        this.saveBatch(farms);
 
     }
+
+    @Override
+    public Result listPage(Map map) {
+        Integer current = (Integer) map.get("current");
+        String strchStr = (String)map.get("strchStr");
+        Integer size =(Integer) map.get("size");
+        QueryWrapper<ProdFarmName> wrapper = new QueryWrapper<>();
+
+        if (StringUtils.isNotBlank(strchStr)){
+            wrapper.like("farm_name",strchStr)
+            .or().like("erp_farm_name",strchStr)
+                    .or().like("erp_short_name",strchStr);
+
+        }
+
+        IPage<ProdFarmName> page = page(new Page<>(current, size), wrapper);
+        return new Result(ResultCode.SUCCESS,page);
+    }
 }

huimv-farm-v2/huimv-common/pom.xml

@@ -57,11 +57,6 @@
             <version>0.9.1</version>
         </dependency>
         <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-generator</artifactId>
-            <version>3.2.0</version>
-        </dependency>
-        <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>1.2.28</version>

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/config/MybatisPlusConfig.java

@@ -0,0 +1,26 @@
+package com.huimv.produce.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;
+
+@Configuration
+public class MybatisPlusConfig {
+
+    /**
+     * 分页插件
+     */
+//    @Bean
+//    public PaginationInterceptor paginationInterceptor() {
+//        return new PaginationInterceptor();
+//    }
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+}

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/controller/BaseBoxController.java

@@ -3,6 +3,7 @@ package com.huimv.produce.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.api.R;
+import com.huimv.common.token.TokenSign;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.produce.entity.BaseBox;
@@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
  *  前端控制器
@@ -29,8 +32,11 @@ public class BaseBoxController {
     private IBaseBoxService baseBoxService;
 
     @GetMapping("list")
-    public Result list(){
-        return new Result(ResultCode.SUCCESS,baseBoxService.list());
+    public Result list(@RequestParam(name = "farmId") Integer farmId){
+
+
+        return new Result(ResultCode.SUCCESS,baseBoxService.list(new QueryWrapper<BaseBox>().eq("farm_id",farmId)));
+
     }
 
     @GetMapping("listByFloor")

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/controller/BaseFloorController.java

@@ -1,13 +1,17 @@
 package com.huimv.produce.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
+import com.huimv.produce.entity.BaseBox;
+import com.huimv.produce.entity.BaseFloor;
 import com.huimv.produce.service.IBaseBoxService;
 import com.huimv.produce.service.IBaseFloorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -26,8 +30,8 @@ public class BaseFloorController {
     private IBaseFloorService baseFloorService;
 
     @GetMapping("list")
-    public Result list(){
-        return new Result(ResultCode.SUCCESS,baseFloorService.list());
+    public Result list(@RequestParam(name = "farmId") Integer farmId){
+        return new Result(ResultCode.SUCCESS,baseFloorService.list(new QueryWrapper<BaseFloor>().eq("farm_id",farmId)));
     }
 
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/controller/BaseRoomController.java

@@ -4,6 +4,7 @@ package com.huimv.produce.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
+import com.huimv.produce.entity.BaseFloor;
 import com.huimv.produce.entity.BaseRoom;
 import com.huimv.produce.service.IBaseFloorService;
 import com.huimv.produce.service.IBaseRoomService;
@@ -28,14 +29,14 @@ public class BaseRoomController {
     private IBaseRoomService baseRoomService;
 
     @GetMapping("/getAllRoomEnvironment")
-    private Result getAllRoomEnvironment(){
-        return  baseRoomService.getAllRoomEnvironment();
+    private Result getAllRoomEnvironment(@RequestParam(name = "farmId") Integer farmId){
+        return  baseRoomService.getAllRoomEnvironment(farmId);
 
     }
 
     @GetMapping("list")
-    public Result list(){
-        return new Result(ResultCode.SUCCESS,baseRoomService.list());
+    public Result list(@RequestParam(name = "farmId") Integer farmId){
+        return new Result(ResultCode.SUCCESS,baseRoomService.list(new QueryWrapper<BaseRoom>().eq("farm_id",farmId)));
     }
 
     @PostMapping("/listByRoom")

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/controller/SysMonthWaterController.java

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -24,12 +25,9 @@ public class SysMonthWaterController {
     @Autowired
     private ISysMonthWaterService monthWaterService;
 
-
-
-
     @GetMapping("/getAllDayWater")
-    public Result getAllDayWater(){
-        return  monthWaterService.getAllDayWater();
+    public Result getAllDayWater(@RequestParam(name = "farmId") Integer farmId){
+        return  monthWaterService.getAllDayWater(farmId);
     }
 
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/entity/SysDayWater.java

@@ -38,5 +38,6 @@ public class SysDayWater extends Model {
     @TableId(value = "day_water_id", type = IdType.AUTO)
     private Integer dayWaterId;
 
+    private Integer farmId;
 
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/entity/SysFodder.java

@@ -38,5 +38,7 @@ public class SysFodder extends Model {
     @TableId(value = "fodder_id", type = IdType.AUTO)
     private Integer fodderId;
 
+    private Integer farmId;
+
 
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/entity/SysHumidity.java

@@ -37,5 +37,7 @@ public class SysHumidity extends Model {
 
     private Integer roomId;
 
+    private Integer farmId;
+
 
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/entity/SysMonthWater.java

@@ -40,5 +40,7 @@ public class SysMonthWater extends Model {
 
     private String increaseValue;
 
+    private Integer farmId;
+
 
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/entity/SysTemperature.java

@@ -37,6 +37,9 @@ public class SysTemperature extends Model {
 
     private Integer roomId;
 
+    private Integer farmId;
+
+
 
 
 

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/IBaseRoomService.java

@@ -16,7 +16,7 @@ import java.util.Map;
  */
 public interface IBaseRoomService extends IService<BaseRoom> {
 
-    Result getAllRoomEnvironment();
+    Result getAllRoomEnvironment(Integer farmId);
 
     Result listByRoom(Map<String,String> map);
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/ISysFodderService.java

@@ -16,7 +16,9 @@ import java.util.Map;
  */
 public interface ISysFodderService extends IService<SysFodder> {
 
+    Result getAllFodder(Map map);
+
     Result getFodder(Map map);
 
-    Result getAllFodder(Map map);
+
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/ISysMonthWaterService.java

@@ -14,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISysMonthWaterService extends IService<SysMonthWater> {
 
-    Result getAllDayWater();
+    Result getAllDayWater(Integer farmId);
 }

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/impl/BaseRoomServiceImpl.java

@@ -39,13 +39,13 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
     private SysTemperatureMapper temperatureMapper;
 
     @Override
-    public Result getAllRoomEnvironment() {
+    public Result getAllRoomEnvironment(Integer farmId) {
         List<BaseRoom> roomList = this.list();
         List resultList = new ArrayList();
         for (BaseRoom baseRoom : roomList) {
             Map map =new HashMap();
-            SysHumidity humidity = humidityMapper.selectOne(new QueryWrapper<SysHumidity>().eq("room_id", baseRoom.getId()).last("ORDER BY hum_id  DESC limit 1"));
-            SysTemperature temperature = temperatureMapper.selectOne(new QueryWrapper<SysTemperature>().eq("room_id", baseRoom.getId()).last("ORDER BY tem_id  DESC limit 1"));
+            SysHumidity humidity = humidityMapper.selectOne(new QueryWrapper<SysHumidity>().eq("farm_id",farmId).eq("room_id", baseRoom.getId()).last("ORDER BY hum_id  DESC limit 1"));
+            SysTemperature temperature = temperatureMapper.selectOne(new QueryWrapper<SysTemperature>().eq("farm_id",farmId).eq("room_id", baseRoom.getId()).last("ORDER BY tem_id  DESC limit 1"));
             if (humidity != null){
                 map.put("humidity",humidity.getValue());
             }else {
@@ -70,11 +70,12 @@ public class BaseRoomServiceImpl extends ServiceImpl<BaseRoomMapper, BaseRoom> i
         String startDate = map.get("startDate");
         String endDate = map.get("endDate");
         String type = map.get("type");
-        String isExcel =(String) map.get("isExcel");
+        String farmId = map.get("farmId");
+
 
         BaseRoom baseRoom = new BaseRoom();
         if (StrUtil.isBlank(roomId)){
-            baseRoom =  this.getOne(new QueryWrapper<BaseRoom>().last("limit 1"));
+            baseRoom =  this.getOne(new QueryWrapper<BaseRoom>().eq("farm_id",farmId).last("limit 1"));
             roomId = baseRoom.getId()+"";
         }else {
             baseRoom =this.getById(roomId);

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/impl/SysDayWaterServiceImpl.java

@@ -51,10 +51,11 @@ public class SysDayWaterServiceImpl extends ServiceImpl<SysDayWaterMapper, SysDa
         String startDate = map.get("startDate");
         String endDate = map.get("endDate");
         String roomId = map.get("roomId");
+        String farmId = map.get("farmId");
         DecimalFormat df = new DecimalFormat("#.00");
         BaseRoom baseRoom ;
         if (roomId == null){
-            baseRoom = baseRoomMapper.selectList(null).get(0);
+            baseRoom = baseRoomMapper.selectList(new QueryWrapper<BaseRoom>().eq("farm_id",farmId)).get(0);
             roomId = baseRoom.getId()+"";
         }else {
             baseRoom = baseRoomMapper.selectById(roomId);
@@ -132,11 +133,12 @@ public class SysDayWaterServiceImpl extends ServiceImpl<SysDayWaterMapper, SysDa
         String type = map.get("type");
         String startDate = map.get("startDate");
         String endDate = map.get("endDate");
+        String farmId = map.get("farmId");
         DecimalFormat df = new DecimalFormat("#.00");
 
 
         QueryWrapper<SysDayWater> wrapper = new QueryWrapper<>();
-
+        wrapper.eq("farm_id",farmId);
 
         Map endMap = new HashMap();
         //自定义
@@ -176,6 +178,7 @@ public class SysDayWaterServiceImpl extends ServiceImpl<SysDayWaterMapper, SysDa
 
             QueryWrapper<SysMonthWater> monthWaterWrapper = new QueryWrapper<>();
             monthWaterWrapper.ge("create_time", DataUill.getTimesmorning());
+            monthWaterWrapper.eq("farm_id",farmId);
             List<SysMonthWater> monthWaters = monthWaterMapper.selecAllMonthWater(monthWaterWrapper);
 //            List<SysMonthWater> list= new ArrayList<>();
             endMap.put("countWater",null);

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/impl/SysFodderServiceImpl.java

@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.common.utils.DataUill;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
+import com.huimv.produce.entity.BaseFloor;
 import com.huimv.produce.entity.SysFodder;
 import com.huimv.produce.entity.dto.FodderDto;
+import com.huimv.produce.mapper.BaseFloorMapper;
 import com.huimv.produce.mapper.SysFodderMapper;
 import com.huimv.produce.service.ISysFodderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +34,10 @@ public class SysFodderServiceImpl extends ServiceImpl<SysFodderMapper, SysFodder
     @Autowired
     private SysFodderMapper fodderMapper;
 
+    @Autowired
+    private BaseFloorMapper floorMapper;
+
+
 
 
     @Override
@@ -39,7 +45,9 @@ public class SysFodderServiceImpl extends ServiceImpl<SysFodderMapper, SysFodder
         String startDate = (String) map.get("satrtDate");
         String endDate = (String) map.get("endDate");
         Integer type = (Integer) map.get("type");
+        Integer farmId = (Integer) map.get("farmId");
         QueryWrapper<SysFodder> wrapper = new QueryWrapper<>();
+        wrapper.eq("farm_id",farmId);
         Map endMap = new HashMap();
         //自定义
         if ("3".equals(type)){
@@ -76,8 +84,9 @@ public class SysFodderServiceImpl extends ServiceImpl<SysFodderMapper, SysFodder
         String endDate = (String) map.get("endDate");
         Integer type = (Integer) map.get("type");
         Integer floorId = (Integer)map.get("floorId");
+        Integer farmId = (Integer)map.get("farmId");
        if (ObjectUtil.isEmpty(floorId)){
-           floorId =1;
+           floorId =floorMapper.selectOne(new QueryWrapper<BaseFloor>().eq("farm_id",farmId).last("limit 1")).getId();
        }
 
         QueryWrapper<SysFodder> wrapper = new QueryWrapper<>();

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/service/impl/SysMonthWaterServiceImpl.java

@@ -33,8 +33,8 @@ public class SysMonthWaterServiceImpl extends ServiceImpl<SysMonthWaterMapper, S
     private BaseRoomMapper baseRoomMapper;
 
     @Override
-    public Result getAllDayWater() {
-        List<BaseRoom> baseRooms = baseRoomMapper.selectList(null);
+    public Result getAllDayWater(Integer farmId) {
+        List<BaseRoom> baseRooms = baseRoomMapper.selectList(new QueryWrapper<BaseRoom>().eq("farm_id",farmId));
         List endList = new ArrayList();
         for (BaseRoom baseRoom : baseRooms) {
             Integer id = baseRoom.getId();

huimv-farm-v2/huimv-produce-warning/src/main/java/com/huimv/produce/timer/SgdTimer.java

@@ -53,7 +53,7 @@ public class SgdTimer {
     @Autowired
     private ISysFodderService fodderService;
 
-
+    private Integer hyFarmId = 1;
 
   /*  //更新盒子,房间信息
     @Scheduled(cron = "0 0 0 1/7 * ?")
@@ -156,6 +156,7 @@ public class SgdTimer {
                         if (ObjectUtil.isNotEmpty(monitoryValue.getValue())){
                             Double value = (Double)monitoryValue.getValue() * 0.1;
                             sysTemperature.setId(monitoryValue.getId());
+                            sysTemperature.setFarmId(hyFarmId);
                             sysTemperature.setRoomId(roomId);
                             if (value != 0.0){
                                 sysTemperature.setValue(df.format(value));
@@ -172,6 +173,7 @@ public class SgdTimer {
                         Double value = (Double)monitoryValue.getValue() ;
                         humidity.setId(monitoryValue.getId());
                         humidity.setRoomId(roomId);
+                        humidity.setFarmId(hyFarmId);
                         if (ObjectUtil.isNotEmpty(value)){
                             if (value != 0.0){
                                 humidity.setValue(df.format(value));
@@ -256,6 +258,7 @@ public class SgdTimer {
 
                         dayWater.setId(monitoryValue.getId());
                         dayWater.setRoomId(roomId);
+                        dayWater.setFarmId(hyFarmId);
                         if (value == null){
                             continue;
                         }
@@ -335,6 +338,7 @@ public class SgdTimer {
                                         .last("ORDER BY create_time LIMIT 1"));
 
                         SysMonthWater monthWater = new SysMonthWater();
+                        monthWater.setFarmId(hyFarmId);
                         Double newValue = (Double)monitoryValue.getValue();
                         Double add  ;
                         if (ObjectUtil.isEmpty(oldWater)){
@@ -425,6 +429,7 @@ public class SgdTimer {
             fodder.setCreateTime(monitoryValue.getTimestamp());
             fodder.setFloorId(1);
             fodder.setId(monitoryValue.getId());
+            fodder.setFodderId(hyFarmId);
             fodderService.save(fodder);
             System.out.println("一号楼新增------------>"+monitoryValue);
         }else {
@@ -448,6 +453,7 @@ public class SgdTimer {
             fodder.setCreateTime(twoMonitoryValue.getTimestamp());
             fodder.setFloorId(2);
             fodder.setId(twoMonitoryValue.getId());
+            fodder.setFarmId(hyFarmId);
             fodderService.save(fodder);
             System.out.println("二号楼新增------------>"+twoMonitoryValue);
         }else {
@@ -470,6 +476,7 @@ public class SgdTimer {
             fodder.setCreateTime(threeMonitoryValue.getTimestamp());
             fodder.setFloorId(3);
             fodder.setId(threeMonitoryValue.getId());
+            fodder.setFarmId(hyFarmId);
             fodderService.save(fodder);
             System.out.println("三号楼新增------------>"+threeMonitoryValue);
         }else {

huimv-farm-v2/huimv-video/src/main/java/com/huimv/video/config/MybatisPlusConfig.java

@@ -0,0 +1,26 @@
+package com.huimv.video.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;
+
+@Configuration
+public class MybatisPlusConfig {
+
+    /**
+     * 分页插件
+     */
+//    @Bean
+//    public PaginationInterceptor paginationInterceptor() {
+//        return new PaginationInterceptor();
+//    }
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
+    }
+}

huimv-farm-v2/pom.xml

@@ -57,6 +57,16 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-extension</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
             <version>3.2.0</version>
         </dependency>
         <dependency>