lyhzzz преди 1 година
родител
ревизия
f01bc4d86a

+ 3 - 0
src/main/java/com/fdkankan/ucenter/entity/SceneEditControls.java

@@ -147,4 +147,7 @@ public class SceneEditControls implements Serializable {
 
     @TableField("show_draw_title")
     private Integer showDrawTitle;
+
+    @TableField("show_all_model")
+    private Integer showAllModel;
 }

+ 6 - 0
src/main/java/com/fdkankan/ucenter/entity/SceneEditInfoExt.java

@@ -119,6 +119,12 @@ public class SceneEditInfoExt implements Serializable {
     @TableField("sns_info")
     private String snsInfo;
 
+    @TableField("cut_model")
+    private Integer cutModel;
+
+    @TableField("started")
+    private String started;
+
     @TableField("scene_draw")
     private Integer sceneDraw;
 }

+ 16 - 0
src/main/java/com/fdkankan/ucenter/entity/Surveillance.java

@@ -60,6 +60,22 @@ public class Surveillance implements Serializable {
      */
     @TableField("play_url")
     private String playUrl;
+    /**
+     * 类型
+     */
+    @TableField("url_type")
+    private Integer urlType;
+
+    /**
+     * 视频类型时,封面图文件名
+     */
+    @TableField("poster")
+    private String poster;
+    /**
+     *视频文件名
+     */
+    @TableField("file_name")
+    private String fileName;
 
     /**
      * 创建时间

+ 9 - 9
src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -537,14 +537,14 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         cameraDetail.setOutTime(DateUserUtil.getDate(new Date()));
         cameraDetailService.save(cameraDetail);
 
-        UserIncrement userIncrementEntity = new UserIncrement();
-        userIncrementEntity.setKeyWord(UUID.randomUUID().toString().replace("-", ""));
-        userIncrementEntity.setCameraId(camera.getId());
-        userIncrementEntity.setOrderSn(UUID.randomUUID().toString().replace("-", ""));
-        userIncrementEntity.setIncrementStartTime(DateUserUtil.getDate(new Date()));
-        userIncrementEntity.setIncrementEndTime("2099-01-01 00:00:00");
-        userIncrementEntity.setIsExpired(0);
-        userIncrementEntity.setIncrementTypeId(1);
-        userIncrementService.save(userIncrementEntity);
+//        UserIncrement userIncrementEntity = new UserIncrement();
+//        userIncrementEntity.setKeyWord(UUID.randomUUID().toString().replace("-", ""));
+//        userIncrementEntity.setCameraId(camera.getId());
+//        userIncrementEntity.setOrderSn(UUID.randomUUID().toString().replace("-", ""));
+//        userIncrementEntity.setIncrementStartTime(DateUserUtil.getDate(new Date()));
+//        userIncrementEntity.setIncrementEndTime("2099-01-01 00:00:00");
+//        userIncrementEntity.setIsExpired(0);
+//        userIncrementEntity.setIncrementTypeId(1);
+//        userIncrementService.save(userIncrementEntity);
     }
 }