2021/8/11 待转猪只业务处理

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/resources/application-dev.yml

@@ -1,9 +1,9 @@
 server:
-  port: 8210
+  port: 9500
 
 spring:
   datasource:
-    url: jdbc:mysql://115.238.57.190:3306/smart_eartag_data_platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/smart_eartag_data_platform2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/Main.java

@@ -1,9 +1,12 @@
 package com.huimv.manager;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.huimv.manager.utils.Constant;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -17,27 +20,35 @@ import java.util.Date;
  */
 public class Main {
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws ParseException {
 
-        long cal1 = System.currentTimeMillis();
-        //执行代码
-        Calendar calendar = Calendar.getInstance();
-        Date time = calendar.getTime();
-        int month = time.getMonth();
-        System.out.println(month);
-//        System.out.println(time);
-        calendar.add(Calendar.MONTH, -1);
-        Date time2 = calendar.getTime();
-//        System.out.println(time2);
-        int i = calendar.get(Calendar.MONTH);
-        System.out.println(i);
-        System.out.println(Constant.SDF_YMD.format(time));
+//        long cal1 = System.currentTimeMillis();
+//        //执行代码
+//        Calendar calendar = Calendar.getInstance();
+//        Date time = calendar.getTime();
+//        int month = time.getMonth();
+//        System.out.println(month);
+////        System.out.println(time);
+//        calendar.add(Calendar.MONTH, -1);
+//        Date time2 = calendar.getTime();
+////        System.out.println(time2);
+//        int i = calendar.get(Calendar.MONTH);
+//        System.out.println(i);
+//        System.out.println(Constant.SDF_YMD.format(time));
+//
+////        //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+////        //System.out.println(sdf.format(new Date()));
+////        System.out.println(DateUtil.format(new Date(), "yyyy-MM-dd"));
+//        //System.out.println(DateUtil.format(DateUtil.endOfYear(DateUtil.parse("2018", Constant.DATE_FORMAT_Y)), Constant.DATE_FORMAT_YMD));
+//        long cal2 = System.currentTimeMillis();
+//        System.out.println(cal2 -cal1);
 
-//        //SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-//        //System.out.println(sdf.format(new Date()));
-//        System.out.println(DateUtil.format(new Date(), "yyyy-MM-dd"));
-        //System.out.println(DateUtil.format(DateUtil.endOfYear(DateUtil.parse("2018", Constant.DATE_FORMAT_Y)), Constant.DATE_FORMAT_YMD));
-        long cal2 = System.currentTimeMillis();
-        System.out.println(cal2 -cal1);
+//        System.out.println(Arrays.toString(Constant.MenuType.values()));
+
+//        Date parse =  Constant.SDF_YMD.parse("2021-08-09");
+//        System.out.println(parse);
+        DateTime dateTime = DateUtil.offsetDay(new Date(), -48);
+        System.out.println(dateTime);
+//        System.out.println(DateUtil.betweenDay(parse, new Date(), false));
     }
 }

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/config/CorsConfig.java

@@ -0,0 +1,34 @@
+package com.huimv.manager.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/8/11 9:58
+ */
+@Configuration
+public class CorsConfig {
+
+    /**
+     * 开启跨域访问拦截器
+     */
+    @Bean
+    public CorsFilter corsFilter() {
+        CorsConfiguration corsConfiguration = new CorsConfiguration();
+        corsConfiguration.addAllowedOrigin("*");
+        corsConfiguration.addAllowedHeader("*");
+        corsConfiguration.addAllowedMethod("*");
+
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", corsConfiguration);
+        return new CorsFilter(source);
+    }
+}

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/controller/PreparePigController.java

