生物防控

shiwan/face/src/main/java/com/huimv/face/controller/FaceUserController.java

@@ -41,11 +41,6 @@ public class FaceUserController {
     @Autowired
     private FaceUserImgsService faceUserImgsService;
 
-    @RequestMapping("list")
-    public List list(){
-        return faceUserService.findAll();
-    }
-
 
     /*
     * @Method      : findOneDay
@@ -112,7 +107,7 @@ public class FaceUserController {
     }
     /*
     * @Method      : findDb
-    * @Description : 查询折线图数据
+    * @Description : 查询折线图数据,传入值:oneDay,oneWeek,oneYear
     * @Params      : [timeHorizon]
     * @Return      : com.huimv.face.result.Result
     * 

shiwan/face/src/main/java/com/huimv/face/domain/FaceUserImgs.java

@@ -7,7 +7,7 @@ import javax.persistence.*;
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.face.domain
- * @Description : TODO
+ * @Description : 图片保存
  * @Author : yuxuexuan
  * @Create : 2020/12/30 0030 18:13
  **/

shiwan/face/src/main/java/com/huimv/face/domain/SaveDb.java

@@ -3,12 +3,11 @@ package com.huimv.face.domain;
 import lombok.Data;
 
 import javax.persistence.*;
-import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.face.domain
- * @Description : TODO
+ * @Description : 数据转存
  * @Author : yuxuexuan
  * @Create : 2020/12/29 0029 16:59
  **/

shiwan/face/src/main/java/com/huimv/face/result/Result.java

@@ -13,12 +13,12 @@ import lombok.Data;
 public class Result {
     private Integer  status;
     private String msg;
-    private Object object;
+    private Object data;
 
-    public Result(Integer status, String msg, Object object) {
+    public Result(Integer status, String msg, Object data) {
         this.status = status;
         this.msg = msg;
-        this.object = object;
+        this.data = data;
     }
 
     public Result(Integer status, String msg) {

shiwan/face/src/main/java/com/huimv/face/service/FaceRecoService.java

@@ -25,10 +25,39 @@ public interface FaceRecoService {
     */
     List findOneDay();
 
-
+    /*
+    * @Method      : findOneYear
+    * @Description : 查询一年的数据
+    * @Params      : []
+    * @Return      : java.util.List
+    *
+    * @Author      : yuxuexuan
+    * @Date        : 2020/12/31 0031
+    * @Time        : 15:56
+    */
     List findOneYear();
 
+    /*
+    * @Method      : findOneWeek
+    * @Description : 查询一周的数据
+    * @Params      : []
+    * @Return      : java.util.List
+    *
+    * @Author      : yuxuexuan
+    * @Date        : 2020/12/31 0031
+    * @Time        : 15:57
+    */
     List findOneWeek();
 
+    /*
+    * @Method      : findTop10ByOrderByIdDesc
+    * @Description : 查询最近的十条数据
+    * @Params      : []
+    * @Return      : java.util.List<com.huimv.face.domain.FaceReco>
+    *
+    * @Author      : yuxuexuan
+    * @Date        : 2020/12/31 0031
+    * @Time        : 15:57
+    */
     List<FaceReco> findTop10ByOrderByIdDesc();
 }

shiwan/face/src/main/java/com/huimv/face/service/FaceUserService.java

@@ -14,7 +14,6 @@ import java.util.List;
  * @Create : 2020/12/29 0029 10:16
  **/
 public interface FaceUserService {
-    List findAll();
 
     FaceUser findAllByUserId(String userid);
 

shiwan/face/src/main/java/com/huimv/face/service/impl/FaceRecoServiceImpl.java

@@ -1,9 +1,7 @@
 package com.huimv.face.service.impl;
 
 import com.huimv.face.domain.FaceReco;
-import com.huimv.face.group.TimeGroup;
 import com.huimv.face.repo.FaceRecoRepository;
-import com.huimv.face.result.Result;
 import com.huimv.face.service.FaceRecoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.domain.Specification;
@@ -299,17 +297,6 @@ public class FaceRecoServiceImpl implements FaceRecoService {
         return count;
     }
 
-
-   /*
-   * @Method      : timeUtils
-   * @Description : 处理时间格式
-   * @Params      : []
-   * @Return      : java.lang.String
-   *
-   * @Author      : yuxuexuan
-   * @Date        : 2020/12/29 0029
-   * @Time        : 14:35
-   */
     private String timeUtils(){
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
     }

shiwan/face/src/main/java/com/huimv/face/service/impl/FaceUserServiceImpl.java

@@ -31,10 +31,6 @@ public class FaceUserServiceImpl implements FaceUserService {
     @Autowired
     private FaceUserRepository faceUserRepository;
 
-    @Override
-    public List findAll() {
-        return findRecordList("2020-09-08 13:17:13","2020-09-08 13:17:15");
-    }
 
     @Override
     public FaceUser findAllByUserId(String userid) {
@@ -56,37 +52,4 @@ public class FaceUserServiceImpl implements FaceUserService {
             return new Result(10003,"查询失败",null);
         }
     }
-
-
-    /*
-    * @Method      : findRecordList
-    * @Description : 查询某个时间段的信息
-    * @Params      : [startTime, endTime]
-    * @Return      : java.util.List
-    *
-    * @Author      : Administrator
-    * @Date        : 2020/12/29 0029
-    * @Time        : 14:00
-    */
-    public List findRecordList( String startTime, String endTime) {
-        try {
-            Specification specification = new Specification() {
-                @Override
-                public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder cb) {
-                    Predicate predicate = cb.conjunction();
-                    if (startTime != null && !startTime.trim().equals("")) {
-                        predicate.getExpressions().add(cb.greaterThanOrEqualTo(root.get("XGSJ").as(String.class), startTime));
-                    }
-                    if (endTime != null && !endTime.trim().equals("")) {
-                        predicate.getExpressions().add(cb.lessThanOrEqualTo(root.get("XGSJ").as(String.class), endTime));
-                    }
-                    return predicate;
-                }
-            };
-            List list = faceUserRepository.findAll(specification);
-            return list;
-        }catch (Exception e){
-            return  null;
-        }
-    }
 }