Merge branch 'dev' into 'master'

消息服务增加返回code参数

See merge request eshop/biz_service_ebtp_extend!2

src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/controller/BizMessageConsumerController.java

@@ -12,8 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO;
+import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageConsumerService;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgDetailVO;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgVO;
@@ -42,7 +42,7 @@ public class BizMessageConsumerController {
 	@ApiOperation("消息概要清单.")
 	@GetMapping("describeSiteMsg")
 	@ResponseStatus(code = HttpStatus.OK)
-	public IPage<DescribeSiteMsgVO> describeSiteMsg(
+	public IBizMessagePage<DescribeSiteMsgVO> describeSiteMsg(
 			@ApiParam(value = "分页参数", required = false) @RequestBody(required = false) PageDTO page) {
 		return service.listOutline(page);
 	}

src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/mybatis/BizMessagePage.java

@@ -0,0 +1,13 @@
+package com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis;
+
+import org.apache.poi.ss.formula.functions.T;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.NoArgsConstructor;
+
+public class BizMessagePage<T> extends Page<T> implements IBizMessagePage<T> {
+
+	private static final long serialVersionUID = -3820693837182317407L;
+
+}

src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/mybatis/IBizMessagePage.java

@@ -0,0 +1,14 @@
+package com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+public interface IBizMessagePage<T> extends IPage<T> {
+
+	/**
+	 * @return 为了兼容前端的组件
+	 */
+	default int getCode() {
+		return 200;
+	}
+
+}

src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/BizMessageConsumerService.java

@@ -1,13 +1,13 @@
 package com.chinaunicom.mall.ebtp.extend.bizmessage.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage;
+import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgVO;
 
 public interface BizMessageConsumerService {
 
-	IPage<DescribeSiteMsgVO> listOutline(PageDTO page);
+	IBizMessagePage<DescribeSiteMsgVO> listOutline(PageDTO page);
 
 	BizMessage getDetailById(String id);
 

src/main/java/com/chinaunicom/mall/ebtp/extend/bizmessage/service/impl/BizMessageConsumerServiceImpl.java

@@ -13,6 +13,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.dao.BizMessageMapper;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.dto.PageDTO;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.entity.BizMessage;
+import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.BizMessagePage;
+import com.chinaunicom.mall.ebtp.extend.bizmessage.mybatis.IBizMessagePage;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.service.BizMessageConsumerService;
 import com.chinaunicom.mall.ebtp.extend.bizmessage.vo.DescribeSiteMsgVO;
 
@@ -32,7 +34,7 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService
 	 * @return
 	 */
 	@Override
-	public IPage<DescribeSiteMsgVO> listOutline(PageDTO page) {
+	public IBizMessagePage<DescribeSiteMsgVO> listOutline(PageDTO page) {
 		page = createPageCondition(page);
 
 		IPage<BizMessage> pageEntity = mapper.selectPage(new Page<>(page.getPageNo(), page.getPageSize()),
@@ -40,7 +42,7 @@ public class BizMessageConsumerServiceImpl implements BizMessageConsumerService
 						.orderByDesc("createtime"));
 
 		// DAT -> VO 转换
-		IPage<DescribeSiteMsgVO> result = new Page<>();
+		IBizMessagePage<DescribeSiteMsgVO> result = new BizMessagePage<>();
 		BeanUtils.copyProperties(pageEntity, result, "records");
 		result.setRecords(pageEntity.getRecords().stream().map(source -> {
 			DescribeSiteMsgVO vo = new DescribeSiteMsgVO();