From a8e45a802600ca1cde28fe8522a26635328bbd99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 17:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java
index 7f7f692..b499d5d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/homemodule/HomeNavbarServiceImpl.java
@@ -1,28 +1,34 @@
package com.yeshi.fanli.service.impl.homemodule;
+import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.UUID;
import javax.annotation.Resource;
import javax.transaction.Transactional;
import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import org.yeshi.utils.tencentcloud.COSManager;
import com.yeshi.fanli.dao.mybatis.homemodule.HomeNavbarMapper;
import com.yeshi.fanli.dao.mybatis.homemodule.SuperHomeNavbarMapper;
import com.yeshi.fanli.entity.bus.homemodule.HomeNavbar;
import com.yeshi.fanli.entity.bus.homemodule.SuperHomeNavbar;
-import com.yeshi.fanli.entity.system.System;
-import com.yeshi.fanli.service.inter.config.SystemService;
+import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarService;
+import com.yeshi.fanli.util.StringUtil;
@Service
public class HomeNavbarServiceImpl implements HomeNavbarService {
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private HomeNavbarMapper homeNavbarMapper;
@Resource
@@ -63,6 +69,17 @@
@Transactional
public int deleteBatchByPrimaryKey(List<Long> list) {
superHomeNavbarMapper.deleteBatchByNavbarIds(list);
+ for (Long id: list) {
+ HomeNavbar homeNavbar = homeNavbarMapper.selectByPrimaryKey(id);
+ if (homeNavbar !=null) {
+ // 鍒犻櫎宸插瓨鍦ㄥ浘鐗� /
+ String picture = homeNavbar.getPicture();
+ if (!StringUtil.isNullOrEmpty(picture)) {
+ COSManager.getInstance().deleteFile(picture);
+ }
+ }
+ }
+
return homeNavbarMapper.deleteBatchByPrimaryKey(list);
}
@@ -72,8 +89,8 @@
}
@Override
- public List<HomeNavbar> getChangeOrder(Long id, Integer type, Integer order) {
- return homeNavbarMapper.getChangeOrder(id, type, order);
+ public List<HomeNavbar> getChangeOrder(Integer type, Integer order) {
+ return homeNavbarMapper.getChangeOrder(type, order);
}
@Override
@@ -84,7 +101,7 @@
return null;
}
- List<System> systemList = systemService.getSystems();
+ List<BusinessSystem> systemList = businessSystemService.getBusinessSystems();
List<Long> listId = new ArrayList<Long>();
for (HomeNavbar homeNavbar: listObj) {
@@ -102,12 +119,12 @@
for (HomeNavbar homeNavbar: listObj) {
Long id = homeNavbar.getId();
- List<System> newList = new ArrayList<System>();
+ List<BusinessSystem> newList = new ArrayList<BusinessSystem>();
// 鏄惁鏈夊叧鑱旂郴缁熼�夐」
- for (System dsystem : systemList) {
+ for (BusinessSystem dsystem : systemList) {
- System newsystem = new System();
+ BusinessSystem newsystem = new BusinessSystem();
try {
PropertyUtils.copyProperties(newsystem, dsystem);
} catch (Exception e) {
@@ -119,7 +136,7 @@
for (SuperHomeNavbar superHomeNavbar : listSuper) {
HomeNavbar navbar = superHomeNavbar.getHomeNavbar();
- System system = superHomeNavbar.getSystem();
+ BusinessSystem system = superHomeNavbar.getSystem();
// 褰撳墠涓撻 銆佸綋鍓嶇郴缁�
if (navbar != null && system != null && id == navbar.getId()
@@ -151,7 +168,29 @@
}
-
+ @Override
+ public void uploadPicture(MultipartFile file, HomeNavbar homeNavbar) throws Exception {
+
+ InputStream inputStream = file.getInputStream();
+ String contentType = file.getContentType();
+ String type = contentType.substring(contentType.indexOf("/") + 1);
+ // 涓婁紶鏂囦欢鐩稿浣嶇疆
+ String fileUrl="HomeNavbar/"+UUID.randomUUID().toString().replace("-", "") + "." + type;
+
+ /* 淇敼鍥剧墖鏃讹紝鍏堝垹闄ゅ凡瀛樺湪鍥剧墖 */
+ String picture = homeNavbar.getPicture();
+ if (!StringUtil.isNullOrEmpty(picture)) {
+ COSManager.getInstance().deleteFile(picture);
+ }
+
+ String uploadFilePath = COSManager.getInstance().uploadFile(inputStream, fileUrl).getUrl();
+ /* 鏇存柊鏁版嵁搴撲俊鎭� */
+ if (!StringUtil.isNullOrEmpty(uploadFilePath)) {
+ homeNavbar.setUpdatetime(new Date());
+ homeNavbar.setPicture(uploadFilePath);
+ updateByPrimaryKeySelective(homeNavbar);
+ }
+ }
}
--
Gitblit v1.8.0