【feat】 青山 openApi

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

@@ -38,6 +38,12 @@ public class EartagRegisterController {
         params.put("userId",userId+"");
         return eartagRegisterService.listFarmUnitEartagData(params);
     }
+    @PostMapping("/listUserEartagData")
+    public Result listUserEartagData(@RequestBody Map<String, String> params, HttpServletRequest req){
+        Integer userId = TokenSign.getMemberIdByJwtToken(req);
+        params.put("userId",userId+"");
+        return eartagRegisterService.listUserEartagData(params);
+    }
 
     @RequestMapping("/listFarmUnitEartagData2")
     public Result listFarmUnitEartagData2(@RequestBody Map<String, String> params, HttpServletRequest req){

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

@@ -21,4 +21,6 @@ public interface IEartagEartagRegister2Service extends IService<EartagEartagRegi
     Result listFarmUnitEartagData2(Map<String, String> params);
 
     Result listFarmUnitEartagDataByFarmer(Map<String, String> params);
+
+    Result listUserEartagData(Map<String, String> params);
 }

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

@@ -51,7 +51,9 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
         queryWrapper.eq("alarm_from","1").or().eq("alarm_from","2");
         queryWrapper.eq("alarm_type","2");
         queryWrapper.eq("add_date",todayDate);
+
         queryWrapper.orderByDesc("add_time");
+        queryWrapper.last("limit 50");
 
         List<EartagAbnormalAlarm> eartagAbnormalAlarmList =  eartagAbnormalAlarmMapper.selectList(queryWrapper);
         JSONArray newJa = new JSONArray();

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

@@ -16,10 +16,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -34,6 +31,8 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
 
     @Autowired
     SysAccountMultilevelMapper sysAccountMultilevelMapper;
+    @Autowired
+    private EartagDeviceRegisterMapper eartagDeviceRegisterMapper;
 
     @Override
     public Result listFarmUnitEartagData(Map<String, String> params) {
@@ -56,11 +55,11 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         Float minEarTemp = 100F;
         QueryWrapper<EartagEartagRegister2> wrapper = new QueryWrapper<>();
         //客户数据
-       /* if (user.getIsUser() == 0){
+        if (user.getIsUser() == 0){
             wrapper.between("ear_temp1",30,40);
             wrapper.le("act",10000);
             wrapper.eq("live_status", 1);
-        }*/
+        }
         //设备
         wrapper.like(StringUtils.isNotBlank(deviceCode),"last_device",deviceCode);
         wrapper.eq("farm_id",farmId);
@@ -152,6 +151,9 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
             wrapper.le("act",10000);
             wrapper.eq("live_status", 1);
         }*/
+       if (StringUtils.isBlank(deviceCode) && StringUtils.isBlank(unitId)){
+           return new Result(ResultCode.SUCCESS,new HashMap<>());
+       }
         //设备
         wrapper.like(StringUtils.isNotBlank(deviceCode),"last_device",deviceCode);
         wrapper.eq("farm_id",farmId);
@@ -217,9 +219,6 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         return new Result(ResultCode.SUCCESS,map);
     }
 
-    @Autowired
-    private EartagDeviceRegisterMapper eartagDeviceRegisterMapper;
-
     @Override
     public Result listFarmUnitEartagDataByFarmer(Map<String, String> params) {
         String pageSize = params.get("pageSize");
@@ -250,8 +249,6 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         for (EartagDeviceRegister eartagDeviceRegister : eartagDeviceRegisters) {
             farmerIds.add(eartagDeviceRegister.getDeviceCode());
         }
-
-
         Float maxEarTemp = 0F;
         Float minEarTemp = 100F;
         QueryWrapper<EartagEartagRegister2> wrapper = new QueryWrapper<>();
@@ -259,17 +256,12 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         wrapper.like(StringUtils.isNotBlank(deviceCode),"last_device",deviceCode);
         wrapper.eq("farm_id",farmId);
         wrapper.like(StringUtils.isNotBlank(earmark),"earmark",earmark);
-
         wrapper.eq(StringUtils.isNotBlank(liveStatus),"live_status",liveStatus);
         wrapper.orderByDesc("ask_time");
         wrapper.in("last_device",farmerIds);
         //屏蔽不合格耳标
         wrapper.le("ear_temp1",50);
-
-
         Page<EartagEartagRegister2> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
-
-
         long allCount = this.count(wrapper);
 
         //在线
@@ -287,7 +279,6 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
             minEarTemp = Math.min(earTemp1,minEarTemp);
         }
 
-
         map.put("countOff",allCount-onCount);
         map.put("countOn",onCount);
         map.put("countAll",allCount);
@@ -298,4 +289,38 @@ public class EartagEartagRegister2ServiceImpl extends ServiceImpl<EartagEartagRe
         return new Result(ResultCode.SUCCESS,map);
     }
 
+    @Override
+    public Result listUserEartagData(Map<String, String> params) {
+        String userId = params.get("userId");
+        String earmark = params.get("eartag");
+        String setatus = params.get("setatus");
+        String farmId = params.get("farmId");
+//        List<SysAccountMultilevel> pids = sysAccountMultilevelMapper.selectList(new QueryWrapper<SysAccountMultilevel>().like("pids", userId).or());
+//        SysAccountMultilevel sysAccountMultilevel = sysAccountMultilevelMapper.selectById(userId);
+//        Set<String> farmIds = new HashSet<>();
+//        pids.add(sysAccountMultilevel);
+//        for (SysAccountMultilevel pid : pids) {
+//            String pidFarmIds = pid.getFarmIds();
+//            for (String s : pidFarmIds.split(".")) {
+//                farmIds.add(s);
+//            }
+//        }
+        String pageSize = params.get("pageSize");
+        String pageNo = params.get("pageNo");
+        if (StringUtils.isBlank(pageNo)){
+            pageNo="1";
+        }
+        if (StringUtils.isBlank(pageSize)){
+            pageSize="20";
+        }
+        QueryWrapper<EartagEartagRegister2> wrapper = new QueryWrapper<>();
+        //
+        wrapper.in(ObjectUtil.isNotEmpty(farmId),"farm_id",farmId);
+        wrapper.eq(StringUtils.isNotBlank(setatus),"live_status",setatus);
+        wrapper.like(StringUtils.isNotBlank(earmark),"earmark",earmark);
+        wrapper.orderByDesc("ask_time");
+        Page<EartagEartagRegister2> page = this.page(new Page<>(Long.parseLong(pageNo), Long.parseLong(pageSize)), wrapper);
+        return new Result(ResultCode.SUCCESS,page);
+    }
+
 }

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/resources/application-dev2.yml

@@ -45,6 +45,7 @@ spring:
 
 mybatis-plus:
   configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   # mapper.xml文件所存放的位置
   mapper-locations: classpath*:com/huimv/eartag2/manage2/mapper/xml/*.xml  # 不加这一行出错：“org.apache.ibatis.binding.BindingException:  Invalid bound statement (not found)”