Merge remote-tracking branch 'origin/feature/1.0.0' into feature/1.0.0

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/QrVariableController.java

@@ -14,12 +14,14 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 码格式变量 Controller
- * 
+ *
  * @author WeiganCai
  * @date 2021-04-19
  */
@@ -40,8 +42,8 @@ public class QrVariableController {
     }
 
     @ApiOperation("码格式变量生成预览")
-    @GetMapping("/previewQrVariable")
-    public BaseResponse<PreviewQrVariableRes> previewQrVariable(@Validated PreviewQrVariableReq previewQrVariableReq) {
+    @PostMapping("/previewQrVariable")
+    public BaseResponse<PreviewQrVariableRes> previewQrVariable(@RequestBody PreviewQrVariableReq previewQrVariableReq) {
         PreviewQrVariableRes result = qrVariableService.previewQrVariable(previewQrVariableReq);
         return BaseResponse.create(result);
     }

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

@@ -37,6 +37,9 @@ public class QrRepertoryColumn {
     @ApiModelProperty("别名")
     private String alias;
 
+    @ApiModelProperty("拆分数量")
+    private Integer splitNum;
+
     @ApiModelProperty("url格式类型 0-非URL 1-系统URL 2-部门URL")
     private Integer urlType;
 

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

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author Eurus
  * @date 2021/5/19 20:39
@@ -11,7 +13,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel
-public class QrPackageBatchVO {
+public class QrPackageBatchVO implements Serializable {
 
     @ApiModelProperty(value = "码包批次id")
     private Long id;

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

@@ -24,7 +24,10 @@ public class QrRepertoryColumnVO {
 	@ApiModelProperty("码格式id")
 	private Long qrFormatId;
 
-	/** 码格式 */
+	@ApiModelProperty("码格式名称")
+	private String qrFormatName;
+
+	@ApiModelProperty("码格式")
 	private QrFormatVO qrFormatVO;
 
 	@ApiModelProperty("克隆列 -1:未克隆 >=0:克隆了哪列，下标从0开始")
@@ -36,6 +39,9 @@ public class QrRepertoryColumnVO {
 	@ApiModelProperty("别名")
 	private String alias;
 
+	@ApiModelProperty("拆分数量")
+	private Integer splitNum;
+
 	@ApiModelProperty("url格式类型 0-非URL 1-系统URL 2-部门URL")
 	private Integer urlType;
 

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

@@ -1,6 +1,5 @@
 package com.abi.qms.platform.dao.vo.result;
 
-import com.abi.qms.platform.dto.req.SaveQrRepertoryColumnReq;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

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

@@ -18,8 +18,8 @@ import java.util.List;
 @ApiModel
 public class PreviewQrVariableReq implements Serializable {
 
-  @NotNull(message = "ids为空")
-  @ApiModelProperty(value = "ids")
-  private List<Long> ids;
+  @NotNull(message = "paramNameList为空")
+  @ApiModelProperty(value = "paramNameList")
+  private List<Long> paramNameList;
 
 }

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

@@ -33,9 +33,9 @@ public class SaveQrFormatReq implements Serializable {
 	@ApiModelProperty("码变量")
 	private String codeVariable;
 
-	@NotNull(message = "选择参数为空")
-	@ApiModelProperty("码变量对应的类")
-	private String codeVariableBuildClass;
+//	@NotNull(message = "选择参数为空")
+//	@ApiModelProperty("码变量对应的类")
+//	private String codeVariableBuildClass;
 
 	@ApiModelProperty("码组成简介")
 	private String brief;

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

@@ -33,6 +33,10 @@ public class SaveQrRepertoryColumnReq implements Serializable {
 	@ApiModelProperty("别名")
 	private String alias;
 
+	@NotNull(message = "拆分数量为空")
+	@ApiModelProperty("拆分数量")
+	private Integer splitNum;
+
 	@NotNull(message = "URL格式为空")
 	@ApiModelProperty("url格式类型 0-非URL 1-系统URL 2-部门URL")
 	private Integer urlType;

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

@@ -25,10 +25,6 @@ public class SaveQrRepertoryReq implements Serializable {
 	@ApiModelProperty("码库id")
 	private Long id;
 
-	@NotNull(message = "部门为空")
-	@ApiModelProperty("部门id")
-	private Long deptId;
-
 	@NotNull(message = "码库名称为空")
 	@Pattern(regexp = "^[a-zA-Z-z0-9\\u4e00-\\u9fa5]{1,20}$", message = "码库名称限制20字内的汉字or字母or数字")
 	@ApiModelProperty("码库名称")
@@ -38,9 +34,6 @@ public class SaveQrRepertoryReq implements Serializable {
 	@ApiModelProperty("码库类型 1-系统生成 2-文本导入 3-FTP接入")
 	private Integer type;
 
-	@ApiModelProperty("初始数量")
-	private Long initialNumber;
-
 	@NotEmpty(message = "码数据组成为空")
 	@Size(max = 10, message = "码数据组成超过10列")
 	@Valid

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

@@ -25,6 +25,9 @@ public class GetQrRepertoryColumnDetailRes implements Serializable {
 	@ApiModelProperty("码格式id")
 	private Long qrFormatId;
 
+	@ApiModelProperty("码格式名称")
+	private String qrFormatName;
+
 	@ApiModelProperty("克隆列 -1:未克隆 >=0:克隆了哪列，下标从0开始")
 	private Integer cloneColumn;
 
@@ -34,7 +37,10 @@ public class GetQrRepertoryColumnDetailRes implements Serializable {
 	@ApiModelProperty("别名")
 	private String alias;
 
-	@ApiModelProperty("url格式类型 0-非URL 1-系统URL 2-部门URL")
+	@ApiModelProperty("拆分数量")
+	private Integer splitNum;
+
+	@ApiModelProperty("url格式类型 0-非URL 1-系统URL")
 	private Integer urlType;
 
 	@ApiModelProperty("备注")

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

@@ -23,18 +23,12 @@ public class GetQrRepertoryDetailRes implements Serializable {
 	@ApiModelProperty("码库id")
 	private Long id;
 
-	@ApiModelProperty("部门id")
-	private Long deptId;
-
 	@ApiModelProperty("码库名称")
 	private String name;
 
 	@ApiModelProperty("码库类型 1-系统生成 2-文本导入 3-FTP接入")
 	private Integer type;
 
-	@ApiModelProperty("初始数量")
-	private Long initialNumber;
-
 	@ApiModelProperty("码库状态 10-待生成 11-自动生成 20-待导入 21-已导入 40-停用")
 	private Integer status;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/interceptor/TokenInterceptor.java

@@ -73,9 +73,11 @@ public class TokenInterceptor implements HandlerInterceptor {
             }
             redisClient.expire(redisTokenKey,2, TimeUnit.HOURS);
             String userName = userMap.get("userName").asString();
+            String roleCode = userMap.get("roleCode").asString();
             UserInfo userInfo = new UserInfo();
             userInfo.setId(Long.valueOf(userId));
             userInfo.setUserName(userName);
+            userInfo.setRoleCode(roleCode);
             UserUtil.setUser(userInfo);
         } catch (JWTDecodeException j) {
             throw new BusinessException(401,"用户认证失败");

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/util/JwtTokenUtils.java

@@ -62,6 +62,7 @@ public class JwtTokenUtils{
                     .withAudience(user.getId().toString())
                     .withClaim("userId",user.getId())
                     .withClaim("userName",user.getUserName())
+                    .withClaim("roleCode",user.getRoleCode())
                     .withClaim("roles","")
                     .sign(Algorithm.RSA512((RSAPublicKey)globalRsaKeyMap.get(RSA_PUBLIC_KEY),
                             (RSAPrivateKey)globalRsaKeyMap.get(RSA_PRIVATE_KEY)));

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

@@ -10,12 +10,10 @@ import com.abi.qms.platform.dto.res.ListQrVariableRes;
 import com.abi.qms.platform.dto.res.PreviewQrVariableRes;
 import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.infrastructure.util.BuildCodeUtil;
-import com.abi.qms.platform.infrastructure.util.PageUtil;
 import com.abi.qms.platform.service.QrVariableService;
 import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.utils.PojoConverterUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,7 +21,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 /**
  * 码格式变量 Service业务层处理
@@ -34,94 +31,94 @@ import java.util.stream.Collectors;
 @Service
 public class QrVariableServiceImpl implements QrVariableService {
 
-	@Autowired
-	private QrVariableMapper qrVariableMapper;
-
-	/**
-	 *  码格式变量查询分页
-	 */
-	@Override
-	public ListQrVariableRes listQrVariable(ListQrVariableReq req) {
-		// 拼接条件
-		QueryWrapper<QrVariable> qrVariableQw = new QueryWrapper<>();
-		qrVariableQw.eq("is_delete", 0);
-		qrVariableQw.eq(req.getValid() != null, "valid", req.getValid());
-		qrVariableQw.eq(req.getDataType() != null, "data_type", req.getDataType());
-		qrVariableQw.eq(req.getParamType() != null, "param_type", req.getParamType());
-		qrVariableQw.orderByAsc("sort_number");
-
-		List<QrVariable> qrVariableList = qrVariableMapper.selectList(qrVariableQw);
-
-		// 封装出参
-		ListQrVariableRes res = new ListQrVariableRes();
-		List<ListQrVariableRes.QrVariableBean> qrVariableBeanList = PojoConverterUtils.copyList(qrVariableList, ListQrVariableRes.QrVariableBean.class);
-		res.setQrVariableBeanList(qrVariableBeanList);
-
-		return res;
-	}
-
-	/**
-	 * 码格式变量生成码预览
-	 */
-	@Override
-	public PreviewQrVariableRes previewQrVariable(PreviewQrVariableReq req) {
-		//校验入参
-		if(CollectionUtils.isEmpty(req.getIds())){
-			throw new BusinessException("码格式入参id为空");
-		}
-		// 查询码格式变量
-		QueryWrapper<QrVariable> qrVariableQw = new QueryWrapper<>();
-		qrVariableQw.in("id",req.getIds());
-		List<QrVariable> qrVariableList = qrVariableMapper.selectList(qrVariableQw);
-		if(CollectionUtils.isEmpty(qrVariableList)){
-			throw new BusinessException("码格式变量不存在");
-		}
-		if(qrVariableList.size()!=req.getIds().size()){
-			throw new BusinessException("部分码格式变量不存在");
-		}
-
-		// 生成单个码
-		StringBuffer codeSb = new StringBuffer();
-		for(QrVariable qrVariable:qrVariableList){
-			String tempCode = BuildCodeUtil.buildSingleCode(qrVariable.getBuildCodeClass(), null);
-			codeSb.append(tempCode);
-		}
-		String code = codeSb.toString();
-		PreviewQrVariableRes res = new PreviewQrVariableRes();
-		res.setCode(code);
-
-		// 位数
-		res.setDigit(code.length());
-
-		// 获得或计算理论不重复数量
-		//TODO 先取一个看看
-		QrVariable qrVariable = qrVariableList.get(0);
-		String effectiveQuantity = qrVariable.getEffectiveQuantity();
-		Long maxCount;
-		Pattern pattern = Pattern.compile("[0-9]*");
-		boolean isDigit = pattern.matcher(effectiveQuantity).matches();
-		if (isDigit) {
-			maxCount = Long.parseLong(effectiveQuantity);
-		} else {
-			maxCount = BuildCodeUtil.getMaxCount(effectiveQuantity, null);
-		}
-		res.setMaxCount(maxCount);
-
-		return res;
-	}
-
-	/**
-	 * 码格式变量查询详情
-	 */
-	@Override
-	public GetQrVariableDetailRes getQrVariableDetail(GetQrVariableDetailReq req) {
-		QueryWrapper<QrVariable> qrVariableQw = new QueryWrapper<>();
-		qrVariableQw.eq(req.getId() != null, "id", req.getId());
-		qrVariableQw.eq(StringUtils.isNotBlank(req.getParamName()), "param_name", req.getParamName());
-
-		QrVariable qrVariable = qrVariableMapper.selectOne(qrVariableQw);
-		AssertUtil.isNull(qrVariable, "码格式变量不存在");
-
-		return PojoConverterUtils.copy(qrVariable, GetQrVariableDetailRes.class);
-	}
+    @Autowired
+    private QrVariableMapper qrVariableMapper;
+
+    /**
+     * 码格式变量查询分页
+     */
+    @Override
+    public ListQrVariableRes listQrVariable(ListQrVariableReq req) {
+        // 拼接条件
+        QueryWrapper<QrVariable> qrVariableQw = new QueryWrapper<>();
+        qrVariableQw.eq("is_delete", 0);
+        qrVariableQw.eq(req.getValid() != null, "valid", req.getValid());
+        qrVariableQw.eq(req.getDataType() != null, "data_type", req.getDataType());
+        qrVariableQw.eq(req.getParamType() != null, "param_type", req.getParamType());
+        qrVariableQw.orderByAsc("sort_number");
+
+        List<QrVariable> qrVariableList = qrVariableMapper.selectList(qrVariableQw);
+
+        // 封装出参
+        ListQrVariableRes res = new ListQrVariableRes();
+        List<ListQrVariableRes.QrVariableBean> qrVariableBeanList = PojoConverterUtils.copyList(qrVariableList, ListQrVariableRes.QrVariableBean.class);
+        res.setQrVariableBeanList(qrVariableBeanList);
+
+        return res;
+    }
+
+    /**
+     * 码格式变量生成码预览
+     */
+    @Override
+    public PreviewQrVariableRes previewQrVariable(PreviewQrVariableReq req) {
+        //校验入参
+        if (CollectionUtils.isEmpty(req.getParamNameList())) {
+            throw new BusinessException("码格式参数名称为空");
+        }
+        // 查询码格式变量
+        QueryWrapper<QrVariable> qrVariableQw = new QueryWrapper<>();
+        qrVariableQw.in("param_name", req.getParamNameList());
+        List<QrVariable> qrVariableList = qrVariableMapper.selectList(qrVariableQw);
+        if (CollectionUtils.isEmpty(qrVariableList)) {
+            throw new BusinessException("码格式变量不存在");
+        }
+        if (qrVariableList.size() != req.getParamNameList().size()) {
+            throw new BusinessException("部分码格式变量不存在");
+        }
+
+        // 生成单个码
+        StringBuffer codeSb = new StringBuffer();
+        for (QrVariable qrVariable : qrVariableList) {
+            String tempCode = BuildCodeUtil.buildSingleCode(qrVariable.getBuildCodeClass(), null);
+            codeSb.append(tempCode).append(" ");
+        }
+        String code = codeSb.toString();
+        PreviewQrVariableRes res = new PreviewQrVariableRes();
+        res.setCode(code);
+
+        // 位数
+        res.setDigit(code.length());
+
+        // 获得或计算理论不重复数量
+        //TODO 先取一个看看
+        QrVariable qrVariable = qrVariableList.get(0);
+        String effectiveQuantity = qrVariable.getEffectiveQuantity();
+        Long maxCount;
+        Pattern pattern = Pattern.compile("[0-9]*");
+        boolean isDigit = pattern.matcher(effectiveQuantity).matches();
+        if (isDigit) {
+            maxCount = Long.parseLong(effectiveQuantity);
+        } else {
+            maxCount = BuildCodeUtil.getMaxCount(effectiveQuantity, null);
+        }
+        res.setMaxCount(maxCount);
+
+        return res;
+    }
+
+    /**
+     * 码格式变量查询详情
+     */
+    @Override
+    public GetQrVariableDetailRes getQrVariableDetail(GetQrVariableDetailReq req) {
+        QueryWrapper<QrVariable> qrVariableQw = new QueryWrapper<>();
+        qrVariableQw.eq(req.getId() != null, "id", req.getId());
+        qrVariableQw.eq(StringUtils.isNotBlank(req.getParamName()), "param_name", req.getParamName());
+
+        QrVariable qrVariable = qrVariableMapper.selectOne(qrVariableQw);
+        AssertUtil.isNull(qrVariable, "码格式变量不存在");
+
+        return PojoConverterUtils.copy(qrVariable, GetQrVariableDetailRes.class);
+    }
 }

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

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="cloneColumn" column="clone_column"/>
         <result property="sortNumber" column="sort_number"/>
         <result property="alias" column="alias"/>
+        <result property="splitNum" column="split_num"/>
         <result property="urlType" column="url_type"/>
         <result property="remark" column="remark"/>
         <result property="createTime" column="create_time"/>
@@ -21,9 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <insert id="batchInsert">
-        INSERT INTO qr_repertory_column (qr_repertory_id, qr_format_id, clone_column, sort_number, alias, url_type, remark, create_by, update_by) VALUES
+        INSERT INTO qr_repertory_column (qr_repertory_id, qr_format_id, clone_column, sort_number, alias, split_num, url_type, remark, create_by, update_by) VALUES
         <foreach item="item" index="index" collection="qrRepertoryColumnList" separator=",">
-            ( #{qrRepertoryId}, #{item.qrFormatId}, #{item.cloneColumn}, #{item.sortNumber}, #{item.alias}, #{item.urlType}, #{item.remark}, #{createBy}, #{updateBy} )
+            ( #{qrRepertoryId}, #{item.qrFormatId}, #{item.cloneColumn}, #{item.sortNumber}, #{item.alias},#{item.splitNum}, #{item.urlType}, #{item.remark}, #{createBy}, #{updateBy} )
         </foreach>
     </insert>
 

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

@@ -24,11 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id" column="qr_repertory_column_id"/>
         <result property="qrRepertoryId" column="qr_repertory_id"/>
         <result property="qrFormatId" column="qr_format_id"/>
-        <result property="qrFormatVO.id" column="qr_format_id"/>
-        <result property="qrFormatVO.codeVariableBuildClass" column="code_variable_build_class"/>
+        <result property="qrFormatName" column="qr_format_name"/>
         <result property="cloneColumn" column="clone_column"/>
         <result property="sortNumber" column="sort_number"/>
         <result property="alias" column="alias"/>
+        <result property="splitNum" column="split_num"/>
         <result property="urlType" column="url_type"/>
         <result property="remark" column="remark"/>
     </resultMap>
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- 码包 -->
     <resultMap id="QrPackageResult" type="com.abi.qms.platform.dao.vo.result.QrPackageVO">
 <!--        <result property="batchNumber" column="batch_number"/>-->
-<!--        <result property="name" column="qr_package_name"/>-->
+        <result property="id" column="qr_package_id"/>
         <result property="qrNumber" column="qr_number"/>
         <result property="createTime" column="qr_package_create_time"/>
         <result property="createByName" column="qr_package_create_by_name"/>
@@ -123,11 +123,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qrc.clone_column,
             qrc.sort_number,
             qrc.alias,
+            qrc.split_num,
             qrc.url_type,
             qrc.remark,
-            qf.code_variable_build_class,
-<!--            qp.batch_number,-->
-<!--            qp.name AS qr_package_name,-->
+            qf.name as qr_format_name,
+            qp.id as qr_package_id,
             qp.qr_number,
             qp.create_time AS qr_package_create_time,
             ui.user_name AS qr_package_create_by_name