耳标管理

huimv-huyang-admin/src/main/java/com/huimv/admin/controller/EartagController.java

@@ -0,0 +1,78 @@
+package com.huimv.admin.controller;
+
+
+import cn.hutool.http.HttpUtil;
+
+import cn.hutool.json.JSONObject;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@CrossOrigin
+@RestController
+@RequestMapping("/admin/earmark")
+public class EartagController {
+
+    //耳标总数量
+    @RequestMapping("/earmarkCount")
+    public JSONObject earmarkCount(@RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        HashMap<String, Object> paramMap = new HashMap<>();
+        paramMap.put("farmId", farmId);
+        String result= HttpUtil.get("http://119.3.44.183:8016/manage/device/getNowAllStatus", paramMap);
+        JSONObject jsonObject = new JSONObject(result);
+        return jsonObject;
+    }
+
+    //耳标列表
+    @RequestMapping("/earmarkList")
+    public JSONObject earmarkList(@RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String earmark = paramsMap.get("earmark");
+        String deviceCode = "";
+        String liveStatus = "";
+        String pageNo = paramsMap.get("pageNo");
+        String pageSize = paramsMap.get("pageSize");
+        if ("".equals(pageNo) || null == pageNo) {
+            pageNo = "1";
+            pageSize = "20";
+        }
+        String unitId = "";
+        HashMap<String, Object> paramMap = new HashMap<>();
+        paramMap.put("farmId", farmId);
+        paramMap.put("earmark", earmark);
+        paramMap.put("deviceCode", deviceCode);
+        paramMap.put("liveStatus", liveStatus);
+        paramMap.put("pageNo", pageNo);
+        paramMap.put("pageSize", pageSize);
+        paramMap.put("unitId", unitId);
+        String result= HttpUtil.post("http://119.3.44.183:8016/manage2/eartagRegister/listFarmUnitEartagData", paramMap);
+        JSONObject jsonObject = new JSONObject(result);
+        return jsonObject;
+    }
+
+    //耳标曲线
+    @RequestMapping("/earmarkDetail")
+    public JSONObject earmarkDetail(@RequestBody Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String earmark = paramsMap.get("earmark");
+        String endDate = paramsMap.get("endDate");
+        String endTime = paramsMap.get("endTime");
+        String starTime = paramsMap.get("starTime");
+        String startDate = paramsMap.get("startDate");
+        HashMap<String, Object> paramMap = new HashMap<>();
+        paramMap.put("farmId", farmId);
+        paramMap.put("earmark", earmark);
+        paramMap.put("endDate", endDate);
+        paramMap.put("endTime", endTime);
+        paramMap.put("starTime", starTime);
+        paramMap.put("startDate", startDate);
+        String result= HttpUtil.get("http://119.3.44.183:8016/manage2/eartagData/getByTimeFilter", paramMap);
+        JSONObject jsonObject = new JSONObject(result);
+        return jsonObject;
+    }
+}

huimv-huyang-admin/src/main/java/com/huimv/admin/entity/ProtSheepInfo.java

@@ -84,4 +84,9 @@ public class ProtSheepInfo implements Serializable {
     private String earmark;
 
     private Integer isLeave;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date birthTime;
+
+    private Integer sex;
 }