【feat】 青山 openApi

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

@@ -4,11 +4,7 @@ package com.huimv.eartag2.manage2.controller;
 import com.huimv.eartag2.common.utils.Result;
 import com.huimv.eartag2.manage2.service.EartagResetCountService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.text.ParseException;
 import java.util.Map;
@@ -22,7 +18,7 @@ import java.util.Map;
  * @since 2022-08-12
  */
 @RestController
-@RequestMapping("/eartag-reset-count")
+@RequestMapping("/eartagResetCount")
 public class EartagResetCountController {
     @Autowired
     private EartagResetCountService eartagResetCountService;
@@ -47,5 +43,11 @@ public class EartagResetCountController {
         }
         return eartagResetCountService.getEartagResetCount(farmCode,startDate,endDate,earmark);
     }
+
+    @PostMapping(value = "/listEartagResetCount")
+    public Result listEartagResetCount(@RequestBody Map<String, String> paramsMap) throws ParseException {
+
+        return eartagResetCountService.listEartagResetCount(paramsMap);
+    }
 }
 

huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/pojo/EartagResetCount.java

@@ -5,6 +5,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -22,13 +24,14 @@ public class EartagResetCount implements Serializable {
 
     private static final long serialVersionUID=1L;
 
-      @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     private String earmark;
 
     private Integer times;
 
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date addDate;
 
     private String farmCode;

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

@@ -5,6 +5,7 @@ import com.huimv.eartag2.manage2.pojo.EartagResetCount;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.text.ParseException;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +18,6 @@ import java.text.ParseException;
 public interface EartagResetCountService extends IService<EartagResetCount> {
 
     Result getEartagResetCount(String farmCode, String startDate, String endDate, String earmark) throws ParseException;
+
+    Result listEartagResetCount(Map<String, String> paramsMap);
 }

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

@@ -1,5 +1,7 @@
 package com.huimv.eartag2.manage2.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.eartag2.common.utils.DateUtil;
@@ -14,10 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -51,4 +50,27 @@ public class EartagResetCountServiceImpl extends ServiceImpl<EartagResetCountMap
         }
         return new Result(ResultCode.SUCCESS,resultList);
     }
+
+    @Override
+    public Result listEartagResetCount(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        String earmark = paramsMap.get("earmark");
+        String day = paramsMap.get("day");
+        int days = Integer.parseInt(day);
+        List<EartagResetCount> list = new ArrayList<>();
+        DateTime dateTime = cn.hutool.core.date.DateUtil.beginOfDay(new Date());
+        for (int i = 0; i < days; i++) {
+            DateTime beforeDate = cn.hutool.core.date.DateUtil.offsetDay(dateTime, -i);
+            EartagResetCount one = this.getOne(new QueryWrapper<EartagResetCount>().eq(StringUtils.isNotBlank(farmId), "farm_code", farmId).eq("add_date", beforeDate).like("earmark", earmark));
+            if (ObjectUtil.isEmpty(one)){
+                one = new EartagResetCount();
+                one.setAddDate(beforeDate);
+                one.setFarmCode(farmId);
+                one.setEarmark(earmark);
+                one.setTimes(0);
+            }
+            list.add(one);
+        }
+        return  new Result(ResultCode.SUCCESS,new ArrayList<>());
+    }
 }