Commit f9bb8cf2 authored by dqjdda's avatar dqjdda
Browse files

修复定时任务执行失败后还继续执行的bug,优化Redis发生异常时,程序正常执行,优化Excel大数据导出,优化QueryHelp,其他细节优化

parent a481b16b
...@@ -45,7 +45,7 @@ public class PictureController { ...@@ -45,7 +45,7 @@ public class PictureController {
public ResponseEntity upload(@RequestParam MultipartFile file){ public ResponseEntity upload(@RequestParam MultipartFile file){
String userName = SecurityUtils.getUsername(); String userName = SecurityUtils.getUsername();
Picture picture = pictureService.upload(file,userName); Picture picture = pictureService.upload(file,userName);
Map map = new HashMap(3); Map<String,Object> map = new HashMap<>(3);
map.put("errno",0); map.put("errno",0);
map.put("id",picture.getId()); map.put("id",picture.getId());
map.put("data",new String[]{picture.getUrl()}); map.put("data",new String[]{picture.getUrl()});
......
...@@ -22,7 +22,7 @@ public interface LocalStorageService { ...@@ -22,7 +22,7 @@ public interface LocalStorageService {
* @param pageable * @param pageable
* @return * @return
*/ */
@Cacheable(keyGenerator = "keyGenerator") @Cacheable
Object queryAll(LocalStorageQueryCriteria criteria, Pageable pageable); Object queryAll(LocalStorageQueryCriteria criteria, Pageable pageable);
/** /**
...@@ -30,7 +30,7 @@ public interface LocalStorageService { ...@@ -30,7 +30,7 @@ public interface LocalStorageService {
* @param criteria * @param criteria
* @return * @return
*/ */
@Cacheable(keyGenerator = "keyGenerator") @Cacheable
public Object queryAll(LocalStorageQueryCriteria criteria); public Object queryAll(LocalStorageQueryCriteria criteria);
/** /**
......
...@@ -20,7 +20,7 @@ public interface PictureService { ...@@ -20,7 +20,7 @@ public interface PictureService {
* @param pageable * @param pageable
* @return * @return
*/ */
@Cacheable(keyGenerator = "keyGenerator") @Cacheable
Object queryAll(PictureQueryCriteria criteria, Pageable pageable); Object queryAll(PictureQueryCriteria criteria, Pageable pageable);
/** /**
......
...@@ -24,7 +24,7 @@ public interface QiNiuService { ...@@ -24,7 +24,7 @@ public interface QiNiuService {
* @param pageable * @param pageable
* @return * @return
*/ */
@Cacheable(keyGenerator = "keyGenerator") @Cacheable
Object queryAll(QiniuQueryCriteria criteria, Pageable pageable); Object queryAll(QiniuQueryCriteria criteria, Pageable pageable);
/** /**
......
...@@ -160,6 +160,17 @@ ...@@ -160,6 +160,17 @@
<artifactId>poi</artifactId> <artifactId>poi</artifactId>
<version>3.17</version> <version>3.17</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.17</version>
</dependency>
<!-- https://mvnrepository.com/artifact/xerces/xercesImpl -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.11.0</version>
</dependency>
<!-- fastjson --> <!-- fastjson -->
<dependency> <dependency>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment