添加按时间查询

ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/controller/EartagDataController.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /****
  * @Author:shenkunlin
@@ -27,15 +28,15 @@ public class EartagDataController {
 
     /***
      * EartagData分页条件搜索实现
-     * @param eartagData
+     * @param map
      * @param page
      * @param size
      * @return
      */
     @PostMapping(value = "/search/{page}/{size}" )
-    public Result<PageInfo> findPage(@RequestBody(required = false) EartagData eartagData, @PathVariable  int page, @PathVariable  int size){
+    public Result<PageInfo> findPage(@RequestBody(required = false)Map map, @PathVariable  int page, @PathVariable  int size){
         //调用EartagDataService实现分页条件查询EartagData
-        PageInfo<EartagData> pageInfo = eartagDataService.findPage(eartagData, page, size);
+        PageInfo<EartagData> pageInfo = eartagDataService.findPage(map, page, size);
         return new Result(true, StatusCode.OK,"查询成功",pageInfo);
     }
 

ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/pojo/EartagData.java

@@ -11,6 +11,28 @@ import java.util.Date;
  *****/
 @Table(name="eartag_data")
 public class EartagData implements Serializable{
+	@Override
+	public String toString() {
+		return "EartagData{" +
+				"id=" + id +
+				", header='" + header + '\'' +
+				", SBID=" + SBID +
+				", CMD=" + CMD +
+				", version='" + version + '\'' +
+				", serial=" + serial +
+				", eartagId='" + eartagId + '\'' +
+				", dl=" + dl +
+				", NBWD=" + NBWD +
+				", EBWD=" + EBWD +
+				", ntc=" + ntc +
+				", YDL=" + YDL +
+				", CQS=" + CQS +
+				", RSSYI=" + RSSYI +
+				", timestamp=" + timestamp +
+				", checkNumber=" + checkNumber +
+				", MLW='" + MLW + '\'' +
+				'}';
+	}
 
 	@Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/service/EartagDataService.java

@@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo;
 import com.huimv.eartag.manager.pojo.EartagData;
 
 import java.util.List;
+import java.util.Map;
 
 /****
  * @Author:shenkunlin
@@ -22,7 +23,7 @@ public interface EartagDataService {
      * @param size
      * @return
      */
-    PageInfo<EartagData> findPage(EartagData eartagData, int page, int size);
+    PageInfo<EartagData> findPage(Map eartagData, int page, int size);
 
     /***
      * EartagData分页查询

ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/service/impl/EartagDataServiceImpl.java

@@ -12,7 +12,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import tk.mybatis.mapper.entity.Example;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /****
  * @Author:shenkunlin
@@ -28,13 +30,33 @@ public class EartagDataServiceImpl implements EartagDataService {
 
     /**
      * EartagData条件+分页查询
-     * @param eartagData 查询条件
+     * @param map 查询条件
      * @param page 页码
      * @param size 页大小
      * @return 分页结果
      */
     @Override
-    public PageInfo<EartagData> findPage(EartagData eartagData, int page, int size){
+    public PageInfo<EartagData> findPage(Map map, int page, int size){
+
+        EartagData eartagData = new EartagData();
+        eartagData.setCheckNumber((Integer) map.get(""));
+        eartagData.setCMD((Integer) map.get(""));
+        eartagData.setCQS((Integer)map.get(""));
+        eartagData.setDl((Integer)map.get(""));
+        eartagData.setEartagId((String) map.get(""));
+        eartagData.setEBWD((Double) map.get(""));
+        eartagData.setHeader((String)map.get("header"));
+        eartagData.setId((Integer)map.get("id"));
+        eartagData.setMLW((String) map.get(""));
+        eartagData.setNBWD((Integer)map.get(""));
+        eartagData.setNtc((Integer)map.get(""));
+        eartagData.setRSSYI((Integer)map.get(""));
+        eartagData.setSBID((Integer)map.get(""));
+        eartagData.setSerial((Integer)map.get(""));
+        eartagData.setTimestamp((Date) map.get(""));
+        eartagData.setVersion((String)map.get("version"));
+        eartagData.setYDL((Integer)map.get(""));
+
         //分页
         PageHelper.startPage(page,size);
         //搜索条件构建

ear_tag/huimv-eartag-manager/src/test/java/com/huimv/eartag/manager/service/DateTimeTest.java

@@ -8,6 +8,8 @@ import org.springframework.test.context.junit4.SpringRunner;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
@@ -17,8 +19,8 @@ import java.util.Date;
  * @Author : ZhuoNing
  * @Create : 2020-12-25
  **/
-@RunWith(SpringRunner.class)
-@SpringBootTest
+//@RunWith(SpringRunner.class)
+//@SpringBootTest
 public class DateTimeTest {
 
     @Test
@@ -52,4 +54,17 @@ public class DateTimeTest {
 //        String date = sdf.format(str);
 //        System.out.println(date);
     }
+    @Test
+    public void ss(){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String str ="2020-12-30T09:59:03.000+00:00";
+        Date date = null;
+        try {
+            date = simpleDateFormat.parse(str);
+            simpleDateFormat.format(date);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        System.out.println(date);
+    }
 }