Merge branch 'master' of http://192.168.1.43:3000/git/sass-lab-distributed-java

zd-modules/zd-camera/pom.xml

@@ -87,6 +87,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-redis</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>io.lettuce</groupId>
+					<artifactId>lettuce-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -110,7 +116,7 @@
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
-			<version>${jedis-version}</version>
+<!--			<version>${jedis-version}</version>-->
 		</dependency>
 
 		<!-- druid数据库连接池 -->

zd-modules/zd-camera/src/main/java/com/zd/iot/vmp/storager/dao/DeviceAlarmMapper.java

@@ -29,8 +29,8 @@ public interface DeviceAlarmMapper {
             " <if test=\"endTime != null\" >  AND alarmTime &lt;= '${endTime}' </if>" +
             " ORDER BY alarmTime ASC " +
             " </script>"})
-    List<DeviceAlarm> query(String deviceId, String alarmPriority, String alarmMethod,
-                            String alarmType, String startTime, String endTime);
+    List<DeviceAlarm> query(@Param("deviceId") String deviceId, @Param("alarmPriority") String alarmPriority, @Param("alarmMethod") String alarmMethod,
+                            @Param("alarmType") String alarmType, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
 
     @Delete(" <script>" +

zd-modules/zd-camera/src/main/java/com/zd/iot/vmp/storager/dao/DeviceChannelMapper.java

@@ -66,10 +66,10 @@ public interface DeviceChannelMapper {
             " <if test=\"hasSubChannel == false\" >  AND subCount=0</if>" +
             " ORDER BY channelId ASC" +
             " </script>"})
-    List<DeviceChannel> queryChannelsByDeviceId(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online);
+    List<DeviceChannel> queryChannelsByDeviceId(@Param("deviceId") String deviceId, @Param("parentChannelId") String parentChannelId, @Param("query") String query, @Param("hasSubChannel") Boolean hasSubChannel,@Param("online") Boolean online);
 
     @Select("SELECT * FROM device_channel WHERE deviceId=#{deviceId} AND channelId=#{channelId}")
-    DeviceChannel queryChannel(String deviceId, String channelId);
+    DeviceChannel queryChannel(@Param("deviceId") String deviceId, @Param("channelId") String channelId);
 
     @Select("<script>" +
             "SELECT * FROM device_channel WHERE deviceId in \n" +
@@ -81,10 +81,10 @@ public interface DeviceChannelMapper {
     int cleanChannelsByDeviceId(String deviceId);
 
     @Update(value = {"UPDATE device_channel SET streamId=null WHERE deviceId=#{deviceId} AND channelId=#{channelId}"})
-    void stopPlay(String deviceId, String channelId);
+    void stopPlay(@Param("deviceId") String deviceId,@Param("channelId") String channelId);
 
     @Update(value = {"UPDATE device_channel SET streamId=#{streamId} WHERE deviceId=#{deviceId} AND channelId=#{channelId}"})
-    void startPlay(String deviceId, String channelId, String streamId);
+    void startPlay(@Param("deviceId") String deviceId, @Param("channelId") String channelId, @Param("streamId") String streamId);
 
 
     @Select(value = {" <script>" +
@@ -107,7 +107,7 @@ public interface DeviceChannelMapper {
             " ORDER BY deviceId, channelId ASC" +
             " </script>"})
 
-    List<ChannelReduce> queryChannelListInAll(String query, Boolean online, Boolean hasSubChannel, String platformId, Boolean inPlatform);
+    List<ChannelReduce> queryChannelListInAll(@Param("query") String query,@Param("online") Boolean online, @Param("hasSubChannel") Boolean hasSubChannel, @Param("platformId") String platformId,@Param("inPlatform") Boolean inPlatform);
 
     @Select("SELECT * FROM device_channel WHERE channelId=#{channelId}")
     List<DeviceChannel> queryChannelByChannelId(String channelId);

zd-modules/zd-camera/src/main/java/com/zd/iot/vmp/storager/dao/DeviceMobilePositionMapper.java

@@ -21,7 +21,7 @@ public interface DeviceMobilePositionMapper {
     "<if test=\"endTime != null\"> AND time&lt;=#{endTime}</if>" +
     " ORDER BY time ASC" +
     " </script>"})
-    List<MobilePosition> queryPositionByDeviceIdAndTime(String deviceId, String startTime, String endTime);
+    List<MobilePosition> queryPositionByDeviceIdAndTime(@Param("deviceId") String deviceId, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     @Select("SELECT * FROM device_mobile_position WHERE deviceId = #{deviceId}" +
             " ORDER BY time DESC LIMIT 1")

zd-modules/zd-camera/src/main/java/com/zd/iot/vmp/storager/dao/LogMapper.java

@@ -1,10 +1,7 @@
 package com.zd.iot.vmp.storager.dao;
 
 import com.zd.iot.vmp.storager.dao.dto.LogDto;
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -30,7 +27,7 @@ public interface LogMapper {
             " <if test=\"endTime != null\" >  AND createTime &lt;= '${endTime}' </if>" +
             " ORDER BY createTime DESC " +
             " </script>"})
-    List<LogDto> query(String query, String type, String startTime, String endTime);
+    List<LogDto> query(@Param("query") String query, @Param("type") String type,@Param("startTime") String startTime, @Param("endTime") String endTime);
 
 
     @Delete("DELETE FROM log")

zd-modules/zd-camera/src/main/java/com/zd/iot/vmp/storager/dao/MediaServerMapper.java

@@ -1,10 +1,7 @@
 package com.zd.iot.vmp.storager.dao;
 
 import com.zd.iot.vmp.media.zlm.dto.MediaServerItem;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
+import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -95,11 +92,11 @@ public interface MediaServerMapper {
     void delOne(String id);
 
     @Select("DELETE FROM media_server WHERE ip='${host}' and httpPort=${port}")
-    void delOneByIPAndPort(String host, int port);
+    void delOneByIPAndPort(@Param("host") String host, @Param("port") int port);
 
     @Select("DELETE FROM media_server WHERE defaultServer=1;")
     void delDefault();
 
     @Select("SELECT * FROM media_server WHERE ip='${host}' and httpPort=${port}")
-    MediaServerItem queryOneByHostAndPort(String host, int port);
+    MediaServerItem queryOneByHostAndPort(@Param("host") String host,@Param("port") int port);
 }

zd-modules/zd-camera/src/main/java/com/zd/iot/vmp/storager/dao/PlatformChannelMapper.java

@@ -3,10 +3,7 @@ package com.zd.iot.vmp.storager.dao;
 import com.zd.iot.vmp.gb28181.bean.Device;
 import com.zd.iot.vmp.gb28181.bean.DeviceChannel;
 import com.zd.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -22,13 +19,13 @@ public interface PlatformChannelMapper {
             "SELECT deviceAndChannelId FROM platform_gb_channel WHERE platformId='${platformId}' AND deviceAndChannelId in" +
             "<foreach collection='deviceAndChannelIds' open='(' item='id_' separator=',' close=')'> '${id_}'</foreach> ORDER BY deviceAndChannelId ASC" +
             "</script>")
-    List<String> findChannelRelatedPlatform(String platformId, List<String> deviceAndChannelIds);
+    List<String> findChannelRelatedPlatform(@Param("platformId") String platformId,@Param("deviceAndChannelIds") List<String> deviceAndChannelIds);
 
     @Insert("<script> "+
             "INSERT INTO platform_gb_channel (channelId, deviceId, platformId, deviceAndChannelId) VALUES" +
             "<foreach collection='channelReducesToAdd'  item='item' separator=','> ('${item.channelId}','${item.deviceId}', '${platformId}', '${item.deviceId}_${item.channelId}' )</foreach>" +
             "</script>")
-    int addChannels(String platformId, List<ChannelReduce> channelReducesToAdd);
+    int addChannels(@Param("platformId") String platformId, @Param("channelReducesToAdd") List<ChannelReduce> channelReducesToAdd);
 
 
     @Delete("<script> "+
@@ -50,8 +47,8 @@ public interface PlatformChannelMapper {
 
     @Select("SELECT * FROM device_channel WHERE deviceId = (SELECT deviceId FROM platform_gb_channel WHERE " +
             "platformId='${platformId}' AND channelId='${channelId}' ) AND channelId='${channelId}'")
-    DeviceChannel queryChannelInParentPlatform(String platformId, String channelId);
+    DeviceChannel queryChannelInParentPlatform(@Param("platformId") String platformId,@Param("channelId") String channelId);
 
     @Select("SELECT * FROM device WHERE deviceId = (SELECT deviceId FROM platform_gb_channel WHERE platformId='${platformId}' AND channelId='${channelId}')")
-    Device queryVideoDeviceByPlatformIdAndChannelId(String platformId, String channelId);
+    Device queryVideoDeviceByPlatformIdAndChannelId(@Param("platformId") String platformId, @Param("channelId") String channelId);
 }

zd-modules/zd-camera/src/main/java/com/zd/iot/vmp/storager/dao/PlatformGbStreamMapper.java

@@ -23,5 +23,5 @@ public interface PlatformGbStreamMapper {
     int delByPlatformId(String platformId);
 
     @Select("SELECT * FROM platform_gb_stream WHERE app=#{app} AND stream=#{stream}")
-    List<StreamProxyItem> selectByAppAndStream(String app, String stream);
+    List<StreamProxyItem> selectByAppAndStream(@Param("app") String app, @Param("stream") String stream);
 }

zd-modules/zd-camera/src/main/java/com/zd/iot/vmp/vmanager/onvif/ONVIFController.java

@@ -93,7 +93,7 @@ public class ONVIFController {
     public DeferredResult<ResponseEntity<WVPResult>> getRTSPUrl(@RequestParam(value = "timeout", required = false, defaultValue = "3000") Integer timeout,
                                                                 @RequestParam(required = true) String hostname,
                                                                 @RequestParam(required = false,defaultValue = "admin") String username,
-                                                                @RequestParam(required = false,defaultValue = "hk123456") String password){
+                                                                @RequestParam(required = false,defaultValue = "a12345678") String password){
         DeferredResult<ResponseEntity<WVPResult>> result = new DeferredResult<>(timeout + 10000L);
         UUID uuid = UUID.randomUUID();
         result.onTimeout(() -> {
@@ -135,7 +135,7 @@ public class ONVIFController {
     public DeferredResult <ResponseEntity<WVPResult>> startRecord(@RequestParam(value = "timeout", required = false, defaultValue = "3000") Integer timeout,
                                   @RequestParam(required = true) String hostname,
                                   @RequestParam(required = false,defaultValue = "admin") String username,
-                                  @RequestParam(required = false,defaultValue = "hk123456") String password)  {
+                                  @RequestParam(required = false,defaultValue = "a12345678") String password)  {
         DeferredResult<ResponseEntity<WVPResult>> result = new DeferredResult<>(timeout + 10000L);
         UUID uuid = UUID.randomUUID();
         result.onTimeout(() -> {