1

README.md

@@ -2,31 +2,13 @@
 
 ###**v1.0.0** 
 ~~~~
-1.数据看板
-2.埋点统计
-3.官网运营管理
-4.订单管理
-5.发票管理
-6.产品运营管理
-7.客户管理
-8.官网用户管理
-9.设备管理
-10.产品管理
-11.系统管理
-12.操作日志
-~~~~
+1.更新nacos网关路由
+4dkankan-gateway-route
+添加
+ "id": "route-center-ucenter"
+     "_genkey_32":"/api/_inner/**"
+
+2.替换jar包
 
-###**v1.1.0** 
+3.执行update-sql-1.0.0.sql文件
 ~~~~
-1.添加经销商管理
-    agentNew ,agentNewLog
-2.设备列表 /service/manage/camera/list
-    添加参数   agentName 模糊查询
-    添加返回值 agentName
-3.相机出库 /service/manage/camera/out
-    添加参数 agentId
-4.相机出库信息编辑 /service/manage/camera/update
-    添加参数 agentId
-5.出库模板 
-    添加经销商名称导入
-~~~~

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

@@ -300,7 +300,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 //        }
         SysUser byId = sysUserService.getById(Long.valueOf(StpUtil.getLoginId().toString()));
         JyUser jyUser = jyUserService.getBySysId(byId.getId());
-        if(byId.getRoleId() != 1){
+        if(byId.getRoleId() != 1 || byId.getRoleId() !=45){
             if(jyUser == null){
                 throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
             }

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

@@ -237,7 +237,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         sysUser.setPassword(passwordMd5);
         sysUser.setNickName(nickName);
         if(sysUserId == null){
-            sysUser.setRoleId(45L);
+            sysUser.setRoleId(47L);
         }
         sysUser.setUpdateTime(null);
         sysUserService.saveOrUpdate(sysUser);

update-sql-1.0.0.sql

@@ -0,0 +1,88 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : local-192.168.0.25
+ Source Server Type    : MySQL
+ Source Server Version : 80027
+ Source Host           : 192.168.0.25:3306
+ Source Schema         : 4dkankan_v4
+
+ Target Server Type    : MySQL
+ Target Server Version : 80027
+ File Encoding         : 65001
+
+ Date: 25/09/2023 09:45:35
+*/
+use 4dkankan_v4;
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for jy_scene_auth
+-- ----------------------------
+DROP TABLE IF EXISTS `jy_scene_auth`;
+CREATE TABLE `jy_scene_auth`  (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `num` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '场景码',
+  `auth_type` int NULL DEFAULT NULL 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,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for jy_scene_user_auth
+-- ----------------------------
+DROP TABLE IF EXISTS `jy_scene_user_auth`;
+CREATE TABLE `jy_scene_user_auth`  (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `num` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '场景码',
+  `jy_user_id` int NULL DEFAULT NULL,
+  `look_auth` int NULL DEFAULT NULL COMMENT '是否有浏览权限0否，1不限时查看，2限时查看',
+  `edit_auth` int NULL DEFAULT NULL COMMENT '是否有编辑权限0否，1不限时编辑，2限时编辑',
+  `look_end_time` timestamp NULL DEFAULT NULL COMMENT '浏览截止时间',
+  `edit_end_time` timestamp NULL DEFAULT NULL COMMENT '编辑截止时间',
+  `is_author` int NULL DEFAULT 0 COMMENT '是否有授权他人权限，0否，1是',
+  `can_auth_look` int NULL DEFAULT NULL COMMENT '是否有授权他人查看权限 0否，1是',
+  `can_edit_look` int NULL DEFAULT NULL 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,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 18 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for jy_user
+-- ----------------------------
+DROP TABLE IF EXISTS `jy_user`;
+CREATE TABLE `jy_user`  (
+  `id` int NOT NULL AUTO_INCREMENT,
+  `ry_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '人员id',
+  `ry_password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '密码',
+  `ry_no` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '编号',
+  `ry_nick_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `user_id` int NULL DEFAULT NULL,
+  `sys_user_id` int NULL DEFAULT NULL,
+  `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,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 12 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
+
+delete from t_user;
+
+INSERT INTO t_user (id,user_name,nick_name,`password`,head,rec_status,register_time) VALUES(1,"super-admin","super-admin","5EFG@AB","/oss/manage/user/newHead.png",'A',NOW());
+
+delete from jy_user;
+
+INSERT INTO jy_user (id,ry_id,ry_password,`ry_no`,ry_nick_name,user_id,sys_user_id) VALUES(1,"super-admin","afdd0b4ad2ec172c586e2150770fbf9e","super-admin","super-admin",1,1);
+
+update t_camera_detail  set user_id = null;
+
+update t_scene_plus  set user_id = 1;
+
+UPDATE t_scene_pro set user_id = 1;