添加下载功能

shiwan/video/src/main/java/com/huimv/video/controller/AllDataController.java

@@ -1,11 +1,15 @@
 package com.huimv.video.controller;
 
+import com.huimv.video.domain.MobileUser;
 import com.huimv.video.domain.SjHkSd;
 import com.huimv.video.result.Result;
 import com.huimv.video.service.AllDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.video.controller
@@ -20,10 +24,17 @@ public class AllDataController {
     @Autowired
     private AllDataService allDataService;
 
-    @RequestMapping(value="/getZsda")
-    public Result getZsda(){
-        //
-        return allDataService.getZsda();
+
+    @RequestMapping("/findByZSID")
+    public Result update(Integer ZSID,String lqid){
+        return allDataService.findByZSID(ZSID,lqid);
+    }
+
+    @RequestMapping("/findAll")
+    public Result findAll(String startTime, String endTime, HttpServletResponse response){
+
+
+        return allDataService.findAll(startTime,endTime,response);
     }
 
 }

shiwan/video/src/main/java/com/huimv/video/controller/CameraInfoController.java

@@ -4,6 +4,10 @@ import com.huimv.video.domain.CameraInfo;
 import com.huimv.video.result.Result;
 import com.huimv.video.service.CameraInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -63,6 +67,7 @@ public class CameraInfoController {
     private Result findAll(){
         try {
             List<CameraInfo> list = cameraInfoService.findAll();
+
             if (list == null){
                 return new Result(10002,"查询失败,地区信息有误",list);
             }
@@ -82,6 +87,18 @@ public class CameraInfoController {
         }
     }
 
+    @RequestMapping("findAllByName")
+    private Page<CameraInfo>  findAllByName(String name,Integer pageSize,Integer pageNum){
+        try {
+            Pageable pageable = PageRequest.of(pageNum-1 ,pageSize);
+
+            Page<CameraInfo> list = cameraInfoService.findAllByName(name,pageable);
+            return list;
+        }catch (Exception e){
+            return null;
+        }
+    }
+
     @RequestMapping("/getCameraDetails")
     private Result getCameraDetails(@RequestParam(required = false) List<Integer> areaIds){
         try {
@@ -92,13 +109,13 @@ public class CameraInfoController {
         }
     }
 
-//    @RequestMapping("/getCameraDetailsByLqid")
-//    private Result getCameraDetailsByLqid(Integer LQID){
-//        try {
-////            List list =  cameraInfoService.getCameraDetails(areaIds);
-////            return new Result(10000,"查询成功",list);
-//        }catch (Exception e){
-//            return new Result(10001,"查询失败");
-//        }
-//    }
+    @RequestMapping("/getCameraDetailsByLqid")
+    private Result getCameraDetailsByLqid(Integer LQID){
+        try {
+            List list =  cameraInfoService.getCameraDetailsByLqid(LQID);
+            return new Result(10000,"查询成功",list);
+        }catch (Exception e){
+            return new Result(10001,"查询失败");
+        }
+    }
 }

shiwan/video/src/main/java/com/huimv/video/controller/PublicNetworkController.java

@@ -1,8 +1,10 @@
 package com.huimv.video.controller;
 
 import com.huimv.video.domain.PublicNetwork;
+import com.huimv.video.repo.SjHkSdRepository;
 import com.huimv.video.result.Result;
 import com.huimv.video.service.PublicNetworkService;
+import com.huimv.video.service.SjHkSdService;
 import com.huimv.video.util.IpUtil;
 import com.huimv.video.util.PropertiesUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,15 +84,22 @@ public class PublicNetworkController {
 
     }
 
+    @Autowired
+    private SjHkSdRepository sdRepository;
+
+
     @RequestMapping("/get")
     public Result getNetwork(){
-        try {
+//        try {
             PublicNetwork publicNetwork = networkService.getNetwork();
+
+
+            sdRepository.findAll("",1,10);
             return new Result(10000,"查询成功",publicNetwork);
-        }catch (Exception e){
-            return new Result(10001,"查询失败");
-        }
+//        }catch (Exception e){
+//            return new Result(10001,"查询失败");
+//        }
     }
 
-
+    
 }

shiwan/video/src/main/java/com/huimv/video/controller/SjHkDlController.java

@@ -34,4 +34,9 @@ public class SjHkDlController {
 		return service.findAll(name,pageNum,pageSize);
 	}
 
+	@RequestMapping("/findAllByLQID")
+	public Result findAllByLQID(Integer LQID){
+		return service.findAllByLQID(LQID);
+	}
+
 }

shiwan/video/src/main/java/com/huimv/video/controller/SjHkPhController.java

@@ -34,4 +34,9 @@ public class SjHkPhController {
 		return service.findAll(name,pageNum,pageSize);
 	}
 
+	@RequestMapping("/findAllByLQID")
+	public Result findAllByLQID(Integer LQID){
+		return service.findAllByLQID(LQID);
+	}
+
 }

shiwan/video/src/main/java/com/huimv/video/controller/SjHkSdController.java

@@ -34,4 +34,9 @@ public class SjHkSdController {
 		return service.findAll(name,pageNum,pageSize);
 	}
 
+	@RequestMapping("/findAllByLQID")
+	public Result findAllByLQID(Integer LQID){
+		return service.findAllByLQID(LQID);
+	}
+
 }

shiwan/video/src/main/java/com/huimv/video/controller/SjHkSlController.java

@@ -34,4 +34,9 @@ public class SjHkSlController {
 		return service.findAll(name,pageNum,pageSize);
 	}
 
+	@RequestMapping("/findAllByLQID")
+	public Result findAllByLQID(Integer LQID){
+		return service.findAllByLQID(LQID);
+	}
+
 }

shiwan/video/src/main/java/com/huimv/video/controller/SjHkWdController.java

@@ -34,4 +34,9 @@ public class SjHkWdController {
 		return service.findAll(name,pageNum,pageSize);
 	}
 
+	@RequestMapping("/findAllByLQID")
+	public Result findAllByLQID(Integer LQID){
+		return service.findAllByLQID(LQID);
+	}
+
 }

shiwan/video/src/main/java/com/huimv/video/domain/SjDl.java

@@ -0,0 +1,57 @@
+package com.huimv.video.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Entity
+@Data
+@Table(name = "sj_dl")
+public class SjDl implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ID", nullable = false)
+    private Integer ID;
+
+    /**
+     * 采集器ID
+     */
+    @Column(name = "CGQID")
+    private String CGQID;
+
+    /**
+     * 当前电量
+     */
+    @Column(name = "DQDL")
+    private BigDecimal DQDL;
+
+    /**
+     * 采集时间
+     */
+    @Column(name = "CJSJ")
+    private Date CJSJ;
+
+    /**
+     * 上传时间
+     */
+    @JsonFormat(pattern = "HH:mm",timezone="GMT+8")
+    @Column(name = "SCSJ")
+    private Date SCSJ;
+
+    /**
+     * 机器ID
+     */
+    @Column(name = "JQID")
+    private String JQID;
+
+}

shiwan/video/src/main/java/com/huimv/video/domain/SjPh.java

@@ -0,0 +1,54 @@
+package com.huimv.video.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Entity
+@Table(name = "sj_ph")
+@Data
+public class SjPh implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ID", nullable = false)
+    private Integer ID;
+
+    /**
+     * 传感器ID
+     */
+    @Column(name = "CGQID")
+    private String CGQID;
+
+    /**
+     * 当前PH
+     */
+    @Column(name = "DQPH")
+    private BigDecimal DQPH;
+
+    /**
+     * 采集时间
+     */
+    @Column(name = "CJSJ")
+    private Date CJSJ;
+
+    /**
+     * 上传时间
+     */
+    @JsonFormat(pattern = "HH:mm",timezone="GMT+8")
+    @Column(name = "SCSJ")
+    private Date SCSJ;
+
+    /**
+     * 机器ID
+     */
+    @Column(name = "JQID")
+    private String JQID;
+
+}

shiwan/video/src/main/java/com/huimv/video/domain/SjSl.java

@@ -0,0 +1,57 @@
+package com.huimv.video.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Entity
+@Table(name = "sj_sl")
+@Data
+public class SjSl implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ID", nullable = false)
+    private Integer ID;
+
+    /**
+     * 采集器ID
+     */
+    @Column(name = "CGQID")
+    private String CGQID;
+
+    /**
+     * 当前水量
+     */
+    @Column(name = "DQSL")
+    private BigDecimal DQSL;
+
+    /**
+     * 采集时间
+     */
+    @Column(name = "CJSJ")
+    private Date CJSJ;
+
+    /**
+     * 上传时间
+     */
+    @JsonFormat(pattern = "HH:mm",timezone="GMT+8")
+    @Column(name = "SCSJ")
+    private Date SCSJ;
+
+    /**
+     * 机器ID
+     */
+    @Column(name = "JQID")
+    private String JQID;
+
+}

shiwan/video/src/main/java/com/huimv/video/domain/SjSy.java

@@ -0,0 +1,54 @@
+package com.huimv.video.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Entity
+@Table(name = "sj_sy")
+@Data
+public class SjSy implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "ID", nullable = false)
+    private Integer ID;
+
+    /**
+     * 传感器ID
+     */
+    @Column(name = "CGQID")
+    private String CGQID;
+
+    /**
+     * 当前水压
+     */
+    @Column(name = "DQSY")
+    private BigDecimal DQSY;
+
+    /**
+     * 采集时间
+     */
+    @Column(name = "CJSJ")
+    private Date CJSJ;
+
+    /**
+     * 上传时间
+     */
+    @JsonFormat(pattern = "HH:mm",timezone="GMT+8")
+    @Column(name = "SCSJ")
+    private Date SCSJ;
+
+    /**
+     * 机器ID
+     */
+    @Column(name = "JQID")
+    private String JQID;
+
+}

shiwan/video/src/main/java/com/huimv/video/repo/CameraInfoRepo.java

@@ -1,6 +1,9 @@
 package com.huimv.video.repo;
 
 import com.huimv.video.domain.CameraInfo;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
@@ -21,4 +24,8 @@ public interface CameraInfoRepo extends JpaRepository<CameraInfo,Integer> , JpaS
 
     @Query(nativeQuery = true,value = "select * from camera_info where  area_id=?1")
     List<CameraInfo> findAllByAreaId(Integer areaId);
+
+    List<CameraInfo> findByLQID(Integer LQID);
+    @Query(nativeQuery = true , value = "SELECT * FROM camera_info WHERE instr(name, ?1)>0 ORDER by id ASC ")
+    Page<CameraInfo> findAllByNameLike(String name, Pageable pageable);
 }

shiwan/video/src/main/java/com/huimv/video/repo/SjDlRepo.java

@@ -0,0 +1,12 @@
+package com.huimv.video.repo;
+
+import com.huimv.video.domain.SjDl;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.Date;
+import java.util.List;
+
+public interface SjDlRepo extends JpaRepository<SjDl, Integer>, JpaSpecificationExecutor<SjDl> {
+    List<SjDl> findAllByJQIDAndSCSJBetween(String JQID, Date startTime, Date endTime);
+}

shiwan/video/src/main/java/com/huimv/video/repo/SjHkAqRepository.java

@@ -5,6 +5,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.Date;
 import java.util.List;
 
 public interface SjHkAqRepository extends JpaRepository<SjHkAq, Integer>, JpaSpecificationExecutor<SjHkAq> {
@@ -17,4 +18,6 @@ public interface SjHkAqRepository extends JpaRepository<SjHkAq, Integer>, JpaSpe
     @Query(nativeQuery = true ,value = "select * from sj_hk_aq where lqid = ?1 order by id DESC limit 0 , 1")
     List<SjHkAq> findByLqidOrderById(Integer LQID);
 
+    List<SjHkAq> findAllByScsjBetweenAndLqid(Date startTime, Date endTime ,Integer LQID);
+
 }

shiwan/video/src/main/java/com/huimv/video/repo/SjHkDlRepository.java

@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.Date;
 import java.util.List;
 
 public interface SjHkDlRepository extends JpaRepository<SjHkDl, Integer>, JpaSpecificationExecutor<SjHkDl> {
@@ -13,5 +14,6 @@ public interface SjHkDlRepository extends JpaRepository<SjHkDl, Integer>, JpaSpe
 	@Query(nativeQuery = true ,value = "select * from sj_hk_dl where lqid like %?1% limit ?2 , ?3")
     List<SjHkDl> findAll(String name, Integer startPage, Integer pageSize);
 
-    List<SjHkDl> findByLqidOrderById(Integer LQID);
+
+    List<SjHkDl> findAllByScsjBetweenAndLqid(Date startTime, Date endTime , Integer LQID);
 }

shiwan/video/src/main/java/com/huimv/video/repo/SjHkPhRepository.java

@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.Date;
 import java.util.List;
 
 public interface SjHkPhRepository extends JpaRepository<SjHkPh, Integer>, JpaSpecificationExecutor<SjHkPh> {
@@ -14,4 +15,6 @@ public interface SjHkPhRepository extends JpaRepository<SjHkPh, Integer>, JpaSpe
     List<SjHkPh> findAll(String name, Integer startPage, Integer pageSize);
 
     List<SjHkPh> findByLqidOrderById(Integer LQID);
+
+    List<SjHkPh> findAllByScsjBetweenAndLqid(Date startTime, Date endTime , Integer LQID);
 }

