添加按时间查询

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

@@ -72,6 +72,10 @@ public class EartagData implements Serializable{
     @Column(name = "YDL")
 	private Integer YDL;//运动量
 
+	@Column(name = "qjydl")
+	private Integer qjydl;//
+
+
     @Column(name = "CQS")
 	private Integer CQS;//重启数
 
@@ -87,7 +91,13 @@ public class EartagData implements Serializable{
     @Column(name = "MLW")
 	private String MLW;//命令尾
 
+	public Integer getQjydl() {
+		return qjydl;
+	}
 
+	public void setQjydl(Integer qjydl) {
+		this.qjydl = qjydl;
+	}
 
 	//get方法
 	public Integer getId() {

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

@@ -39,6 +39,7 @@ public class EartagDataServiceImpl implements EartagDataService {
     @Override
     public PageInfo<Map> findPage(Map map, int page, int size){
         List<EartagData>  list = new ArrayList();
+        page = (page-1 )*size;
         String eartag = (String)map.get("eartagId");
         String  startTime = (String) map.get("startTime");
         String  endTime = (String) map.get("endTime");
@@ -54,6 +55,7 @@ public class EartagDataServiceImpl implements EartagDataService {
                 list = eartagDataMapper.selectByEartag2( startTime, endTime, page, size);
             }else {
                 list = eartagDataMapper.selectByEartag1( eartag, startTime, endTime, page, size);
+
             }
 
         }
@@ -152,7 +154,7 @@ public class EartagDataServiceImpl implements EartagDataService {
         }
         String  startTime1 = (String) map.get("startTime");
         String  endTime1 = (String) map.get("endTime");
-        DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map map1 = new HashMap();
         if (startTime1 != null && endTime1 != null) {
 
@@ -182,7 +184,11 @@ public class EartagDataServiceImpl implements EartagDataService {
             for (EartagData data : list) {
                 timeList.add(fmt.format(data.getTimestamp()));
                 tempList.add(data.getEBWD());
-                sportsList.add(data.getYDL());
+                if (data.getQjydl() == null) {
+                    sportsList.add(0);
+                } else {
+                    sportsList.add(data.getQjydl());
+                }
                 electricList.add(data.getDl());
             }
             map1.put("time",timeList);
@@ -196,29 +202,6 @@ public class EartagDataServiceImpl implements EartagDataService {
         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){
@@ -245,6 +228,7 @@ public class EartagDataServiceImpl implements EartagDataService {
             map.put("cqs",eartagData.getCQS());
             map.put("sbid",eartagData.getSBID());
             map.put("nbwd",eartagData.getNBWD());
+            map.put("qjydl",eartagData.getQjydl());
             list1.add(map);
         }
         return list1;

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

@@ -244,7 +244,7 @@ public class JqidServiceImpl implements JqidService {
     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");
+        DateFormat fmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map map1 = new HashMap();
         if (startTime1 != null && endTime1 != null) {
 

ear_tag/huimv-eartag-manager/src/main/resources/log4j.properties

@@ -0,0 +1,4 @@
+log4j.rootLogger=INFO, stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n