@@ -0,0 +1,106 @@
+package com.huimv.manager.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.manager.entity.MovePigpenEntity;
+import com.huimv.manager.entity.PigBasicInformationEntity;
+import com.huimv.manager.mapper.MovePigpenDao;
+import com.huimv.manager.mapper.PigBasicInformationDao;
+import com.huimv.manager.result.R;
+import com.huimv.manager.result.RRException;
+import com.huimv.manager.utils.Constant;
+import com.huimv.manager.utils.PageUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 待转猪只Controller
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/8/11 9:49
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/prepareTrans")
+public class PreparePigController {
+
+    private final int breeding = 50;
+    private final int childbirth = 50;
+    private final int threadshold = 5;
+
+    @Autowired
+    private MovePigpenDao movePigpenDao;
+
+    @Autowired
+    private PigBasicInformationDao pigBasicInformationDao;
+
+    @RequestMapping("/prepareCountAndDetail")
+    public R countPrepareAmountAndListPigDetail(Integer type,
+                                                @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
+                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        int breed = Constant.Stage.PEIZHONG.getType();
+        if (type != null && type != breed && type != Constant.Stage.FENMIAN.getType()) {
+            throw new RRException("type参数有误,请检查");
+        }
+
+        LambdaQueryWrapper<MovePigpenEntity> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(MovePigpenEntity::getStage, breed);
+        List<MovePigpenEntity> breedingList = movePigpenDao.selectList(lambdaQuery);
+
+        List<String> prepareToTransList = filterEligibleEartags(breedingList, breeding);
+        int prepareToTransNum = prepareToTransList.size();
+
+        lambdaQuery.clear();
+
+        lambdaQuery.eq(MovePigpenEntity::getStage, Constant.Stage.FENMIAN.getType());
+        List<MovePigpenEntity> childbirthList = movePigpenDao.selectList(lambdaQuery);
+        List<String> weaningList = filterEligibleEartags(childbirthList, childbirth);
+        int weaningNum = weaningList.size();
+
+        List<String> list = CollUtil.newArrayList(prepareToTransList);
+        if (type == null) {
+            list.addAll(prepareToTransList);
+            list.addAll(weaningList);
+        } else if (type == breed) {
+            list.addAll(prepareToTransList);
+        } else {
+            list.addAll(weaningList);
+        }
+
+        IPage<PigBasicInformationEntity> iPage = new Page<>(pageNum, pageSize);
+
+        LambdaQueryWrapper<PigBasicInformationEntity> eartagLambdaQuery = Wrappers.lambdaQuery();
+        IPage<PigBasicInformationEntity> page = new Page<>(pageNum, pageSize);
+        if (CollUtil.isNotEmpty(list)) {
+            eartagLambdaQuery.in(PigBasicInformationEntity::getEartagNo, list);
+             page = pigBasicInformationDao.selectPage(iPage, eartagLambdaQuery);
+        }
+
+        PageUtils pageUtils = new PageUtils(page);
+        return Objects.requireNonNull(Objects.requireNonNull(R.ok().put("prepareToTransNum", prepareToTransNum)).put("weaningNum", weaningNum)).put("page", pageUtils);
+    }
+
+    private List<String> filterEligibleEartags(List<MovePigpenEntity> list, Integer type) {
+        return list.stream()
+                .filter(movePigpenEntity -> DateUtil.betweenDay(movePigpenEntity.getMoveDate(), new Date(), false) > type - threadshold)
+                .sorted((o1, o2) -> (int) (o2.getMoveDate().getTime() - o1.getMoveDate().getTime()))
+                .map(MovePigpenEntity::getEartagNo)
+                .collect(Collectors.toList());
+    }
+}

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/controller/TestController.java

@@ -0,0 +1,33 @@
+package com.huimv.manager.controller;
+
+import com.huimv.manager.service.BasePigpenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.Map;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/8/6 14:09
+ */
+@RestController
+@RequestMapping("/test")
+@CrossOrigin
+public class TestController {
+
+    @Autowired
+    private BasePigpenService basePigpenService;
+
+
+    @PostMapping("/list")
+    public String list(@RequestBody Integer[] params) {
+        System.out.println(Arrays.toString(params));
+        return "ok";
+    }
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/entity/MovePigpenEntity.java

@@ -0,0 +1,44 @@
+package com.huimv.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-28 09:57:42
+ */
+@Data
+@TableName("move_pigpen")
+public class MovePigpenEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 耳标号
+	 */
+	private String eartagNo;
+	/**
+	 * 转舍日期
+	 */
+	private Date moveDate;
+	/**
+	 * 当前阶段
+	 */
+	private Integer stage;
+	/**
+	 * 设备编码
+	 */
+	private String deviceCode;
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/entity/PigBasicInformationEntity.java

@@ -0,0 +1,91 @@
+package com.huimv.manager.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-11 17:05:02
+ */
+@Data
+@TableName("pig_basic_information")
+public class PigBasicInformationEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 耳标号
+	 */
+	private String eartagNo;
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+	/**
+	 * 更新时间
+	 */
+	private Date updateTime;
+	/**
+	 * 机器编码
+	 */
+	private String deviceCode;
+	/**
+	 * 猪的出生日期
+	 */
+	private Date birthDay;
+	/**
+	 * 佩标日期
+	 */
+	private Date wearTagTime;
+	/**
+	 * 牧场编号
+	 */
+	private String farmCode;
+	/**
+	 * 牧场名称
+	 */
+	private String farmName;
+	/**
+	 * 猪舍id
+	 */
+	private Integer penId;
+	/**
+	 * 猪舍名称
+	 */
+	private String penName;
+	/**
+	 * 单元id
+	 */
+	private Integer unitId;
+	/**
+	 * 单元名称
+	 */
+	private String unitName;
+	/**
+	 * 县id
+	 */
+	private Integer countyId;
+	/**
+	 * 县名称
+	 */
+	private String countyName;
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+
+	private Integer stage;
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/entity/vo/PrepareToTransferNumVo.java

@@ -0,0 +1,25 @@
+package com.huimv.manager.entity.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author yinhao
+ * @date 2021/8/11 15:29
+ */
+@Data
+public class PrepareToTransferNumVo implements Serializable {
+    private static final long serialVersionUID = -2124453539588836968L;
+
+
+    private Integer willGoToDeliveryNum;
+
+    private Integer willWeaningNum;
+
+
+}

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/mapper/MovePigpenDao.java

@@ -0,0 +1,20 @@
+package com.huimv.manager.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.manager.entity.MovePigpenEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-28 09:57:42
+ */
+@Mapper
+@Repository
+public interface MovePigpenDao extends BaseMapper<MovePigpenEntity> {
+	
+}

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/mapper/PigBasicInformationDao.java

@@ -0,0 +1,19 @@
+package com.huimv.manager.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.manager.entity.PigBasicInformationEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-08-11 17:05:02
+ */
+@Mapper
+@Repository
+public interface PigBasicInformationDao extends BaseMapper<PigBasicInformationEntity> {
+	
+}

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/service/impl/FarmStockServiceImpl.java

@@ -23,7 +23,6 @@ import java.util.stream.Stream;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import sun.jvm.hotspot.debugger.Page;
 
 
 /**

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/utils/Constant.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2016-2019 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -16,8 +16,8 @@ import java.text.SimpleDateFormat;
  * @author Mark sunlightcs@gmail.com
  */
 public class Constant {
-	/** 超级管理员ID */
-	public static final int SUPER_ADMIN = 1;
+    /** 超级管理员ID */
+    public static final int SUPER_ADMIN = 1;
     /**
      * 当前页码
      */
@@ -38,18 +38,19 @@ public class Constant {
      *  升序
      */
     public static final String ASC = "asc";
-	/**
-	 * 菜单类型
-	 * 
-	 * @author chenshun
-	 * @email sunlightcs@gmail.com
-	 * @date 2016年11月15日 下午1:24:29
-	 */
+
+    /**
+     * 菜单类型
+     *
+     * @author chenshun
+     * @email sunlightcs@gmail.com
+     * @date 2016年11月15日 下午1:24:29
+     */
     public enum MenuType {
         /**
          * 目录
          */
-    	CATALOG(0),
+        CATALOG(0),
         /**
          * 菜单
          */
@@ -69,10 +70,67 @@ public class Constant {
             return value;
         }
     }
-    
+
+    /**
+     * 阶段类型
+     */
+    public enum Stage {
+
+        /**
+         * 配种
+         */
+        PEIZHONG(1),
+        /**
+         * 分娩
+         */
+        FENMIAN(2),
+        /**
+         * 保育
+         */
+        BAOYU(3),
+        /**
+         * 育肥
+         */
+        YUFEI(4),
+        /**
+         * 空怀
+         */
+        KONGHUAI(5),
+        /**
+         * 后备母猪
+         */
+        HOUBEI(6),
+        /**
+         * 公猪
+         */
+        GONGZHU(7),
+        /**
+         * 病死场内收集
+         */
+        BINGSI_INNNER(8),
+        /**
+         * 病死集中收集
+         */
+        BINGSI_CONCENTRATION(9),
+        /**
+         * 病死无害化处理中心
+         */
+        BINGSI_HARMLESS(10);
+
+        private int type;
+
+        Stage(int type) {
+            this.type = type;
+        }
+
+        public int getType() {
+            return type;
+        }
+    }
+
     /**
      * 定时任务状态
-     * 
+     *
      * @author chenshun
      * @email sunlightcs@gmail.com
      * @date 2016年12月3日 上午12:07:22
@@ -81,18 +139,18 @@ public class Constant {
         /**
          * 正常
          */
-    	NORMAL(0),
+        NORMAL(0),
         /**
          * 暂停
          */
-    	PAUSE(1);
+        PAUSE(1);
 
         private int value;
 
         ScheduleStatus(int value) {
             this.value = value;
         }
-        
+
         public int getValue() {
             return value;
         }

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   datasource:
-    url: jdbc:mysql://115.238.57.190:3306/smart_eartag_data_platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&&failOverReadOnly=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/smart_eartag_data_platform2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&&failOverReadOnly=false&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/test/java/com/huimv/manager/HuimvSmartEartagDataManagerTests.java

@@ -3,8 +3,10 @@ package com.huimv.manager;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.manager.entity.BaseRegionEntity;
 import com.huimv.manager.entity.dto.DataAnalysisDto;
 import com.huimv.manager.entity.vo.DayStockVo;
 import com.huimv.manager.entity.vo.SunAreaStockVo;
@@ -50,31 +52,37 @@ public class HuimvSmartEartagDataManagerTests {
 //        List<BaseRegionEntity> all = baseRegionDao.selectList(Wrappers.<BaseRegionEntity>lambdaQuery().eq(BaseRegionEntity::getParentCode, "001"));
 //        all.stream().filter()
 
-        DataAnalysisDto dataAnalysisDto = new DataAnalysisDto();
-        dataAnalysisDto.setRegionCode("001");
-        String start = dataAnalysisDto.getStart();
-        if (StringUtils.isEmpty(start)) {
-            start = DateUtil.format(DateUtil.offsetMonth(DateUtil.date(), -1), "yyyy-MM-dd");
-        }
-        String end = dataAnalysisDto.getEnd();
-        if (StringUtils.isEmpty(end)) {
-            end = DateUtil.format(DateUtil.date(), "yyyy-MM-dd");
-        }
+//        DataAnalysisDto dataAnalysisDto = new DataAnalysisDto();
+//        dataAnalysisDto.setRegionCode("001");
+//        String start = dataAnalysisDto.getStart();
+//        if (StringUtils.isEmpty(start)) {
+//            start = DateUtil.format(DateUtil.offsetMonth(DateUtil.date(), -1), "yyyy-MM-dd");
+//        }
+//        String end = dataAnalysisDto.getEnd();
+//        if (StringUtils.isEmpty(end)) {
+//            end = DateUtil.format(DateUtil.date(), "yyyy-MM-dd");
+//        }
 
 //        List<DayStockVo> dayStockVoList =  dailyTabulateDataDao.getDayStockByRegion(query);
 //        System.out.println(dayStockVoList);
 
 
-        QueryWrapper<SunAreaStockVo> sunAreaQuery = Wrappers.query();
-        sunAreaQuery.eq("farm.province", dataAnalysisDto.getRegionCode())
-                .ge("dtd.statistic_date", start)
-                .le("dtd.statistic_date", end)
-                .groupBy("farm.city", "dtd.statistic_date")
-                .orderByDesc("dtd.statistic_date");
+//        QueryWrapper<SunAreaStockVo> sunAreaQuery = Wrappers.query();
+//        sunAreaQuery.eq("farm.province", dataAnalysisDto.getRegionCode())
+//                .ge("dtd.statistic_date", start)
+//                .le("dtd.statistic_date", end)
+//                .groupBy("farm.city", "dtd.statistic_date")
+//                .orderByDesc("dtd.statistic_date");
 //        List<SunAreaStockVo> sunAreaStockVoList = dailyTabulateDataDao.getCityPigStock(sunAreaQuery);
 
 //        System.out.println(sunAreaStockVoList);
 
+        LambdaQueryWrapper<BaseRegionEntity> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(1 > 2,BaseRegionEntity::getRegionCode, "330100")
+                .or().apply("region_name = {0}", "杭州市");
+        List<BaseRegionEntity> list = baseRegionDao.selectList(lambdaQuery);
+        System.out.println(list);
+
     }
 
     @Test

smart.eartag.data.platform/huimv-smart-eartag-data-transmission/pom.xml

@@ -27,4 +27,7 @@
     </dependencies>
 
 
+
+
+
 </project>

smart.eartag.data.platform/huimv-smart-eartag-data-transmission/src/main/java/com/huimv/transmission/utils/Query.java

@@ -41,8 +41,8 @@ public class Query<T> {
         //分页对象
         Page<T> page = new Page<>(curPage, limit);
 
-        //分页参数
-        params.put(Constant.PAGE, page);
+//        //分页参数
+//        params.put(Constant.PAGE, page);
 
         //排序字段
         //防止SQL注入（因为sidx、order是通过拼接SQL实现排序的，会有SQL注入风险）

smart.eartag.data.platform/huimv-smart-eartag-data-transmission/src/main/resources/application-dev.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   datasource:
-    url: jdbc:mysql://115.238.57.190:3306/smart_eartag_data_platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/smart_eartag_data_platform2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver