码预览、位数、理论不重复数量保存到数据库

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/QrFormat.java

@@ -47,6 +47,15 @@ public class QrFormat {
     @ApiModelProperty("说明")
     private String illustrate;
 
+    @ApiModelProperty("码预览")
+    private String previewCode;
+
+    @ApiModelProperty("位数")
+    private Integer digit;
+
+    @ApiModelProperty("理论不重复数量")
+    private Long maxCount;
+
     @ApiModelProperty("是否验证唯一性 0-不验证，1-验证")
     private Integer verifyUnique;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/QrRepertorySerialNumber.java

@@ -0,0 +1,31 @@
+package com.abi.qms.platform.dao.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 码库流水号 对象 qr_repertory_serial_number
+ *
+ * @author WeiganCai
+ * @date 2021-04-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class QrRepertorySerialNumber {
+
+	@ApiModelProperty("码库流水号id")
+	private Long id;
+
+	@ApiModelProperty("码库id")
+	private Long qrRepertoryId;
+
+	@ApiModelProperty("码库的列id")
+	private Long qrRepertoryColumnId;
+
+	@ApiModelProperty("流水号")
+	private Long serialNumber;
+
+}

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

@@ -0,0 +1,14 @@
+package com.abi.qms.platform.dao.mapper;
+
+import com.abi.qms.platform.dao.entity.QrRepertorySerialNumber;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 码库流水号 Mapper接口
+ *
+ * @author WeiganCai
+ * @date 2021-04-30
+ */
+public interface QrRepertorySerialNumberMapper extends BaseMapper<QrRepertorySerialNumber> {
+
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/QrFormatVO.java

@@ -40,6 +40,15 @@ public class QrFormatVO {
     @ApiModelProperty("说明")
     private String illustrate;
 
+    @ApiModelProperty("码预览")
+    private String previewCode;
+
+    @ApiModelProperty("位数")
+    private Integer digit;
+
+    @ApiModelProperty("理论不重复数量")
+    private Long maxCount;
+
     @ApiModelProperty("是否验证唯一性 0-不验证，1-验证")
     private Integer verifyUnique;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/SaveQrFormatReq.java

@@ -47,6 +47,15 @@ public class SaveQrFormatReq implements Serializable {
 	@ApiModelProperty("说明")
 	private String illustrate;
 
+	@ApiModelProperty("码预览")
+	private String previewCode;
+
+	@ApiModelProperty("位数")
+	private Integer digit;
+
+	@ApiModelProperty("理论不重复数量")
+	private Long maxCount;
+
 	@ApiModelProperty("是否验证唯一性 0-不验证，1-验证")
 	private Integer verifyUnique;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/ListQrFormatRes.java

@@ -58,6 +58,15 @@ public class ListQrFormatRes extends PageResp implements Serializable {
 		@ApiModelProperty("说明")
 		private String illustrate;
 
+		@ApiModelProperty("码预览")
+		private String previewCode;
+
+		@ApiModelProperty("位数")
+		private Integer digit;
+
+		@ApiModelProperty("理论不重复数量")
+		private Long maxCount;
+
 		@ApiModelProperty("是否验证唯一性 0-不验证，1-验证")
 		private Integer verifyUnique;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/PreviewQrVariableRes.java

@@ -20,6 +20,9 @@ public class PreviewQrVariableRes implements Serializable {
   @ApiModelProperty(value = "生成的码")
   private String code;
 
+  @ApiModelProperty("位数")
+  private Integer digit;
+
   @ApiModelProperty(value = "理论不重复数量")
   private Long maxCount;
 

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

@@ -0,0 +1,11 @@
+package com.abi.qms.platform.service;
+
+/**
+ * 码库流水号 Service接口
+ *
+ * @author WeiganCai
+ * @date 2021-04-30
+ */
+public interface QrRepertorySerialNumberService {
+
+}

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

@@ -71,6 +71,8 @@ public class QrPackageServiceImpl implements QrPackageService {
 		Long userId = UserUtil.getUser().getId();
 		qrPackage.setUpdateBy(userId);
 		if (qrPackageId != null) {
+			// 修改时，需要重置码包的状态为待审核
+			qrPackage.setApplyStatus(QrPackageApplyStatusEnum.WAIT_REVIEW.getCode());
 			qrPackageMapper.updateById(qrPackage);
 		} else {
 			qrPackage.setCreateBy(userId);

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

@@ -0,0 +1,15 @@
+package com.abi.qms.platform.service.impl;
+
+import com.abi.qms.platform.service.QrRepertorySerialNumberService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 码库流水号 Service业务层处理
+ *
+ * @author WeiganCai
+ * @date 2021-04-30
+ */
+@Service
+public class QrRepertorySerialNumberServiceImpl implements QrRepertorySerialNumberService {
+
+}

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

@@ -72,6 +72,9 @@ public class QrVariableServiceImpl implements QrVariableService {
 		PreviewQrVariableRes res = new PreviewQrVariableRes();
 		res.setCode(code);
 
+		// 位数
+		res.setDigit(qrVariable.getDigit());
+
 		// 获得或计算理论不重复数量
 		String effectiveQuantity = qrVariable.getEffectiveQuantity();
 		Long maxCount;

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrFormatMapper.xml

@@ -13,6 +13,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="codeVariableBuildClass" column="code_variable_build_class"/>
         <result property="brief" column="brief"/>
         <result property="illustrate" column="illustrate"/>
+        <result property="previewCode" column="preview_code"/>
+        <result property="digit" column="digit"/>
+        <result property="maxCount" column="max_count"/>
         <result property="verifyUnique" column="verify_unique"/>
         <result property="uniqueStatus" column="unique_status"/>
         <result property="useStatus" column="use_status"/>
@@ -32,6 +35,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qf.code_variable_build_class,
             qf.brief,
             qf.illustrate,
+            qf.preview_code,
+            qf.digit,
+            qf.max_count,
             qf.verify_unique,
             qf.unique_status,
             qf.use_status,

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrRepertorySerialNumberMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.abi.qms.platform.dao.mapper.QrRepertorySerialNumberMapper">
+
+    <resultMap type="com.abi.qms.platform.dao.entity.QrRepertorySerialNumber" id="QrRepertorySerialNumberResult">
+        <result property="id" column="id"/>
+        <result property="qrRepertoryId" column="qr_repertory_id"/>
+        <result property="qrRepertoryColumnId" column="qr_repertory_column_id"/>
+        <result property="serialNumber" column="serial_number"/>
+    </resultMap>
+
+
+</mapper>