返回给wms写入日志

增加开始结束的时间控制
不再用order_num判定唯一

.gitignore

@@ -32,3 +32,7 @@ target
 /modules/modules.iml
 /modules/filter/filter.iml
 /modules/common/common.iml
+lp.key
+lp.lic
+libs/encrypt/Encryptor.dll
+modules/common/src/main/resources/lib/core-1.0.0.jar

web/src/main/java/com/zhehekeji/web/lib/hik/HikCameraControlModuleImpl.java

@@ -261,7 +261,7 @@ public class HikCameraControlModuleImpl implements CameraControlModule {
     public void downloadMp4(Integer cameraId, String path, LocalDateTime start, LocalDateTime end) {
         ConfigProperties configProperties =  SpringContextUtil.getBean(ConfigProperties.class);
         start = start.minusNanos(1000000000 * configProperties.getKsec().getDownloadStartMp4());
-        start = start.minusNanos(1000000000 * configProperties.getKsec().getDownloadEndMp4());
+        end = end.plusNanos(1000000000 * configProperties.getKsec().getDownloadEndMp4());
       /*  start = start.minusMinutes(1);
         end = end.minusMinutes(1);*/
         PathUtil.checkDirc(path);

web/src/main/java/com/zhehekeji/web/mapper/OrderMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
 
 public interface OrderMapper extends BaseMapper<Order> {
 
-    @Select("select * from `order` where order_num = #{orderNum} limit 1")
+    @Select("select * from `order` where order_num = #{orderNum}  ORDER BY start_time desc  limit 1")
     Order getOneByOrderNum(String orderNum);
 
     List<OrderVO> list(@Param("req")OrderSearch orderSearch);

web/src/main/java/com/zhehekeji/web/service/ksec/KsecNettyClient.java

@@ -88,6 +88,7 @@ public class KsecNettyClient {
 
     public static void write(KsecInfo ksecInfo){
         if(channel != null){
+            log.info("write server:"+ksecInfo);
             channel.writeAndFlush(ksecInfo);
         }else {
             log.error(" no connected upPc");