From 0f06a5ddc3fbb03e0a34532ffca5770d711d4be4 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 27 二月 2024 20:47:20 +0800
Subject: [PATCH] 修改了test代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java | 4 +
ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java | 6 +-
ruoyi-admin/src/test/java/com/ruoyi/esTest.java | 34 +++++-----
ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java | 98 ++++++++++++++++----------------
4 files changed, 72 insertions(+), 70 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java
index fd94d83..3f68808 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/TravelCountController.java
@@ -52,7 +52,9 @@
- return travelCountService.selectDataList(userId,pageNum,pageSize,travelCount,happenStartTime,happenEndTime);
+ AjaxResult res = travelCountService.selectDataList(userId,pageNum,pageSize,travelCount,happenStartTime,happenEndTime);
+ System.out.println(res);
+ return res;
}
@GetMapping("/{id}")
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java b/ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java
index e0d8ec9..a201ed9 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/ExcelTest.java
@@ -20,8 +20,8 @@
@Test
public void testExcelImport() throws Exception {
- InputStream is = new FileInputStream(new File("D:\\test.xlsx"));
- ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
- List<ZfProperty> userList = util.importExcel(is);
+// InputStream is = new FileInputStream(new File("D:\\test.xlsx"));
+// ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
+// List<ZfProperty> userList = util.importExcel(is);
}
}
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/esTest.java b/ruoyi-admin/src/test/java/com/ruoyi/esTest.java
index 4c071ab..ee9e9df 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/esTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/esTest.java
@@ -32,8 +32,8 @@
@Test
public void esUser()
{
- System.out.println("__________________________");
- System.out.println(ess.findByCondition("鎴戠湡鐨勫緢寮�蹇�"));
+// System.out.println("__________________________");
+// System.out.println(ess.findByCondition("鎴戠湡鐨勫緢寮�蹇�"));
// request.settings(Settings.builder().put("number_of_shards", "1").put("number_of_replicas", "0"));
// request.settings(Settings.builder().put("number_of_shards", "1").put("number_of_replicas", "0"));
}
@@ -41,21 +41,21 @@
public void esUs()
{
// // 鎿嶄綔绱㈠紩鐨勫璞�
- System.out.println(ess);
- ZfEvent zfe = new ZfEvent();
- zfe.setId(1489);
- zfe.setRemark("澶у濂�90");
- zfe.setAddress("浣犲ソ2");
- zfe.setTitle("寰堝ソ寰堝ソ");
- zfe.setPeople("浣犲ソ");
- zfEs.addData(zfe);
-
- System.out.println(ess);
- System.out.println("sdsdsdsds");
- System.out.println("sdsdsdsds");
-
- System.out.println("sdsdsdsds");
- System.out.println(ess);
+// System.out.println(ess);
+// ZfEvent zfe = new ZfEvent();
+// zfe.setId(1489);
+// zfe.setRemark("澶у濂�90");
+// zfe.setAddress("浣犲ソ2");
+// zfe.setTitle("寰堝ソ寰堝ソ");
+// zfe.setPeople("浣犲ソ");
+// zfEs.addData(zfe);
+//
+// System.out.println(ess);
+// System.out.println("sdsdsdsds");
+// System.out.println("sdsdsdsds");
+//
+// System.out.println("sdsdsdsds");
+// System.out.println(ess);
//
// EsModel esModel = new EsModel();
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java b/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java
index b2c85b9..9ebe193 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/generatorTest.java
@@ -19,55 +19,55 @@
public class generatorTest {
@Test
public void test01() {
- //鍒涘缓涓�涓唬鐮佺敓鎴愬櫒
- FastAutoGenerator.create("jdbc:mysql://192.168.88.68:3306/mall_pms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8",
- "root", "root")
- //鍏ㄥ眬閰嶇疆(GlobalConfig)
- .globalConfig(builder -> {
- builder.author("ojq") // 璁剧疆浣滆�咃紝鍙互鍐欒嚜宸卞悕瀛�
- //.enableSwagger() // 寮�鍚� swagger 妯″紡锛岃繖涓槸鎺ュ彛鏂囨。鐢熸垚鍣紝濡傛灉寮�鍚殑璇濓紝灏辫繕闇�瑕佸鍏wagger渚濊禆
- .fileOverride() // 瑕嗙洊宸茬敓鎴愭枃浠�
- .dateType(DateType.TIME_PACK) //鏃堕棿绛栫暐
- .commentDate("yyyy-MM-dd") //娉ㄩ噴鏃ユ湡
- .outputDir("F:\\JavaProject\\mail-service\\mall-generator\\src\\main\\java"); // 鎸囧畾杈撳嚭鐩綍锛屼竴鑸寚瀹氬埌java鐩綍
- })
- //鍖呴厤缃�(PackageConfig)
- .packageConfig(builder -> {
- builder.parent("com.ojq") // 璁剧疆鐖跺寘鍚�
- .moduleName("") // 璁剧疆鐖跺寘妯″潡鍚嶏紝杩欓噷涓�鑸笉璁剧疆
- .pathInfo(Collections.singletonMap(OutputFile.mapperXml, "F:\\JavaProject\\mail-service\\mall-generator\\src\\main\\resources\\com\\ojq\\mapper")); // 璁剧疆mapperXml鐢熸垚璺緞锛岃繖閲屾槸Mapper閰嶇疆鏂囦欢鐨勮矾寰勶紝寤鸿浣跨敤缁濆璺緞
- })
- //绛栫暐閰嶇疆(StrategyConfig)
- .strategyConfig(builder -> {
-// builder.addInclude("zf_clean") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-// .addInclude("zf_collection") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- builder.addInclude("pms_attr") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("pms_attr_attrgroup_relation") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("pms_attr_group") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("pms_brand") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("pms_category") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("pms_category_brand") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("pms_comment_replay") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("pms_product_attr_value") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("pms_sku_images") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("pms_sku_info") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("pms_sku_sale_attr_value") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("pms_spu_comment") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("pms_spu_images") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("pms_spu_info") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
- .addInclude("pms_spu_info_desc"); // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
-
- builder.serviceBuilder()
- .formatServiceFileName("%sService") //璁剧疆service鐨勫懡鍚嶇瓥鐣�,娌℃湁杩欎釜閰嶇疆鐨勮瘽锛岀敓鎴愮殑service鍜宻erviceImpl绫诲墠闈細鏈変竴涓狪锛屾瘮濡侷UserService鍜孖UserServiceImpl
- .formatServiceImplFileName("%sServiceImpl"); //璁剧疆serviceImpl鐨勫懡鍚嶇瓥鐣�
- builder.controllerBuilder()
- .enableRestStyle(); // 寮�鍚敓鎴怈RestController 鎺у埗鍣紝涓嶉厤缃繖涓粯璁ゆ槸Controller娉ㄨВ锛孯estController鏄繑鍥濲son瀛楃涓茬殑锛屽鐢ㄤ簬鍓嶅悗绔垎绂婚」鐩��
- builder.mapperBuilder()
- .enableMapperAnnotation() ;//寮�鍚� @Mapper 娉ㄨВ锛屼篃灏辨槸鍦╠ao鎺ュ彛涓婃坊鍔犱竴涓狜Mapper娉ㄨВ锛岃繖涓敞瑙ｇ殑浣滅敤鏄紑鍚敞瑙ｆā寮忥紝灏卞彲浠ュ湪鎺ュ彛鐨勬娊璞℃柟娉曚笂闈㈢洿鎺ヤ娇鐢ˊSelect鍜孈Insert鍜孈Update鍜孈Delete娉ㄨВ銆�
- })
-// .templateEngine(new FreemarkerTemplateEngine()) // 浣跨敤Freemarker寮曟搸妯℃澘锛岄粯璁ょ殑鏄疺elocity寮曟搸妯℃澘
- .templateEngine(new VelocityTemplateEngine())
- .execute(); //鎵ц浠ヤ笂閰嶇疆
+// //鍒涘缓涓�涓唬鐮佺敓鎴愬櫒
+// FastAutoGenerator.create("jdbc:mysql://192.168.88.68:3306/mall_pms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8",
+// "root", "root")
+// //鍏ㄥ眬閰嶇疆(GlobalConfig)
+// .globalConfig(builder -> {
+// builder.author("ojq") // 璁剧疆浣滆�咃紝鍙互鍐欒嚜宸卞悕瀛�
+// //.enableSwagger() // 寮�鍚� swagger 妯″紡锛岃繖涓槸鎺ュ彛鏂囨。鐢熸垚鍣紝濡傛灉寮�鍚殑璇濓紝灏辫繕闇�瑕佸鍏wagger渚濊禆
+// .fileOverride() // 瑕嗙洊宸茬敓鎴愭枃浠�
+// .dateType(DateType.TIME_PACK) //鏃堕棿绛栫暐
+// .commentDate("yyyy-MM-dd") //娉ㄩ噴鏃ユ湡
+// .outputDir("F:\\JavaProject\\mail-service\\mall-generator\\src\\main\\java"); // 鎸囧畾杈撳嚭鐩綍锛屼竴鑸寚瀹氬埌java鐩綍
+// })
+// //鍖呴厤缃�(PackageConfig)
+// .packageConfig(builder -> {
+// builder.parent("com.ojq") // 璁剧疆鐖跺寘鍚�
+// .moduleName("") // 璁剧疆鐖跺寘妯″潡鍚嶏紝杩欓噷涓�鑸笉璁剧疆
+// .pathInfo(Collections.singletonMap(OutputFile.mapperXml, "F:\\JavaProject\\mail-service\\mall-generator\\src\\main\\resources\\com\\ojq\\mapper")); // 璁剧疆mapperXml鐢熸垚璺緞锛岃繖閲屾槸Mapper閰嶇疆鏂囦欢鐨勮矾寰勶紝寤鸿浣跨敤缁濆璺緞
+// })
+// //绛栫暐閰嶇疆(StrategyConfig)
+// .strategyConfig(builder -> {
+//// builder.addInclude("zf_clean") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//// .addInclude("zf_collection") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+// builder.addInclude("pms_attr") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+// .addInclude("pms_attr_attrgroup_relation") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+// .addInclude("pms_attr_group") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+// .addInclude("pms_brand") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+// .addInclude("pms_category") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+// .addInclude("pms_category_brand") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+// .addInclude("pms_comment_replay") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+// .addInclude("pms_product_attr_value") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+// .addInclude("pms_sku_images") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+// .addInclude("pms_sku_info") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+// .addInclude("pms_sku_sale_attr_value") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+// .addInclude("pms_spu_comment") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+// .addInclude("pms_spu_images") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+// .addInclude("pms_spu_info") // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+// .addInclude("pms_spu_info_desc"); // 璁剧疆闇�瑕佺敓鎴愮殑琛ㄥ悕
+//
+// builder.serviceBuilder()
+// .formatServiceFileName("%sService") //璁剧疆service鐨勫懡鍚嶇瓥鐣�,娌℃湁杩欎釜閰嶇疆鐨勮瘽锛岀敓鎴愮殑service鍜宻erviceImpl绫诲墠闈細鏈変竴涓狪锛屾瘮濡侷UserService鍜孖UserServiceImpl
+// .formatServiceImplFileName("%sServiceImpl"); //璁剧疆serviceImpl鐨勫懡鍚嶇瓥鐣�
+// builder.controllerBuilder()
+// .enableRestStyle(); // 寮�鍚敓鎴怈RestController 鎺у埗鍣紝涓嶉厤缃繖涓粯璁ゆ槸Controller娉ㄨВ锛孯estController鏄繑鍥濲son瀛楃涓茬殑锛屽鐢ㄤ簬鍓嶅悗绔垎绂婚」鐩��
+// builder.mapperBuilder()
+// .enableMapperAnnotation() ;//寮�鍚� @Mapper 娉ㄨВ锛屼篃灏辨槸鍦╠ao鎺ュ彛涓婃坊鍔犱竴涓狜Mapper娉ㄨВ锛岃繖涓敞瑙ｇ殑浣滅敤鏄紑鍚敞瑙ｆā寮忥紝灏卞彲浠ュ湪鎺ュ彛鐨勬娊璞℃柟娉曚笂闈㈢洿鎺ヤ娇鐢ˊSelect鍜孈Insert鍜孈Update鍜孈Delete娉ㄨВ銆�
+// })
+//// .templateEngine(new FreemarkerTemplateEngine()) // 浣跨敤Freemarker寮曟搸妯℃澘锛岄粯璁ょ殑鏄疺elocity寮曟搸妯℃澘
+// .templateEngine(new VelocityTemplateEngine())
+// .execute(); //鎵ц浠ヤ笂閰嶇疆
}
--
Gitblit v1.9.1