shiwan/video/src/main/java/com/huimv/video/repo/SjHkSdRepository.java

@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.Date;
 import java.util.List;
 
 public interface SjHkSdRepository extends JpaRepository<SjHkSd, Integer>, JpaSpecificationExecutor<SjHkSd> {
@@ -15,4 +16,6 @@ public interface SjHkSdRepository extends JpaRepository<SjHkSd, Integer>, JpaSpe
 
     @Query(nativeQuery = true ,value = "select * from sj_hk_sd where lqid = ?1 order by id DESC limit 0 , 1")
     List<SjHkSd> findByLqidOrderById(Integer LQID);
+
+    List<SjHkSd> findAllByScsjBetweenAndLqid(Date startTime, Date endTime , Integer LQID);
 }

shiwan/video/src/main/java/com/huimv/video/repo/SjHkSlRepository.java

@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.Date;
 import java.util.List;
 
 public interface SjHkSlRepository extends JpaRepository<SjHkSl, Integer>, JpaSpecificationExecutor<SjHkSl> {
@@ -14,4 +15,6 @@ public interface SjHkSlRepository extends JpaRepository<SjHkSl, Integer>, JpaSpe
     List<SjHkSl> findAll(String name, Integer startPage, Integer pageSize);
 
     List<SjHkSl> findByLqidOrderById(Integer LQID);
+
+    List<SjHkSl> findAllByScsjBetweenAndLqidAndCgqid(Date startTime, Date endTime , Integer LQID,String CGQID);
 }

shiwan/video/src/main/java/com/huimv/video/repo/SjHkWdRepository.java

@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.Date;
 import java.util.List;
 
 public interface SjHkWdRepository extends JpaRepository<SjHkWd, Integer>, JpaSpecificationExecutor<SjHkWd> {
@@ -15,4 +16,6 @@ public interface SjHkWdRepository extends JpaRepository<SjHkWd, Integer>, JpaSpe
 
     @Query(nativeQuery = true ,value = "select * from sj_hk_wd where lqid = ?1 order by id DESC limit 0 , 1")
     List<SjHkWd> findByLqidOrderById(Integer LQID);
+
+    List<SjHkWd> findAllByScsjBetweenAndLqid(Date startTime, Date endTime , Integer LQID);
 }

shiwan/video/src/main/java/com/huimv/video/repo/SjPhRepo.java

@@ -0,0 +1,12 @@
+package com.huimv.video.repo;
+
+import com.huimv.video.domain.SjPh;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.Date;
+import java.util.List;
+
+public interface SjPhRepo extends JpaRepository<SjPh, Integer>, JpaSpecificationExecutor<SjPh> {
+    List findAllByJQIDAndSCSJBetween(String JQID, Date startTime, Date endTime);
+}

shiwan/video/src/main/java/com/huimv/video/repo/SjSlRepo.java

@@ -0,0 +1,12 @@
+package com.huimv.video.repo;
+
+import com.huimv.video.domain.SjSl;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.Date;
+import java.util.List;
+
+public interface SjSlRepo extends JpaRepository<SjSl, Integer>, JpaSpecificationExecutor<SjSl> {
+    List<SjSl> findAllByJQIDAndSCSJBetween(String JQID, Date startTime, Date endTime);
+}

shiwan/video/src/main/java/com/huimv/video/repo/SjSyRepo.java

@@ -0,0 +1,12 @@
+package com.huimv.video.repo;
+
+import com.huimv.video.domain.SjSy;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+import java.util.Date;
+import java.util.List;
+
+public interface SjSyRepo extends JpaRepository<SjSy, Integer>, JpaSpecificationExecutor<SjSy> {
+    List findAllByJQIDAndSCSJBetween(String JQID, Date startTime, Date endTime);
+}

shiwan/video/src/main/java/com/huimv/video/service/AllDataService.java

@@ -2,6 +2,9 @@ package com.huimv.video.service;
 
 import com.huimv.video.result.Result;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.video.service
@@ -12,5 +15,7 @@ import com.huimv.video.result.Result;
 public interface AllDataService {
 
 
-    Result getZsda();
+    Result findByZSID(Integer zsid,String lqid);
+
+    Result findAll(String startTime, String  endTime, HttpServletResponse response);
 }

shiwan/video/src/main/java/com/huimv/video/service/CameraInfoService.java

@@ -1,6 +1,8 @@
 package com.huimv.video.service;
 
 import com.huimv.video.domain.CameraInfo;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 
@@ -44,4 +46,8 @@ public interface CameraInfoService {
      * @Time        : 19:01
      */
     List getCameraDetails(List<Integer> areaIds);
+
+    List getCameraDetailsByLqid(Integer lqid);
+
+    Page<CameraInfo> findAllByName(String name, Pageable pageable);
 }

shiwan/video/src/main/java/com/huimv/video/service/SjHkAqService.java

@@ -19,4 +19,6 @@ public interface SjHkAqService  {
 
    //根据id查找
    Result findAllById(Integer id);
+
+    Result findAllByLQID(Integer lqid);
 }

shiwan/video/src/main/java/com/huimv/video/service/SjHkDlService.java

@@ -19,4 +19,6 @@ public interface SjHkDlService  {
 
    //根据id查找
    Result findAllById(Integer id);
+
+    Result findAllByLQID(Integer lqid);
 }

shiwan/video/src/main/java/com/huimv/video/service/SjHkPhService.java

@@ -19,4 +19,6 @@ public interface SjHkPhService  {
 
    //根据id查找
    Result findAllById(Integer id);
+
+    Result findAllByLQID(Integer lqid);
 }

shiwan/video/src/main/java/com/huimv/video/service/SjHkSdService.java

@@ -19,4 +19,6 @@ public interface SjHkSdService  {
 
    //根据id查找
    Result findAllById(Integer id);
+
+    Result findAllByLQID(Integer lqid);
 }

shiwan/video/src/main/java/com/huimv/video/service/SjHkSlService.java

@@ -19,4 +19,6 @@ public interface SjHkSlService  {
 
    //根据id查找
    Result findAllById(Integer id);
+
+    Result findAllByLQID(Integer lqid);
 }

shiwan/video/src/main/java/com/huimv/video/service/SjHkWdService.java

@@ -19,4 +19,6 @@ public interface SjHkWdService  {
 
    //根据id查找
    Result findAllById(Integer id);
+
+    Result findAllByLQID(Integer lqid);
 }

shiwan/video/src/main/java/com/huimv/video/service/impl/AllDataServiceImpl.java

