From 3c3429cf1e49a6214e345eb71677ac1e5f9ba217 Mon Sep 17 00:00:00 2001 From: yiming Date: Mon, 14 Nov 2022 14:02:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lia_duoji_nanjing_wuliu.sql | 334 ++++++++++++++++++ .../filter/aspect/SessionAspect.java | 76 ++-- .../web/controller/AppCenterController.java | 32 +- web/src/main/resources/application-dev.yml | 4 - web/src/main/resources/application-prod.yml | 12 +- 5 files changed, 392 insertions(+), 66 deletions(-) create mode 100644 lia_duoji_nanjing_wuliu.sql diff --git a/lia_duoji_nanjing_wuliu.sql b/lia_duoji_nanjing_wuliu.sql new file mode 100644 index 0000000..ad96cd8 --- /dev/null +++ b/lia_duoji_nanjing_wuliu.sql @@ -0,0 +1,334 @@ +/* + Navicat Premium Data Transfer + + Source Server : 82 + Source Server Type : MySQL + Source Server Version : 50731 + Source Host : 115.236.65.98:12004 + Source Schema : + + Target Server Type : MySQL + Target Server Version : 50731 + File Encoding : 65001 + + Date: 14/11/2022 13:44:24 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +create database `lia_duoji_nanjing_wuliu`; +use `lia_duoji_nanjing_wuliu`; +-- ---------------------------- +-- Table structure for RFID +-- ---------------------------- +DROP TABLE IF EXISTS `RFID`; +CREATE TABLE `RFID` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `street_id` int(11) NULL DEFAULT NULL, + `direction` tinyint(4) NULL DEFAULT NULL COMMENT '方向 0：左 1：右', + `ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `port` int(11) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE, + INDEX `STREET`(`street_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = 'RFID' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for camera +-- ---------------------------- +DROP TABLE IF EXISTS `camera`; +CREATE TABLE `camera` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `type` int(11) NULL DEFAULT NULL COMMENT '0:利珀 1：海康', + `ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `port` int(11) NULL DEFAULT NULL, + `user` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `password` varchar(512) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `rtsp` varchar(512) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `ptz_id` int(11) NULL DEFAULT NULL, + `rtc_server` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'rtc_server,没有的话使用配置文件里的', + `rtc_server_port` int(11) NULL DEFAULT NULL, + `update_time` datetime NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for camera_io +-- ---------------------------- +DROP TABLE IF EXISTS `camera_io`; +CREATE TABLE `camera_io` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `camera_id` int(11) NULL DEFAULT NULL, + `ptz_id` int(11) NULL DEFAULT NULL, + `position` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '位置', + `focusing` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '对焦', + `aperture` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '光圈', + `multiple` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '倍数', + `update_time` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `CAMERA_ID`(`camera_id`, `code`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for camera_io_config +-- ---------------------------- +DROP TABLE IF EXISTS `camera_io_config`; +CREATE TABLE `camera_io_config` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `update_time` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `UQ_NAME`(`name`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for category +-- ---------------------------- +DROP TABLE IF EXISTS `category`; +CREATE TABLE `category` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '条码号', + `name` varchar(1000) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '名称', + `update_time` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `UQ`(`code`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for check_log +-- ---------------------------- +DROP TABLE IF EXISTS `check_log`; +CREATE TABLE `check_log` ( + `street_id` int(11) NOT NULL, + `lotnum` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '盘点批次号', + `direction` tinyint(4) NULL DEFAULT NULL COMMENT '1:左 2：右', + `side` tinyint(4) NULL DEFAULT NULL COMMENT '1:浅侧 2：深测', + `row` smallint(6) NULL DEFAULT NULL, + `column` smallint(11) NULL DEFAULT NULL, + `code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '算法code', + `wms_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'WMS code', + `tray_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '托盘码', + `wms_tray_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'wms托盘码', + `category` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `count` smallint(11) NULL DEFAULT NULL, + `status` tinyint(255) NULL DEFAULT NULL COMMENT '1：盘点异常 2：盘点正确 3：人工核对正确', + `check_num` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `pic` varchar(1000) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '操作前图片', + `create_time` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`street_id`) USING BTREE, + INDEX `lotnum`(`lotnum`) USING BTREE, + INDEX `INDEX`(`street_id`, `direction`, `side`, `row`, `column`) USING BTREE +) ENGINE = MyISAM CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for check_street_summary +-- ---------------------------- +DROP TABLE IF EXISTS `check_street_summary`; +CREATE TABLE `check_street_summary` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `street_id` int(11) NOT NULL, + `task_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `type` tinyint(255) NULL DEFAULT NULL COMMENT '1：全库扫描 2：按品规扫描 3：按货位', + `empty_count` int(11) NULL DEFAULT NULL, + `empty_goods_count` int(11) NULL DEFAULT NULL, + `goods_count` int(11) NULL DEFAULT NULL, + `start_time` datetime NULL DEFAULT NULL, + `end_time` datetime NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE, + INDEX `NORAML`(`task_id`, `street_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for check_summary +-- ---------------------------- +DROP TABLE IF EXISTS `check_summary`; +CREATE TABLE `check_summary` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `task_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `start_time` datetime NULL DEFAULT NULL, + `end_time` datetime NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE, + INDEX `UQ`(`task_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for empty_check +-- ---------------------------- +DROP TABLE IF EXISTS `empty_check`; +CREATE TABLE `empty_check` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `order_num` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '工单任务号', + `street_id` int(11) NULL DEFAULT NULL, + `direction` tinyint(4) NULL DEFAULT NULL, + `side` tinyint(4) NULL DEFAULT NULL, + `row` int(11) NULL DEFAULT NULL, + `column` int(11) NULL DEFAULT NULL, + `empty_status` tinyint(4) NULL DEFAULT NULL COMMENT '0:未知 1：空 2：非空', + `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `SHELVE_CELL`(`street_id`, `direction`, `side`, `row`, `column`) USING BTREE +) ENGINE = MyISAM AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for light_source +-- ---------------------------- +DROP TABLE IF EXISTS `light_source`; +CREATE TABLE `light_source` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `street_id` int(11) NOT NULL, + `ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `port` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `direction` tinyint(4) NULL DEFAULT NULL COMMENT '方向 0：左 1：右', + `info` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `type` int(11) NULL DEFAULT NULL COMMENT '类型，不同光源产品', + PRIMARY KEY (`id`) USING BTREE, + INDEX `INDEX`(`street_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for order +-- ---------------------------- +DROP TABLE IF EXISTS `order`; +CREATE TABLE `order` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `street_id` int(11) NULL DEFAULT NULL, + `order_num` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, + `in_out1` int(11) NULL DEFAULT NULL COMMENT '1:库内 2：库外', + `left_right1` tinyint(4) NULL DEFAULT NULL COMMENT '1：左 2：右', + `column1` int(11) NULL DEFAULT NULL, + `row1` int(11) NULL DEFAULT NULL, + `into_stock_time` timestamp NULL DEFAULT NULL COMMENT '入库时间', + `into_stock_pic` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `into_stock_over_time` timestamp NULL DEFAULT NULL COMMENT '入库完成时间', + `into_stock_over_pic` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '入库完成照片', + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `INDEX_ORDER`(`order_num`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for sensor_gun +-- ---------------------------- +DROP TABLE IF EXISTS `sensor_gun`; +CREATE TABLE `sensor_gun` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `street_id` int(11) NULL DEFAULT NULL, + `direction` tinyint(4) NULL DEFAULT NULL COMMENT '方向 0：左 1：右', + `ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `port` int(11) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE, + INDEX `street`(`street_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '扫码枪' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for stock +-- ---------------------------- +DROP TABLE IF EXISTS `stock`; +CREATE TABLE `stock` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `lotnum` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '盘点批次好', + `order_num` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '工单任务号', + `check_num` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '盘点任务号', + `code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '扫描条码', + `category` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '扫描品规', + `count` int(11) NULL DEFAULT NULL COMMENT '扫描数量', + `wms_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'WMS系统中的条码', + `wms_category` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'WMS系统中的品规', + `wms_count` int(11) NULL DEFAULT NULL COMMENT 'WMS数量', + `wms_tray_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT 'wms托盘码', + `tray_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '托盘码', + `street_id` int(11) NULL DEFAULT NULL, + `direction` tinyint(4) NULL DEFAULT NULL, + `side` tinyint(4) NULL DEFAULT NULL, + `row` int(11) NULL DEFAULT NULL, + `column` int(11) NULL DEFAULT NULL, + `status` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '0:未盘点 1：盘点异常 2：盘点正确 3：人工核对正确', + `empty_status` tinyint(4) NULL DEFAULT NULL COMMENT '0:没检测 1：有托盘 2：有货物 3：空托盘', + `preoperation_pic` varchar(1000) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '操作前图片', + `overoperation_pic` varchar(1000) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '操作后图片', + `check_pic` varchar(1000) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '盘点图片', + `export_time` datetime NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `SHELVE_CELL`(`street_id`, `direction`, `side`, `row`, `column`) USING BTREE +) ENGINE = MyISAM AUTO_INCREMENT = 22 CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for stock_log +-- ---------------------------- +DROP TABLE IF EXISTS `stock_log`; +CREATE TABLE `stock_log` ( + `street_id` int(11) NOT NULL, + `direction` tinyint(4) NOT NULL, + `side` tinyint(4) NOT NULL, + `row` int(11) NOT NULL, + `column` int(11) NOT NULL, + `order_num` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '随行工单号', + `pic` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图片', + `type` tinyint(4) NULL DEFAULT NULL COMMENT '2:入库完成图片 4：出库完成图片', + `create_time` datetime NOT NULL, + INDEX `INDEX`(`street_id`, `direction`, `side`, `row`, `column`) USING BTREE +) ENGINE = MyISAM CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '货位历史，随行模式下入库 出库后的照片' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for street +-- ---------------------------- +DROP TABLE IF EXISTS `street`; +CREATE TABLE `street` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `plc_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `plc_ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `plc_port` int(11) NULL DEFAULT NULL, + `left_type` tinyint(4) NULL DEFAULT NULL COMMENT '左货架类型 0：单伸 1：双伸', + `left_column` int(11) NULL DEFAULT NULL COMMENT '左货架列数量', + `left_row` int(11) NULL DEFAULT NULL COMMENT '左货架行数量', + `left_inside_shelve_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '左内侧货架号-双伸', + `left_outside_shelve_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '左外侧货架号-双伸', + `left_shelve_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '货架号-单伸', + `right_type` tinyint(4) NULL DEFAULT NULL COMMENT '右货架类型 0：单伸 1：双伸', + `right_column` int(11) NULL DEFAULT NULL COMMENT '右货架列数量', + `right_row` int(11) NULL DEFAULT NULL COMMENT '右货架行数量', + `right_inside_shelve_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '右内侧货架号-双伸', + `right_outside_shelve_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '右外侧货架号-双伸', + `right_shelve_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL COMMENT '货架号-单伸', + `camera1_id` int(11) NULL DEFAULT NULL COMMENT '球机', + `camera2_id` int(11) NULL DEFAULT NULL COMMENT '球机', + `video_style` int(11) NULL DEFAULT 0 COMMENT '样式 默认0 0:1个铺满 1:上下两个视频 2:2*2 3:3*3 4:4*4 5:5*5 6：6*6 8:8*8', + `update_time` datetime NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP, + `create_time` datetime NULL DEFAULT CURRENT_TIMESTAMP, + `video_style_row` int(11) NULL DEFAULT NULL, + `video_style_column` int(11) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE, + UNIQUE INDEX `UQ_PLC`(`plc_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for warn +-- ---------------------------- +DROP TABLE IF EXISTS `warn`; +CREATE TABLE `warn` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `street_id` int(11) NULL DEFAULT NULL, + `start_time` datetime NULL DEFAULT NULL, + `end_time` datetime NULL DEFAULT NULL, + `video_path_1` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `video_path_2` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `location` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `signal` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NULL DEFAULT NULL, + `order_id` bigint(20) NULL DEFAULT NULL COMMENT '发生告警打断的工单id order.id', + PRIMARY KEY (`id`) USING BTREE, + INDEX `time`(`start_time`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_unicode_ci ROW_FORMAT = DYNAMIC; + +SET FOREIGN_KEY_CHECKS = 1; + +INSERT INTO `camera_io_config` (`id`, `code`, `name`, `update_time`) VALUES (1, 'C1', '顶部拍照', '2022-10-12 13:37:36'); +INSERT INTO `camera_io_config` (`id`, `code`, `name`, `update_time`) VALUES (2, 'C2-IN-L', '左侧浅货位入库拍照', '2022-10-12 13:38:27'); +INSERT INTO `camera_io_config` (`id`, `code`, `name`, `update_time`) VALUES (3, 'C2-OUT-L', '左侧深货位到位拍照', '2022-10-12 13:40:31'); +INSERT INTO `camera_io_config` (`id`, `code`, `name`, `update_time`) VALUES (4, 'C2-IN-R', '右侧浅货位到位拍照', '2022-10-12 13:41:06'); +INSERT INTO `camera_io_config` (`id`, `code`, `name`, `update_time`) VALUES (5, 'C2-OUT-R', '右侧深货位到位拍照', '2022-10-12 13:41:35'); +commit; diff --git a/modules/filter/src/main/java/com/zhehekeji/filter/aspect/SessionAspect.java b/modules/filter/src/main/java/com/zhehekeji/filter/aspect/SessionAspect.java index 0ee91b7..8747dd3 100644 --- a/modules/filter/src/main/java/com/zhehekeji/filter/aspect/SessionAspect.java +++ b/modules/filter/src/main/java/com/zhehekeji/filter/aspect/SessionAspect.java @@ -29,45 +29,45 @@ import java.io.IOException; * @Date 2019/10/28 19:26 **/ @Aspect -@Component +//@Component @Slf4j public class SessionAspect { - @Value("${zhehe.filter.enable}") - private Boolean enable; - @Value("${userUrl}") - private String userUrl; - - /** - * zhehekeji..*.controller - * 匹配zhehekeji 到controller多级目录 - * - * @param sessionHandler - */ - @Before("execution(public * com.zhehekeji..*.controller.*.*(..))&&@annotation(sessionHandler)") - public void handler(SessionHandler sessionHandler){ - if(!enable){ - return; - } - HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); - String token = request.getHeader(FilterConstance.HEADER); - CurrentUser currentUser = null; - try { - String res = HttpUtil.token(userUrl+"/api/account/checkToken",token); - Result currentUserResult = JSONObject.parseObject(res,Result.class); - if(currentUserResult != null && currentUserResult.getCode() == 200){ - currentUser = JSONObject.parseObject(JSONObject.toJSONString(currentUserResult.getData()),CurrentUser.class); - } - } catch (IOException e) { - e.printStackTrace(); - } - - if (sessionHandler.login()) { - Assert.isTrue(currentUser != null, HttpStatus.UNAUTHORIZED.getCode(), HttpStatus.UNAUTHORIZED.getReasonPhrase()); - } - if (sessionHandler.auth()) { - //todo 权限检验 - } - CurrentUserUtil.setCurrentUser(currentUser); - } +// @Value("${zhehe.filter.enable}") +// private Boolean enable; +// @Value("${userUrl}") +// private String userUrl; +// +// /** +// * zhehekeji..*.controller +// * 匹配zhehekeji 到controller多级目录 +// * +// * @param sessionHandler +// */ +// @Before("execution(public * com.zhehekeji..*.controller.*.*(..))&&@annotation(sessionHandler)") +// public void handler(SessionHandler sessionHandler){ +// if(!enable){ +// return; +// } +// HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); +// String token = request.getHeader(FilterConstance.HEADER); +// CurrentUser currentUser = null; +// try { +// String res = HttpUtil.token(userUrl+"/api/account/checkToken",token); +// Result currentUserResult = JSONObject.parseObject(res,Result.class); +// if(currentUserResult != null && currentUserResult.getCode() == 200){ +// currentUser = JSONObject.parseObject(JSONObject.toJSONString(currentUserResult.getData()),CurrentUser.class); +// } +// } catch (IOException e) { +// e.printStackTrace(); +// } +// +// if (sessionHandler.login()) { +// Assert.isTrue(currentUser != null, HttpStatus.UNAUTHORIZED.getCode(), HttpStatus.UNAUTHORIZED.getReasonPhrase()); +// } +// if (sessionHandler.auth()) { +// //todo 权限检验 +// } +// CurrentUserUtil.setCurrentUser(currentUser); +// } } diff --git a/web/src/main/java/com/zhehekeji/web/controller/AppCenterController.java b/web/src/main/java/com/zhehekeji/web/controller/AppCenterController.java index c470d1f..3544eb3 100644 --- a/web/src/main/java/com/zhehekeji/web/controller/AppCenterController.java +++ b/web/src/main/java/com/zhehekeji/web/controller/AppCenterController.java @@ -21,20 +21,20 @@ import java.io.IOException; @Slf4j public class AppCenterController { - @Value("${userUrl}") - private String userUrl; - - @GetMapping("/userCenter") - @ApiOperation(value = "用户中心") - public Result userCenter() { - Result result = null; - try { - String res = HttpUtil.doGet(userUrl+"/api/app/userCenter"); - result = JSONObject.parseObject(res,Result.class); - } catch (IOException e) { - log.error("请求用户中心地址失败:{}",e); - Assert.isTrue(false,"请求用户中心地址失败"); - } - return result; - } +// @Value("${userUrl}") +// private String userUrl; +// +// @GetMapping("/userCenter") +// @ApiOperation(value = "用户中心") +// public Result userCenter() { +// Result result = null; +// try { +// String res = HttpUtil.doGet(userUrl+"/api/app/userCenter"); +// result = JSONObject.parseObject(res,Result.class); +// } catch (IOException e) { +// log.error("请求用户中心地址失败:{}",e); +// Assert.isTrue(false,"请求用户中心地址失败"); +// } +// return result; +// } } diff --git a/web/src/main/resources/application-dev.yml b/web/src/main/resources/application-dev.yml index 486ac36..964df06 100644 --- a/web/src/main/resources/application-dev.yml +++ b/web/src/main/resources/application-dev.yml @@ -20,10 +20,6 @@ spring: # --------本服务端口号 server: port: 8099 -#-------------- -# ------用户中心地址 -userUrl: http://115.236.65.98:11001 -# ----------- # ----默认摄像头的连接信息 cameraConfig: # ------------球機選擇--- 0:利珀 1：海康 diff --git a/web/src/main/resources/application-prod.yml b/web/src/main/resources/application-prod.yml index 523f54b..8574b00 100644 --- a/web/src/main/resources/application-prod.yml +++ b/web/src/main/resources/application-prod.yml @@ -14,16 +14,12 @@ spring: testWhileIdle: false timeBetweenEvictionRunsMillis: 60000 type: com.alibaba.druid.pool.DruidDataSource - url: jdbc:mysql://192.168.77.91:3306/lia_duoji?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://127.0.0.1:3306/lia_duoji_nanjing_wuliu?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 username: root validationQuery: SELECT 1 FROM DUAL # --------本服务端口号 server: port: 8099 -#-------------- -# ------用户中心地址 -userUrl: http://115.236.65.98:11001 -# ----------- # ----默认摄像头的连接信息 cameraConfig: # ------------球機選擇--- 0:利珀 1：海康 @@ -72,18 +68,18 @@ videoStyleConfig: # ----------- num:总共多少个光源端口 index:需要控制的是哪个 # ------------ 利珀视觉控制器id从1开始，光源控制器从0开始 lightSource: - type: 1 + type: 2 num: 4 index: 1 # -----tray 托盘 # -----goods 货物 # 扫码模式 0:此处不盘点 1：球机扫码 2：sick扫码枪 3:南北达RFID scanCodeMode: - tray: 3 + tray: 0 goods: 0 goodsCodeTypes: - 14 trayCodeTypes: - 14 # 照片 視頻保存多久 -deleteFileDays: 365 \ No newline at end of file +deleteFileDays: 30 \ No newline at end of file