From 4c4f3b236debafce9b554dad3047eaa3683d4695 Mon Sep 17 00:00:00 2001 From: gjh <1421wake> Date: Wed, 19 Feb 2025 15:47:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/test/AssertUnitTest.java | 90 +++++------ .../java/org/dromara/test/DemoUnitTest.java | 140 ++++++++--------- .../java/org/dromara/test/ParamUnitTest.java | 144 +++++++++--------- .../java/org/dromara/test/TagUnitTest.java | 108 ++++++------- ruoyi-modules/guoyan-platform/pom.xml | 10 +- script/sql/gjh_sql/update.sql | 88 +++++++---- 6 files changed, 303 insertions(+), 277 deletions(-) diff --git a/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java b/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java index dba2323..e9dff53 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java +++ b/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java @@ -1,45 +1,45 @@ -package org.dromara.test; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -/** - * 断言单元测试案例 - * - * @author Lion Li - */ -@DisplayName("断言单元测试案例") -public class AssertUnitTest { - - @DisplayName("测试 assertEquals 方法") - @Test - public void testAssertEquals() { - Assertions.assertEquals("666", new String("666")); - Assertions.assertNotEquals("666", new String("666")); - } - - @DisplayName("测试 assertSame 方法") - @Test - public void testAssertSame() { - Object obj = new Object(); - Object obj1 = obj; - Assertions.assertSame(obj, obj1); - Assertions.assertNotSame(obj, obj1); - } - - @DisplayName("测试 assertTrue 方法") - @Test - public void testAssertTrue() { - Assertions.assertTrue(true); - Assertions.assertFalse(true); - } - - @DisplayName("测试 assertNull 方法") - @Test - public void testAssertNull() { - Assertions.assertNull(null); - Assertions.assertNotNull(null); - } - -} +//package org.dromara.test; +// +//import org.junit.jupiter.api.Assertions; +//import org.junit.jupiter.api.DisplayName; +//import org.junit.jupiter.api.Test; +// +///** +// * 断言单元测试案例 +// * +// * @author Lion Li +// */ +//@DisplayName("断言单元测试案例") +//public class AssertUnitTest { +// +// @DisplayName("测试 assertEquals 方法") +// @Test +// public void testAssertEquals() { +// Assertions.assertEquals("666", new String("666")); +// Assertions.assertNotEquals("666", new String("666")); +// } +// +// @DisplayName("测试 assertSame 方法") +// @Test +// public void testAssertSame() { +// Object obj = new Object(); +// Object obj1 = obj; +// Assertions.assertSame(obj, obj1); +// Assertions.assertNotSame(obj, obj1); +// } +// +// @DisplayName("测试 assertTrue 方法") +// @Test +// public void testAssertTrue() { +// Assertions.assertTrue(true); +// Assertions.assertFalse(true); +// } +// +// @DisplayName("测试 assertNull 方法") +// @Test +// public void testAssertNull() { +// Assertions.assertNull(null); +// Assertions.assertNotNull(null); +// } +// +//} diff --git a/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java b/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java index 5b3dfdc..49dc961 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java +++ b/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java @@ -1,70 +1,70 @@ -package org.dromara.test; - -import org.dromara.common.core.config.RuoYiConfig; -import org.junit.jupiter.api.*; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import java.util.concurrent.TimeUnit; - -/** - * 单元测试案例 - * - * @author Lion Li - */ -@SpringBootTest // 此注解只能在 springboot 主包下使用 需包含 main 方法与 yml 配置文件 -@DisplayName("单元测试案例") -public class DemoUnitTest { - - @Autowired - private RuoYiConfig ruoYiConfig; - - @DisplayName("测试 @SpringBootTest @Test @DisplayName 注解") - @Test - public void testTest() { - System.out.println(ruoYiConfig); - } - - @Disabled - @DisplayName("测试 @Disabled 注解") - @Test - public void testDisabled() { - System.out.println(ruoYiConfig); - } - - @Timeout(value = 2L, unit = TimeUnit.SECONDS) - @DisplayName("测试 @Timeout 注解") - @Test - public void testTimeout() throws InterruptedException { - Thread.sleep(3000); - System.out.println(ruoYiConfig); - } - - - @DisplayName("测试 @RepeatedTest 注解") - @RepeatedTest(3) - public void testRepeatedTest() { - System.out.println(666); - } - - @BeforeAll - public static void testBeforeAll() { - System.out.println("@BeforeAll =================="); - } - - @BeforeEach - public void testBeforeEach() { - System.out.println("@BeforeEach =================="); - } - - @AfterEach - public void testAfterEach() { - System.out.println("@AfterEach =================="); - } - - @AfterAll - public static void testAfterAll() { - System.out.println("@AfterAll =================="); - } - -} +//package org.dromara.test; +// +//import org.dromara.common.core.config.RuoYiConfig; +//import org.junit.jupiter.api.*; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.boot.test.context.SpringBootTest; +// +//import java.util.concurrent.TimeUnit; +// +///** +// * 单元测试案例 +// * +// * @author Lion Li +// */ +//@SpringBootTest // 此注解只能在 springboot 主包下使用 需包含 main 方法与 yml 配置文件 +//@DisplayName("单元测试案例") +//public class DemoUnitTest { +// +// @Autowired +// private RuoYiConfig ruoYiConfig; +// +// @DisplayName("测试 @SpringBootTest @Test @DisplayName 注解") +// @Test +// public void testTest() { +// System.out.println(ruoYiConfig); +// } +// +// @Disabled +// @DisplayName("测试 @Disabled 注解") +// @Test +// public void testDisabled() { +// System.out.println(ruoYiConfig); +// } +// +// @Timeout(value = 2L, unit = TimeUnit.SECONDS) +// @DisplayName("测试 @Timeout 注解") +// @Test +// public void testTimeout() throws InterruptedException { +// Thread.sleep(3000); +// System.out.println(ruoYiConfig); +// } +// +// +// @DisplayName("测试 @RepeatedTest 注解") +// @RepeatedTest(3) +// public void testRepeatedTest() { +// System.out.println(666); +// } +// +// @BeforeAll +// public static void testBeforeAll() { +// System.out.println("@BeforeAll =================="); +// } +// +// @BeforeEach +// public void testBeforeEach() { +// System.out.println("@BeforeEach =================="); +// } +// +// @AfterEach +// public void testAfterEach() { +// System.out.println("@AfterEach =================="); +// } +// +// @AfterAll +// public static void testAfterAll() { +// System.out.println("@AfterAll =================="); +// } +// +//} diff --git a/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java b/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java index 1db51df..297b345 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java +++ b/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java @@ -1,72 +1,72 @@ -package org.dromara.test; - -import org.dromara.common.core.enums.UserType; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.EnumSource; -import org.junit.jupiter.params.provider.MethodSource; -import org.junit.jupiter.params.provider.NullSource; -import org.junit.jupiter.params.provider.ValueSource; - -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Stream; - -/** - * 带参数单元测试案例 - * - * @author Lion Li - */ -@DisplayName("带参数单元测试案例") -public class ParamUnitTest { - - @DisplayName("测试 @ValueSource 注解") - @ParameterizedTest - @ValueSource(strings = {"t1", "t2", "t3"}) - public void testValueSource(String str) { - System.out.println(str); - } - - @DisplayName("测试 @NullSource 注解") - @ParameterizedTest - @NullSource - public void testNullSource(String str) { - System.out.println(str); - } - - @DisplayName("测试 @EnumSource 注解") - @ParameterizedTest - @EnumSource(UserType.class) - public void testEnumSource(UserType type) { - System.out.println(type.getUserType()); - } - - @DisplayName("测试 @MethodSource 注解") - @ParameterizedTest - @MethodSource("getParam") - public void testMethodSource(String str) { - System.out.println(str); - } - - public static Stream getParam() { - List list = new ArrayList<>(); - list.add("t1"); - list.add("t2"); - list.add("t3"); - return list.stream(); - } - - @BeforeEach - public void testBeforeEach() { - System.out.println("@BeforeEach =================="); - } - - @AfterEach - public void testAfterEach() { - System.out.println("@AfterEach =================="); - } - - -} +//package org.dromara.test; +// +//import org.dromara.common.core.enums.UserType; +//import org.junit.jupiter.api.AfterEach; +//import org.junit.jupiter.api.BeforeEach; +//import org.junit.jupiter.api.DisplayName; +//import org.junit.jupiter.params.ParameterizedTest; +//import org.junit.jupiter.params.provider.EnumSource; +//import org.junit.jupiter.params.provider.MethodSource; +//import org.junit.jupiter.params.provider.NullSource; +//import org.junit.jupiter.params.provider.ValueSource; +// +//import java.util.ArrayList; +//import java.util.List; +//import java.util.stream.Stream; +// +///** +// * 带参数单元测试案例 +// * +// * @author Lion Li +// */ +//@DisplayName("带参数单元测试案例") +//public class ParamUnitTest { +// +// @DisplayName("测试 @ValueSource 注解") +// @ParameterizedTest +// @ValueSource(strings = {"t1", "t2", "t3"}) +// public void testValueSource(String str) { +// System.out.println(str); +// } +// +// @DisplayName("测试 @NullSource 注解") +// @ParameterizedTest +// @NullSource +// public void testNullSource(String str) { +// System.out.println(str); +// } +// +// @DisplayName("测试 @EnumSource 注解") +// @ParameterizedTest +// @EnumSource(UserType.class) +// public void testEnumSource(UserType type) { +// System.out.println(type.getUserType()); +// } +// +// @DisplayName("测试 @MethodSource 注解") +// @ParameterizedTest +// @MethodSource("getParam") +// public void testMethodSource(String str) { +// System.out.println(str); +// } +// +// public static Stream getParam() { +// List list = new ArrayList<>(); +// list.add("t1"); +// list.add("t2"); +// list.add("t3"); +// return list.stream(); +// } +// +// @BeforeEach +// public void testBeforeEach() { +// System.out.println("@BeforeEach =================="); +// } +// +// @AfterEach +// public void testAfterEach() { +// System.out.println("@AfterEach =================="); +// } +// +// +//} diff --git a/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java b/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java index b50afa6..fc2e31c 100644 --- a/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java +++ b/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java @@ -1,54 +1,54 @@ -package org.dromara.test; - -import org.junit.jupiter.api.*; -import org.springframework.boot.test.context.SpringBootTest; - -/** - * 标签单元测试案例 - * - * @author Lion Li - */ -@SpringBootTest -@DisplayName("标签单元测试案例") -public class TagUnitTest { - - @Tag("dev") - @DisplayName("测试 @Tag dev") - @Test - public void testTagDev() { - System.out.println("dev"); - } - - @Tag("prod") - @DisplayName("测试 @Tag prod") - @Test - public void testTagProd() { - System.out.println("prod"); - } - - @Tag("local") - @DisplayName("测试 @Tag local") - @Test - public void testTagLocal() { - System.out.println("local"); - } - - @Tag("exclude") - @DisplayName("测试 @Tag exclude") - @Test - public void testTagExclude() { - System.out.println("exclude"); - } - - @BeforeEach - public void testBeforeEach() { - System.out.println("@BeforeEach =================="); - } - - @AfterEach - public void testAfterEach() { - System.out.println("@AfterEach =================="); - } - - -} +//package org.dromara.test; +// +//import org.junit.jupiter.api.*; +//import org.springframework.boot.test.context.SpringBootTest; +// +///** +// * 标签单元测试案例 +// * +// * @author Lion Li +// */ +//@SpringBootTest +//@DisplayName("标签单元测试案例") +//public class TagUnitTest { +// +// @Tag("dev") +// @DisplayName("测试 @Tag dev") +// @Test +// public void testTagDev() { +// System.out.println("dev"); +// } +// +// @Tag("prod") +// @DisplayName("测试 @Tag prod") +// @Test +// public void testTagProd() { +// System.out.println("prod"); +// } +// +// @Tag("local") +// @DisplayName("测试 @Tag local") +// @Test +// public void testTagLocal() { +// System.out.println("local"); +// } +// +// @Tag("exclude") +// @DisplayName("测试 @Tag exclude") +// @Test +// public void testTagExclude() { +// System.out.println("exclude"); +// } +// +// @BeforeEach +// public void testBeforeEach() { +// System.out.println("@BeforeEach =================="); +// } +// +// @AfterEach +// public void testAfterEach() { +// System.out.println("@AfterEach =================="); +// } +// +// +//} diff --git a/ruoyi-modules/guoyan-platform/pom.xml b/ruoyi-modules/guoyan-platform/pom.xml index 9edfbae..43fd835 100644 --- a/ruoyi-modules/guoyan-platform/pom.xml +++ b/ruoyi-modules/guoyan-platform/pom.xml @@ -3,16 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-modules org.dromara - 5.2.3 + ruoyi-modules + ${revision} + ../pom.xml 4.0.0 - + jar guoyan-platform - - org.dromara @@ -107,7 +106,6 @@ org.dromara ruoyi-system - diff --git a/script/sql/gjh_sql/update.sql b/script/sql/gjh_sql/update.sql index 0e275be..4aba5c8 100644 --- a/script/sql/gjh_sql/update.sql +++ b/script/sql/gjh_sql/update.sql @@ -1,30 +1,58 @@ -drop table if exists work_order_info; -CREATE TABLE `work_order_info` ( - `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '工单ID', - `project_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '所属项目', - `repairer` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '报修人员', - `repairer_id` int NOT NULL COMMENT '保修人员ID', - `is_accident` tinyint(1) NOT NULL COMMENT '是否事故 (0: 否, 1: 是)', - `response_level` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '响应级别 (0: 常规, 1: 紧急, 2: 特急)', - `response_time` int NOT NULL COMMENT '响应时限', - `fault_category` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '故障大类', - `fault_subcategory` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊)', - `institution` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '所属机构', - `fault_location` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '故障地点', - `fault_description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci COMMENT '故障描述', - `fault_image` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '故障图片', - `maintenance_requirement` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他)', - `dispatch_opinion` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '派遣意见', - `is_dispatched` tinyint(1) DEFAULT NULL COMMENT '是否派遣 (0: 否, 1: 是)', - `latitude` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '纬度', - `longitude` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '经度', - `tenant_id` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT '0' COMMENT '租户编号', - `create_dept` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建部门', - `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人', - `update_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '更新人', - `status` tinyint DEFAULT '0' COMMENT '当前状态', - `del_flag` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='工单信息表'; +/* + Navicat Premium Data Transfer + + Source Server : 10.1.21.250 + Source Server Type : MySQL + Source Server Version : 100434 + Source Host : 10.1.21.250:3306 + Source Schema : ry-vue + + Target Server Type : MySQL + Target Server Version : 100434 + File Encoding : 65001 + + Date: 19/02/2025 15:00:38 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for work_order_info +-- ---------------------------- +DROP TABLE IF EXISTS `work_order_info`; +CREATE TABLE `work_order_info` ( + `id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '工单ID', + `project_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '所属项目', + `repairer` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '报修人员', + `repairer_id` int(11) NOT NULL COMMENT '保修人员ID', + `is_accident` tinyint(1) NOT NULL COMMENT '是否事故 (0: 否, 1: 是)', + `response_level` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '响应级别 (0: 常规, 1: 紧急, 2: 特急)', + `response_time` int(11) NOT NULL COMMENT '响应时限', + `fault_category` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '故障大类', + `fault_subcategory` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '故障小类 (0: 电源故障, 1: 光缆故障, 2: 设备故障, 3: 监控故障, 4: 抓拍方向偏移, 5: 树枝遮挡, 6: 无图像, 7: 图像模糊)', + `institution` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '所属机构', + `fault_location` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '故障地点', + `fault_description` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '故障描述', + `fault_image` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '故障图片', + `maintenance_requirement` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '维护要求 (0: 修复, 1: 新增, 2: 拆除, 3: 清除, 4: 其他)', + `dispatch_opinion` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '派遣意见', + `is_dispatched` tinyint(1) NULL DEFAULT NULL COMMENT '是否派遣 (0: 否, 1: 是)', + `latitude` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '纬度', + `longitude` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '经度', + `tenant_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '0' COMMENT '租户编号', + `create_dept` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建部门', + `create_time` timestamp(0) NULL DEFAULT current_timestamp(0) COMMENT '创建时间', + `update_time` timestamp(0) NULL DEFAULT current_timestamp(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间', + `create_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人', + `update_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人', + `status` tinyint(4) NULL DEFAULT 0 COMMENT '当前状态', + `del_flag` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '工单信息表' ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Records of work_order_info +-- ---------------------------- + +SET FOREIGN_KEY_CHECKS = 1;