@@ -1,17 +1,32 @@
 package com.huimv.video.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.huimv.video.domain.*;
 import com.huimv.video.repo.*;
 import com.huimv.video.result.Result;
 import com.huimv.video.service.AllDataService;
+import com.spire.xls.*;
+import com.spire.xls.charts.ChartSerie;
+import com.spire.xls.charts.ChartSeries;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.awt.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
@@ -22,87 +37,284 @@ import java.util.Map;
  **/
 @Service
 public class AllDataServiceImpl implements AllDataService {
-    @Autowired
-    private DaZsdaEntityRepository zsdaEntityRepo;
-    @Autowired
-    private DaLqdaEntityRepository lqdaEntityRepo;
+
+
+
 
     @Autowired
-    private SjHkAqRepository aqRepository;
-    @Autowired
-    private SjHkSdRepository sdRepository;
-    @Autowired
-    private SjHkWdRepository wdRepository;
+    private SjDlRepo dlRepo;
+
     @Autowired
-    private SjHkSlRepository slRepository;
+    private SjSlRepo slRepo;
+
     @Autowired
-    private SjHkDlRepository dlRepository;
+    private SjPhRepo phRepo;
+
     @Autowired
-    private SjHkPhRepository phRepository;
+    private SjSyRepo syRepo;
 
 
     @Override
-    @DS("slave")
-    public Result getZsda() {
-        Integer mcid = 39;
-        //--读取所有猪舍
-        List<DaZsdaEntity> zsdsList = zsdaEntityRepo.getAllZs(mcid);
-
-        List zsidList = new ArrayList();
-        for (DaZsdaEntity zsdaEntity : zsdsList) {
-            zsidList.add(zsdaEntity.getID());
+    @DS("thired")
+    public Result findByZSID(Integer zsid,String lqid) {
+        String JQID ;
+
+        switch (zsid){
+            case 367:
+                JQID = "00000481";
+                break;
+            case 378:
+                JQID = "00000488";
+                break;
+            default:
+                JQID = "00000489";
+                break;
         }
-        //--读取所有栏期
-        List<DaLqdaEntity> lqdaEntityList = lqdaEntityRepo.getLqid(zsidList);
+        Date date = DateUtil.date();
+        DateTime dateTime = DateUtil.beginOfDay(date);
+        Map endMap = new HashMap();
 
 
-        List<Map> zsxx = new ArrayList();
-        Map map = new HashMap();
-        for (DaZsdaEntity zsdaEntity : zsdsList) {
-            int zsid = zsdaEntity.getID();
 
+        Map dlMap = initMap();
+        List<SjDl> allByJQIDAndSCSJBetween = dlRepo.findAllByJQIDAndSCSJBetween(JQID, dateTime, date);
+        for (SjDl o : allByJQIDAndSCSJBetween) {
+            Integer x = Integer.parseInt((o.getSCSJ()+"").substring(11,13));
+            String str ;
+            if (x <10){
+                str = "0"+x+":00";
+            }else {
+                str = x+":00";
+            }
+            dlMap.put(str,o.getDQDL());
+        }
+        endMap.put("dl",dlMap);
 
-            map.put("zsid", zsid);
-            map.put("zsmc", zsdaEntity.getZSMC());
-            List<Integer>  lqidList  = new ArrayList();
-            for (DaLqdaEntity lqdaEntity : lqdaEntityList) {
-                if (lqdaEntity.getZSID() == zsid) {
-                    Integer lqid = lqdaEntity.getID();
-                    map.put("lqid", lqid);
-                    lqidList.add(lqid);
-                    break;
-                }
+
+        Map slMap = initMap();
+        List<SjSl> allByJQIDAndSCSJBetween1 = slRepo.findAllByJQIDAndSCSJBetween(JQID, dateTime, date);
+        for (SjSl o : allByJQIDAndSCSJBetween1) {
+            Integer x = Integer.parseInt((o.getSCSJ()+"").substring(11,13));
+            String str ;
+            if (x <10){
+                str = "0"+x+":00";
+            }else {
+                str = x+":00";
             }
+            slMap.put(str,o.getDQSL());
+        }
+        endMap.put("sl",slMap);
 
+        Map phMap = initMap();
+        List<SjPh> allByJQIDAndSCSJBetween2 = phRepo.findAllByJQIDAndSCSJBetween(JQID, dateTime, date);
+        for (SjPh o : allByJQIDAndSCSJBetween2) {
+            Integer x = Integer.parseInt((o.getSCSJ()+"").substring(11,13));
+            String str ;
+            if (x <10){
+                str = "0"+x+":00";
+            }else {
+                str = x+":00";
+            }
+            phMap.put(str,o.getDQPH());
+        }
+        endMap.put("ph",phMap);
 
-            for (Integer lqid : lqidList) {
-                List<SjHkAq> byLqidOrderById = aqRepository.findByLqidOrderById(lqid);
-                if ( byLqidOrderById.size()> 0){
-                    map.put("aq",byLqidOrderById.get(0).getDqaq()) ;
-                }else{
-                    map.put("aq",null) ;
-                }
 
-                List<SjHkWd> byLqidOrderById1 = wdRepository.findByLqidOrderById(lqid);
-                if ( byLqidOrderById1.size()> 0){
-                    map.put("wd",byLqidOrderById1.get(0).getDqwd()) ;
-                }else{
-                    map.put("wd",null) ;
-                }
+        Map syMap = initMap();
+        List<SjSy> allByJQIDAndSCSJBetween3 = syRepo.findAllByJQIDAndSCSJBetween(JQID, dateTime, date);
+        for (SjSy o : allByJQIDAndSCSJBetween3) {
+            Integer x = Integer.parseInt((o.getSCSJ()+"").substring(11,13));
+            String str ;
+            if (x <10){
+                str = "0"+x+":00";
+            }else {
+                str = x+":00";
+            }
+            syMap.put(str,o.getDQSY());
+        }
+        endMap.put("sy",syMap);
+        endMap.put("zsid",zsid);
+        endMap.put("lqid",lqid);
+
+
+        return new Result(10000,"成功",endMap);
+    }
+
+    @Override
+    @DS("thired")
+    public Result findAll(String startTime, String  endTime, HttpServletResponse response) {
+        //367  一栋全控   00000481
+        //378   二栋      00000488
+        //379   三栋      00000489
+        Date startDate =  DateUtil.parse(startTime);
+        Date endDate =  DateUtil.parse(endTime);
+
+        Double sl1result = 0.0;
+        List<SjSl> slList1 = slRepo.findAllByJQIDAndSCSJBetween("00000481", startDate, endDate);
+        if (slList1  != null && slList1.size()>0){
+            sl1result = slList1.get(slList1.size() - 1).getDQSL().subtract(slList1.get(0).getDQSL()).doubleValue();
+        }
+
+        Double dl1result = 0.0;
+        List<SjDl> dlList1 = dlRepo.findAllByJQIDAndSCSJBetween("00000481", startDate, endDate);
+        if (dlList1  != null &&dlList1.size()>0){
+            dl1result = dlList1.get(dlList1.size() - 1).getDQDL().subtract(dlList1.get(0).getDQDL()).doubleValue();
+        }
+
+
+
+        Double sl2result = 0.0;
+        List<SjSl> slList2 = slRepo.findAllByJQIDAndSCSJBetween("00000488", startDate, endDate);
+        if (slList2  != null &&slList2.size()>0){
+            sl2result = slList2.get(slList2.size() - 1).getDQSL().subtract(slList2.get(0).getDQSL()).doubleValue();
+        }
+
+        Double dl2result = 0.0;
+        List<SjDl> dlList2 = dlRepo.findAllByJQIDAndSCSJBetween("00000488", startDate, endDate);
+        if (dlList2  != null &&dlList2.size() >0 ){
+            dl2result = dlList2.get(dlList2.size() - 1).getDQDL().subtract(dlList2.get(0).getDQDL()).doubleValue();
+        }
 
-                List<SjHkSd> byLqidOrderById2 = sdRepository.findByLqidOrderById(lqid);
-                if ( byLqidOrderById2.size()> 0){
-                    map.put("sd",byLqidOrderById2.get(0).getDqsd()) ;
-                }else{
-                    map.put("sd",null) ;
+
+        Double sl3result = 0.0;
+        List<SjSl> slList3 = slRepo.findAllByJQIDAndSCSJBetween("00000489", startDate, endDate);
+        if (slList3  != null &&slList3.size()>0){
+            sl3result= slList3.get(slList3.size() - 1).getDQSL().subtract(slList3.get(0).getDQSL()).doubleValue();
+        }
+
+        Double dl3result = 0.0;
+        List<SjDl> dlList3 = dlRepo.findAllByJQIDAndSCSJBetween("00000489", startDate, endDate);
+        if (dlList3  != null &&dlList3.size()>0){
+             dl3result = dlList3.get(dlList3.size() - 1).getDQDL().subtract(dlList3.get(0).getDQDL()).doubleValue();
+        }
+
+
+
+
+
+        Workbook workbook = new Workbook();
+
+        //获取第一个工作表
+        Worksheet sheet = workbook.getWorksheets().get(0);
+
+        //将图表数据写入工作表
+        sheet.getCellRange("A1").setValue("栋舍");
+        sheet.getCellRange("A2").setValue("一栋全控");
+        sheet.getCellRange("A3").setValue("二栋全控");
+        sheet.getCellRange("A4").setValue("三栋全控");
+        sheet.getCellRange("B1").setValue("用水量");
+        sheet.getCellRange("B2").setNumberValue(sl1result);
+        sheet.getCellRange("B3").setNumberValue(sl2result);
+        sheet.getCellRange("B4").setNumberValue(sl3result);
+
+        sheet.getCellRange("C1").setValue("用电量");
+        sheet.getCellRange("C2").setNumberValue(dl1result);
+        sheet.getCellRange("C3").setNumberValue(dl2result);
+        sheet.getCellRange("C4").setNumberValue(dl3result);
+
+        //设置单元格样式
+        sheet.getCellRange("A1:C1").setRowHeight(15);
+        sheet.getCellRange("A1:C1").getCellStyle().setColor(Color.darkGray);
+        sheet.getCellRange("A1:C1").getCellStyle().getExcelFont().setColor(Color.white);
+        sheet.getCellRange("A1:C1").getCellStyle().setVerticalAlignment(VerticalAlignType.Center);
+        sheet.getCellRange("A1:C1").getCellStyle().setHorizontalAlignment(HorizontalAlignType.Center);
+        sheet.autoFitColumn(1);
+
+        //添加柱形图
+        Chart chart =sheet.getCharts().add(ExcelChartType.ColumnClustered);
+
+        //设置图表数据区域
+        chart.setDataRange(sheet.getCellRange("A1:C5"));
+        chart.setSeriesDataFromRange(false);
+
+//设置图表位置
+        chart.setLeftColumn(5);
+        chart.setTopRow(1);
+        chart.setRightColumn(14);
+        chart.setBottomRow(21);
+
+//设置图表标题
+
+        chart.setChartTitle(startTime.substring(5,10)+ " 到 " + endTime.substring(0,10) + " 水电统计图");
+        chart.getChartTitleArea().isBold(true);
+        chart.getChartTitleArea().setSize(12);
+
+//设置x,y轴的名称
+        chart.getPrimaryCategoryAxis().setTitle("栋舍");
+        chart.getPrimaryCategoryAxis().getFont().isBold(true);
+        chart.getPrimaryCategoryAxis().getTitleArea().isBold(true);
+        chart.getPrimaryValueAxis().setTitle("数值");
+        chart.getPrimaryValueAxis().hasMajorGridLines(false);
+        chart.getPrimaryValueAxis().getTitleArea().isBold(true);
+        chart.getPrimaryValueAxis().getTitleArea().setTextRotationAngle(90);
+
+//设置系列颜色、重叠、宽度和数字标签
+        ChartSeries series = chart.getSeries();
+        for (int i = 0 ; i < series.size() ; i++) {
+            ChartSerie cs = series.get(i);
+            cs.getFormat().getOptions().isVaryColor(true);
+            cs.getFormat().getOptions().setOverlap(-50);
+            cs.getFormat().getOptions().setGapWidth(350);
+            cs.getDataPoints().getDefaultDataPoint().getDataLabels().hasValue(true);
+        }
+
+        //设置图例位置
+        chart.getLegend().setPosition(LegendPositionType.Top);
+
+        //保存文档
+
+
+
+        String fileName = System.currentTimeMillis()+".xls";
+        response.setContentType("application/vnd.ms-excel");  //"application/vnd.ms-excel;charset=utf-8"  application/force-download
+        response.reset();
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        ServletOutputStream outputStream = null;
+        // try {
+        try {
+            response.addHeader("Content-Disposition","attachment;fileName=" + new String(fileName.getBytes("UTF-8"),"iso-8859-1"));
+
+             outputStream = response.getOutputStream();
+
+            workbook.saveToStream(outputStream);
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }finally {
+            if (outputStream != null){
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
                 }
             }
 
 
-            zsxx.add(map);
         }
 
+//
+
 
-        return new Result(10000,"成功",zsxx);
+
+        return null;
+    }
+
+    private Map initMap (){
+        Map map = new TreeMap<String ,Object>(new Comparator<String>() {
+            @Override
+            public int compare(String s, String t1) {
+                return s.compareTo(t1);
+            }
+        });
+        for (int i = 0; i< 24 ;i++){
+            String x ;
+            if (i <10){
+                x = "0"+i;
+            }else {
+                x =i+"";
+            }
+            map.put(x+":00",0);
+        }
+        return map;
     }
 }

shiwan/video/src/main/java/com/huimv/video/service/impl/CameraInfoServiceImpl.java

@@ -8,6 +8,8 @@ import com.huimv.video.repo.PastureAreaRepo;
 import com.huimv.video.repo.PublicNetworkRepo;
 import com.huimv.video.service.CameraInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -115,4 +117,38 @@ public class CameraInfoServiceImpl implements CameraInfoService {
 
         return cameraDetailsList;
     }
+
+    @Override
+    @DS("master")
+    public List getCameraDetailsByLqid(Integer lqid) {
+        List cameraDetailsList = new ArrayList();
+
+            List<CameraInfo> cameraList = cameraInfoRepo.findByLQID(lqid);
+            String publicIp = publicNetworkRepo.findTopByIdDesc().getUrl();
+            int i = 1;
+            for (CameraInfo cameraInfo : cameraList) {
+
+                PastureArea pastureArea = pastureAreaRepo.findAllById( Integer.parseInt(cameraInfo.getAreaId()));
+                Map map = new HashMap();
+                String cameraAccount =  cameraInfo.getAccount();
+                String cameraPassword =  cameraInfo.getPassword();
+                String camerIp = cameraInfo.getIp();
+                map.put("wsUrl","ws://" + publicIp + ":10080/camera_relay?tcpaddr=" + cameraAccount + "%3A" + cameraPassword+"%40"+camerIp);
+                map.put("rtspUrl","rtsp://"+cameraAccount+":"+cameraPassword+"@"+camerIp);
+                map.put("areaParentId",pastureArea.getParent());
+                map.put("text",cameraInfo.getName());
+                map.put("value",i);
+                cameraDetailsList.add(map);
+                i++;
+            }
+
+
+        return cameraDetailsList;
+    }
+
+    @Override
+    @DS("master")
+    public Page<CameraInfo> findAllByName(String name, Pageable pageable) {
+        return cameraInfoRepo.findAllByNameLike(name,pageable);
+    }
 }

shiwan/video/src/main/java/com/huimv/video/service/impl/PastureAreaServiceImpl.java

@@ -25,11 +25,13 @@ public class PastureAreaServiceImpl implements PastureAreaService {
     @Autowired
     private PastureAreaRepo pastureAreaRepo;
     @Override
+    @DS("master")
     public void save(PastureArea pastureArea) {
         pastureAreaRepo.save(pastureArea);
     }
 
     @Override
+    @DS("master")
     public void update(PastureArea pastureArea) {
         pastureAreaRepo.save(pastureArea);
     }

shiwan/video/src/main/java/com/huimv/video/service/impl/SjHkAqServiceImpl.java

@@ -1,5 +1,8 @@
 package com.huimv.video.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.huimv.video.domain.SjHkAq;
 import com.huimv.video.repo.SjHkAqRepository;
 import com.huimv.video.result.Result;
@@ -8,9 +11,7 @@ import com.huimv.video.service.SjHkAqService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class SjHkAqServiceImpl implements SjHkAqService {
@@ -19,6 +20,7 @@ public class SjHkAqServiceImpl implements SjHkAqService {
 	private SjHkAqRepository rep;
 
 	@Override
+	@DS("slave")
 	public Result add(SjHkAq entity){
 		if (entity == null){
 			return new Result(10002, ResultStatus.addNull);
@@ -32,6 +34,7 @@ public class SjHkAqServiceImpl implements SjHkAqService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result remove(Integer[] ids) {
 		if (ids == null || ids.length==0){
 			return new Result(10002, ResultStatus.deleteNull);
@@ -47,6 +50,7 @@ public class SjHkAqServiceImpl implements SjHkAqService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result update(SjHkAq entity) {
 		if (entity == null){
 			return new Result(10002, ResultStatus.updateNull);
@@ -60,6 +64,7 @@ public class SjHkAqServiceImpl implements SjHkAqService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result findAll(String name , Integer pageNum , Integer pageSize) {
 		try {
 			Map map = new HashMap();
@@ -77,6 +82,7 @@ public class SjHkAqServiceImpl implements SjHkAqService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result findAllById(Integer id) {
 		try {
 			SjHkAq entity = rep.findById(id).get();
@@ -85,4 +91,28 @@ public class SjHkAqServiceImpl implements SjHkAqService {
 			return new Result(10001, ResultStatus.findFailed,null);
 		}
 	}
+
+	@Override
+	@DS("slave")
+	public Result findAllByLQID(Integer lqid) {
+		Date date = DateUtil.date();
+		DateTime dateTime = DateUtil.beginOfDay(date);
+		List<SjHkAq> allByScsjBetweenAndLqid = rep.findAllByScsjBetweenAndLqid(dateTime, date, lqid);
+
+		List list = new ArrayList();
+		for (SjHkAq sjHkAq : allByScsjBetweenAndLqid) {
+			Map map = new HashMap();
+			map.put("data",sjHkAq.getDqaq());
+			map.put("time",(sjHkAq.getScsj()+"").substring(11,16));
+			list.add(map);
+		}
+		List endList = new ArrayList();
+		for (int i =1; i<list.size(); i++){
+			if ( i % 2 ==0 ){
+				endList.add(list.get(i));
+			}
+		}
+
+		return new Result(10000,"成功",endList);
+	}
 }

shiwan/video/src/main/java/com/huimv/video/service/impl/SjHkDlServiceImpl.java

@@ -1,5 +1,9 @@
 package com.huimv.video.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.huimv.video.domain.SjHkAq;
 import com.huimv.video.domain.SjHkDl;
 import com.huimv.video.repo.SjHkDlRepository;
 import com.huimv.video.result.Result;
@@ -8,9 +12,7 @@ import com.huimv.video.service.SjHkDlService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class SjHkDlServiceImpl implements SjHkDlService {
@@ -19,6 +21,7 @@ public class SjHkDlServiceImpl implements SjHkDlService {
 	private SjHkDlRepository rep;
 
 	@Override
+	@DS("slave")
 	public Result add(SjHkDl entity){
 		if (entity == null){
 			return new Result(10002, ResultStatus.addNull);
@@ -32,6 +35,7 @@ public class SjHkDlServiceImpl implements SjHkDlService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result remove(Integer[] ids) {
 		if (ids == null || ids.length==0){
 			return new Result(10002, ResultStatus.deleteNull);
@@ -47,6 +51,7 @@ public class SjHkDlServiceImpl implements SjHkDlService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result update(SjHkDl entity) {
 		if (entity == null){
 			return new Result(10002, ResultStatus.updateNull);
@@ -60,6 +65,7 @@ public class SjHkDlServiceImpl implements SjHkDlService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result findAll(String name , Integer pageNum , Integer pageSize) {
 		try {
 			Map map = new HashMap();
@@ -77,6 +83,7 @@ public class SjHkDlServiceImpl implements SjHkDlService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result findAllById(Integer id) {
 		try {
 			SjHkDl entity = rep.findById(id).get();
@@ -85,4 +92,29 @@ public class SjHkDlServiceImpl implements SjHkDlService {
 			return new Result(10001, ResultStatus.findFailed,null);
 		}
 	}
+
+	@Override
+	@DS("slave")
+	public Result findAllByLQID(Integer lqid) {
+		Date date = DateUtil.date();
+		DateTime dateTime = DateUtil.beginOfDay(date);
+		List<SjHkDl> allByScsjBetweenAndLqid = rep.findAllByScsjBetweenAndLqid(dateTime, date, lqid);
+
+		List list = new ArrayList();
+		for (SjHkDl sjHkDl : allByScsjBetweenAndLqid) {
+			Map map = new HashMap();
+			map.put("data",sjHkDl.getDqdl());
+			map.put("time",(sjHkDl.getScsj()+"").substring(11,16));
+			list.add(map);
+		}
+
+		List endList = new ArrayList();
+		for (int i =1; i<list.size(); i++){
+			if ( i % 2 ==0 ){
+				endList.add(list.get(i));
+			}
+		}
+
+		return new Result(10000,"成功",endList);
+	}
 }

shiwan/video/src/main/java/com/huimv/video/service/impl/SjHkPhServiceImpl.java

@@ -1,5 +1,9 @@
 package com.huimv.video.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.huimv.video.domain.SjHkAq;
 import com.huimv.video.domain.SjHkPh;
 import com.huimv.video.repo.SjHkPhRepository;
 import com.huimv.video.result.Result;
@@ -8,9 +12,7 @@ import com.huimv.video.service.SjHkPhService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class SjHkPhServiceImpl implements SjHkPhService {
@@ -19,6 +21,7 @@ public class SjHkPhServiceImpl implements SjHkPhService {
 	private SjHkPhRepository rep;
 
 	@Override
+	@DS("slave")
 	public Result add(SjHkPh entity){
 		if (entity == null){
 			return new Result(10002, ResultStatus.addNull);
@@ -32,6 +35,7 @@ public class SjHkPhServiceImpl implements SjHkPhService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result remove(Integer[] ids) {
 		if (ids == null || ids.length==0){
 			return new Result(10002, ResultStatus.deleteNull);
@@ -47,6 +51,7 @@ public class SjHkPhServiceImpl implements SjHkPhService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result update(SjHkPh entity) {
 		if (entity == null){
 			return new Result(10002, ResultStatus.updateNull);
@@ -60,6 +65,7 @@ public class SjHkPhServiceImpl implements SjHkPhService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result findAll(String name , Integer pageNum , Integer pageSize) {
 		try {
 			Map map = new HashMap();
@@ -77,6 +83,7 @@ public class SjHkPhServiceImpl implements SjHkPhService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result findAllById(Integer id) {
 		try {
 			SjHkPh entity = rep.findById(id).get();
@@ -85,4 +92,29 @@ public class SjHkPhServiceImpl implements SjHkPhService {
 			return new Result(10001, ResultStatus.findFailed,null);
 		}
 	}
+
+	@Override
+	@DS("slave")
+	public Result findAllByLQID(Integer lqid) {
+		Date date = DateUtil.date();
+		DateTime dateTime = DateUtil.beginOfDay(date);
+		List<SjHkPh> allByScsjBetweenAndLqid = rep.findAllByScsjBetweenAndLqid(dateTime, date, lqid);
+
+		List list = new ArrayList();
+		for (SjHkPh sjHkPh : allByScsjBetweenAndLqid) {
+			Map map = new HashMap();
+			map.put("data",sjHkPh.getDqph());
+			map.put("time",(sjHkPh.getScsj()+"").substring(11,16));
+			list.add(map);
+		}
+
+		List endList = new ArrayList();
+		for (int i =1; i<list.size(); i++){
+			if ( i % 2 ==0 ){
+				endList.add(list.get(i));
+			}
+		}
+
+		return new Result(10000,"成功",endList);
+	}
 }

shiwan/video/src/main/java/com/huimv/video/service/impl/SjHkSdServiceImpl.java

@@ -1,5 +1,9 @@
 package com.huimv.video.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.huimv.video.domain.SjHkAq;
 import com.huimv.video.domain.SjHkSd;
 import com.huimv.video.repo.SjHkSdRepository;
 import com.huimv.video.result.Result;
@@ -8,9 +12,7 @@ import com.huimv.video.service.SjHkSdService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class SjHkSdServiceImpl implements SjHkSdService {
@@ -19,6 +21,7 @@ public class SjHkSdServiceImpl implements SjHkSdService {
 	private SjHkSdRepository rep;
 
 	@Override
+	@DS("slave")
 	public Result add(SjHkSd entity){
 		if (entity == null){
 			return new Result(10002, ResultStatus.addNull);
@@ -32,6 +35,7 @@ public class SjHkSdServiceImpl implements SjHkSdService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result remove(Integer[] ids) {
 		if (ids == null || ids.length==0){
 			return new Result(10002, ResultStatus.deleteNull);
@@ -47,6 +51,7 @@ public class SjHkSdServiceImpl implements SjHkSdService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result update(SjHkSd entity) {
 		if (entity == null){
 			return new Result(10002, ResultStatus.updateNull);
@@ -60,6 +65,7 @@ public class SjHkSdServiceImpl implements SjHkSdService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result findAll(String name , Integer pageNum , Integer pageSize) {
 		try {
 			Map map = new HashMap();
@@ -69,7 +75,7 @@ public class SjHkSdServiceImpl implements SjHkSdService {
 			map.put("total",size);
 			map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
 			map.put("data",all);
-			
+
 			return new Result(10000, ResultStatus.findSuccess,map);
 		}catch (Exception e){
 			return new Result(10001, ResultStatus.findFailed,null);
@@ -77,6 +83,7 @@ public class SjHkSdServiceImpl implements SjHkSdService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result findAllById(Integer id) {
 		try {
 			SjHkSd entity = rep.findById(id).get();
@@ -85,4 +92,29 @@ public class SjHkSdServiceImpl implements SjHkSdService {
 			return new Result(10001, ResultStatus.findFailed,null);
 		}
 	}
+
+	@Override
+	@DS("slave")
+	public Result findAllByLQID(Integer lqid) {
+		Date date = DateUtil.date();
+		DateTime dateTime = DateUtil.beginOfDay(date);
+		List<SjHkSd> allByScsjBetweenAndLqid = rep.findAllByScsjBetweenAndLqid(dateTime, date, lqid);
+
+		List list = new ArrayList();
+		for (SjHkSd sjHkSd : allByScsjBetweenAndLqid) {
+			Map map = new HashMap();
+			map.put("data",sjHkSd.getDqsd());
+			map.put("time",(sjHkSd.getScsj()+"").substring(11,16));
+			list.add(map);
+		}
+
+		List endList = new ArrayList();
+		for (int i =1; i<list.size(); i++){
+			if ( i % 2 ==0 ){
+				endList.add(list.get(i));
+			}
+		}
+
+		return new Result(10000,"成功",endList);
+	}
 }

shiwan/video/src/main/java/com/huimv/video/service/impl/SjHkSlServiceImpl.java

@@ -1,5 +1,9 @@
 package com.huimv.video.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.huimv.video.domain.SjHkAq;
 import com.huimv.video.domain.SjHkSl;
 import com.huimv.video.repo.SjHkSlRepository;
 import com.huimv.video.result.Result;
@@ -8,9 +12,7 @@ import com.huimv.video.service.SjHkSlService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class SjHkSlServiceImpl implements SjHkSlService {
@@ -19,6 +21,7 @@ public class SjHkSlServiceImpl implements SjHkSlService {
 	private SjHkSlRepository rep;
 
 	@Override
+	@DS("slave")
 	public Result add(SjHkSl entity){
 		if (entity == null){
 			return new Result(10002, ResultStatus.addNull);
@@ -32,6 +35,7 @@ public class SjHkSlServiceImpl implements SjHkSlService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result remove(Integer[] ids) {
 		if (ids == null || ids.length==0){
 			return new Result(10002, ResultStatus.deleteNull);
@@ -47,6 +51,7 @@ public class SjHkSlServiceImpl implements SjHkSlService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result update(SjHkSl entity) {
 		if (entity == null){
 			return new Result(10002, ResultStatus.updateNull);
@@ -60,6 +65,7 @@ public class SjHkSlServiceImpl implements SjHkSlService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result findAll(String name , Integer pageNum , Integer pageSize) {
 		try {
 			Map map = new HashMap();
@@ -77,6 +83,7 @@ public class SjHkSlServiceImpl implements SjHkSlService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result findAllById(Integer id) {
 		try {
 			SjHkSl entity = rep.findById(id).get();
@@ -85,4 +92,29 @@ public class SjHkSlServiceImpl implements SjHkSlService {
 			return new Result(10001, ResultStatus.findFailed,null);
 		}
 	}
+
+	@Override
+	@DS("slave")
+	public Result findAllByLQID(Integer lqid) {
+		Date date = DateUtil.date();
+		DateTime dateTime = DateUtil.beginOfDay(date);
+		List<SjHkSl> allByScsjBetweenAndLqid = rep.findAllByScsjBetweenAndLqidAndCgqid(dateTime, date, lqid,"1");
+
+		List list = new ArrayList();
+		for (SjHkSl sjHkSl : allByScsjBetweenAndLqid) {
+			Map map = new HashMap();
+			map.put("data",sjHkSl.getDqsl());
+			map.put("time",(sjHkSl.getScsj()+"").substring(11,16));
+			list.add(map);
+		}
+
+
+		List endList = new ArrayList();
+		for (int i =1; i<list.size(); i++){
+			if ( i % 4 ==0 ){
+				endList.add(list.get(i));
+			}
+		}
+		return new Result(10000,"成功",endList);
+	}
 }

shiwan/video/src/main/java/com/huimv/video/service/impl/SjHkWdServiceImpl.java

@@ -1,5 +1,9 @@
 package com.huimv.video.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.huimv.video.domain.SjHkAq;
 import com.huimv.video.domain.SjHkWd;
 import com.huimv.video.repo.SjHkWdRepository;
 import com.huimv.video.result.Result;
@@ -8,9 +12,7 @@ import com.huimv.video.service.SjHkWdService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class SjHkWdServiceImpl implements SjHkWdService {
@@ -19,6 +21,7 @@ public class SjHkWdServiceImpl implements SjHkWdService {
 	private SjHkWdRepository rep;
 
 	@Override
+	@DS("slave")
 	public Result add(SjHkWd entity){
 		if (entity == null){
 			return new Result(10002, ResultStatus.addNull);
@@ -32,6 +35,7 @@ public class SjHkWdServiceImpl implements SjHkWdService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result remove(Integer[] ids) {
 		if (ids == null || ids.length==0){
 			return new Result(10002, ResultStatus.deleteNull);
@@ -47,6 +51,7 @@ public class SjHkWdServiceImpl implements SjHkWdService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result update(SjHkWd entity) {
 		if (entity == null){
 			return new Result(10002, ResultStatus.updateNull);
@@ -60,6 +65,7 @@ public class SjHkWdServiceImpl implements SjHkWdService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result findAll(String name , Integer pageNum , Integer pageSize) {
 		try {
 			Map map = new HashMap();
@@ -77,6 +83,7 @@ public class SjHkWdServiceImpl implements SjHkWdService {
 	}
 
 	@Override
+	@DS("slave")
 	public Result findAllById(Integer id) {
 		try {
 			SjHkWd entity = rep.findById(id).get();
@@ -85,4 +92,29 @@ public class SjHkWdServiceImpl implements SjHkWdService {
 			return new Result(10001, ResultStatus.findFailed,null);
 		}
 	}
+
+	@Override
+	@DS("slave")
+	public Result findAllByLQID(Integer lqid) {
+		Date date = DateUtil.date();
+		DateTime dateTime = DateUtil.beginOfDay(date);
+		List<SjHkWd> allByScsjBetweenAndLqid = rep.findAllByScsjBetweenAndLqid(dateTime, date, lqid);
+
+		List list = new ArrayList();
+		for (SjHkWd sjHkWd : allByScsjBetweenAndLqid) {
+			Map map = new HashMap();
+			map.put("data",sjHkWd.getDqwd());
+			map.put("time",(sjHkWd.getScsj()+"").substring(11,16));
+			list.add(map);
+		}
+
+		List endList = new ArrayList();
+		for (int i =1; i<list.size(); i++){
+			if ( i % 5 ==0 ){
+				endList.add(list.get(i));
+			}
+		}
+
+		return new Result(10000,"成功",endList);
+	}
 }