Merge branch 'release' into 'master'

Release

See merge request rays/pcloud-book!1687

pcloud-service-book/src/main/java/com/pcloud/book/BookApplication.java

@@ -339,4 +339,24 @@ public class BookApplication {
     public Binding qrcodeBookUpdateBind() {
         return RabbitMQFactory.bindingExchange(qrcodeBookUpdateQueue(), MQTopicProducer.QRCODE_BOOK_UPDATE);
     }
+
+    @Bean
+    public Queue deleteQrcodeQueue() {
+        return RabbitMQFactory.queueBuilder(MQTopicConumer.DELETE_QRCODE);
+    }
+
+    @Bean
+    public Binding deleteQrcodeBind() {
+        return RabbitMQFactory.bindingExchange(deleteQrcodeQueue(), MQTopicProducer.DELETE_QRCODE);
+    }
+
+    @Bean
+    public Queue recoverQrcodeQueue() {
+        return RabbitMQFactory.queueBuilder(MQTopicConumer.RECOVER_QRCODE);
+    }
+
+    @Bean
+    public Binding recoverQrcodeBind() {
+        return RabbitMQFactory.bindingExchange(recoverQrcodeQueue(), MQTopicProducer.RECOVER_QRCODE);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/ResourcePageBiz.java

@@ -610,4 +610,6 @@ public interface ResourcePageBiz {
     void deleteDouluoCache(Long sceneId, List<Long> mapSceneIds, Long wechatUserId);
 
     List<ResourcePageFolderItemVO> getFolderItemList(Long wechatUserId, Long folderId);
+
+    int updateDeleteBySceneId(Long sceneId, Integer isDelete);
 }

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

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ReUtil;
 import cn.hutool.core.util.StrUtil;
@@ -12,7 +11,6 @@ import cn.hutool.extra.qrcode.QrCodeException;
 import cn.hutool.extra.qrcode.QrCodeUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.pcloud.advertising.advertising.dto.AdvertisingSpaceDTO;
 import com.pcloud.advertising.advertising.dto.AdvertisingSpaceItemDTO;
@@ -5274,4 +5272,9 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         }
         return folderItemVOS;
     }
+
+    @Override
+    public int updateDeleteBySceneId(Long sceneId, Integer isDelete) {
+        return resourcePageDao.updateDeleteBySceneId(sceneId, isDelete);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/ResourcePageDao.java

@@ -131,4 +131,6 @@ public interface ResourcePageDao extends BaseDao<ResourcePage>{
     Long getBookIdBySceneId(Long sceneId);
 
     List<ResourcePage> getOtherPageRaysOpen(Long bookId, Long channelId, Long createUser, Long sceneId, Long bookGroupId);
+
+    int updateDeleteBySceneId(Long sceneId, Integer isDelete);
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/ResourcePageDaoImpl.java

@@ -187,4 +187,12 @@ public class ResourcePageDaoImpl extends BaseDaoImpl<ResourcePage> implements Re
         map.put("sceneId", sceneId);
         return getSessionTemplate().selectList(getStatement("getOtherPageRaysOpen"), map);
     }
+
+    @Override
+    public int updateDeleteBySceneId(Long sceneId, Integer isDelete) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("sceneId", sceneId);
+        map.put("isDelete", isDelete);
+        return getSessionTemplate().delete(getStatement("updateDeleteBySceneId"), map);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageItemResourceVO.java

@@ -39,6 +39,12 @@ public class ResourcePageItemResourceVO extends BaseDto {
      */
     private String typeCode;
 
+    private String selfBigPic;
+
+    private String selfSmallPic;
+
+    private String selfServeName;
+
 
     private String typeName;
     private String resourceName;

pcloud-service-book/src/main/java/com/pcloud/book/mq/config/MQTopicConumer.java

@@ -113,4 +113,12 @@ public class MQTopicConumer {
      * 二维码图书变更
      */
     public static final String QRCODE_BOOK_UPDATE = PREFIX + MQTopicProducer.QRCODE_BOOK_UPDATE;
+    /**
+     * 二维码删除
+     */
+    public static final String DELETE_QRCODE = PREFIX + MQTopicProducer.DELETE_QRCODE;
+    /**
+     * 二维码恢复
+     */
+    public static final String RECOVER_QRCODE = PREFIX + MQTopicProducer.RECOVER_QRCODE;
 }

pcloud-service-book/src/main/java/com/pcloud/book/mq/topic/DeleteQrcodeListener.java

+/**
+ * 
+ */
+package com.pcloud.book.mq.topic;
+
+import com.pcloud.book.group.biz.ResourcePageBiz;
+import com.pcloud.book.mq.config.MQTopicConumer;
+import com.pcloud.channelcenter.qrcode.entity.QrcodeScene;
+import com.pcloud.common.exceptions.BizException;
+import com.pcloud.data.domain.enums.YesNoEnum;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 二维码删除
+ */
+@Component
+@RabbitListener(queues = MQTopicConumer.DELETE_QRCODE)
+public class DeleteQrcodeListener {
+
+	/**
+	 * 
+	 */
+	private static final Logger LOGGER = LoggerFactory.getLogger(DeleteQrcodeListener.class);
+
+	@Autowired
+	private ResourcePageBiz resourcePageBiz;
+
+	/**
+	 * 二维码删除
+	 */
+	@RabbitHandler
+	public void process(QrcodeScene qrcodeScene) {
+		if (null == qrcodeScene || null == qrcodeScene.getSceneId()) {
+			return;
+		}
+		try {
+			resourcePageBiz.updateDeleteBySceneId(qrcodeScene.getSceneId(), YesNoEnum.YES.value);
+		} catch (Exception e) {
+			LOGGER.error("【二维码删除】消费topic,JMS异常,<ERROR>:" + e.getMessage(), e);
+		}
+	}
+}

pcloud-service-book/src/main/java/com/pcloud/book/mq/topic/RecoverQrcodeListener.java

+/**
+ * 
+ */
+package com.pcloud.book.mq.topic;
+
+import com.pcloud.book.group.biz.ResourcePageBiz;
+import com.pcloud.book.mq.config.MQTopicConumer;
+import com.pcloud.channelcenter.qrcode.entity.QrcodeScene;
+import com.pcloud.common.exceptions.BizException;
+import com.pcloud.data.domain.enums.YesNoEnum;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 二维码恢复
+ */
+@Component
+@RabbitListener(queues = MQTopicConumer.RECOVER_QRCODE)
+public class RecoverQrcodeListener {
+
+	/**
+	 * 
+	 */
+	private static final Logger LOGGER = LoggerFactory.getLogger(RecoverQrcodeListener.class);
+
+	@Autowired
+	private ResourcePageBiz resourcePageBiz;
+
+	/**
+	 * 二维码恢复
+	 */
+	@RabbitHandler
+	public void process(QrcodeScene qrcodeScene) {
+		if (null == qrcodeScene || null == qrcodeScene.getSceneId()) {
+			return;
+		}
+		try {
+			resourcePageBiz.updateDeleteBySceneId(qrcodeScene.getSceneId(), YesNoEnum.NO.value);
+		} catch (Exception e) {
+			LOGGER.error("【二维码恢复】消费topic,JMS异常,<ERROR>:" + e.getMessage(), e);
+		}
+	}
+}

pcloud-service-book/src/main/resources/mapper/group/ResourcePageDao.xml

@@ -411,4 +411,13 @@
             AND book_group_id != #{bookGroupId}
         </if>
     </select>
+
+    <update id="updateDeleteBySceneId" parameterType="map">
+        UPDATE resource_page
+        <set>
+            is_delete = #{isDelete},
+            update_time = NOW(),
+        </set>
+        where scene_id = #{sceneId}
+    </update>
 </mapper>

pcloud-service-book/src/main/resources/mapper/group/ResourcePageItemDao.xml

@@ -500,13 +500,17 @@
             i.serve_id serveId,
             i.serve_type serveType,
             i.link_url linkUrl,
-            i.type_code typeCode
+            i.type_code typeCode,
+            i.self_big_pic selfBigPic,
+            i.self_small_pic selfSmallPic,
+            i.self_serve_name selfServeName
         FROM
             resource_page_item i
                 LEFT JOIN resource_page p ON i.resource_page_id = p.id
         WHERE
             p.book_id = #{bookId}
           AND p.create_user = #{adviserId}
+          AND p.is_delete = 0
         GROUP BY
             i.resource_page_id
         HAVING