Merge remote-tracking branch 'origin/master'

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,18 +28,24 @@ 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<Map> pageInfo = eartagDataService.findPage(map, page, size);
         return new Result(true, StatusCode.OK,"查询成功",pageInfo);
     }
 
+    @PostMapping(value = "/searchData" )
+    public Result ss(@RequestBody(required = false)Map map){
+        //调用EartagDataService实现分页条件查询EartagData
+       Map map1 = eartagDataService.searchData(map);
+        return new Result(true, StatusCode.OK,"查询成功",map1);
+    }
     /***
      * EartagData分页搜索实现
      * @param page:当前页

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

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /****
  * @Author:shenkunlin
@@ -40,6 +41,13 @@ public class JqidController {
         return new Result(true, StatusCode.OK,"查询成功",pageInfo);
     }
 
+
+    @PostMapping(value = "/searchData" )
+    public Result ss(@RequestBody(required = false) Map map){
+        //调用EartagDataService实现分页条件查询EartagData
+        Map map1 = jqidService.searchData(map);
+        return new Result(true, StatusCode.OK,"查询成功",map1);
+    }
     /***
      * Jqid分页搜索实现
      * @param page:当前页

ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/dao/EartagDataMapper.java

@@ -2,12 +2,30 @@ package com.huimv.eartag.manager.dao;
 
 
 import com.huimv.eartag.manager.pojo.EartagData;
+import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 /****
  * @Author:shenkunlin
  * @Description:EartagData的Dao
  * @Date 2019/6/14 0:12
  *****/
 public interface EartagDataMapper extends Mapper<EartagData> {
+    @Select("<script>select * from eartag_data where eartag_id = #{str} ORDER BY id DESC LIMIT 1 </script>")
+    EartagData selectByEartagId(String str);
+
+
+    @Select("<script> select * from eartag_data where SBID=#{SBID} eartag_id=#{eartag}  and DATE_FORMAT(timestamp, '%Y-%m-%d')  between #{startTime} and  #{endTime} ORDER BY id DESC LIMIT #{page},#{size}</script>")
+    List<EartagData>  selectByEartag(Integer SBID,String eartag,String startTime ,String endTime,int page,int size);
+
+    @Select("<script> select * from eartag_data where eartag_id=#{eartag}  and DATE_FORMAT(timestamp, '%Y-%m-%d')  between #{startTime} and  #{endTime} ORDER BY id DESC LIMIT #{page},#{size}</script>")
+    List<EartagData>  selectByEartag1(String eartag,String startTime ,String endTime,int page,int size);
+
+    @Select("<script>SELECT * FROM(SELECT * FROM eartag_data where  DATE_FORMAT(timestamp, '%Y-%m-%d')  between #{startTime} and  #{endTime} ORDER BY id DESC LIMIT 1000000) a GROUP BY eartag_id LIMIT #{page},#{size} </script>")
+    List<EartagData>  selectByEartag2(String startTime ,String endTime,int page,int size);
+
+    @Select("<script>SELECT * FROM(SELECT * FROM eartag_data where SBID = #{SBID} and  DATE_FORMAT(timestamp, '%Y-%m-%d')  between #{startTime} and  #{endTime} ORDER BY id DESC LIMIT 1000000) a GROUP BY eartag_id LIMIT #{page},#{size} </script>")
+    List<EartagData>  selectByEartag3(Integer SBID,String startTime ,String endTime,int page,int size);
 }

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<Map> findPage(Map eartagData, int page, int size);
 
     /***
      * EartagData分页查询
@@ -69,4 +70,6 @@ public interface EartagDataService {
      * @return
      */
     List<EartagData> findAll();
+
+    Map searchData(Map map);
 }

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

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
 import com.huimv.eartag.manager.pojo.Jqid;
 
 import java.util.List;
+import java.util.Map;
 
 /****
  * @Author:shenkunlin
@@ -78,4 +79,6 @@ public interface JqidService {
      * @Time        : 18:36
      */
     String findDeviceIdByJQcode(String serialNo);
