From 5d8d6211c77edc6d07d1a3f847904dd30a8b3447 Mon Sep 17 00:00:00 2001
From: fangyuan <527392886@qq.com>
Date: 星期四, 16 二月 2023 09:32:45 +0800
Subject: [PATCH] 案件bug修复及优化
---
src/main/java/com/example/jz/dao/CauseDao.java | 3 +++
src/main/java/com/example/jz/service/MinIOService.java | 2 +-
src/main/java/com/example/jz/service/impl/CauseServiceImpl.java | 3 ++-
src/main/resources/application.yml | 6 +++---
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/example/jz/dao/CauseDao.java b/src/main/java/com/example/jz/dao/CauseDao.java
index b3a873d..457ab71 100644
--- a/src/main/java/com/example/jz/dao/CauseDao.java
+++ b/src/main/java/com/example/jz/dao/CauseDao.java
@@ -1,9 +1,12 @@
package com.example.jz.dao;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.jz.modle.entity.Cause;
import org.apache.ibatis.annotations.Mapper;
+import java.util.Arrays;
+
/**
* 妗堜欢琛�(Cause)琛ㄦ暟鎹簱璁块棶灞�
*
diff --git a/src/main/java/com/example/jz/service/MinIOService.java b/src/main/java/com/example/jz/service/MinIOService.java
index 1b9559e..d6cbc39 100644
--- a/src/main/java/com/example/jz/service/MinIOService.java
+++ b/src/main/java/com/example/jz/service/MinIOService.java
@@ -3,7 +3,7 @@
import org.springframework.web.multipart.MultipartFile;
public interface MinIOService {
- public String getPreviewFileUrl(String fileName);
+ String getPreviewFileUrl(String fileName);
String upload(MultipartFile file);
diff --git a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
index f30d942..8090b17 100644
--- a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -306,7 +307,7 @@
@Override
public List<Map<String, String>> getCauseIdAndName() {
ArrayList<Map<String, String>> maps = new ArrayList<>();
- causeDao.selectList(null).stream().forEach(a -> {
+ causeDao.selectList(new QueryWrapper<Cause>().eq("status", 0).or().eq("status", 2)).stream().forEach(a -> {
Map<String, String> map = new HashMap<>();
map.put("id", a.getId().toString());
map.put("name", a.getName());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bd2a932..b8a3fe4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,6 +1,6 @@
# 绔彛鍙�
server:
- port: 8888
+ port: 8080
# spring閰嶇疆
spring:
@@ -48,5 +48,5 @@
#灏忕▼搴�
wx:
- appid: wx15ee01704b3c9dd0
- secret: a96eaee73d9de507d8412b7d2959b927
\ No newline at end of file
+ appid: wxd7bb3a22cfb97aaa
+ secret: 0d08a9dfe83749d65aea9a0ad3a23b5a
\ No newline at end of file
--
Gitblit v1.8.0