From bd8d88e5e984e59a5c895ec1a254e3dbae1f9f21 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 21 Jan 2025 14:55:39 +0800
Subject: [PATCH] 修复
---
/dev/null | 40 ----------------------------------------
src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml | 2 +-
2 files changed, 1 insertions(+), 41 deletions(-)
diff --git a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
index a4ba966..4d980eb 100644
--- a/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/assessment/mapper/AssessmentScoreMapper.xml
@@ -91,7 +91,7 @@
</select>
<select id="selectAssessmentScoreInfoV2Page" resultMap="assessmentScoreResultInfoMap">
- select a.user_name as scoreUserName,a.dept_name as scoreDeptName,a.post_name as scorePostName,
+ select c.id,a.user_name as scoreUserName,a.dept_name as scoreDeptName,a.post_name as scorePostName,
b.user_name,b.dept_name ,b.post_name,
<if test="assessmentScore.type != null and assessmentScore.type == 0">
diff --git a/src/test/java/org/springblade/test/BladeTest.java b/src/test/java/org/springblade/test/BladeTest.java
deleted file mode 100644
index 600b816..0000000
--- a/src/test/java/org/springblade/test/BladeTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.springblade.test;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springblade.core.test.BladeBootTest;
-import org.springblade.core.test.BladeSpringExtension;
-import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.flow.engine.entity.FlowModel;
-import org.springblade.flow.engine.service.FlowEngineService;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-
-/**
- * Blade单元测试
- *
- * @author Chill
- */
-@ExtendWith(BladeSpringExtension.class)
-@BladeBootTest(appName = "blade-runner", enableLoader = true)
-public class BladeTest {
-
- @Autowired
- private FlowEngineService service;
-
- @Test
- public void contextLoads() {
- System.out.println("=====数据迁移启动=====");
-
- // 获取 ACT_DE_MODEL 表需要转换的数据
- List<FlowModel> list = service.list();
- // 循环转换
- list.forEach(flowModel -> {
- if (StringUtil.isBlank(flowModel.getModelEditorXml())) {
- service.update(Wrappers.<FlowModel>lambdaUpdate()
- .set(FlowModel::getModelEditorXml, new String(service.getModelEditorXML(flowModel)))
- .ge(FlowModel::getId, flowModel.getId())
- );
- }
- });
-
- System.out.println("=====数据迁移完毕=====");
- }
-
-}
diff --git a/src/test/java/org/springblade/test/CodeGenerator.java b/src/test/java/org/springblade/test/CodeGenerator.java
deleted file mode 100644
index eb66528..0000000
--- a/src/test/java/org/springblade/test/CodeGenerator.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.test;
-
-
-import org.springblade.develop.constant.DevelopConstant;
-import org.springblade.develop.support.BladeCodeGenerator;
-
-/**
- * 代码生成器
- *
- * @author Chill
- */
-public class CodeGenerator {
-
- /**
- * 代码生成的模块名
- */
- public static String CODE_NAME = "自定义模块";
- /**
- * 代码所在服务名
- */
- public static String SERVICE_NAME = "blade-desk";
- /**
- * 代码生成的包名
- */
- public static String PACKAGE_NAME = "org.springblade.desk";
- /**
- * 前端代码生成风格
- */
- public static String CODE_STYLE = DevelopConstant.SABER_NAME;
- /**
- * 前端代码生成地址
- */
- public static String PACKAGE_WEB_DIR = "/Users/chill/Workspaces/product/Sword";
- /**
- * 需要去掉的表前缀
- */
- public static String[] TABLE_PREFIX = {"blade_"};
- /**
- * 需要生成的表名(两者只能取其一)
- */
- public static String[] INCLUDE_TABLES = {"blade_notice"};
- /**
- * 需要排除的表名(两者只能取其一)
- */
- public static String[] EXCLUDE_TABLES = {};
- /**
- * 是否包含基础业务字段
- */
- public static Boolean HAS_SUPER_ENTITY = Boolean.TRUE;
- /**
- * 基础业务字段
- */
- public static String[] SUPER_ENTITY_COLUMNS = {"id", "create_time", "create_user", "create_dept", "update_time", "update_user", "status", "is_deleted"};
-
- /**
- * RUN THIS
- */
- public static void main(String[] args) {
- BladeCodeGenerator generator = new BladeCodeGenerator();
- generator.setCodeName(CODE_NAME);
- generator.setServiceName(SERVICE_NAME);
- generator.setCodeStyle(CODE_STYLE);
- generator.setPackageName(PACKAGE_NAME);
- generator.setPackageWebDir(PACKAGE_WEB_DIR);
- generator.setTablePrefix(TABLE_PREFIX);
- generator.setIncludeTables(INCLUDE_TABLES);
- generator.setExcludeTables(EXCLUDE_TABLES);
- generator.setHasSuperEntity(HAS_SUPER_ENTITY);
- generator.setSuperEntityColumns(SUPER_ENTITY_COLUMNS);
- generator.run();
- }
-
-}
diff --git a/src/test/java/org/springblade/test/SignKeyGenerator.java b/src/test/java/org/springblade/test/SignKeyGenerator.java
deleted file mode 100644
index a0ff708..0000000
--- a/src/test/java/org/springblade/test/SignKeyGenerator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.springblade.test;
-
-import org.springblade.core.tool.utils.RandomType;
-import org.springblade.core.tool.utils.StringUtil;
-
-/**
- * signKey生成器
- *
- * @author Chill
- */
-public class SignKeyGenerator {
-
- public static void main(String[] args) {
- System.out.println("=======================================================");
- System.out.println("====== blade.token.sign-key 的值从中挑选一个便可 =========");
- System.out.println("=======================================================");
- for (int i = 0; i < 10; i++) {
- String signKey = StringUtil.random(32, RandomType.ALL);
- System.out.println("BladeX SignKey：[" + signKey + "] ");
- }
- System.out.println("=======================================================");
- }
-
-}
diff --git a/src/test/java/org/springblade/test/http/OsChina.java b/src/test/java/org/springblade/test/http/OsChina.java
deleted file mode 100644
index 9583620..0000000
--- a/src/test/java/org/springblade/test/http/OsChina.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.springblade.test.http;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springblade.core.http.CssQuery;
-
-import java.util.List;
-
-@Getter
-@Setter
-public class OsChina {
-
- @CssQuery(value = "head > title", attr = "text")
- private String title;
-
- @CssQuery(value = "#v_news .page .news", inner = true)
- private List<VNews> vNews;
-
- @CssQuery(value = ".blog-container .blog-list div", inner = true)
- private List<VBlog> vBlogList;
-
-}
diff --git a/src/test/java/org/springblade/test/http/OsChinaTest.java b/src/test/java/org/springblade/test/http/OsChinaTest.java
deleted file mode 100644
index 34e1209..0000000
--- a/src/test/java/org/springblade/test/http/OsChinaTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.springblade.test.http;
-
-import org.springblade.core.http.HttpRequest;
-
-import java.util.List;
-
-public class OsChinaTest {
-
- public static void main(String[] args) {
- // 同步，异常返回 null
- OsChina oschina = HttpRequest.get("https://www.oschina.net")
- .execute()
- .onSuccess(responseSpec -> responseSpec.asDomValue(OsChina.class));
- if (oschina == null) {
- return;
- }
- System.out.println(oschina.getTitle());
-
- System.out.println("热门新闻");
-
- List<VNews> vNews = oschina.getVNews();
- for (VNews vNew : vNews) {
- System.out.println("title:\t" + vNew.getTitle());
- System.out.println("href:\t" + vNew.getHref());
- System.out.println("时间:\t" + vNew.getDate());
- }
-
- System.out.println("热门博客");
- List<VBlog> vBlogList = oschina.getVBlogList();
- for (VBlog vBlog : vBlogList) {
- System.out.println("title:\t" + vBlog.getTitle());
- System.out.println("href:\t" + vBlog.getHref());
- System.out.println("阅读数:\t" + vBlog.getRead());
- System.out.println("评价数:\t" + vBlog.getPing());
- System.out.println("点赞数:\t" + vBlog.getZhan());
- }
- }
-}
diff --git a/src/test/java/org/springblade/test/http/VBlog.java b/src/test/java/org/springblade/test/http/VBlog.java
deleted file mode 100644
index 0488891..0000000
--- a/src/test/java/org/springblade/test/http/VBlog.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.springblade.test.http;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springblade.core.http.CssQuery;
-
-/**
- * 热门博客
- */
-@Getter
-@Setter
-public class VBlog {
-
- @CssQuery(value = "a", attr = "title")
- private String title;
-
- @CssQuery(value = "a", attr = "href")
- private String href;
-
- //1341阅/9评/4赞
- @CssQuery(value = "span", attr = "text", regex = "^\\d+")
- private Integer read;
-
- @CssQuery(value = "span", attr = "text", regex = "(\\d*).*/(\\d*).*/(\\d*).*", regexGroup = 2)
- private Integer ping;
-
- @CssQuery(value = "span", attr = "text", regex = "(\\d*).*/(\\d*).*/(\\d*).*", regexGroup = 3)
- private Integer zhan;
-
-}
diff --git a/src/test/java/org/springblade/test/http/VNews.java b/src/test/java/org/springblade/test/http/VNews.java
deleted file mode 100644
index 3b5763c..0000000
--- a/src/test/java/org/springblade/test/http/VNews.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.springblade.test.http;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.springblade.core.http.CssQuery;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-@Setter
-@Getter
-public class VNews {
-
- @CssQuery(value = "a", attr = "title")
- private String title;
-
- @CssQuery(value = "a", attr = "href")
- private String href;
-
- @CssQuery(value = ".news-date", attr = "text")
- @DateTimeFormat(pattern = "MM/dd")
- private Date date;
-
-}
diff --git a/src/test/java/org/springblade/test/launch/LauncherTestServiceImpl.java b/src/test/java/org/springblade/test/launch/LauncherTestServiceImpl.java
deleted file mode 100644
index 192e754..0000000
--- a/src/test/java/org/springblade/test/launch/LauncherTestServiceImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
-package org.springblade.test.launch;
-
-import org.springblade.core.auto.service.AutoService;
-import org.springblade.core.launch.service.LauncherService;
-import org.springblade.core.launch.utils.PropsUtil;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-
-import java.util.Properties;
-
-/**
- * 启动参数拓展
- *
- * @author smallchil
- */
-@AutoService(LauncherService.class)
-public class LauncherTestServiceImpl implements LauncherService {
-
- @Override
- public void launcher(SpringApplicationBuilder builder, String appName, String profile, boolean isLocalDev) {
- Properties props = System.getProperties();
- PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "false");
- }
-
-}
--
Gitblit v1.9.3