+
+    Map searchData(Map map);
 }

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

@@ -12,7 +12,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import tk.mybatis.mapper.entity.Example;
 
-import java.util.List;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /****
  * @Author:shenkunlin
@@ -28,19 +31,223 @@ 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){
-        //分页
-        PageHelper.startPage(page,size);
-        //搜索条件构建
-        Example example = createExample(eartagData);
-        //执行搜索
-        return new PageInfo<EartagData>(eartagDataMapper.selectByExample(example));
+    public PageInfo<Map> findPage(Map map, int page, int size){
+        List<EartagData>  list = new ArrayList();
+        String eartag = (String)map.get("eartagId");
+        String  startTime = (String) map.get("startTime");
+        String  endTime = (String) map.get("endTime");
+        if (map.get("SBID")!=null && !"".equals(map.get("SBID"))) {
+            Integer SBID = Integer.parseInt((String) map.get("SBID"));
+            if (eartag == null || eartag.equals("")){
+                list = eartagDataMapper.selectByEartag3(SBID, startTime, endTime, page, size);
+            }else {
+                list = eartagDataMapper.selectByEartag(SBID, eartag, startTime, endTime, page, size);
+            }
+        }else {
+            if (eartag == null || eartag.equals("")){
+                list = eartagDataMapper.selectByEartag2( startTime, endTime, page, size);
+            }else {
+                list = eartagDataMapper.selectByEartag1( eartag, startTime, endTime, page, size);
+            }
+
+        }
+        List list2 = new ArrayList();
+        for (EartagData eartagData : list) {
+            Example example = createExample(eartagData);
+            List<EartagData> eartagData1 = eartagDataMapper.selectByExample(example);
+            list2.add(eartagData1.get(0));
+        }
+
+        list2 =timeUtil(list2);
+
+        return new PageInfo<>(list2);
+    }
+//    @Override
+//    public PageInfo<Map> findPage(Map map, int page, int size){
+//        PageInfo<Map> eartagDataPageInfo=null;
+//        EartagData eartagData = new EartagData();
+//        if (map != null){
+//            /*eartagData.setCheckNumber((Integer) map.get("checkNumber"));
+//            eartagData.setCMD((Integer) map.get("cmd"));
+//            eartagData.setCQS((Integer)map.get("cqs"));
+//            eartagData.setDl((Integer)map.get("dl"));
+//
+//            eartagData.setEBWD((Double) map.get("ebwd"));
+//            eartagData.setHeader((String)map.get("header"));
+//            eartagData.setId((Integer)map.get("id"));
+//            eartagData.setMLW((String) map.get("mlw"));
+//            eartagData.setNBWD((Integer)map.get("nbwd"));
+//            eartagData.setNtc((Integer)map.get("ntc"));
+//            eartagData.setRSSYI((Integer)map.get("rssyi"));*/
+//            eartagData.setEartagId((String) map.get("eartagId"));
+//            if (map.get("SBID")!=null && !"".equals(map.get("SBID"))) {
+//                eartagData.setSBID(Integer.parseInt((String)map.get("SBID")));
+//            }
+//           /* eartagData.setSerial((Integer)map.get("serial"));
+//            // eartagData.setTimestamp((Date) map.get("timestamp"));
+//            eartagData.setVersion((String)map.get("version"));
+//            eartagData.setYDL((Integer)map.get("ydl"));*/
+//
+//            String  startTime1 = (String) map.get("startTime");
+//            String  endTime1 = (String) map.get("endTime");
+//            DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+//            if (startTime1 != null && endTime1 != null){
+//
+//                Date startTime = null;
+//                Date endTime = null;
+//                try {
+//                    startTime =fmt.parse(startTime1);
+//                    endTime = fmt.parse(endTime1);
+//                } catch (ParseException e) {
+//                    e.printStackTrace();
+//                }
+//
+//                //分页
+//               // PageHelper.startPage(page,size);
+//                //搜索条件构建
+//                Example example = createExample(eartagData);
+//                List<EartagData> eartagData1 = eartagDataMapper.selectByExample(example);
+//                List list3 = utils(eartagData1,startTime,endTime);
+//
+//                List resultList = timeUtil(list3);
+//
+//
+//                eartagDataPageInfo = new PageInfo<>(resultList);
+//            }else {
+//                //PageHelper.startPage(page,size);
+//                //搜索条件构建
+//                Example example = createExample(eartagData);
+//                List<EartagData> eartagData1 = eartagDataMapper.selectByExample(example);
+//
+//                eartagDataPageInfo = new PageInfo<>(timeUtil( utils(eartagData1,null,null)));
+//            }
+//
+//
+//        }else {
+//            //分页
+//           // PageHelper.startPage(page,size);
+//            //搜索条件构建
+//            Example example = createExample(eartagData);
+//            List<EartagData> eartagData1 = eartagDataMapper.selectByExample(example);
+//            List utils = utils(eartagData1, null, null);
+//            List list = timeUtil(utils);
+//            eartagDataPageInfo = new PageInfo<>(list);
+//            System.out.println("ssss");
+//        }
+//
+//        return eartagDataPageInfo;
+//    }
+    @Override
+    public Map searchData(Map map) {
+        EartagData eartagData = new EartagData();
+        eartagData.setEartagId((String) map.get("eartagId"));
+        if (map.get("SBID")!=null && !"".equals(map.get("SBID"))) {
+            eartagData.setSBID(Integer.parseInt((String)map.get("SBID")));
+        }
+        String  startTime1 = (String) map.get("startTime");
+        String  endTime1 = (String) map.get("endTime");
+        DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        Map map1 = new HashMap();
+        if (startTime1 != null && endTime1 != null) {
+
+            Date startTime = null;
+            Date endTime = null;
+            try {
+                startTime = fmt.parse(startTime1);
+                endTime = fmt.parse(endTime1);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+
+            Example example = createExample(eartagData);
+            List<EartagData> eartagData1 = eartagDataMapper.selectByExample(example);
+            List<EartagData> list = new ArrayList();
+            for (EartagData data : eartagData1) {
+                Date timestamp = data.getTimestamp();
+                if (startTime.before(timestamp) && endTime.after(timestamp)){
+                    list.add(data);
+                }
+            }
+            List timeList = new ArrayList();
+            List tempList = new ArrayList();
+            List sportsList = new ArrayList();
+            List electricList = new ArrayList();
+
+            for (EartagData data : list) {
+                timeList.add(fmt.format(data.getTimestamp()));
+                tempList.add(data.getEBWD());
+                sportsList.add(data.getYDL());
+                electricList.add(data.getDl());
+            }
+            map1.put("time",timeList);
+            map1.put("temp",tempList);
+            map1.put("sports",sportsList);
+            map1.put("electric",electricList);
+
+        }
+
+
+        return map1;
+    }
+
+    public List utils(List<EartagData> eartagData1,Date startTime,Date  endTime){
+        List<EartagData> list = new ArrayList();
+        if (startTime != null || endTime !=null){
+            for (EartagData data : eartagData1) {
+                Date timestamp = data.getTimestamp();
+                if (startTime.before(timestamp) && endTime.after(timestamp)){
+                    list.add(data);
+                }
+            }
+        }
+        Set<String> set = new HashSet();
+        for (EartagData eartagData : eartagData1) {
+            set.add(eartagData.getEartagId());
+        }
+        List list1 = new ArrayList();
+        for (String str : set) {
+            EartagData eartagData = eartagDataMapper.selectByEartagId(str);
+            Example example = createExample(eartagData);
+            List<EartagData> eartagData2 = eartagDataMapper.selectByExample(example);
+            list1.add(eartagData2.get(0));
+        }
+        return list1;
+    }
+
+
+    public List<Map> timeUtil(List<EartagData> list){
+        List<Map> list1 = new ArrayList();
+        for (EartagData eartagData : list) {
+            Date timestamp = eartagData.getTimestamp();
+            SimpleDateFormat sfm1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String format = sfm1.format(timestamp);
+            Map map =new HashMap();
+            map.put("id",eartagData.getId());
+            map.put("header",eartagData.getHeader());
+            map.put("version",eartagData.getVersion());
+            map.put("serial",eartagData.getSerial());
+            map.put("eartagId",eartagData.getEartagId());
+            map.put("dl",eartagData.getDl());
+            map.put("ntc",eartagData.getNtc());
+            map.put("timestamp",format);
+            map.put("checkNumber",eartagData.getCheckNumber());
+            map.put("mlw",eartagData.getMLW());
+            map.put("ydl",eartagData.getYDL());
+            map.put("ebwd",eartagData.getEBWD());
+            map.put("cmd",eartagData.getCMD());
+            map.put("rssyi",eartagData.getRSSYI());
+            map.put("cqs",eartagData.getCQS());
+            map.put("sbid",eartagData.getSBID());
+            map.put("nbwd",eartagData.getNBWD());
+            list1.add(map);
+        }
+        return list1;
     }
 
     /**
@@ -193,4 +400,6 @@ public class EartagDataServiceImpl implements EartagDataService {
     public List<EartagData> findAll() {
         return eartagDataMapper.selectAll();
     }
+
+
 }

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

@@ -4,7 +4,12 @@ package com.huimv.eartag.manager.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.huimv.eartag.manager.dao.EartagDampnessMapper;
+import com.huimv.eartag.manager.dao.EartagTemperatureMapper;
 import com.huimv.eartag.manager.dao.JqidMapper;
+import com.huimv.eartag.manager.pojo.EartagDampness;
+import com.huimv.eartag.manager.pojo.EartagData;
+import com.huimv.eartag.manager.pojo.EartagTemperature;
 import com.huimv.eartag.manager.pojo.Jqid;
 import com.huimv.eartag.manager.service.FarmInfoService;
 import com.huimv.eartag.manager.service.JqidService;
@@ -14,8 +19,10 @@ 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.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /****
  * @Author:shenkunlin
@@ -123,6 +130,49 @@ public class JqidServiceImpl implements JqidService {
         }
         return example;
     }
+    public Example createExample(EartagDampness eartagDampness){
+        Example example=new Example(EartagDampness.class);
+        Example.Criteria criteria = example.createCriteria();
+        if(eartagDampness!=null){
+            //
+            if(!StringUtils.isEmpty(eartagDampness.getId())){
+                criteria.andEqualTo("id",eartagDampness.getId());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagDampness.getHeader())){
+                criteria.andEqualTo("header",eartagDampness.getHeader());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagDampness.getDeviceId())){
+                criteria.andEqualTo("deviceId",eartagDampness.getDeviceId());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagDampness.getCmd())){
+                criteria.andEqualTo("cmd",eartagDampness.getCmd());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagDampness.getSerialNo())){
+                criteria.andEqualTo("serialNo",eartagDampness.getSerialNo());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagDampness.getValue())){
+                criteria.andEqualTo("value",eartagDampness.getValue());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagDampness.getCreateDate())){
+                criteria.andEqualTo("createDate",eartagDampness.getCreateDate());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagDampness.getCheckNumber())){
+                criteria.andEqualTo("checkNumber",eartagDampness.getCheckNumber());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagDampness.getTail())){
+                criteria.andEqualTo("tail",eartagDampness.getTail());
+            }
+        }
+        return example;
+    }
 
     /**
      * 删除
@@ -186,4 +236,113 @@ public class JqidServiceImpl implements JqidService {
         String deviceId = jqidObj.getJQID();
         return deviceId;
     }
+    @Autowired
+    private EartagDampnessMapper eartagDampnessMapper;
+    @Autowired
+    private EartagTemperatureMapper eartagTemperatureMapper;
+    @Override
+    public Map searchData(Map map) {
+        String startTime1 = (String) map.get("startTime");
+        String endTime1 = (String) map.get("endTime");
+        DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        Map map1 = new HashMap();
+        if (startTime1 != null && endTime1 != null) {
+
+            Date startTime = null;
+            Date endTime = null;
+            try {
+                startTime = fmt.parse(startTime1);
+                endTime = fmt.parse(endTime1);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            EartagDampness eartagDampness = new EartagDampness();
+            eartagDampness.setDeviceId(Integer.parseInt((String) map.get("JQID")));
+            Example example = createExample(eartagDampness);
+
+            List<EartagDampness> eartagDampnessList = eartagDampnessMapper.selectByExample(example);
+            List<EartagDampness> list = new ArrayList();
+            for (EartagDampness data : eartagDampnessList) {
+                Date timestamp = data.getCreateDate();
+                if (startTime.before(timestamp) && endTime.after(timestamp)) {
+                    list.add(data);
+                }
+            }
+            List dampnessList = new ArrayList();
+            List dampnessTimeList = new ArrayList();
+
+            for (EartagDampness data : list) {
+                dampnessList.add(data.getValue());
+                dampnessTimeList.add(fmt.format(data.getCreateDate()));
+            }
+            map1.put("dampnessValue", dampnessList);
+            map1.put("dampnessTime", dampnessTimeList);
+
+
+            EartagTemperature eartagTemperature = new EartagTemperature();
+            eartagTemperature.setDeviceId(Integer.parseInt((String) map.get("JQID")));
+            Example example1 = createExample(eartagTemperature);
+            List<EartagTemperature> eartagTemperatureMapperList = eartagTemperatureMapper.selectByExample(example1);
+            List<EartagTemperature> list1 = new ArrayList();
+            for (EartagTemperature data : eartagTemperatureMapperList) {
+                Date timestamp = data.getCreateDate();
+                if (startTime.before(timestamp) && endTime.after(timestamp)) {
+                    list1.add(data);
+                }
+            }
+            List eartagTemperaList = new ArrayList();
+            List eartagTemperaTimeList = new ArrayList();
+
+            for (EartagTemperature data : list1) {
+                eartagTemperaList.add(data.getValue());
+                eartagTemperaTimeList.add(fmt.format(data.getCreateDate()));
+            }
+            map1.put("temperaValue", eartagTemperaList);
+            map1.put("temperaTime", eartagTemperaTimeList);
+        }
+        return map1;
+    }
+    public Example createExample(EartagTemperature eartagTemperature){
+        Example example=new Example(EartagTemperature.class);
+        Example.Criteria criteria = example.createCriteria();
+        if(eartagTemperature!=null){
+            // id
+            if(!StringUtils.isEmpty(eartagTemperature.getId())){
+                criteria.andEqualTo("id",eartagTemperature.getId());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagTemperature.getHeader())){
+                criteria.andEqualTo("header",eartagTemperature.getHeader());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagTemperature.getDeviceId())){
+                criteria.andEqualTo("deviceId",eartagTemperature.getDeviceId());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagTemperature.getCmd())){
+                criteria.andEqualTo("cmd",eartagTemperature.getCmd());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagTemperature.getSerialNo())){
+                criteria.andEqualTo("serialNo",eartagTemperature.getSerialNo());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagTemperature.getValue())){
+                criteria.andEqualTo("value",eartagTemperature.getValue());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagTemperature.getCreateDate())){
+                criteria.andEqualTo("createDate",eartagTemperature.getCreateDate());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagTemperature.getCheckNumber())){
+                criteria.andEqualTo("checkNumber",eartagTemperature.getCheckNumber());
+            }
+            //
+            if(!StringUtils.isEmpty(eartagTemperature.getTail())){
+                criteria.andEqualTo("tail",eartagTemperature.getTail());
+            }
+        }
+        return example;
+    }
 }

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

@@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
 
 /**
  * @Project : huimv.shiwan
@@ -17,8 +17,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 +52,11 @@ public class DateTimeTest {
 //        String date = sdf.format(str);
 //        System.out.println(date);
     }
+    @Test
+    public void ss() throws ParseException {
+        List list =new ArrayList();
+        for (Object o : list) {
+            System.out.println(o);
+        }
+    }
 }