From c2e3dea0d75b7239b1ed66c9d9e1bbb177050858 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 13:57:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java
index 505b70a..57a52f5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java
@@ -23,9 +23,9 @@
import com.yeshi.fanli.entity.bus.lable.Label;
import com.yeshi.fanli.entity.bus.lable.LabelGoods;
import com.yeshi.fanli.entity.common.AdminUser;
-import com.yeshi.fanli.exception.LabelException;
-import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.exception.goods.quality.LabelException;
import com.yeshi.fanli.service.inter.lable.LabelService;
+import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.StringUtil;
import jxl.Sheet;
@@ -50,7 +50,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void insertList(List<Label> records,AdminUser admin) throws LabelException{
if (records != null && records.size() > 0) {
for (Label label : records) {
@@ -97,7 +97,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void updateList(List<Label> records) throws LabelException{
if (records != null && records.size() > 0) {
for (Label label : records) {
@@ -126,13 +126,13 @@
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public int deleteBatchById(long[] ids) throws LabelException{
return labelMapper.deleteBatchByPrimaryKey(ids);
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void deleteBatchByPrimaryKey(List<Long> ids) throws LabelException {
for (Long id : ids) {
Label label = labelMapper.selectByPrimaryKey(id);
@@ -157,14 +157,21 @@
@Override
public List<Label> selectByTitle(String title) throws LabelException{
- LogHelper.test("鏌ヨ鏍囩锛� "+title);
return labelMapper.selectByTitle(title);
}
+
@Override
- @Cacheable(value = "labelCache",key="'selectByTitleCache-'+#labKey +'-'+#title")
- public List<Label> selectByTitleCache(String labKey, String title) throws LabelException{
- return selectByTitle(title);
+ @Cacheable(value = "labelCache",key="'getByTitleCache-'+#labKey +'-'+#title")
+ public Label getByTitleCache(String labKey, String title) throws LabelException{
+ return labelMapper.getByTitle(title);
+ }
+
+
+ @Override
+ @Cacheable(value = "labelCache",key="'listByTitlesCache-'+#list")
+ public List<Label> listByTitlesCache(List<String> list){
+ return labelMapper.listByTitles(list);
}
@@ -239,7 +246,7 @@
String contentType = file.getContentType();
String type = contentType.substring(contentType.indexOf("/") + 1);
// 涓婁紶鏂囦欢鐩稿浣嶇疆
- String fileUrl="LableImg/"+UUID.randomUUID().toString().replace("-", "") + "." + type;
+ String fileUrl=FilePathEnum.lable.getPath() + UUID.randomUUID().toString().replace("-", "") + "." + type;
boolean deleteFile =true;
--
Gitblit v1.8.0