Merge branch 'feature/mofang2' into 'release'

Feature/mofang2

See merge request rays/pcloud-book!1703

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

+/**
+ *
+ */
+package com.pcloud.book.book.dto;
+
+import lombok.Data;
+
+/**
+ * 魔方二维码
+ */
+@Data
+public class MoFangSceneDto {
+
+    private static final long serialVersionUID = -162839317433038629L;
+
+    /**
+     * 二维码标识
+     */
+    private Long sceneId;
+
+    private String linkUrl;
+
+}

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookBiz.java

@@ -842,4 +842,10 @@ public interface BookBiz {
 	 * 查询魔方书刊
 	 */
 	PageBeanNew<MoFangBookDto> listMoFangBook(String keyWords,Integer currentPage,Integer numPerPage);
+
+	/**
+	 * 魔方二维码
+	 */
+	Map<Long,String> listMoFangScene();
+
 }

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

@@ -82,6 +82,7 @@ import com.pcloud.book.book.dto.EditionAnalysisVO;
 import com.pcloud.book.book.dto.ErpBookApprovalDTO;
 import com.pcloud.book.book.dto.MapResourceTotalCountDTO;
 import com.pcloud.book.book.dto.MoFangBookDto;
+import com.pcloud.book.book.dto.MoFangSceneDto;
 import com.pcloud.book.book.dto.ProjectOrderSheetDTO;
 import com.pcloud.book.book.dto.ProjectRelateVO;
 import com.pcloud.book.book.dto.ProjectUploaderDTO;
@@ -4786,4 +4787,13 @@ public class BookBizImpl implements BookBiz {
         PageBeanNew<MoFangBookDto> listPageNew = bookDao.listPageNew(new PageParam(currentPage, numPerPage), paramMap, "listMoFangBook");
         return listPageNew;
     }
+
+    @Override
+    public Map<Long, String> listMoFangScene() {
+        List<MoFangSceneDto> list = bookDao.listMoFangScene();
+        if(CollUtil.isEmpty(list)){
+            return null;
+        }
+        return list.stream().collect(Collectors.toMap(a->a.getSceneId(),a->a.getLinkUrl(),(v1,v2)->v2));
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/dao/BookDao.java

@@ -7,6 +7,7 @@ import com.pcloud.book.book.dto.AdviserBookInfoDTO;
 import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.book.book.dto.BookInfo4AnlysicsDTO;
 import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
+import com.pcloud.book.book.dto.MoFangSceneDto;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.vo.BookSaleVO;
 import com.pcloud.book.book.vo.SearchBookVO;
@@ -396,4 +397,6 @@ public interface BookDao extends BaseDao<Book> {
 	List<Object> getListPage4Adviser(Map<String, Object> paramMap);
 
 	Integer getListPage4AdviserCount(Map<String, Object> paramMap);
+
+	List<MoFangSceneDto> listMoFangScene();
 }

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

@@ -10,6 +10,7 @@ import com.pcloud.book.book.dto.AdviserBookInfoDTO;
 import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.book.book.dto.BookInfo4AnlysicsDTO;
 import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
+import com.pcloud.book.book.dto.MoFangSceneDto;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.vo.BookSaleVO;
 import com.pcloud.book.book.vo.SearchBookVO;
@@ -500,4 +501,9 @@ public class BookDaoImpl extends BaseDaoImpl<Book> implements BookDao {
     public Integer getListPage4AdviserCount(Map<String, Object> paramMap) {
         return getSessionTemplate().selectOne(getStatement("getListPage4AdviserCount"),paramMap);
     }
+
+    @Override
+    public List<MoFangSceneDto> listMoFangScene() {
+        return getSessionTemplate().selectList(getStatement("listMoFangScene"));
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/impl/BookFacadeImpl.java

@@ -1554,4 +1554,13 @@ public class BookFacadeImpl implements BookFacade {
         return new ResponseDto<>(bookBiz.listMoFangBook(keyWords, currentPage, numPerPage));
     }
 
+    /**
+     * 魔方二维码
+     */
+    @RequestMapping(value = "listMoFangScene", method = RequestMethod.GET)
+    public ResponseDto<?> listMoFangScene()
+            throws BizException, PermissionException {
+        return new ResponseDto<>(bookBiz.listMoFangScene());
+    }
+
 }

pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml

@@ -3452,4 +3452,11 @@
 			and book_name like concat('%',#{keyWords},'%')
 		</if>
 	</select>
+
+	<select id="listMoFangScene" resultType="com.pcloud.book.book.dto.MoFangSceneDto">
+		select
+		scene_id sceneId,
+        link_url linkUrl
+		from mofang_scene
+	</select>
 </mapper>