diff --git a/src/main/java/com/hisense/monitormanage/controller/Controller.java b/src/main/java/com/hisense/monitormanage/controller/Controller.java index 596036c..6a9d856 100644 --- a/src/main/java/com/hisense/monitormanage/controller/Controller.java +++ b/src/main/java/com/hisense/monitormanage/controller/Controller.java @@ -109,6 +109,13 @@ public class Controller { return "startScenic finish"; } + @RequestMapping("capture1") + public Object capture1(){ + monitorService.start1(); + + return "finish capture"; + } + /** * 查询所有摄像头 @@ -190,6 +197,28 @@ public class Controller { return Result.success(channelLabelDtos); } + /** + * 根据两个点查询范围内的摄像头 + * @param gpsX + * @param gpsX1 + * @param gpsY + * @param gpsY1 + * @return + */ + @RequestMapping("selectAllByGps") + public Result selectAllByGps(String gpsX,String gpsX1,String gpsY,String gpsY1){ + + List gps = cameraChannelMapper.selectAllByGps(gpsX, gpsX1, gpsY, gpsY1); + double gpsx = Double.parseDouble(gpsX); + double gpsx1 = Double.parseDouble(gpsX1); + double gpsy = Double.parseDouble(gpsY); + double gpsy1 = Double.parseDouble(gpsY1); + if (gpsx < gpsx1 || gpsy < gpsy1){ + return Result.success(gps); + } + return Result.error("请输入正确的精度范围"); + } + /** * 查询所有标签 * @param label diff --git a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java index 1347756..a0f853c 100644 --- a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java +++ b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java @@ -43,6 +43,11 @@ public interface CameraChannelMapper extends BaseMapper { "ON a.label_code = b.label_code AND b.channel_code = c.channel_code where c.`status`!= 0) m where m.label_code in (#{labelCode},#{labelCode1}) ") List selectLabelAndChannel(@Param("labelCode") String labelCode,@Param("labelCode1") String labelCode1); - + @Select("select cc.channel_code,cc.gps_x,cc.gps_y from t_camera_channel cc " + + "where (gps_x between #{gpsX} and #{gpsX1}) and (gps_y between #{gpsY} and #{gpsY1} )") + List selectAllByGps(@Param("gpsX") String gpsX, + @Param("gpsX1") String gpsX1, + @Param("gpsY") String gpsY, + @Param("gpsY1") String gpsY1); } diff --git a/src/main/java/com/hisense/monitormanage/service/MonitorService.java b/src/main/java/com/hisense/monitormanage/service/MonitorService.java index 0f069ef..0683ad4 100644 --- a/src/main/java/com/hisense/monitormanage/service/MonitorService.java +++ b/src/main/java/com/hisense/monitormanage/service/MonitorService.java @@ -71,10 +71,7 @@ public class MonitorService { private String fileDir; @Value("${hwx.file.pic-host}") private String picHost; - @Value("${wwd.file.work-path}") - private String fileDir1; - @Value("${wwd.file.pic-host}") - private String picHost1; + @Value("iOgQotfgfyLvhj6WgfDTpq7F") private String key; @@ -224,17 +221,18 @@ public class MonitorService { try { BufferedImage bufferedImage = capturecreenshot(channelCode); String fileName = channelCode + ".jpg"; - ImageIO.write(bufferedImage, "jpg", new File(fileDir1 + "/images/" + fileName)); + ImageIO.write(bufferedImage, "jpg", new File(fileDir + "/images/" + fileName)); - String picUrl = picHost1 + "/images/" + fileName; + String picUrl = picHost + "/images/" + fileName; ChannelPicture picture = new ChannelPicture(); picture.setChannelCode(channelCode); picture.setPicUrl(picUrl); - picture.setInsertTime(new Date()); - /*channelPictureMapper.insert(picture);*/ + /*picture.setInsertTime(new Date()); + channelPictureMapper.insert(picture);*/ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("channel_code",channelCode); + picture.setInsertTime(new Date()); channelPictureMapper.update(picture,queryWrapper); }catch (Exception e){ @@ -261,17 +259,18 @@ public class MonitorService { try { BufferedImage bufferedImage = capturecreenshot(channelCode); String fileName = channelCode + ".jpg"; - ImageIO.write(bufferedImage, "jpg", new File(fileDir1 + "/images/" + fileName)); + ImageIO.write(bufferedImage, "jpg", new File(fileDir + "/images/" + fileName)); - String picUrl = picHost1 + "/images/" + fileName; + String picUrl = picHost + "/images/" + fileName; ChannelPicture picture = new ChannelPicture(); picture.setChannelCode(channelCode); picture.setPicUrl(picUrl); - picture.setInsertTime(new Date()); - /*channelPictureMapper.insert(picture);*/ + /*picture.setInsertTime(new Date()); + channelPictureMapper.insert(picture);*/ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("channel_code",channelCode); + picture.setInsertTime(new Date()); channelPictureMapper.update(picture,queryWrapper); }catch (Exception e){ diff --git a/src/main/java/com/hisense/monitormanage/utils/EhcacheUtil.java b/src/main/java/com/hisense/monitormanage/utils/EhcacheUtil.java index c71c684..440d2ad 100644 --- a/src/main/java/com/hisense/monitormanage/utils/EhcacheUtil.java +++ b/src/main/java/com/hisense/monitormanage/utils/EhcacheUtil.java @@ -4,9 +4,6 @@ import net.sf.ehcache.CacheManager; import java.net.URL; import net.sf.ehcache.Cache; import net.sf.ehcache.Element; -import org.springframework.beans.factory.annotation.Autowired; - -import javax.xml.ws.Action; /** * @author admin @@ -26,16 +23,16 @@ public class EhcacheUtil { } public static EhcacheUtil getInstance() { - if (ehCache== null) { - ehCache= new EhcacheUtil(path); - } - return ehCache; + if (ehCache== null) { + ehCache= new EhcacheUtil(path); + } + return ehCache; } public void put(String cacheName, String key, Object value) { - Cache cache = manager.getCache(cacheName); - Element element = new Element(key, value); - cache.put(element); + Cache cache = manager.getCache(cacheName); + Element element = new Element(key, value); + cache.put(element); } public Object get(String cacheName, String key) { @@ -45,8 +42,8 @@ public class EhcacheUtil { } public Cache get(String cacheName) { - return manager.getCache(cacheName); - } + return manager.getCache(cacheName); + } public void remove(String cacheName, String key) { Cache cache = manager.getCache(cacheName); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8fe754b..27adc21 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -17,10 +17,8 @@ spring.datasource.username=root spring.datasource.password=w@CmM1mBVQkPhdrc #spring.datasource.password=123456 -hwx.file.work-path=/Users/huangweixiong/Downloads/ -wwd.file.work-path=C:/Users/szkingdom/.m2 +hwx.file.work-path=D:/tupian/ hwx.file.pic-host=http://127.0.0.1:7009 -wwd.file.pic-host=http://15.72.183.90:7009 spring.resources.static-locations=classpath:/static,classpath:/public,file:${hwx.file.work-path} mybatis-plus.mapper-locations=classpath*:/mapper/*.xml diff --git a/src/main/resources/mapper/CameraChannelMapper.xml b/src/main/resources/mapper/CameraChannelMapper.xml index 76fe9cd..ade2f93 100644 --- a/src/main/resources/mapper/CameraChannelMapper.xml +++ b/src/main/resources/mapper/CameraChannelMapper.xml @@ -12,7 +12,7 @@