1

doc/update-eur-2.8.0.sql

@@ -0,0 +1,101 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 4dkk120.24.144.164
+ Source Server Type    : MySQL
+ Source Server Version : 80025
+ Source Host           : 120.24.144.164:3306
+ Source Schema         : 4dkankan_v4
+
+ Target Server Type    : MySQL
+ Target Server Version : 80025
+ File Encoding         : 65001
+
+ Date: 24/01/2025 09:37:16
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for t_rtk_account
+-- ----------------------------
+DROP TABLE IF EXISTS `t_rtk_account`;
+CREATE TABLE `t_rtk_account`  (
+                                  `id` int NOT NULL AUTO_INCREMENT,
+                                  `user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                  `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                  `ip_addr` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                  `mount_point` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                  `port` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                  `operator` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '运营商',
+                                  `status` int NULL DEFAULT 0 COMMENT '使用状态0初始状态未激活，1未使用，2正在使用，3已停用',
+                                  `failure_time` timestamp NULL DEFAULT NULL COMMENT '失效时间',
+                                  `use_status` int NULL DEFAULT 0 COMMENT '0正常，1禁用',
+                                  `rec_status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT 'A',
+                                  `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+                                  `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+                                  `create_user_id` int NULL DEFAULT NULL,
+                                  `update_user_id` int NULL DEFAULT NULL,
+                                  `del_user_id` int NULL DEFAULT NULL,
+                                  PRIMARY KEY (`id`) USING BTREE,
+                                  UNIQUE INDEX `uni_user_name_rec_status`(`user_name`, `rec_status`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 299 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for t_rtk_device
+-- ----------------------------
+DROP TABLE IF EXISTS `t_rtk_device`;
+CREATE TABLE `t_rtk_device`  (
+                                 `id` int NOT NULL AUTO_INCREMENT,
+                                 `rtk_sn_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                 `camera_sn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                 `sg_rtk_sn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                 `rtk_type` int NULL DEFAULT 0,
+                                 `use_status` int NULL DEFAULT 0 COMMENT '0正常，1禁用',
+                                 `rec_status` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT 'A',
+                                 `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
+                                 `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+                                 `create_user_id` int NULL DEFAULT NULL,
+                                 `update_user_id` int NULL DEFAULT NULL,
+                                 `del_user_id` int NULL DEFAULT NULL,
+                                 `failure_time` timestamp NULL DEFAULT NULL COMMENT '失效时间',
+                                 `account_type` int NULL DEFAULT 0 COMMENT '0账号池，1专用账号',
+                                 `camera_type` int NULL DEFAULT NULL COMMENT '0看看，1看见，2深时，3深光',
+                                 `user_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                 `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                 `ip_addr` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                 `mount_point` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                 `port` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+                                 `operator` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '运营商',
+                                 PRIMARY KEY (`id`) USING BTREE,
+                                 UNIQUE INDEX `uni_rtk_sn_code_rec_status`(`rtk_sn_code`, `rec_status`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 616 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+
+
+
+INSERT INTO t_rtk_device(rtk_sn_code,camera_sn,sg_rtk_sn,rtk_type,create_user_id,update_user_id,user_name,`password`,ip_addr,mount_point,`port`,operator,account_type,failure_time)
+SELECT rtk_sn_code,camera_sn_code,sg_rtk_sn,rtk_type,create_user_id,update_user_id,user_name,`password`,ip_addr,mount_point,`port`,operator,1 as account_type,failure_time FROM t_rtk_info WHERE rec_status = 'A' and rtk_sn_code is not null and rtk_sn_code != ''
+
+
+CREATE TEMPORARY TABLE temp_table AS
+
+SELECT rd.id,camera_sn ,camera_type,d.type from t_rtk_device rd
+                                                    LEFT JOIN t_camera a on rd.camera_sn = a.sn_code
+                                                    LEFT JOIN t_camera_detail d on a.id = d.camera_id
+
+WHERE rd.rec_status ='A' and camera_sn is not null and camera_type  is null;
+
+
+UPDATE t_rtk_device set camera_type = 0 WHERE id in (SELECT id from temp_table WHERE type = 1);
+
+UPDATE t_rtk_device set camera_type = 1 WHERE id in (SELECT id from temp_table WHERE type = 9);
+
+UPDATE t_rtk_device set camera_type = 2 WHERE id in (SELECT id from temp_table WHERE type = 10);
+
+UPDATE t_rtk_device set camera_type = 3 WHERE id in (SELECT id from temp_table WHERE type = 11);
+
+DROP TABLE IF EXISTS temp_table;

doc/update.2.8.0.sql

@@ -47,11 +47,11 @@ SELECT rd.id,camera_sn ,camera_type,d.type from t_rtk_device rd
 WHERE rd.rec_status ='A' and camera_sn is not null and camera_type  is null;
 
 
-UPDATE t_rtk_device set camera_type = 0 WHERE id in (SELECT id from temp_table WHERE type = 11);
+UPDATE t_rtk_device set camera_type = 0 WHERE id in (SELECT id from temp_table WHERE type = 1);
 
-UPDATE t_rtk_device set camera_type = 1 WHERE id in (SELECT id from temp_table WHERE type = 11);
+UPDATE t_rtk_device set camera_type = 1 WHERE id in (SELECT id from temp_table WHERE type = 9);
 
-UPDATE t_rtk_device set camera_type = 2 WHERE id in (SELECT id from temp_table WHERE type = 11);
+UPDATE t_rtk_device set camera_type = 2 WHERE id in (SELECT id from temp_table WHERE type = 10);
 
 UPDATE t_rtk_device set camera_type = 3 WHERE id in (SELECT id from temp_table WHERE type = 11);
 

pom.xml

@@ -22,26 +22,6 @@
       <groupId>com.fdkankan</groupId>
       <artifactId>4dkankan-utils-fyun-parent</artifactId>
       <version>3.0.0-SNAPSHOT</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.bytedeco</groupId>
-          <artifactId>javacv</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>org.bytedeco</groupId>
-          <artifactId>javacpp</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.bytedeco</groupId>
-          <artifactId>javacv-platform</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>joinery</groupId>
-          <artifactId>jave</artifactId>
-        </exclusion>
-      </exclusions>
-
     </dependency>
     <dependency>
       <groupId>com.fdkankan</groupId>

src/main/java/com/fdkankan/manage/service/impl/AppFileServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.service.impl;
 
+import cn.hutool.core.io.FileUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,7 +9,6 @@ import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.common.util.FileMd5Util;
-import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.manage.common.FilePath;
 import com.fdkankan.manage.entity.AppFile;
 import com.fdkankan.manage.mapper.IAppFileMapper;
@@ -56,10 +56,10 @@ public class AppFileServiceImpl extends ServiceImpl<IAppFileMapper, AppFile> imp
             Map<String,String> result = new HashMap<>(2);
 
             String filePath = FilePath.appLocalPath;
-            FileUtils.createDir(filePath);
+            FileUtil.mkdir(filePath);
             filePath = filePath.concat(file.getOriginalFilename());
             // 删除旧文件
-            FileUtils.deleteFile(filePath);
+            FileUtil.del(filePath);
             File file1 = new File(filePath);
             file.transferTo(file1);
             // 写文件到本地
@@ -135,8 +135,8 @@ public class AppFileServiceImpl extends ServiceImpl<IAppFileMapper, AppFile> imp
         fYunFileServiceInterface.uploadFile(param.getFileServerType(),versionFilePath, ossPathPrefix+"version/version.json");
 
         // 删除旧文件
-        FileUtils.deleteFile(filePath);
-        FileUtils.deleteFile(versionFilePath);
+        FileUtil.del(filePath);
+        FileUtil.del(versionFilePath);
 
         managerAPPEntity.setUrl(prefixAli.concat(ossPathPrefix+"4dkankan."+fileType));
         managerAPPEntity.setVersion(prefixAli.concat(ossPathPrefix+"version/version.json"));

src/main/java/com/fdkankan/manage/service/impl/CameraVersionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.io.FileUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,7 +13,6 @@ import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileMd5Util;
-import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.validation.ValidationUtils;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.entity.SpaceSdk;
@@ -75,7 +75,7 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
         log.info("resourcePath: {}", resourcePath);
         // 创建目录
         String dirPath = resourcePath + DIR_NAME;
-        FileUtils.createDir(dirPath);
+        FileUtil.mkdir(dirPath);
         // 拼接唯一文件名
         String fileName = DateUtil.dateStr() + fullFileName;
         // 文件保存路径
@@ -114,7 +114,7 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
         versionEntity.setSysUserId(Long.valueOf(StpUtil.getLoginId().toString()));
         this.save(versionEntity);
         // 删除本地文件
-        FileUtils.deleteFile(filePath);
+        FileUtil.del(filePath);
     }
 
     private List<CameraVersion> getByVersion(String version,Integer type) {

src/main/java/com/fdkankan/manage/service/impl/SpaceSdkServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.io.FileUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -12,7 +13,6 @@ import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.common.util.DateUtil;
-import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.manage.entity.SpaceSdk;
@@ -83,7 +83,7 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
 
         // 创建目录
         String dirPath = resourcePath + DIR_NAME;
-        FileUtils.createDir(dirPath);
+        FileUtil.mkdir(dirPath);
 
         // 拼接唯一文件名
         String fileName = fullFileName + "_" + version + "_" + DateUtil.dateStr() + fileNameAll;
@@ -120,7 +120,7 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
         }
         this.updateById(managerSdkEntity);
         // 删除本地文件
-        FileUtils.deleteFile(filePath);
+        FileUtil.del(filePath);
 
         return url;
     }