From 24ad57c7d90019443a859751c1da5984b8045496 Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Thu, 6 Jun 2024 15:01:12 +0800 Subject: [PATCH] add iot frp --- sql/mysql/iotdata.sql | 53 ++++ sql/mysql/mesdata.sql | 272 ++++++++++++------ .../module/iot/enums/ErrorCodeConstants.java | 3 + .../admin/frpc/FrpcProxyServerController.java | 96 +++++++ .../frpc/vo/FrpcProxyServerPageReqVO.java | 55 ++++ .../admin/frpc/vo/FrpcProxyServerRespVO.java | 73 +++++ .../frpc/vo/FrpcProxyServerSaveReqVO.java | 49 ++++ .../admin/frps/FrpsServerController.java | 95 ++++++ .../admin/frps/vo/FrpsServerPageReqVO.java | 49 ++++ .../admin/frps/vo/FrpsServerRespVO.java | 64 +++++ .../admin/frps/vo/FrpsServerSaveReqVO.java | 43 +++ .../dataobject/frpc/FrpcProxyServerDO.java | 81 ++++++ .../iot/dal/dataobject/frps/FrpsServerDO.java | 71 +++++ .../dal/mysql/frpc/FrpcProxyServerMapper.java | 37 +++ .../iot/dal/mysql/frps/FrpsServerMapper.java | 35 +++ .../service/frpc/FrpcProxyServerService.java | 56 ++++ .../frpc/FrpcProxyServerServiceImpl.java | 75 +++++ .../iot/service/frps/FrpsServerService.java | 56 ++++ .../service/frps/FrpsServerServiceImpl.java | 75 +++++ .../mapper/frpc/FrpcProxyServerMapper.xml | 12 + .../mapper/frps/FrpsServerMapper.xml | 12 + .../frpc/FrpcProxyServerServiceImplTest.java | 175 +++++++++++ .../frps/FrpsServerServiceImplTest.java | 166 +++++++++++ .../src/test/resources/sql/clean.sql | 8 +- .../src/test/resources/sql/create_tables.sql | 60 +++- 25 files changed, 1670 insertions(+), 101 deletions(-) create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/FrpcProxyServerController.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerPageReqVO.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerRespVO.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerSaveReqVO.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/FrpsServerController.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerPageReqVO.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerRespVO.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerSaveReqVO.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frpc/FrpcProxyServerDO.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frps/FrpsServerDO.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frpc/FrpcProxyServerMapper.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frps/FrpsServerMapper.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerService.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerServiceImpl.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerService.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerServiceImpl.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/frpc/FrpcProxyServerMapper.xml create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/frps/FrpsServerMapper.xml create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerServiceImplTest.java create mode 100644 yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerServiceImplTest.java diff --git a/sql/mysql/iotdata.sql b/sql/mysql/iotdata.sql index 9717dbf894..405be8d39c 100644 --- a/sql/mysql/iotdata.sql +++ b/sql/mysql/iotdata.sql @@ -255,3 +255,56 @@ CREATE TABLE `iot_formula_record` `tenant_id` bigint DEFAULT NULL COMMENT '租户id', PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='变量记录'; + + +CREATE TABLE `iot_frps_server` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `frps_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs DEFAULT NULL COMMENT '名称', + `host_mac` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs DEFAULT NULL COMMENT 'mac地址', + `host_os` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs DEFAULT NULL COMMENT '操作系统', + `host_ip` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs DEFAULT NULL COMMENT '服务IP', + `host_port` int DEFAULT NULL COMMENT '服务端口', + `frps_path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs DEFAULT NULL COMMENT '程序绝对路径', + `frps_state` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs DEFAULT NULL COMMENT '服务状态', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='代理服务器'; + +CREATE TABLE `iot_frpc_proxy_server` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `frpc_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs DEFAULT NULL COMMENT '代理名称', + `local_ip` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs DEFAULT NULL COMMENT '内网IP', + `local_port` int DEFAULT NULL COMMENT '内网端口', + `suffix_path` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs DEFAULT NULL COMMENT '访问后缀', + `local_status` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs DEFAULT NULL COMMENT '内网状态', + `frps_id` bigint NOT NULL COMMENT '代理服务器', + `proxy_port` int DEFAULT NULL COMMENT '代理端口', + `proxy_address` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs DEFAULT NULL COMMENT '代理地址', + `proxy_status` varchar(15) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_as_cs DEFAULT NULL COMMENT '代理状态', + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='代理服务'; diff --git a/sql/mysql/mesdata.sql b/sql/mysql/mesdata.sql index e018706014..f54020fe55 100644 --- a/sql/mysql/mesdata.sql +++ b/sql/mysql/mesdata.sql @@ -1,111 +1,201 @@ CREATE TABLE `mes_work_team` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', - `team_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '班组名称', - `team_leader_id` bigint NOT NULL COMMENT '组长ID', - - `team_type` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '工序类型', - - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', - `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', - `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `team_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '班组名称', + `team_leader_id` bigint NOT NULL COMMENT '组长ID', + + `team_type` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '工序类型', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='生产报工单'; +) ENGINE = InnoDB + AUTO_INCREMENT = 91 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='生产报工单'; CREATE TABLE `mes_work_team_detail` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', - `work_team_id` bigint DEFAULT NULL COMMENT '班组id', - `user_id` bigint NOT NULL COMMENT '用户ID', - - `user_role` tinyint NOT NULL COMMENT '角色', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', - - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', - `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `work_team_id` bigint DEFAULT NULL COMMENT '班组id', + `user_id` bigint NOT NULL COMMENT '用户ID', + + `user_role` tinyint NOT NULL COMMENT '角色', + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='生产报工明细'; +) ENGINE = InnoDB + AUTO_INCREMENT = 91 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='生产报工明细'; CREATE TABLE `mes_produce_report` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', - `process_instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '流程实例的编号', - `work_team_id` bigint NOT NULL COMMENT '组别ID', - `group_id` bigint NOT NULL COMMENT '班组ID', - `report_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '报工日期', - `status` tinyint NOT NULL COMMENT '状态', - `group_type` tinyint NOT NULL COMMENT '白班/夜班', - - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', - `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', - `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `process_instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '流程实例的编号', + `work_team_id` bigint NOT NULL COMMENT '组别ID', + `group_id` bigint NOT NULL COMMENT '班组ID', + `report_date` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '报工日期', + `status` tinyint NOT NULL COMMENT '状态', + `group_type` tinyint NOT NULL COMMENT '白班/夜班', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='生产报工单'; +) ENGINE = InnoDB + AUTO_INCREMENT = 91 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='生产报工单'; CREATE TABLE `mes_produce_report_detail` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', - `report_id` bigint DEFAULT NULL COMMENT '报工单id', - `plan_id` bigint NOT NULL COMMENT '生产计划ID', - `product_id` bigint NOT NULL COMMENT '产品ID', - `user_id` bigint NOT NULL COMMENT '用户ID', - `org_id` bigint NOT NULL COMMENT '组织ID', - `quality_number` decimal(24, 6) DEFAULT NULL COMMENT '成品数量', - `waste_number` decimal(24, 6) DEFAULT NULL COMMENT '废品数量', - `total_number` decimal(24, 6) DEFAULT NULL COMMENT '废品数量', - `quality_rate` decimal(24, 6) DEFAULT NULL COMMENT '成品率', - `waste_reason` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', - `report_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '计件时间', - `total_time` decimal(24, 6) DEFAULT NULL COMMENT '总时长', - `package_number` decimal(24, 6) DEFAULT NULL COMMENT '打包数量', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', - `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', - `tenant_id` bigint DEFAULT NULL COMMENT '租户id', + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID', + `report_id` bigint DEFAULT NULL COMMENT '报工单id', + `plan_id` bigint NOT NULL COMMENT '生产计划ID', + `product_id` bigint NOT NULL COMMENT '产品ID', + `user_id` bigint NOT NULL COMMENT '用户ID', + `org_id` bigint NOT NULL COMMENT '组织ID', + `quality_number` decimal(24, 6) DEFAULT NULL COMMENT '成品数量', + `waste_number` decimal(24, 6) DEFAULT NULL COMMENT '废品数量', + `total_number` decimal(24, 6) DEFAULT NULL COMMENT '废品数量', + `quality_rate` decimal(24, 6) DEFAULT NULL COMMENT '成品率', + `waste_reason` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `report_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '计件时间', + `total_time` decimal(24, 6) DEFAULT NULL COMMENT '总时长', + `package_number` decimal(24, 6) DEFAULT NULL COMMENT '打包数量', + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `is_enable` bit(1) NOT NULL DEFAULT b'1' COMMENT '是否启用', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint DEFAULT NULL COMMENT '租户id', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=91 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='生产报工明细'; +) ENGINE = InnoDB + AUTO_INCREMENT = 91 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='生产报工明细'; CREATE TABLE `mes_machine_component` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '组织id', - `name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '组织名称', - `parent_id` bigint NOT NULL DEFAULT '0' COMMENT '父组织id', - `sort` int NOT NULL DEFAULT '0' COMMENT '显示顺序', - `org_id` bigint NOT NULL COMMENT '组织机台ID', - `serial_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '装备SN号', - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '装备名称', - `outgoing_time` datetime DEFAULT NULL COMMENT '出厂日期', - `outgoing_report` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '出厂报告', - `position` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '位置', - `standard` varchar(255) DEFAULT NULL COMMENT '规格', - `status` tinyint NOT NULL COMMENT '状态', - `component_type` tinyint NOT NULL COMMENT '类型', - - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', - `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', - `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', - `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + `id` bigint NOT NULL AUTO_INCREMENT COMMENT '组织id', + `name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '装备名称', + `parent_id` bigint NOT NULL DEFAULT '0' COMMENT '父组织id', + `sort` int NOT NULL DEFAULT '0' COMMENT '显示顺序', + `org_id` bigint NOT NULL COMMENT '组织机台ID', + `serial_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '装备SN号', + `outgoing_time` datetime DEFAULT NULL COMMENT '出厂日期', + `outgoing_report` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci COMMENT '出厂报告', + `position` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '位置', + `standard` varchar(255) DEFAULT NULL COMMENT '规格', + `status` tinyint NOT NULL COMMENT '状态', + `component_type` tinyint NOT NULL COMMENT '类型', + + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 1 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='机台组织表'; + + +CREATE TABLE `mes_stock_workshop` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `item_id` bigint NOT NULL COMMENT '原料编号', + `count` decimal(24,6) NOT NULL COMMENT '库存数量', + `category_id` bigint DEFAULT NULL COMMENT '分类', + + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='车间仓库存'; + +CREATE TABLE `mes_stock_workshop_detail` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `item_id` bigint NOT NULL COMMENT '原料id', + `count` decimal(24,6) NOT NULL COMMENT '数量', + `detail_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '明细类别', + `item_requisition_code` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '领料单', + `item_requisition_detail_id` bigint NOT NULL COMMENT '领料明细id', + `feeding_record_code` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '投料单', + `feeding_record_id` bigint NOT NULL COMMENT '投料id', + `user_id` bigint NOT NULL COMMENT '操作人员', + `operate_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '单据时间', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='车间仓出入库明细'; + + +CREATE TABLE `mes_feeding_record` +( + `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id', + `feeding_record_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '单号', + `product_id` bigint COMMENT '产品id', + `plan_id` bigint COMMENT '计划id', + `item_id` bigint COMMENT '原料id', + `feeding_pipeline` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '制浆线', + `feeding_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '投料类型', + `weight` decimal(24, 6) DEFAULT NULL COMMENT '重量', + `feeding_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '投料时间', + `user_id` bigint DEFAULT NULL COMMENT '记录人', + `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '备注', + `record_status` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '状态', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint NOT NULL DEFAULT '0' COMMENT '租户编号', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='机台组织表'; +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_unicode_ci + ROW_FORMAT = DYNAMIC COMMENT ='投料记录'; \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java b/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java index 73a9aa6eeb..9e0d048ba6 100644 --- a/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java +++ b/yudao-module-iot/yudao-module-iot-api/src/main/java/cn/iocoder/yudao/module/iot/enums/ErrorCodeConstants.java @@ -24,5 +24,8 @@ public interface ErrorCodeConstants { ErrorCode ORGANIZATION_NAME_DUPLICATE = new ErrorCode(1_003_000_000, "GoView 项目不存在"); ErrorCode FORMULA_RECORD_NOT_EXISTS = new ErrorCode(1_003_000_000, "GoView 项目不存在"); ErrorCode MQTT_RECORD_NOT_EXISTS = new ErrorCode(1_003_000_000, "GoView 项目不存在"); + ErrorCode FRPC_PROXY_SERVER_NOT_EXISTS = new ErrorCode(1_003_000_000, "GoView 项目不存在"); + ErrorCode FRPS_SERVER_NOT_EXISTS = new ErrorCode(1_003_000_000, "GoView 项目不存在"); + } diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/FrpcProxyServerController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/FrpcProxyServerController.java new file mode 100644 index 0000000000..91048867b1 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/FrpcProxyServerController.java @@ -0,0 +1,96 @@ +package cn.iocoder.yudao.module.iot.controller.admin.frpc; + +import org.springframework.web.bind.annotation.*; + +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import java.util.*; +import java.io.IOException; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; + +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; + +import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.*; +import cn.iocoder.yudao.module.iot.dal.dataobject.frpc.FrpcProxyServerDO; +import cn.iocoder.yudao.module.iot.service.frpc.FrpcProxyServerService; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + +@Tag(name = "管理后台 - 代理服务") +@RestController +@RequestMapping("/iot/frpc-proxy-server") +@Validated +public class FrpcProxyServerController { + + @Resource + private FrpcProxyServerService frpcProxyServerService; + + @PostMapping("/create") + @Operation(summary = "创建代理服务") + @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:create')") + public CommonResult createFrpcProxyServer(@Valid @RequestBody FrpcProxyServerSaveReqVO createReqVO) { + return success(frpcProxyServerService.createFrpcProxyServer(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新代理服务") + @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:update')") + public CommonResult updateFrpcProxyServer(@Valid @RequestBody FrpcProxyServerSaveReqVO updateReqVO) { + frpcProxyServerService.updateFrpcProxyServer(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除代理服务") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:delete')") + public CommonResult deleteFrpcProxyServer(@RequestParam("id") Long id) { + frpcProxyServerService.deleteFrpcProxyServer(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得代理服务") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:query')") + public CommonResult getFrpcProxyServer(@RequestParam("id") Long id) { + FrpcProxyServerDO frpcProxyServer = frpcProxyServerService.getFrpcProxyServer(id); + return success(BeanUtils.toBean(frpcProxyServer, FrpcProxyServerRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得代理服务分页") + @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:query')") + public CommonResult> getFrpcProxyServerPage(@Valid FrpcProxyServerPageReqVO pageReqVO) { + PageResult pageResult = frpcProxyServerService.getFrpcProxyServerPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, FrpcProxyServerRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出代理服务 Excel") + @PreAuthorize("@ss.hasPermission('iot:frpc-proxy-server:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportFrpcProxyServerExcel(@Valid FrpcProxyServerPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = frpcProxyServerService.getFrpcProxyServerPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "代理服务.xls", "数据", FrpcProxyServerRespVO.class, + BeanUtils.toBean(list, FrpcProxyServerRespVO.class)); + } + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerPageReqVO.java new file mode 100644 index 0000000000..3a783b40e4 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerPageReqVO.java @@ -0,0 +1,55 @@ +package cn.iocoder.yudao.module.iot.controller.admin.frpc.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 代理服务分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class FrpcProxyServerPageReqVO extends PageParam { + + @Schema(description = "代理名称", example = "芋艿") + private String frpcName; + + @Schema(description = "内网IP") + private String localIp; + + @Schema(description = "内网端口") + private Integer localPort; + + @Schema(description = "访问后缀") + private String suffixPath; + + @Schema(description = "内网状态", example = "1") + private String localStatus; + + @Schema(description = "代理服务器", example = "30251") + private Long frpsId; + + @Schema(description = "代理端口") + private Integer proxyPort; + + @Schema(description = "代理地址") + private String proxyAddress; + + @Schema(description = "代理状态", example = "2") + private String proxyStatus; + + @Schema(description = "备注", example = "随便") + private String remark; + + @Schema(description = "是否启用") + private Boolean isEnable; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerRespVO.java new file mode 100644 index 0000000000..2a9a397ad9 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerRespVO.java @@ -0,0 +1,73 @@ +package cn.iocoder.yudao.module.iot.controller.admin.frpc.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; + +@Schema(description = "管理后台 - 代理服务 Response VO") +@Data +@ExcelIgnoreUnannotated +public class FrpcProxyServerRespVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "24857") + @ExcelProperty("id") + private Long id; + + @Schema(description = "代理名称", example = "芋艿") + @ExcelProperty("代理名称") + private String frpcName; + + @Schema(description = "内网IP") + @ExcelProperty("内网IP") + private String localIp; + + @Schema(description = "内网端口") + @ExcelProperty("内网端口") + private Integer localPort; + + @Schema(description = "访问后缀") + @ExcelProperty("访问后缀") + private String suffixPath; + + @Schema(description = "内网状态", example = "1") + @ExcelProperty(value = "内网状态", converter = DictConvert.class) + @DictFormat("iot_proxy_server_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 + private String localStatus; + + @Schema(description = "代理服务器", example = "30251") + @ExcelProperty("代理服务器") + private Long frpsId; + + @Schema(description = "代理端口") + @ExcelProperty("代理端口") + private Integer proxyPort; + + @Schema(description = "代理地址") + @ExcelProperty("代理地址") + private String proxyAddress; + + @Schema(description = "代理状态", example = "2") + @ExcelProperty(value = "代理状态", converter = DictConvert.class) + @DictFormat("iot_proxy_server_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 + private String proxyStatus; + + @Schema(description = "备注", example = "随便") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty(value = "是否启用", converter = DictConvert.class) + @DictFormat("infra_boolean_string") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 + private Boolean isEnable; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerSaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerSaveReqVO.java new file mode 100644 index 0000000000..ff4065be51 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frpc/vo/FrpcProxyServerSaveReqVO.java @@ -0,0 +1,49 @@ +package cn.iocoder.yudao.module.iot.controller.admin.frpc.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import javax.validation.constraints.NotNull; + +@Schema(description = "管理后台 - 代理服务新增/修改 Request VO") +@Data +public class FrpcProxyServerSaveReqVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "24857") + private Long id; + + @Schema(description = "代理名称", example = "芋艿") + private String frpcName; + + @Schema(description = "内网IP") + private String localIp; + + @Schema(description = "内网端口") + private Integer localPort; + + @Schema(description = "访问后缀") + private String suffixPath; + + @Schema(description = "内网状态", example = "1") + private String localStatus; + + @Schema(description = "代理服务器", example = "30251") + private Long frpsId; + + @Schema(description = "代理端口") + private Integer proxyPort; + + @Schema(description = "代理地址") + private String proxyAddress; + + @Schema(description = "代理状态", example = "2") + private String proxyStatus; + + @Schema(description = "备注", example = "随便") + private String remark; + + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "是否启用不能为空") + private Boolean isEnable; + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/FrpsServerController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/FrpsServerController.java new file mode 100644 index 0000000000..12aa7ea118 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/FrpsServerController.java @@ -0,0 +1,95 @@ +package cn.iocoder.yudao.module.iot.controller.admin.frps; + +import org.springframework.web.bind.annotation.*; + +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; +import java.util.*; +import java.io.IOException; + +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; + +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; + +import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.*; +import cn.iocoder.yudao.module.iot.dal.dataobject.frps.FrpsServerDO; +import cn.iocoder.yudao.module.iot.service.frps.FrpsServerService; + +@Tag(name = "管理后台 - 代理服务器") +@RestController +@RequestMapping("/iot/frps-server") +@Validated +public class FrpsServerController { + + @Resource + private FrpsServerService frpsServerService; + + @PostMapping("/create") + @Operation(summary = "创建代理服务器") + @PreAuthorize("@ss.hasPermission('iot:frps-server:create')") + public CommonResult createFrpsServer(@Valid @RequestBody FrpsServerSaveReqVO createReqVO) { + return success(frpsServerService.createFrpsServer(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新代理服务器") + @PreAuthorize("@ss.hasPermission('iot:frps-server:update')") + public CommonResult updateFrpsServer(@Valid @RequestBody FrpsServerSaveReqVO updateReqVO) { + frpsServerService.updateFrpsServer(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除代理服务器") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('iot:frps-server:delete')") + public CommonResult deleteFrpsServer(@RequestParam("id") Long id) { + frpsServerService.deleteFrpsServer(id); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得代理服务器") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('iot:frps-server:query')") + public CommonResult getFrpsServer(@RequestParam("id") Long id) { + FrpsServerDO frpsServer = frpsServerService.getFrpsServer(id); + return success(BeanUtils.toBean(frpsServer, FrpsServerRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得代理服务器分页") + @PreAuthorize("@ss.hasPermission('iot:frps-server:query')") + public CommonResult> getFrpsServerPage(@Valid FrpsServerPageReqVO pageReqVO) { + PageResult pageResult = frpsServerService.getFrpsServerPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, FrpsServerRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出代理服务器 Excel") + @PreAuthorize("@ss.hasPermission('iot:frps-server:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportFrpsServerExcel(@Valid FrpsServerPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = frpsServerService.getFrpsServerPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "代理服务器.xls", "数据", FrpsServerRespVO.class, + BeanUtils.toBean(list, FrpsServerRespVO.class)); + } + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerPageReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerPageReqVO.java new file mode 100644 index 0000000000..6f8286b299 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerPageReqVO.java @@ -0,0 +1,49 @@ +package cn.iocoder.yudao.module.iot.controller.admin.frps.vo; + +import lombok.*; +import java.util.*; +import io.swagger.v3.oas.annotations.media.Schema; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 代理服务器分页 Request VO") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +public class FrpsServerPageReqVO extends PageParam { + + @Schema(description = "名称", example = "芋艿") + private String frpsName; + + @Schema(description = "mac地址") + private String hostMac; + + @Schema(description = "操作系统") + private String hostOs; + + @Schema(description = "服务IP") + private String hostIp; + + @Schema(description = "服务端口") + private Integer hostPort; + + @Schema(description = "程序绝对路径") + private String frpsPath; + + @Schema(description = "服务状态") + private String frpsState; + + @Schema(description = "备注", example = "随便") + private String remark; + + @Schema(description = "是否启用") + private Boolean isEnable; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerRespVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerRespVO.java new file mode 100644 index 0000000000..fb9511fbba --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerRespVO.java @@ -0,0 +1,64 @@ +package cn.iocoder.yudao.module.iot.controller.admin.frps.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; + +@Schema(description = "管理后台 - 代理服务器 Response VO") +@Data +@ExcelIgnoreUnannotated +public class FrpsServerRespVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "18589") + @ExcelProperty("id") + private Long id; + + @Schema(description = "名称", example = "芋艿") + @ExcelProperty("名称") + private String frpsName; + + @Schema(description = "mac地址") + @ExcelProperty("mac地址") + private String hostMac; + + @Schema(description = "操作系统") + @ExcelProperty("操作系统") + private String hostOs; + + @Schema(description = "服务IP") + @ExcelProperty("服务IP") + private String hostIp; + + @Schema(description = "服务端口") + @ExcelProperty("服务端口") + private Integer hostPort; + + @Schema(description = "程序绝对路径") + @ExcelProperty("程序绝对路径") + private String frpsPath; + + @Schema(description = "服务状态") + @ExcelProperty(value = "服务状态", converter = DictConvert.class) + @DictFormat("iot_proxy_server_status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 + private String frpsState; + + @Schema(description = "备注", example = "随便") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty(value = "是否启用", converter = DictConvert.class) + @DictFormat("infra_boolean_string") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 + private Boolean isEnable; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerSaveReqVO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerSaveReqVO.java new file mode 100644 index 0000000000..a3bc00bd0c --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/frps/vo/FrpsServerSaveReqVO.java @@ -0,0 +1,43 @@ +package cn.iocoder.yudao.module.iot.controller.admin.frps.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import javax.validation.constraints.NotNull; + +@Schema(description = "管理后台 - 代理服务器新增/修改 Request VO") +@Data +public class FrpsServerSaveReqVO { + + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "18589") + private Long id; + + @Schema(description = "名称", example = "芋艿") + private String frpsName; + + @Schema(description = "mac地址") + private String hostMac; + + @Schema(description = "操作系统") + private String hostOs; + + @Schema(description = "服务IP") + private String hostIp; + + @Schema(description = "服务端口") + private Integer hostPort; + + @Schema(description = "程序绝对路径") + private String frpsPath; + + @Schema(description = "服务状态") + private String frpsState; + + @Schema(description = "备注", example = "随便") + private String remark; + + @Schema(description = "是否启用", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "是否启用不能为空") + private Boolean isEnable; + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frpc/FrpcProxyServerDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frpc/FrpcProxyServerDO.java new file mode 100644 index 0000000000..55a5eb7a76 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frpc/FrpcProxyServerDO.java @@ -0,0 +1,81 @@ +package cn.iocoder.yudao.module.iot.dal.dataobject.frpc; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; + +/** + * 代理服务 DO + * + * @author 内蒙必硕 + */ +@TableName("iot_frpc_proxy_server") +@KeySequence("iot_frpc_proxy_server_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class FrpcProxyServerDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 代理名称 + */ + private String frpcName; + /** + * 内网IP + */ + private String localIp; + /** + * 内网端口 + */ + private Integer localPort; + /** + * 访问后缀 + */ + private String suffixPath; + /** + * 内网状态 + * + * 枚举 {@link TODO iot_proxy_server_status 对应的类} + */ + private String localStatus; + /** + * 代理服务器 + */ + private Long frpsId; + /** + * 代理端口 + */ + private Integer proxyPort; + /** + * 代理地址 + */ + private String proxyAddress; + /** + * 代理状态 + * + * 枚举 {@link TODO iot_proxy_server_status 对应的类} + */ + private String proxyStatus; + /** + * 备注 + */ + private String remark; + /** + * 是否启用 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean isEnable; + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frps/FrpsServerDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frps/FrpsServerDO.java new file mode 100644 index 0000000000..721fe07495 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/frps/FrpsServerDO.java @@ -0,0 +1,71 @@ +package cn.iocoder.yudao.module.iot.dal.dataobject.frps; + +import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; + +/** + * 代理服务器 DO + * + * @author 内蒙必硕 + */ +@TableName("iot_frps_server") +@KeySequence("iot_frps_server_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class FrpsServerDO extends BaseDO { + + /** + * id + */ + @TableId + private Long id; + /** + * 名称 + */ + private String frpsName; + /** + * mac地址 + */ + private String hostMac; + /** + * 操作系统 + */ + private String hostOs; + /** + * 服务IP + */ + private String hostIp; + /** + * 服务端口 + */ + private Integer hostPort; + /** + * 程序绝对路径 + */ + private String frpsPath; + /** + * 服务状态 + * + * 枚举 {@link TODO iot_proxy_server_status 对应的类} + */ + private String frpsState; + /** + * 备注 + */ + private String remark; + /** + * 是否启用 + * + * 枚举 {@link TODO infra_boolean_string 对应的类} + */ + private Boolean isEnable; + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frpc/FrpcProxyServerMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frpc/FrpcProxyServerMapper.java new file mode 100644 index 0000000000..5e656d5a58 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frpc/FrpcProxyServerMapper.java @@ -0,0 +1,37 @@ +package cn.iocoder.yudao.module.iot.dal.mysql.frpc; + +import java.util.*; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.iot.dal.dataobject.frpc.FrpcProxyServerDO; +import org.apache.ibatis.annotations.Mapper; +import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.*; + +/** + * 代理服务 Mapper + * + * @author 内蒙必硕 + */ +@Mapper +public interface FrpcProxyServerMapper extends BaseMapperX { + + default PageResult selectPage(FrpcProxyServerPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(FrpcProxyServerDO::getFrpcName, reqVO.getFrpcName()) + .eqIfPresent(FrpcProxyServerDO::getLocalIp, reqVO.getLocalIp()) + .eqIfPresent(FrpcProxyServerDO::getLocalPort, reqVO.getLocalPort()) + .eqIfPresent(FrpcProxyServerDO::getSuffixPath, reqVO.getSuffixPath()) + .eqIfPresent(FrpcProxyServerDO::getLocalStatus, reqVO.getLocalStatus()) + .eqIfPresent(FrpcProxyServerDO::getFrpsId, reqVO.getFrpsId()) + .eqIfPresent(FrpcProxyServerDO::getProxyPort, reqVO.getProxyPort()) + .eqIfPresent(FrpcProxyServerDO::getProxyAddress, reqVO.getProxyAddress()) + .eqIfPresent(FrpcProxyServerDO::getProxyStatus, reqVO.getProxyStatus()) + .eqIfPresent(FrpcProxyServerDO::getRemark, reqVO.getRemark()) + .eqIfPresent(FrpcProxyServerDO::getIsEnable, reqVO.getIsEnable()) + .betweenIfPresent(FrpcProxyServerDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(FrpcProxyServerDO::getId)); + } + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frps/FrpsServerMapper.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frps/FrpsServerMapper.java new file mode 100644 index 0000000000..d4d6ced99c --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/mysql/frps/FrpsServerMapper.java @@ -0,0 +1,35 @@ +package cn.iocoder.yudao.module.iot.dal.mysql.frps; + +import java.util.*; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.iot.dal.dataobject.frps.FrpsServerDO; +import org.apache.ibatis.annotations.Mapper; +import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.*; + +/** + * 代理服务器 Mapper + * + * @author 内蒙必硕 + */ +@Mapper +public interface FrpsServerMapper extends BaseMapperX { + + default PageResult selectPage(FrpsServerPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(FrpsServerDO::getFrpsName, reqVO.getFrpsName()) + .eqIfPresent(FrpsServerDO::getHostMac, reqVO.getHostMac()) + .eqIfPresent(FrpsServerDO::getHostOs, reqVO.getHostOs()) + .eqIfPresent(FrpsServerDO::getHostIp, reqVO.getHostIp()) + .eqIfPresent(FrpsServerDO::getHostPort, reqVO.getHostPort()) + .eqIfPresent(FrpsServerDO::getFrpsPath, reqVO.getFrpsPath()) + .eqIfPresent(FrpsServerDO::getFrpsState, reqVO.getFrpsState()) + .eqIfPresent(FrpsServerDO::getRemark, reqVO.getRemark()) + .eqIfPresent(FrpsServerDO::getIsEnable, reqVO.getIsEnable()) + .betweenIfPresent(FrpsServerDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(FrpsServerDO::getId)); + } + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerService.java new file mode 100644 index 0000000000..c46862140b --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerService.java @@ -0,0 +1,56 @@ +package cn.iocoder.yudao.module.iot.service.frpc; + +import java.util.*; +import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.*; +import cn.iocoder.yudao.module.iot.dal.dataobject.frpc.FrpcProxyServerDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; + +import javax.validation.Valid; + +/** + * 代理服务 Service 接口 + * + * @author 内蒙必硕 + */ +public interface FrpcProxyServerService { + + /** + * 创建代理服务 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createFrpcProxyServer(@Valid FrpcProxyServerSaveReqVO createReqVO); + + /** + * 更新代理服务 + * + * @param updateReqVO 更新信息 + */ + void updateFrpcProxyServer(@Valid FrpcProxyServerSaveReqVO updateReqVO); + + /** + * 删除代理服务 + * + * @param id 编号 + */ + void deleteFrpcProxyServer(Long id); + + /** + * 获得代理服务 + * + * @param id 编号 + * @return 代理服务 + */ + FrpcProxyServerDO getFrpcProxyServer(Long id); + + /** + * 获得代理服务分页 + * + * @param pageReqVO 分页查询 + * @return 代理服务分页 + */ + PageResult getFrpcProxyServerPage(FrpcProxyServerPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerServiceImpl.java new file mode 100644 index 0000000000..8b87794551 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerServiceImpl.java @@ -0,0 +1,75 @@ +package cn.iocoder.yudao.module.iot.service.frpc; + +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.*; +import cn.iocoder.yudao.module.iot.dal.dataobject.frpc.FrpcProxyServerDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; + +import cn.iocoder.yudao.module.iot.dal.mysql.frpc.FrpcProxyServerMapper; + +import javax.annotation.Resource; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; + +/** + * 代理服务 Service 实现类 + * + * @author 内蒙必硕 + */ +@Service +@Validated +public class FrpcProxyServerServiceImpl implements FrpcProxyServerService { + + @Resource + private FrpcProxyServerMapper frpcProxyServerMapper; + + @Override + public Long createFrpcProxyServer(FrpcProxyServerSaveReqVO createReqVO) { + // 插入 + FrpcProxyServerDO frpcProxyServer = BeanUtils.toBean(createReqVO, FrpcProxyServerDO.class); + frpcProxyServerMapper.insert(frpcProxyServer); + // 返回 + return frpcProxyServer.getId(); + } + + @Override + public void updateFrpcProxyServer(FrpcProxyServerSaveReqVO updateReqVO) { + // 校验存在 + validateFrpcProxyServerExists(updateReqVO.getId()); + // 更新 + FrpcProxyServerDO updateObj = BeanUtils.toBean(updateReqVO, FrpcProxyServerDO.class); + frpcProxyServerMapper.updateById(updateObj); + } + + @Override + public void deleteFrpcProxyServer(Long id) { + // 校验存在 + validateFrpcProxyServerExists(id); + // 删除 + frpcProxyServerMapper.deleteById(id); + } + + private void validateFrpcProxyServerExists(Long id) { + if (frpcProxyServerMapper.selectById(id) == null) { + throw exception(FRPC_PROXY_SERVER_NOT_EXISTS); + } + } + + @Override + public FrpcProxyServerDO getFrpcProxyServer(Long id) { + return frpcProxyServerMapper.selectById(id); + } + + @Override + public PageResult getFrpcProxyServerPage(FrpcProxyServerPageReqVO pageReqVO) { + return frpcProxyServerMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerService.java new file mode 100644 index 0000000000..616dcdcc2c --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerService.java @@ -0,0 +1,56 @@ +package cn.iocoder.yudao.module.iot.service.frps; + +import java.util.*; +import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.*; +import cn.iocoder.yudao.module.iot.dal.dataobject.frps.FrpsServerDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; + +import javax.validation.Valid; + +/** + * 代理服务器 Service 接口 + * + * @author 内蒙必硕 + */ +public interface FrpsServerService { + + /** + * 创建代理服务器 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + Long createFrpsServer(@Valid FrpsServerSaveReqVO createReqVO); + + /** + * 更新代理服务器 + * + * @param updateReqVO 更新信息 + */ + void updateFrpsServer(@Valid FrpsServerSaveReqVO updateReqVO); + + /** + * 删除代理服务器 + * + * @param id 编号 + */ + void deleteFrpsServer(Long id); + + /** + * 获得代理服务器 + * + * @param id 编号 + * @return 代理服务器 + */ + FrpsServerDO getFrpsServer(Long id); + + /** + * 获得代理服务器分页 + * + * @param pageReqVO 分页查询 + * @return 代理服务器分页 + */ + PageResult getFrpsServerPage(FrpsServerPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerServiceImpl.java new file mode 100644 index 0000000000..7ccc290cc7 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerServiceImpl.java @@ -0,0 +1,75 @@ +package cn.iocoder.yudao.module.iot.service.frps; + +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.*; +import cn.iocoder.yudao.module.iot.dal.dataobject.frps.FrpsServerDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; + +import cn.iocoder.yudao.module.iot.dal.mysql.frps.FrpsServerMapper; + +import javax.annotation.Resource; + +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; + +/** + * 代理服务器 Service 实现类 + * + * @author 内蒙必硕 + */ +@Service +@Validated +public class FrpsServerServiceImpl implements FrpsServerService { + + @Resource + private FrpsServerMapper frpsServerMapper; + + @Override + public Long createFrpsServer(FrpsServerSaveReqVO createReqVO) { + // 插入 + FrpsServerDO frpsServer = BeanUtils.toBean(createReqVO, FrpsServerDO.class); + frpsServerMapper.insert(frpsServer); + // 返回 + return frpsServer.getId(); + } + + @Override + public void updateFrpsServer(FrpsServerSaveReqVO updateReqVO) { + // 校验存在 + validateFrpsServerExists(updateReqVO.getId()); + // 更新 + FrpsServerDO updateObj = BeanUtils.toBean(updateReqVO, FrpsServerDO.class); + frpsServerMapper.updateById(updateObj); + } + + @Override + public void deleteFrpsServer(Long id) { + // 校验存在 + validateFrpsServerExists(id); + // 删除 + frpsServerMapper.deleteById(id); + } + + private void validateFrpsServerExists(Long id) { + if (frpsServerMapper.selectById(id) == null) { + throw exception(FRPS_SERVER_NOT_EXISTS); + } + } + + @Override + public FrpsServerDO getFrpsServer(Long id) { + return frpsServerMapper.selectById(id); + } + + @Override + public PageResult getFrpsServerPage(FrpsServerPageReqVO pageReqVO) { + return frpsServerMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/frpc/FrpcProxyServerMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/frpc/FrpcProxyServerMapper.xml new file mode 100644 index 0000000000..e02094d8c3 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/frpc/FrpcProxyServerMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/frps/FrpsServerMapper.xml b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/frps/FrpsServerMapper.xml new file mode 100644 index 0000000000..d368a34b92 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/frps/FrpsServerMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerServiceImplTest.java b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerServiceImplTest.java new file mode 100644 index 0000000000..1eb2ae6561 --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/frpc/FrpcProxyServerServiceImplTest.java @@ -0,0 +1,175 @@ +package cn.iocoder.yudao.module.iot.service.frpc; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; + + +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; + +import cn.iocoder.yudao.module.iot.controller.admin.frpc.vo.*; +import cn.iocoder.yudao.module.iot.dal.dataobject.frpc.FrpcProxyServerDO; +import cn.iocoder.yudao.module.iot.dal.mysql.frpc.FrpcProxyServerMapper; +import cn.iocoder.yudao.framework.common.pojo.PageResult; + + +import org.springframework.context.annotation.Import; + +import javax.annotation.Resource; +import java.util.*; +import java.time.LocalDateTime; + +import static cn.hutool.core.util.RandomUtil.*; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*; +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*; +import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*; +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +/** + * {@link FrpcProxyServerServiceImpl} 的单元测试类 + * + * @author 内蒙必硕 + */ +@Import(FrpcProxyServerServiceImpl.class) +public class FrpcProxyServerServiceImplTest extends BaseDbUnitTest { + + @Resource + private FrpcProxyServerServiceImpl frpcProxyServerService; + + @Resource + private FrpcProxyServerMapper frpcProxyServerMapper; + + @Test + public void testCreateFrpcProxyServer_success() { + // 准备参数 + FrpcProxyServerSaveReqVO createReqVO = randomPojo(FrpcProxyServerSaveReqVO.class).setId(null); + + // 调用 + Long frpcProxyServerId = frpcProxyServerService.createFrpcProxyServer(createReqVO); + // 断言 + assertNotNull(frpcProxyServerId); + // 校验记录的属性是否正确 + FrpcProxyServerDO frpcProxyServer = frpcProxyServerMapper.selectById(frpcProxyServerId); + assertPojoEquals(createReqVO, frpcProxyServer, "id"); + } + + @Test + public void testUpdateFrpcProxyServer_success() { + // mock 数据 + FrpcProxyServerDO dbFrpcProxyServer = randomPojo(FrpcProxyServerDO.class); + frpcProxyServerMapper.insert(dbFrpcProxyServer);// @Sql: 先插入出一条存在的数据 + // 准备参数 + FrpcProxyServerSaveReqVO updateReqVO = randomPojo(FrpcProxyServerSaveReqVO.class, o -> { + o.setId(dbFrpcProxyServer.getId()); // 设置更新的 ID + }); + + // 调用 + frpcProxyServerService.updateFrpcProxyServer(updateReqVO); + // 校验是否更新正确 + FrpcProxyServerDO frpcProxyServer = frpcProxyServerMapper.selectById(updateReqVO.getId()); // 获取最新的 + assertPojoEquals(updateReqVO, frpcProxyServer); + } + + @Test + public void testUpdateFrpcProxyServer_notExists() { + // 准备参数 + FrpcProxyServerSaveReqVO updateReqVO = randomPojo(FrpcProxyServerSaveReqVO.class); + + // 调用, 并断言异常 + assertServiceException(() -> frpcProxyServerService.updateFrpcProxyServer(updateReqVO), FRPC_PROXY_SERVER_NOT_EXISTS); + } + + @Test + public void testDeleteFrpcProxyServer_success() { + // mock 数据 + FrpcProxyServerDO dbFrpcProxyServer = randomPojo(FrpcProxyServerDO.class); + frpcProxyServerMapper.insert(dbFrpcProxyServer);// @Sql: 先插入出一条存在的数据 + // 准备参数 + Long id = dbFrpcProxyServer.getId(); + + // 调用 + frpcProxyServerService.deleteFrpcProxyServer(id); + // 校验数据不存在了 + assertNull(frpcProxyServerMapper.selectById(id)); + } + + @Test + public void testDeleteFrpcProxyServer_notExists() { + // 准备参数 + Long id = randomLongId(); + + // 调用, 并断言异常 + assertServiceException(() -> frpcProxyServerService.deleteFrpcProxyServer(id), FRPC_PROXY_SERVER_NOT_EXISTS); + } + + @Test + @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 + public void testGetFrpcProxyServerPage() { + // mock 数据 + FrpcProxyServerDO dbFrpcProxyServer = randomPojo(FrpcProxyServerDO.class, o -> { // 等会查询到 + o.setFrpcName(null); + o.setLocalIp(null); + o.setLocalPort(null); + o.setSuffixPath(null); + o.setLocalStatus(null); + o.setFrpsId(null); + o.setProxyPort(null); + o.setProxyAddress(null); + o.setProxyStatus(null); + o.setRemark(null); + o.setIsEnable(null); + o.setCreateTime(null); + }); + frpcProxyServerMapper.insert(dbFrpcProxyServer); + // 测试 frpcName 不匹配 + frpcProxyServerMapper.insert(cloneIgnoreId(dbFrpcProxyServer, o -> o.setFrpcName(null))); + // 测试 localIp 不匹配 + frpcProxyServerMapper.insert(cloneIgnoreId(dbFrpcProxyServer, o -> o.setLocalIp(null))); + // 测试 localPort 不匹配 + frpcProxyServerMapper.insert(cloneIgnoreId(dbFrpcProxyServer, o -> o.setLocalPort(null))); + // 测试 suffixPath 不匹配 + frpcProxyServerMapper.insert(cloneIgnoreId(dbFrpcProxyServer, o -> o.setSuffixPath(null))); + // 测试 localStatus 不匹配 + frpcProxyServerMapper.insert(cloneIgnoreId(dbFrpcProxyServer, o -> o.setLocalStatus(null))); + // 测试 frpsId 不匹配 + frpcProxyServerMapper.insert(cloneIgnoreId(dbFrpcProxyServer, o -> o.setFrpsId(null))); + // 测试 proxyPort 不匹配 + frpcProxyServerMapper.insert(cloneIgnoreId(dbFrpcProxyServer, o -> o.setProxyPort(null))); + // 测试 proxyAddress 不匹配 + frpcProxyServerMapper.insert(cloneIgnoreId(dbFrpcProxyServer, o -> o.setProxyAddress(null))); + // 测试 proxyStatus 不匹配 + frpcProxyServerMapper.insert(cloneIgnoreId(dbFrpcProxyServer, o -> o.setProxyStatus(null))); + // 测试 remark 不匹配 + frpcProxyServerMapper.insert(cloneIgnoreId(dbFrpcProxyServer, o -> o.setRemark(null))); + // 测试 isEnable 不匹配 + frpcProxyServerMapper.insert(cloneIgnoreId(dbFrpcProxyServer, o -> o.setIsEnable(null))); + // 测试 createTime 不匹配 + frpcProxyServerMapper.insert(cloneIgnoreId(dbFrpcProxyServer, o -> o.setCreateTime(null))); + // 准备参数 + FrpcProxyServerPageReqVO reqVO = new FrpcProxyServerPageReqVO(); + reqVO.setFrpcName(null); + reqVO.setLocalIp(null); + reqVO.setLocalPort(null); + reqVO.setSuffixPath(null); + reqVO.setLocalStatus(null); + reqVO.setFrpsId(null); + reqVO.setProxyPort(null); + reqVO.setProxyAddress(null); + reqVO.setProxyStatus(null); + reqVO.setRemark(null); + reqVO.setIsEnable(null); + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + + // 调用 + PageResult pageResult = frpcProxyServerService.getFrpcProxyServerPage(reqVO); + // 断言 + assertEquals(1, pageResult.getTotal()); + assertEquals(1, pageResult.getList().size()); + assertPojoEquals(dbFrpcProxyServer, pageResult.getList().get(0)); + } + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerServiceImplTest.java b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerServiceImplTest.java new file mode 100644 index 0000000000..8ca03acecf --- /dev/null +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/frps/FrpsServerServiceImplTest.java @@ -0,0 +1,166 @@ +package cn.iocoder.yudao.module.iot.service.frps; + +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; + + +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; + +import cn.iocoder.yudao.module.iot.controller.admin.frps.vo.*; +import cn.iocoder.yudao.module.iot.dal.dataobject.frps.FrpsServerDO; +import cn.iocoder.yudao.module.iot.dal.mysql.frps.FrpsServerMapper; +import cn.iocoder.yudao.framework.common.pojo.PageResult; + +import org.springframework.context.annotation.Import; + +import javax.annotation.Resource; +import java.util.*; +import java.time.LocalDateTime; + +import static cn.hutool.core.util.RandomUtil.*; +import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*; +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*; +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; +import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*; +import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*; +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.Mockito.*; + +/** + * {@link FrpsServerServiceImpl} 的单元测试类 + * + * @author 内蒙必硕 + */ +@Import(FrpsServerServiceImpl.class) +public class FrpsServerServiceImplTest extends BaseDbUnitTest { + + @Resource + private FrpsServerServiceImpl frpsServerService; + + @Resource + private FrpsServerMapper frpsServerMapper; + + @Test + public void testCreateFrpsServer_success() { + // 准备参数 + FrpsServerSaveReqVO createReqVO = randomPojo(FrpsServerSaveReqVO.class).setId(null); + + // 调用 + Long frpsServerId = frpsServerService.createFrpsServer(createReqVO); + // 断言 + assertNotNull(frpsServerId); + // 校验记录的属性是否正确 + FrpsServerDO frpsServer = frpsServerMapper.selectById(frpsServerId); + assertPojoEquals(createReqVO, frpsServer, "id"); + } + + @Test + public void testUpdateFrpsServer_success() { + // mock 数据 + FrpsServerDO dbFrpsServer = randomPojo(FrpsServerDO.class); + frpsServerMapper.insert(dbFrpsServer);// @Sql: 先插入出一条存在的数据 + // 准备参数 + FrpsServerSaveReqVO updateReqVO = randomPojo(FrpsServerSaveReqVO.class, o -> { + o.setId(dbFrpsServer.getId()); // 设置更新的 ID + }); + + // 调用 + frpsServerService.updateFrpsServer(updateReqVO); + // 校验是否更新正确 + FrpsServerDO frpsServer = frpsServerMapper.selectById(updateReqVO.getId()); // 获取最新的 + assertPojoEquals(updateReqVO, frpsServer); + } + + @Test + public void testUpdateFrpsServer_notExists() { + // 准备参数 + FrpsServerSaveReqVO updateReqVO = randomPojo(FrpsServerSaveReqVO.class); + + // 调用, 并断言异常 + assertServiceException(() -> frpsServerService.updateFrpsServer(updateReqVO), FRPS_SERVER_NOT_EXISTS); + } + + @Test + public void testDeleteFrpsServer_success() { + // mock 数据 + FrpsServerDO dbFrpsServer = randomPojo(FrpsServerDO.class); + frpsServerMapper.insert(dbFrpsServer);// @Sql: 先插入出一条存在的数据 + // 准备参数 + Long id = dbFrpsServer.getId(); + + // 调用 + frpsServerService.deleteFrpsServer(id); + // 校验数据不存在了 + assertNull(frpsServerMapper.selectById(id)); + } + + @Test + public void testDeleteFrpsServer_notExists() { + // 准备参数 + Long id = randomLongId(); + + // 调用, 并断言异常 + assertServiceException(() -> frpsServerService.deleteFrpsServer(id), FRPS_SERVER_NOT_EXISTS); + } + + @Test + @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 + public void testGetFrpsServerPage() { + // mock 数据 + FrpsServerDO dbFrpsServer = randomPojo(FrpsServerDO.class, o -> { // 等会查询到 + o.setFrpsName(null); + o.setHostMac(null); + o.setHostOs(null); + o.setHostIp(null); + o.setHostPort(null); + o.setFrpsPath(null); + o.setFrpsState(null); + o.setRemark(null); + o.setIsEnable(null); + o.setCreateTime(null); + }); + frpsServerMapper.insert(dbFrpsServer); + // 测试 frpsName 不匹配 + frpsServerMapper.insert(cloneIgnoreId(dbFrpsServer, o -> o.setFrpsName(null))); + // 测试 hostMac 不匹配 + frpsServerMapper.insert(cloneIgnoreId(dbFrpsServer, o -> o.setHostMac(null))); + // 测试 hostOs 不匹配 + frpsServerMapper.insert(cloneIgnoreId(dbFrpsServer, o -> o.setHostOs(null))); + // 测试 hostIp 不匹配 + frpsServerMapper.insert(cloneIgnoreId(dbFrpsServer, o -> o.setHostIp(null))); + // 测试 hostPort 不匹配 + frpsServerMapper.insert(cloneIgnoreId(dbFrpsServer, o -> o.setHostPort(null))); + // 测试 frpsPath 不匹配 + frpsServerMapper.insert(cloneIgnoreId(dbFrpsServer, o -> o.setFrpsPath(null))); + // 测试 frpsState 不匹配 + frpsServerMapper.insert(cloneIgnoreId(dbFrpsServer, o -> o.setFrpsState(null))); + // 测试 remark 不匹配 + frpsServerMapper.insert(cloneIgnoreId(dbFrpsServer, o -> o.setRemark(null))); + // 测试 isEnable 不匹配 + frpsServerMapper.insert(cloneIgnoreId(dbFrpsServer, o -> o.setIsEnable(null))); + // 测试 createTime 不匹配 + frpsServerMapper.insert(cloneIgnoreId(dbFrpsServer, o -> o.setCreateTime(null))); + // 准备参数 + FrpsServerPageReqVO reqVO = new FrpsServerPageReqVO(); + reqVO.setFrpsName(null); + reqVO.setHostMac(null); + reqVO.setHostOs(null); + reqVO.setHostIp(null); + reqVO.setHostPort(null); + reqVO.setFrpsPath(null); + reqVO.setFrpsState(null); + reqVO.setRemark(null); + reqVO.setIsEnable(null); + reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); + + // 调用 + PageResult pageResult = frpsServerService.getFrpsServerPage(reqVO); + // 断言 + assertEquals(1, pageResult.getTotal()); + assertEquals(1, pageResult.getList().size()); + assertPojoEquals(dbFrpsServer, pageResult.getList().get(0)); + } + +} \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/clean.sql b/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/clean.sql index eadba8890a..84795ad3a2 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/clean.sql +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/clean.sql @@ -23,4 +23,10 @@ DELETE FROM "iot_kanban"; DELETE FROM "iot_formula_record"; -- 将该删表 SQL 语句，添加到 yudao-module-iot-biz 模块的 test/resources/sql/clean.sql 文件里 -DELETE FROM "iot_mqtt_record"; \ No newline at end of file +DELETE FROM "iot_mqtt_record"; + +-- 将该删表 SQL 语句，添加到 yudao-module-iot-biz 模块的 test/resources/sql/clean.sql 文件里 +DELETE FROM "iot_frps_server"; + +-- 将该删表 SQL 语句，添加到 yudao-module-iot-biz 模块的 test/resources/sql/clean.sql 文件里 +DELETE FROM "iot_frpc_proxy_server"; \ No newline at end of file diff --git a/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/create_tables.sql b/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/create_tables.sql index 7d666a8a64..dae9365efe 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/create_tables.sql +++ b/yudao-module-iot/yudao-module-iot-biz/src/test/resources/sql/create_tables.sql @@ -34,14 +34,14 @@ CREATE TABLE IF NOT EXISTS "iot_device" "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, "deleted" bit NOT NULL DEFAULT FALSE, "tenant_id" bigint, - "device_use_type" varchar, - "ap_ip" varchar, - "gate_bridge_ip" varchar, - "com_server_ip" varchar, - "com_server_port" varchar, - "plc_controller_ip" varchar, - "plc_screen_ip" varchar, - "org_machine_id" bigint, + "device_use_type" varchar, + "ap_ip" varchar, + "gate_bridge_ip" varchar, + "com_server_ip" varchar, + "com_server_port" varchar, + "plc_controller_ip" varchar, + "plc_screen_ip" varchar, + "org_machine_id" bigint, PRIMARY KEY ("id") ) COMMENT '物联设备表'; CREATE TABLE IF NOT EXISTS "iot_formula" @@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS "iot_formula" "name" varchar, "formula_code" varchar, "formula" varchar, - "data_unit" varchar, + "data_unit" varchar, "result_type" varchar, "machine_id" bigint NOT NULL, "remark" varchar, @@ -232,5 +232,47 @@ CREATE TABLE IF NOT EXISTS "iot_mqtt_record" "tenant_id" bigint, PRIMARY KEY ("id") ) COMMENT '数采记录'; +CREATE TABLE IF NOT EXISTS "iot_frps_server" +( + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, + "frps_name" varchar, + "host_mac" varchar, + "host_os" varchar, + "host_ip" varchar, + "host_port" int, + "frps_path" varchar, + "frps_state" varchar, + "remark" varchar, + "is_enable" bit NOT NULL, + "creator" varchar DEFAULT '', + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updater" varchar DEFAULT '', + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + "deleted" bit NOT NULL DEFAULT FALSE, + "tenant_id" bigint , + PRIMARY KEY ("id") +) COMMENT '代理服务器'; +CREATE TABLE IF NOT EXISTS "iot_frpc_proxy_server" +( + "id" bigint NOT NULL GENERATED BY DEFAULT AS IDENTITY, + "frpc_name" varchar, + "local_ip" varchar, + "local_port" int, + "suffix_path" varchar, + "local_status" varchar, + "frps_id" bigint, + "proxy_port" int, + "proxy_address" varchar, + "proxy_status" varchar, + "remark" varchar, + "is_enable" bit NOT NULL, + "creator" varchar DEFAULT '', + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + "updater" varchar DEFAULT '', + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + "deleted" bit NOT NULL DEFAULT FALSE, + "tenant_id" bigint, + PRIMARY KEY ("id") +) COMMENT '代理服务';