Merge remote-tracking branch 'origin/master'

admin

2019-03-15 a8e45a802600ca1cde28fe8522a26635328bbd99

 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);

      }

   }

   



}