diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java index 5b9c9f8..c1f9af2 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java @@ -12,7 +12,7 @@ import org.junit.jupiter.api.Test; @DisplayName("断言单元测试案例") public class AssertUnitTest { - @DisplayName("测试 assertEquals 方法") + /*@DisplayName("测试 assertEquals 方法") @Test public void testAssertEquals() { Assertions.assertEquals("666", new String("666")); @@ -40,6 +40,6 @@ public class AssertUnitTest { public void testAssertNull() { Assertions.assertNull(null); Assertions.assertNotNull(null); - } + }*/ } diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java index a40fd82..d5443f6 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java @@ -19,7 +19,7 @@ public class DemoUnitTest { @Autowired private RuoYiConfig ruoYiConfig; - @DisplayName("测试 @SpringBootTest @Test @DisplayName 注解") + /*@DisplayName("测试 @SpringBootTest @Test @DisplayName 注解") @Test public void testTest() { System.out.println(ruoYiConfig); @@ -66,5 +66,5 @@ public class DemoUnitTest { public static void testAfterAll() { System.out.println("@AfterAll =================="); } - +*/ } diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java index 04bf1b5..4510800 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java @@ -22,7 +22,7 @@ import java.util.stream.Stream; @DisplayName("带参数单元测试案例") public class ParamUnitTest { - @DisplayName("测试 @ValueSource 注解") + /* @DisplayName("测试 @ValueSource 注解") @ParameterizedTest @ValueSource(strings = {"t1", "t2", "t3"}) public void testValueSource(String str) { @@ -68,5 +68,5 @@ public class ParamUnitTest { System.out.println("@AfterEach =================="); } - +*/ } diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java index 04240a0..c53a41d 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java @@ -12,7 +12,7 @@ import org.springframework.boot.test.context.SpringBootTest; @DisplayName("标签单元测试案例") public class TagUnitTest { - @Tag("dev") + /*@Tag("dev") @DisplayName("测试 @Tag dev") @Test public void testTagDev() { @@ -49,6 +49,6 @@ public class TagUnitTest { public void testAfterEach() { System.out.println("@AfterEach =================="); } - +*/ } diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/domain/GwSlideshow.java b/ruoyi-system/src/main/java/com/ruoyi/official/domain/GwSlideshow.java index e680ba4..8665d77 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/domain/GwSlideshow.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/domain/GwSlideshow.java @@ -38,6 +38,11 @@ public class GwSlideshow extends BaseEntity { * 标题名称 */ private String captionName; + + /** + * 标题名称english + */ + private String captionNameEnglish; /** * 发布时间 */ @@ -46,14 +51,26 @@ public class GwSlideshow extends BaseEntity { * 集团名称 */ private String groupName; + /** + * 集团名称english + */ + private String groupNameEnglish; /** * 新闻内容 */ private String newsContent; + /** + * 新闻内容english + */ + private String newsContentEnglish; /** * 摘要 */ private String abstracts; + /** + * 摘要english + */ + private String abstractsEnglish; /** * 是否置顶 0:否 1:是 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwSlideshowBo.java b/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwSlideshowBo.java index 1c33d2a..a0df34c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwSlideshowBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwSlideshowBo.java @@ -42,6 +42,12 @@ public class GwSlideshowBo extends BaseEntity { @NotBlank(message = "标题名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String captionName; + /** + * 标题名称english + */ + @NotBlank(message = "标题名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String captionNameEnglish; + /** * 发布时间 */ @@ -54,17 +60,34 @@ public class GwSlideshowBo extends BaseEntity { @NotBlank(message = "集团名称不能为空", groups = { AddGroup.class, EditGroup.class }) private String groupName; + /** + * 集团名称english + */ + @NotBlank(message = "集团名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String groupNameEnglish; + /** * 新闻内容 */ @NotBlank(message = "新闻内容不能为空", groups = { AddGroup.class, EditGroup.class }) private String newsContent; + /** + * 新闻内容english + */ + @NotBlank(message = "新闻内容不能为空", groups = { AddGroup.class, EditGroup.class }) + private String newsContentEnglish; + /** * 摘要 */ private String abstracts; + /** + * 摘要english + */ + private String abstractsEnglish; + /** * 是否置顶 0:否 1:是 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/GwSlideshowVo.java b/ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/GwSlideshowVo.java index 84480e1..0c042e4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/GwSlideshowVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/GwSlideshowVo.java @@ -41,6 +41,11 @@ public class GwSlideshowVo { */ @ExcelProperty(value = "标题名称") private String captionName; + /** + * 标题名称english + */ + @ExcelProperty(value = "标题名称") + private String captionNameEnglish; /** * 发布时间 @@ -53,6 +58,11 @@ public class GwSlideshowVo { */ @ExcelProperty(value = "集团名称") private String groupName; + /** + * 集团名称english + */ + @ExcelProperty(value = "集团名称") + private String groupNameEnglish; /** * 新闻内容 @@ -60,12 +70,24 @@ public class GwSlideshowVo { @ExcelProperty(value = "新闻内容") private String newsContent; + /** + * 新闻内容english + */ + @ExcelProperty(value = "新闻内容") + private String newsContentEnglish; + /** * 摘要 */ @ExcelProperty(value = "摘要") private String abstracts; + /** + * 摘要english + */ + @ExcelProperty(value = "摘要") + private String abstractsEnglish; + /** * 是否置顶 0:否 1:是 */ diff --git a/ruoyi-system/src/main/resources/mapper/official/GwSlideshowMapper.xml b/ruoyi-system/src/main/resources/mapper/official/GwSlideshowMapper.xml index efdc951..3566e46 100644 --- a/ruoyi-system/src/main/resources/mapper/official/GwSlideshowMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/official/GwSlideshowMapper.xml @@ -8,10 +8,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - - - + + +