Merge branch 'feature/1.0.0' of github.com:ab-inbev-apac/abi-cloud-qr-platform into feature/1.0.0

abi-cloud-qr-platform-server/pom.xml

@@ -28,7 +28,12 @@
             <artifactId>abi-cloud-qr-platform-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-
+<!--        ali json-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.28</version>
+        </dependency>
         <!-- 其他微服务api -->
 <!--        <dependency>-->
 <!--            <groupId>com.abi.bees.user</groupId>-->

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/QrRepertoryMapper.java

@@ -5,6 +5,7 @@ import com.abi.qms.platform.dao.vo.result.QrRepertoryVO;
 import com.abi.qms.platform.dto.req.ListQrRepertoryReq;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -19,7 +20,7 @@ public interface QrRepertoryMapper extends BaseMapper<QrRepertory> {
 	/**
 	 * 分页查询码库信息
 	 */
-	IPage<QrRepertoryVO> listQrRepertory(IPage page, ListQrRepertoryReq param);
+	IPage<QrRepertoryVO> listQrRepertory(IPage page, @Param("param")ListQrRepertoryReq param);
 
 	/**
 	 * 查询码库详细信息

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageServiceImpl.java

@@ -2,6 +2,7 @@ package com.abi.qms.platform.service.impl;
 
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
+import cn.hutool.json.JSONUtil;
 import com.abi.qms.platform.dao.entity.QrPackage;
 import com.abi.qms.platform.dao.entity.QrPackageDownloadRecord;
 import com.abi.qms.platform.dao.enums.QrPackageApplyStatusEnum;
@@ -22,6 +23,7 @@ import com.abi.qms.platform.service.QrDataService;
 import com.abi.qms.platform.service.QrPackageService;
 import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.utils.PojoConverterUtils;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -103,7 +105,8 @@ public class QrPackageServiceImpl implements QrPackageService {
 		} else {
 			qrPackage.setBatchNumber(IdWorker.getIdStr());
 			qrPackage.setCreateBy(userId);
-			qrPackageMapper.insert(qrPackage);
+			int insert = qrPackageMapper.insert(qrPackage);
+			System.out.println(insert);
 		}
 
 	}
@@ -182,7 +185,8 @@ public class QrPackageServiceImpl implements QrPackageService {
 
 		// 码库类型为系统生成时，放入rabbitmq，生成码
 		if (QrRepertoryTypeEnum.SYSTEM_GENERATE.is(qrPackage.getQrRepertoryType())) {
-			amqpTemplate.convertAndSend(GenerateCodeConsumer.GENERATE_CODE_BY_REPERTORY_QUEUE, qrPackage);
+			amqpTemplate.convertAndSend(GenerateCodeConsumer.GENERATE_CODE_BY_REPERTORY_QUEUE, JSONObject.toJSONString(qrPackage) );
+			System.out.println("rabbitmq结束。。。。。。。。。。。。。。。。");
 		}
 	}