【feat】 青山 openApi

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

@@ -1,9 +1,11 @@
 package com.huimv.eartag2.manage2.controller;
 
 
+import com.huimv.eartag2.common.common.token.TokenSign;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.manage2.service.EartagAbnormalAlarmService;
 import com.huimv.eartag2.manage2.service.FarmerAssetService;
+import com.huimv.eartag2.manage2.service.IEartagData2Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -11,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
 import java.util.Map;
 
@@ -60,5 +63,18 @@ public class EartagAbnormalAlarmController {
         return eartagAbnormalAlarmService.pigMonitor(paramsMap);
     }
 
+    @PostMapping("/getFarmerAndPig")
+    public Result getFarmerAndPig(@RequestBody Map<String, Object> paramsMap)  {
+        return eartagAbnormalAlarmService.getFarmerAndPig(paramsMap);
+    }
+
+    @Autowired
+    private IEartagData2Service eartagDataService;
+    @PostMapping("/getEnvByTime")
+    public Result getEnvByTime(@RequestBody Map<String,String> map, HttpServletRequest request){
+
+        return eartagDataService.getEnvByTimePanan(map);
+    }
+
 }
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/schedule/EartagTask.java

@@ -1,3 +1,4 @@
+/*
 package com.huimv.eartag2.manage2.schedule;
 
 import cn.hutool.core.date.DateTime;
@@ -25,6 +26,7 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+*/
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.biosafety.uface.controller
@@ -32,7 +34,8 @@ import java.util.concurrent.Executors;
  * @Version : 1.0
  * @Author : ZhuoNing
  * @Create : 2020-12-25
- **/
+ **//*
+
 @Configuration      //1.主要用于标记配置类，兼备Component的效果。
 @EnableScheduling   // 2.开启定时任务
 public class EartagTask {
@@ -57,7 +60,8 @@ public class EartagTask {
     @Autowired
     private FarmerDayageWeightMapper farmerDayageWeightMapper;
 
-    /**
+    */
+/**
      * @Method : countEartagOnlineTimes
      * @Description : 判断耳标离线状态
      * @Params : []
@@ -65,7 +69,8 @@ public class EartagTask {
      * @Author : ZhuoNing
      * @Date : 2022/8/20
      * @Time : 19:35
-     */
+     *//*
+
     // 10分钟
     @Scheduled(cron = "0 0/10 * * * ? ")
     private void countEartagOnlineTimes() throws IOException, ParseException {
@@ -81,7 +86,8 @@ public class EartagTask {
     }
 
 
-    /**
+    */
+/**
      * @Method : updateDevice
      * @Description : 判断设备离线状态
      * @Params : []
@@ -89,7 +95,8 @@ public class EartagTask {
      * @Author : ZhuoNing
      * @Date : 2022/8/20
      * @Time : 19:36
-     */
+     *//*
+
     // 5分钟
     @Scheduled(cron = "0 0/5 * * * ? ")
     private void updateDevice() {
@@ -206,3 +213,4 @@ public class EartagTask {
         }
     }
 }
+*/

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

@@ -26,4 +26,6 @@ public interface EartagAbnormalAlarmService extends IService<EartagAbnormalAlarm
     Result countAll(Map<String, Object> paramsMap);
 
     Result pigMonitor(Map<String, Object> paramsMap);
+
+    Result getFarmerAndPig(Map<String, Object> paramsMap);
 }

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

@@ -31,4 +31,6 @@ public interface IEartagData2Service extends IService<EartagData2> {
     Result getAct(Map<String, String> map);
 
     Result countEartag(Map<String, String> map);
+
+    Result getEnvByTimePanan(Map<String, String> map);
 }

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

@@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.eartag2.common.utils.DateUtil;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.common.utils.ResultCode;
@@ -153,6 +154,32 @@ public class EartagAbnormalAlarmServiceImpl extends ServiceImpl<EartagAbnormalAl
         return new Result(ResultCode.SUCCESS,eartagEartagRegister2s);
     }
 
+    @Override
+    public Result getFarmerAndPig(Map<String, Object> paramsMap) {
+        List<BaseFarmer> farmers = baseFarmerMapper.selectList(new QueryWrapper<BaseFarmer>().eq("farm_code", "330727001"));
+
+        List endList = new ArrayList();
+        for (BaseFarmer farmer : farmers) {
+            Map map = new HashMap();
+            List<EartagDeviceRegister> eartagDeviceRegisters = eartagDeviceRegisterMapper.selectList(new QueryWrapper<EartagDeviceRegister>().eq("farmer_id", farmer.getId()).eq("farm_id","330727001"));
+            map.put( "data",new ArrayList<>());
+            map.put("id",farmer.getId());
+            map.put("farmer",farmer.getFarmer());
+            map.put("phone",farmer.getPhone());
+            map.put("address",farmer.getAddress());
+            map.put("farmCode",farmer.getFarmCode());
+            if (ObjectUtil.isNotEmpty(eartagDeviceRegisters)){
+                List farmerIds = new ArrayList();
+                for (EartagDeviceRegister eartagDeviceRegister : eartagDeviceRegisters) {
+                    farmerIds.add(eartagDeviceRegister.getDeviceCode());
+                }
+                map.put("data", eartagEartagRegister2Mapper.selectList(new QueryWrapper<EartagEartagRegister2>().in("last_device",farmerIds)));
+            }
+            endList.add(map);
+        }
+
+        return new Result(ResultCode.SUCCESS,endList);
+    }
 
 
 }

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

@@ -220,4 +220,29 @@ public class EartagData2ServiceImpl extends ServiceImpl<EartagData2Mapper, Earta
 
         return new Result(ResultCode.SUCCESS,endMap);
     }
+
+    @Override
+    public Result getEnvByTimePanan(Map<String, String> map) {
+        String earmark = map.get("earmark");
+        String startDate = map.get("startDate");
+        String endDate = map.get("endDate");
+
+        Date now = new Date();
+
+        if (StringUtils.isBlank(earmark)) {
+            return new Result(10001, "请选择耳标", false);
+        }
+        QueryWrapper<EartagData2> wrapper = new QueryWrapper<>();
+        wrapper.eq("earmark", earmark);
+        if (StringUtils.isBlank(startDate)) {
+            wrapper.ge("add_time", DateUtil.beginOfDay(now));
+        } else {
+            wrapper.between("add_time", startDate, endDate);
+        }
+        wrapper.orderByAsc("add_time");
+        List<EartagData2> list = this.list(wrapper);
+
+
+        return new Result(ResultCode.SUCCESS, list);
+    }
 }