合并代码 扫码推送消息

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookCoverImgUpdateDTO.java

+package com.pcloud.book.book.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author lily
+ * @date 2018/10/13 17:29
+ */
+public class BookCoverImgUpdateDTO implements Serializable {
+
+    private String coverImg;
+
+    private Long bookId;
+
+    public String getCoverImg() {
+        return coverImg;
+    }
+
+    public void setCoverImg(String coverImg) {
+        this.coverImg = coverImg;
+    }
+
+    public Long getBookId() {
+        return bookId;
+    }
+
+    public void setBookId(Long bookId) {
+        this.bookId = bookId;
+    }
+
+    @Override
+    public String toString() {
+        return "BookCoverImgUpdateDTO{" +
+                "coverImg='" + coverImg + '\'' +
+                ", bookId=" + bookId +
+                '}';
+    }
+}

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java

@@ -379,6 +379,11 @@ public class BookDto extends BaseDto {
 	 * 配置服务个数
 	 */
 	private Integer messageCount;
+
+	/**
+	 * 类型名称
+	 */
+	private List<String>  typeCodeNames;
 	/**
 	 * 印码位置
 	 */
@@ -993,6 +998,14 @@ public class BookDto extends BaseDto {
 		this.templeParentId = templeParentId;
 	}
 
+	public List<String>  getTypeCodeNames() {
+		return typeCodeNames;
+	}
+
+	public void setTypeCodeNames(List<String> typeCodeNames) {
+		this.typeCodeNames = typeCodeNames;
+	}
+
 	@Override
 	public String toString() {
 		return "BookDto [bookId=" + bookId + ", typeCode=" + typeCode + ", typeName=" + typeName + ", isbn=" + isbn

pcloud-facade-book/src/main/java/com/pcloud/book/book/service/BookService.java

@@ -114,7 +114,7 @@ public interface BookService {
     /**
      * 根据ISBN码获取书籍 to exapi
      *
-     * @param bookId
+     * @param isbn
      * @return
      * @throws BizException
      */
@@ -128,7 +128,7 @@ public interface BookService {
     /**
      * 根据ISBN码获取书籍详情（包含二维码个数，应用个数，商品个数） to exapi
      *
-     * @param bookId
+     * @param isbn
      * @return
      * @throws BizException
      */
@@ -158,7 +158,7 @@ public interface BookService {
 	/**
 	 * 根据ISBN码获取书籍 to exapi
 	 *
-	 * @param bookId
+	 * @param isbn
 	 * @return
 	 * @throws BizException
 	 */

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java

@@ -10,11 +10,23 @@ import com.pcloud.appcenter.base.exception.AppBizException;
 import com.pcloud.book.base.enums.BookFreezeEnum;
 import com.pcloud.book.base.enums.BookTypeEnum;
 import com.pcloud.book.base.exception.BookBizException;
-import com.pcloud.book.book.biz.*;
+import com.pcloud.book.book.biz.BookAdviserBiz;
+import com.pcloud.book.book.biz.BookAppBiz;
+import com.pcloud.book.book.biz.BookBiz;
+import com.pcloud.book.book.biz.BookFreezeBiz;
+import com.pcloud.book.book.biz.BookFundBiz;
+import com.pcloud.book.book.biz.BookProductBiz;
+import com.pcloud.book.book.biz.BookResourceBiz;
 import com.pcloud.book.book.cache.BookCache;
 import com.pcloud.book.book.constant.BookConstant;
 import com.pcloud.book.book.dao.BookDao;
-import com.pcloud.book.book.dto.*;
+import com.pcloud.book.book.dto.BookAdviserUpdateTimeDTO;
+import com.pcloud.book.book.dto.BookAssocCount;
+import com.pcloud.book.book.dto.BookCoverImgUpdateDTO;
+import com.pcloud.book.book.dto.BookDetialDTO;
+import com.pcloud.book.book.dto.BookDto;
+import com.pcloud.book.book.dto.BookFreezeDto;
+import com.pcloud.book.book.dto.BookFundDto;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.entity.BookAdviser;
 import com.pcloud.book.book.set.BookSet;
@@ -26,6 +38,7 @@ import com.pcloud.book.consumer.user.AdviserConsr;
 import com.pcloud.book.consumer.user.AgentConsr;
 import com.pcloud.book.consumer.user.ChannelConsr;
 import com.pcloud.book.consumer.user.PartyConsr;
+import com.pcloud.book.mq.producer.BookMQProducer;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.core.constant.AgentTypeEnum;
 import com.pcloud.common.core.constant.SystemCode;
@@ -44,7 +57,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
@@ -96,6 +114,8 @@ public class BookBizImpl implements BookBiz {
 	private BookFreezeBiz bookFreezeBiz;
 	@Autowired
 	private AssistTempletConsr assistTempletConsr;
+	@Autowired
+	private BookMQProducer bookMQProducer;
 
 	/**
 	 * 创建书籍,同时建立与编辑的推广关系
@@ -171,12 +191,24 @@ public class BookBizImpl implements BookBiz {
 		LOGGER.info("【书籍基础】修改书籍基础信息,<PARAM>.[book]=" + book.toString());
 		// 校验参数
 		this.checkParam(book);
+		//获取图书基本信息
+		BookDto bookDto = this.getBaseById(book.getBookId());
+		checkIsUpdateCoverImgAndSendTopic(bookDto, book.getCoverImg());
 		bookDao.update(book);
 		// 清除redis中数据
 		bookCache.clearRedisByBook(book.getBookId(), book.getIsbn(), book.getSerialNumber());
 		LOGGER.info("【书籍基础】修改书籍基础信息,<END>");
 	}
 
+	void checkIsUpdateCoverImgAndSendTopic(BookDto oldBook, String newCoverImg){
+		if(newCoverImg != null && !newCoverImg.equalsIgnoreCase(oldBook.getCoverImg())){
+			BookCoverImgUpdateDTO bookCoverImgUpdateDTO = new BookCoverImgUpdateDTO();
+			bookCoverImgUpdateDTO.setBookId(oldBook.getBookId());
+			bookCoverImgUpdateDTO.setCoverImg(newCoverImg);
+			bookMQProducer.sendUpdateBookCoverImgTopic(bookCoverImgUpdateDTO);
+		}
+	}
+
 	/**
 	 * 修改书籍封面图
 	 */
@@ -191,6 +223,7 @@ public class BookBizImpl implements BookBiz {
 			throw new BookBizException(BookBizException.PARAM_IS_NULL, "默认图书不能修改！");
 		}
 		bookDao.updateCoverImg(book);
+		checkIsUpdateCoverImgAndSendTopic(bookDto, book.getCoverImg());
 		// 清除redis中数据
 		bookCache.clearRedisByBook(bookDto.getBookId(), bookDto.getIsbn(), bookDto.getSerialNumber());
 		LOGGER.info("【书籍基础】修改书籍基础信息,<END>");
@@ -228,6 +261,7 @@ public class BookBizImpl implements BookBiz {
 		}
 		// 清除redis中数据
 		bookCache.clearRedisByBook(book.getBookId(), book.getIsbn(), book.getSerialNumber());
+		checkIsUpdateCoverImgAndSendTopic(bookDto, book.getCoverImg());
 		LOGGER.info("【书籍基础】修改书籍基础信息,<END>");
 		return bookDto;
 	}
@@ -1390,6 +1424,7 @@ public class BookBizImpl implements BookBiz {
 			// 书籍总数缓存加1
 			bookCache.incrObject(BookConstant.BOOK_CACHE + "PLATFORM_BOOK_COUNT");
 		} else {
+			checkIsUpdateCoverImgAndSendTopic(bookDto, book.getCoverImg());
 			// 修改图书基本信息
 			bookDao.updateByAdviser(book);
 			// 清除redis中数据

pcloud-facade-book/src/main/java/com/pcloud/book/book/facade/BookAppFacade.java → pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookAppFacade.java

@@ -49,7 +49,7 @@ public interface BookAppFacade {
 	/**
 	 * 微信端添加书籍和应用关联关系
 	 *
-	 * @param token
+	 * @param userInfo
 	 * @param bookApp
 	 * @return
 	 * @throws BizException
@@ -68,8 +68,7 @@ public interface BookAppFacade {
 	 * 删除书籍应用关联关系
 	 *
 	 * @param token
-	 * @param bookId
-	 * @param appId
+	 * @param bookAppId
 	 * @return
 	 * @throws BizException
 	 * @throws PermissionException
@@ -86,9 +85,8 @@ public interface BookAppFacade {
 	/**
 	 * 微信端删除书籍应用关联关系
 	 *
-	 * @param token
-	 * @param bookId
-	 * @param appId
+	 * @param userInfo
+	 * @param bookAppId
 	 * @throws BizException
 	 * @throws PermissionException
 	 * @throws JsonParseException

pcloud-service-book/src/main/java/com/pcloud/book/book/service/impl/BookServiceImpl.java

@@ -3,6 +3,17 @@
  */
 package com.pcloud.book.book.service.impl;
 
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.pcloud.book.book.biz.BookBiz;
 import com.pcloud.book.book.dto.BookAdviserUpdateTimeDTO;
 import com.pcloud.book.book.dto.BookDetialDTO;
@@ -11,12 +22,6 @@ import com.pcloud.book.book.service.BookService;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.utils.ResponseHandleUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Map;
 
 /**
  * @描述：

pcloud-service-book/src/main/java/com/pcloud/book/book/set/BookSet.java

@@ -18,7 +18,15 @@ import com.pcloud.book.book.biz.BookFundBiz;
 import com.pcloud.book.book.dao.BookAdviserDao;
 import com.pcloud.book.book.dao.BookFreezeDao;
 import com.pcloud.book.book.dao.BookTypeDao;
-import com.pcloud.book.book.dto.*;
+import com.pcloud.book.book.dto.AdviserManageDto;
+import com.pcloud.book.book.dto.BookAdviserDto;
+import com.pcloud.book.book.dto.BookAppDto;
+import com.pcloud.book.book.dto.BookDeleteDto;
+import com.pcloud.book.book.dto.BookDto;
+import com.pcloud.book.book.dto.BookFreezeDto;
+import com.pcloud.book.book.dto.BookProductDto;
+import com.pcloud.book.book.dto.BookResourceDto;
+import com.pcloud.book.book.dto.BookTypeDto;
 import com.pcloud.book.book.entity.BookDefendant;
 import com.pcloud.book.book.tools.BookTools;
 import com.pcloud.book.consumer.analysisengine.BookScanCountConsr;
@@ -237,6 +245,7 @@ public class BookSet {
 		LOGGER.info("【书刊基础】批量填充顾问名称,<END>");
 	}
 
+
 	/**
 	 * 批量填充顾问名称
 	 */

pcloud-service-book/src/main/java/com/pcloud/book/consumer/channel/QrcodeSceneConsr.java

@@ -3,15 +3,6 @@
  */
 package com.pcloud.book.consumer.channel;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
 
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.channelcenter.qrcode.dto.DefaultTempletQrcode;

pcloud-service-book/src/main/java/com/pcloud/book/consumer/user/AgentConsr.java

@@ -3,6 +3,8 @@
  */
 package com.pcloud.book.consumer.user;
 
+import com.pcloud.common.dto.ResponseDto;
+import com.pcloud.usercenter.party.agent.entity.Agent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,10 +12,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
 import com.pcloud.channelcenter.base.exceptions.ChannelBizException;
-import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.utils.ResponseHandleUtil;
-import com.pcloud.usercenter.party.agent.entity.Agent;
 import com.pcloud.usercenter.party.agent.service.AgentService;
 
 /**
@@ -59,7 +59,7 @@ public class AgentConsr {
 			throw new ChannelBizException(ChannelBizException.PARAM_IS_NULL, "运营不存在");
 		}
 	}
-	
+
 	public Long getAgentIdByType(Integer agentType){
 		LOGGER.info("根据出版端心获取出版信息【start】，参数：agentType="+agentType);
 		if(agentType==null){

pcloud-service-book/src/main/java/com/pcloud/book/mq/producer/BookMQProducer.java

+package com.pcloud.book.mq.producer;
+
+import com.pcloud.book.book.dto.BookCoverImgUpdateDTO;
+
+public interface BookMQProducer {
+
+  void sendUpdateBookCoverImgTopic(BookCoverImgUpdateDTO bookCoverImgUpdateDTO);
+}

pcloud-service-book/src/main/java/com/pcloud/book/mq/producer/impl/BookProducerImpl.java

+package com.pcloud.book.mq.producer.impl;
+
+import com.pcloud.book.book.dto.BookCoverImgUpdateDTO;
+import com.pcloud.book.mq.producer.BookMQProducer;
+import com.pcloud.common.core.constant.MQTopicProducer;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component("bookMQProducer")
+public class BookProducerImpl implements BookMQProducer {
+
+    @Resource
+    private AmqpTemplate amqpTemplate;
+
+    @Override
+    public void sendUpdateBookCoverImgTopic(BookCoverImgUpdateDTO bookCoverImgUpdateDTO) {
+        amqpTemplate.convertAndSend(MQTopicProducer.EXCHAGE, MQTopicProducer.UPDATE_BOOK_COVERIMG, bookCoverImgUpdateDTO);
+    }
+}