修复转舍位置信息

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

@@ -39,9 +39,10 @@ public class EartagDataController {
     }
 
 
+
     //根据耳标电量查询
     @RequestMapping("/findByConditions")
-    public R findByFarmId(@RequestParam Map<String, Object> params) throws ParseException {
+    public R findByFarmId( @RequestParam Map<String, Object> params  ) throws ParseException {
         PageUtils byConditions = eartagDataService.findByConditions(params);
         return R.ok().put("page", byConditions);
     }
@@ -50,6 +51,8 @@ public class EartagDataController {
 
 
 
+
+
     @RequestMapping("/list_deatils")
     public R listDeatils(@RequestParam Map<String, Object> params) throws ParseException {
         Map queryDetailsMap = eartagDataService.queryDetails(params);
@@ -67,7 +70,6 @@ public class EartagDataController {
     }
 
 
-
     /**
      * 保存
      */
@@ -77,8 +79,6 @@ public class EartagDataController {
         return R.ok();
     }
 
-
-
     /**
      * 修改
      */
@@ -88,7 +88,6 @@ public class EartagDataController {
         return R.ok();
     }
 
-
     /**
      * 删除
      */
@@ -98,7 +97,4 @@ public class EartagDataController {
         return R.ok();
     }
 
-
-
-
 }

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

@@ -67,6 +67,9 @@ 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 );
@@ -196,10 +199,14 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
 
         movePigpenEntities.add(movePigpen);
 
+        System.out.println(movePigpen+"ioioio");//最开始不为空
+
+
         System.out.println(movePigpenEntities+"opop");
     if ( movePigpen!=null ) {
 
         List<Object> movePigpe111 = new ArrayList<>();
+
         for (MovePigpenEntity movePigpenEntity : movePigpenEntities) {
             Map<String, Object> movePigpenEntitiesmap = new HashMap<>();
 
@@ -224,12 +231,15 @@ public class EartagDataServiceImpl extends ServiceImpl<EartagDataDao, EartagData
             tempMovePenEntity.setMoveDate(movePigpenEntity.getMoveDate());
             tempMovePenEntity.setId(movePigpenEntity.getId());
             tempMovePenEntity.setStage(movePigpenEntity.getStage());
+
             movePigpe111.add(tempMovePenEntity);
         }
 
         map1.put("movePigPenData",movePigpe111);
-    }
-        map1.put("movePigPenData",null);
+         }else{
+        map1.put("movePigPenData",null);}
+
+
         map1.put("eartagdeta",earTagData);  //点击的耳标信息
 
         //获取运动等信息

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

@@ -1,5 +1,5 @@
 server:
-  port: 9500
+  port: 8210
 
 spring:
   datasource: