From 8954ec90143fb27f3b860a316531062b5d9e1171 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Fri, 30 Aug 2024 18:12:42 +0800
Subject: [PATCH] jdk 升级为 11 修改不兼容Base64
---
src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java b/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java
index a092b03..fd46f68 100644
--- a/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java
+++ b/src/main/java/org/springblade/modules/architecture/controller/ArchitectureController.java
@@ -53,7 +53,7 @@
import org.springblade.modules.architecture.service.IArchitectureService;
import org.springblade.core.boot.ctrl.BladeController;
import springfox.documentation.annotations.ApiIgnore;
-import sun.misc.BASE64Encoder;
+//import sun.misc.BASE64Encoder;
import java.io.*;
import java.net.URLEncoder;
@@ -292,8 +292,8 @@
* @return
*/
@GetMapping("/selectArchALL")
- public R selectArchALL() {
- return R.data(architectureService.selectArchALL());
+ public R selectArchALL(ArchitectureVO architecture) {
+ return R.data(architectureService.selectArchALL(architecture));
}
/**
@@ -409,12 +409,13 @@
* 校园搜索
*
* @param mechanismName 名称模糊查询
+ * @param campus 所属校区
* @return
*/
@GetMapping("/selectLook")
- public R selectLook(String mechanismName) {
+ public R selectLook(String mechanismName,String campus) {
List list = new ArrayList();
- List<Map<Object, Object>> maps = architectureService.selectLook(mechanismName);
+ List<Map<Object, Object>> maps = architectureService.selectLook(mechanismName,campus);
//排除为null的数据
List<Map<Object, Object>> list2 = maps.parallelStream().filter(Objects::nonNull).collect(Collectors.toList());
// for (int i = 0; i < list2.size(); i++) {
@@ -432,7 +433,7 @@
*/
@GetMapping("/url")
public void url() throws IOException, ServerException, InsufficientDataException, NoSuchAlgorithmException, InternalException, InvalidResponseException, XmlParserException, InvalidKeyException, ErrorResponseException {
- List<Architecture> list = architectureService.selectArchALL();
+ List<Architecture> list = architectureService.selectArchALL(null);
for (Architecture architecture : list) {
int index = architecture.getCodeurl().lastIndexOf(",") +1;
String substring = architecture.getCodeurl().substring(index);
@@ -496,7 +497,7 @@
*/
@GetMapping("/refreshCode")
public void refreshCode() throws IOException, ServerException, InsufficientDataException, NoSuchAlgorithmException, InternalException, InvalidResponseException, XmlParserException, InvalidKeyException, ErrorResponseException {
- List<Architecture> list = architectureService.selectArchALL();
+ List<Architecture> list = architectureService.selectArchALL(null);
for (Architecture architecture : list) {
int index = architecture.getCodeurl().lastIndexOf(",") +1;
String substring = architecture.getCodeurl().substring(index);
--
Gitblit v1.9.3