111

src/main/java/com/fdkankan/scene/entity/Company.java

@@ -65,12 +65,6 @@ public class Company implements Serializable {
     private Integer showLogo;
 
     /**
-     * t_manager表的id
-     */
-    @TableField("manager_id")
-    private Long managerId;
-
-    /**
      * 新增的相机是否注册，0否，1删
      */
     @TableField("camera_delete")

src/main/java/com/fdkankan/scene/service/impl/SceneCleanServiceImpl.java

@@ -63,7 +63,7 @@ public class SceneCleanServiceImpl extends ServiceImpl<ISceneCleanMapper, SceneC
         List<SceneClean> allInsertList = Lists.newArrayList();
         Set<String> allUpdateSet = Sets.newHashSet();
 
-        DateTime dateTime = DateUtil.beginOfDay(DateUtil.offsetMonth(Calendar.getInstance().getTime(), -6));
+        DateTime dateTime = DateUtil.beginOfDay(DateUtil.offsetMonth(Calendar.getInstance().getTime(), -7));
 
         while (true){
             String uuid = UUID.randomUUID().toString();

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -945,7 +945,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         //如果是压缩包上传，需要解压缩
         if(file.getOriginalFilename().endsWith(".zip")){
             //解压zip包
-            FileUtils.unZip(zipTargetFilePath, targetImagesPath);
+            ZipUtil.unzip(zipTargetFilePath,targetImagesPath);
             //删除压缩包
             FileUtils.delFile(zipTargetFilePath);
         }
@@ -978,9 +978,6 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             throw new BusinessException(ErrorCode.FAILURE_CODE_5062);
         }
 
-        //列出caches/images中的文件列表
-        String imgCachePath = String.format(UploadFilePath.IMG_CACHES_PATH, num);
-
         //比对图片列表，不存在的要返回名称集合
         String visionPath = path + "/results/vision.txt";
         List<String> panoramaImageList = SceneUtil.getPanoramaImageList(visionPath);