From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并
---
fanli/src/main/java/com/yeshi/fanli/service/impl/lable/LabelServiceImpl.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 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 f284fe1..505b70a 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
@@ -10,14 +10,12 @@
import java.util.UUID;
import javax.annotation.Resource;
-import javax.transaction.Transactional;
-
-import jxl.Sheet;
-import jxl.Workbook;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import org.yeshi.utils.tencentcloud.COSManager;
import com.yeshi.fanli.dao.mybatis.lable.LabelClassMapper;
import com.yeshi.fanli.dao.mybatis.lable.LabelGoodsMapper;
@@ -29,15 +27,15 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.lable.LabelService;
import com.yeshi.fanli.util.StringUtil;
-import org.yeshi.utils.tencentcloud.COSManager;
+
+import jxl.Sheet;
+import jxl.Workbook;
@Service
public class LabelServiceImpl implements LabelService {
@Resource
private LabelMapper labelMapper;
- @Resource
- private LabelService labelService;
@Resource
private LabelGoodsMapper labelGoodsMapper;
@@ -92,7 +90,7 @@
// 涓婁紶鍥剧墖
if (file != null) {
- labelService.uploadPicture(file, label);
+ uploadPicture(file, label);
}
@@ -140,7 +138,7 @@
Label label = labelMapper.selectByPrimaryKey(id);
if (label != null) {
// 鍒犻櫎鍥剧墖
- labelService.deleteImg(label);
+ deleteImg(label);
// 鍒犻櫎鏁版嵁淇℃伅
labelMapper.deleteByPrimaryKey(id);
@@ -215,7 +213,7 @@
for (String title : titles) {
- List<Label> labels = labelService.selectByTitle(title.trim());
+ List<Label> labels = selectByTitle(title.trim());
// 鑻ュ凡瀛樺湪鍒欎笉瀛樺叆鏁版嵁搴�
if (labels == null || labels.size() == 0) {
Label label = new Label();
@@ -226,7 +224,7 @@
label.setUpdatetime(nowTime);
label.setCreateUser(admin);
- labelService.insertSelective(label);
+ insertSelective(label);
}
}
@@ -266,7 +264,7 @@
label.setPicture(uploadFilePath);
label.setUpdatetime(nowTime);
- result = labelService.updateByPrimaryKeySelective(label);
+ result = updateByPrimaryKeySelective(label);
}
}
@@ -295,7 +293,7 @@
label.setPicture(null);
label.setUpdatetime(nowTime);
// 鏇存柊鏁版嵁搴�
- result = labelService.updateByPrimaryKey(label);
+ result = updateByPrimaryKey(label);
}
}
@@ -366,7 +364,7 @@
for (String title : arrtitles) {
/* 閬嶅巻鏍囩鍚嶇О锛氭煡璇㈡暟鎹簱涓槸鍚﹀凡瀛樺湪 */
- List<Label> labels = labelService.selectByTitle(title.trim());
+ List<Label> labels = selectByTitle(title.trim());
if (labels != null && labels.size() > 0) {
Label label = labels.get(0);
listLabs.add(label);
@@ -380,7 +378,7 @@
label.setCreateUser(admin);
label.setIosClick(0l);
label.setAndroidClick(0l);
- labelService.insertSelective(label);
+ insertSelective(label);
listLabs.add(label);
}
--
Gitblit v1.8.0