增加排名条件查询

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/controller/SowRankTableController.java

@@ -46,6 +46,8 @@ public class SowRankTableController {
         return R.ok().put("sowRankTable", sowRankTable);
     }
 
+
+
     /**
      * 保存
      */
@@ -62,7 +64,6 @@ public class SowRankTableController {
     @RequestMapping("/update")
     public R update(@RequestBody SowRankTableEntity sowRankTable){
 		sowRankTableService.updateById(sowRankTable);
-
         return R.ok();
     }
 
@@ -70,6 +71,9 @@ public class SowRankTableController {
 
 
 
+
+
+
     /**
      * 删除
      */

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/service/impl/EartagDataServiceImpl.java

@@ -67,9 +67,6 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
         String bat = (String) params.get("bat");//电量
         String dayAge2 = (String) params.get("dayage2");//日龄
 
-
-
-
         LambdaQueryWrapper<EartagDataEntity> wrapper = Wrappers.lambdaQuery();
         if(StringUtils.isNotEmpty(farmID)){  //StringUtils.isNotEmpty(orderField) && StringUtils.isNotEmpty(order)
             wrapper.eq(EartagDataEntity::getFarmCode, farmID );
@@ -110,15 +107,15 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
         }
         wrapper.orderByDesc( EartagDataEntity::getId );
 
+
+
         IPage<EartagDataEntity>  page =  this.page((new Query<EartagDataEntity>().getPage(params)),wrapper);
         //拼接栋舍信息在里面
         List<EartagDataEntity> records = page.getRecords();  //获取信息
 
-
         for (EartagDataEntity record : records) {
             //这一页的数据
             System.out.println("数据record"+records);
-
             LambdaQueryWrapper<MovePigpenEntity> wrapper23 = Wrappers.lambdaQuery();
             wrapper23.eq(MovePigpenEntity::getEartagNo , record.getEartagNo()).orderByAsc( MovePigpenEntity::getId ).last( "limit 1");
             MovePigpenEntity  movePigpen = movePigpenDao.selectOne(wrapper23);

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/service/impl/SowRankTableServiceImpl.java

@@ -1,8 +1,12 @@
 package com.huimv.acquisition.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.acquisition.entity.EartagDataEntity;
 import com.huimv.acquisition.entity.SowRankTableEntity;
 import com.huimv.acquisition.mapper.SowRankTableDao;
 import com.huimv.acquisition.service.SowRankTableService;
+import com.huimv.acquisition.socket.eartagrecive.util.StringUtilsWork;
 import com.huimv.acquisition.utils.PageUtils;
 import com.huimv.acquisition.utils.Query;
 import org.springframework.stereotype.Service;
@@ -23,12 +27,35 @@ public class SowRankTableServiceImpl extends ServiceImpl<SowRankTableDao, SowRan
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
+
         IPage<SowRankTableEntity> page = this.page(
                 new Query<SowRankTableEntity>().getPage(params),
                 new QueryWrapper<SowRankTableEntity>()
         );
 
-        return new PageUtils(page);
+        String max_sow_count = String.valueOf(params.get("max_sow_count"));//母猪存栏最高
+        String min_sow_count = String.valueOf( params.get("min_sow_count"));//母猪存栏最低
+        String max_sow_inc = String.valueOf( params.get("max_sow_inc"));//母猪新增最高
+        String min_sow_inc = String.valueOf( params.get("min_sow_inc"));//母猪新增最低
+
+        if(StringUtilsWork.isNotBlank(max_sow_count)||StringUtilsWork.isNotBlank(min_sow_count)||StringUtilsWork.isNotBlank(max_sow_count)||StringUtilsWork.isNotBlank(min_sow_count))
+        {
+
+            LambdaQueryWrapper<SowRankTableEntity> wrapper = Wrappers.lambdaQuery();
+            if (StringUtilsWork.isNotBlank(max_sow_count) & StringUtilsWork.isNotBlank(min_sow_count)) {
+                wrapper.between(SowRankTableEntity::getSowLivestock, max_sow_count, min_sow_count);
+            }
+            if (StringUtilsWork.isNotBlank(max_sow_count) & StringUtilsWork.isNotBlank(min_sow_count)) {
+                wrapper.between(SowRankTableEntity::getSowLivestockInc, max_sow_inc, min_sow_inc);
+            }
+            wrapper.orderByDesc(SowRankTableEntity::getRank);
+            IPage<SowRankTableEntity> page1 = this.page((new Query<SowRankTableEntity>().getPage(params)), wrapper);
+            return new PageUtils(page1);
+        }
+
+        return   new PageUtils(page)   ;
+
+
     }
 
 }

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/service/impl/ReceivePackageSerivce.java

@@ -13,8 +13,6 @@ import com.huimv.acquisition.service.MovePigpenService;
 import com.huimv.acquisition.socket.eartagrecive.util.DateUtil;
 import com.huimv.acquisition.socket.eartagrecive.util.DateUtilsPublic;
 import com.huimv.acquisition.socket.eartagrecive.util.StringUtilsWork;
-import com.huimv.acquisition.utils.PageUtils;
-import com.huimv.acquisition.utils.Query;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -47,7 +45,6 @@ public class ReceivePackageSerivce {
 
     @Autowired
     private MovePigpenService movePigpenService;
-
     @Autowired
     private EartagRegisterDao eartagRegisterDao ;
     @Autowired
@@ -72,10 +69,6 @@ public class ReceivePackageSerivce {
         String prepare_field= clientMessageArray[9];    //耳标温度
 
         String[] split = prepare_field.split("#");//1.0#1.0#9314   --耳标版本--网关版本--电阻值（用来计算环境温度）
-
-
-
-
         String  check = clientMessageArray[10];          //校验码
         String  tail  = clientMessageArray[11];          //命令尾
         EartagDataEntity eartagDataEntity = new EartagDataEntity();
@@ -219,8 +212,7 @@ public class ReceivePackageSerivce {
     public static  double getTwoDecimal(double num) {
         DecimalFormat   dFormat = new DecimalFormat("#.00");
         String yearString = dFormat.format(num);
-        Double temp = Double.valueOf(yearString);
-        return temp;
+        return  Double.parseDouble(yearString);
 
     }
 
@@ -228,19 +220,18 @@ public class ReceivePackageSerivce {
 
     public static  double  m1(double num ) {
         BigDecimal bg = new BigDecimal(num);
-        double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-        return f1;
+        return  bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
     }
 
 
 
 
     public static String swapHex(String src) {
-        String target = "";
+        StringBuilder target = new StringBuilder();
         for (int i = src.length() - 1; i > 0; i -= 2) {
-            target += src.substring(i - 1, i + 1);
+            target.append(src.substring(i - 1, i + 1));
         }
-        return target;
+        return target.toString();
     }
     public static String numberFormater(double d) {
         DecimalFormat nf = new DecimalFormat();

smart.eartag.data.platform/huimv-smart-eartag-data-acquisition/src/main/java/com/huimv/acquisition/socket/eartagrecive/service/impl/SendPackageService.java

@@ -46,6 +46,7 @@ public class SendPackageService {
              //注册失败的标志
              return    "hm+1+1+158+123+8+end";
          }
+
         return "hm+1+0+"+collectorRegisterEntity.getDeviceCode()+"+520+8+end";
     }