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/dao/entity/QrBoxCodeFormatSplit.java

@@ -0,0 +1,56 @@
+package com.abi.qms.platform.dao.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 箱码幅面关联码库拆分数量
+ * </p>
+ *
+ * @author Andy.Tan
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(name="箱码幅面关联码库拆分数量对象", description="箱码幅面关联码库拆分数量")
+public class QrBoxCodeFormatSplit {
+
+	@Schema(name = "id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+	@Schema(name = "箱码幅面id")
+    private Long boxCodeFormatId;
+
+	@Schema(name = "码库id")
+    private Long qrRepertoryId;
+
+	@Schema(name = "码库列id")
+    private Long qrRepertoryColumnId;
+
+	@Schema(name = "拆分数量")
+    private Integer splitNum;
+
+	@Schema(name = "创建时间")
+    private LocalDateTime createTime;
+
+	@Schema(name = "创建人id")
+    private Long createBy;
+
+	@Schema(name = "修改时间")
+    private LocalDateTime updateTime;
+
+	@Schema(name = "修改人id")
+    private Long updateBy;
+
+	@Schema(name = "是否删除")
+    private Integer isDelete;
+
+
+
+}

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

@@ -0,0 +1,15 @@
+package com.abi.qms.platform.dao.mapper;
+
+import com.abi.qms.platform.dao.entity.QrBoxCodeFormatSplit;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 箱码幅面关联码库拆分数量 Mapper 接口
+ * </p>
+ *
+ * @author Andy.Tan
+ */
+public interface QrBoxCodeFormatSplitMapper extends BaseMapper<QrBoxCodeFormatSplit> {
+
+}

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

@@ -2,11 +2,16 @@ package com.abi.qms.platform.dto.req;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author: fangxinjian
@@ -43,4 +48,25 @@ public class SaveBoxCodeFormatReq implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remark;
 
+    @Schema(name = "拆分数量列表")
+    private List<SplitBean> splitBeanList;
+
+    /**
+    * 拆分数量 BEAN
+    */
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ToString
+    @Schema(name = "SaveBoxCodeFormatReq_SplitBean")
+    public static class SplitBean implements Serializable {
+
+        @Schema(name = "码库列id")
+        private Long qrRepertoryColumnId;
+
+        @Schema(name = "拆分数量")
+        private Integer splitNum;
+
+    }
+
 }

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

@@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.Method;
 import java.text.MessageFormat;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import static com.abi.qms.platform.infrastructure.constant.RedisKey.TOKEN_KEY;
@@ -74,10 +75,14 @@ public class TokenInterceptor implements HandlerInterceptor {
             redisClient.expire(redisTokenKey,2, TimeUnit.HOURS);
             String userName = userMap.get("userName").asString();
             String roleCode = userMap.get("roleCode").asString();
+            Long factoryId = userMap.get("factoryId").asLong();
             UserInfo userInfo = new UserInfo();
             userInfo.setId(Long.valueOf(userId));
             userInfo.setUserName(userName);
             userInfo.setRoleCode(roleCode);
+            if(Objects.nonNull(factoryId)) {
+                userInfo.setFactoryId(factoryId);
+            }
             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

@@ -63,6 +63,7 @@ public class JwtTokenUtils{
                     .withClaim("userId",user.getId())
                     .withClaim("userName",user.getUserName())
                     .withClaim("roleCode",user.getRoleCode())
+                    .withClaim("factoryId",user.getFactoryId())
                     .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/QrBoxCodeFormatImpl.java

@@ -50,7 +50,7 @@ public class QrBoxCodeFormatImpl implements QrBoxCodeFormatService {
             qrBoxCodeFormat = new QrBoxCodeFormat();
         }
 
-        //2-放入数据
+        //2-箱码幅面放入数据
         qrBoxCodeFormat.setQrRepertoryId(req.getQrRepertoryId());
         //若当前登录用户为包材厂用户，则该选项默认选择该用户所在的包材厂，不可修改
         qrBoxCodeFormat.setFactoryId(UserUtil.getUser().getFactoryId() != null ? UserUtil.getUser().getFactoryId() : req.getFactoryId());
@@ -66,6 +66,9 @@ public class QrBoxCodeFormatImpl implements QrBoxCodeFormatService {
             qrBoxCodeFormatMapper.insert(qrBoxCodeFormat);
         }
 
+        //4-新增or修改 拆分数量列表
+
+
     }
 
     @Override

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

@@ -0,0 +1,24 @@
+<?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.QrBoxCodeFormatSplitMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.QrBoxCodeFormatSplit">
+        <id column="ID" property="id" />
+        <result column="BOX_CODE_FORMAT_ID" property="boxCodeFormatId" />
+        <result column="QR_REPERTORY_ID" property="qrRepertoryId" />
+        <result column="QR_REPERTORY_COLUMN_ID" property="qrRepertoryColumnId" />
+        <result column="SPLIT_NUM" property="splitNum" />
+        <result column="CREATE_TIME" property="createTime" />
+        <result column="CREATE_BY" property="createBy" />
+        <result column="UPDATE_TIME" property="updateTime" />
+        <result column="UPDATE_BY" property="updateBy" />
+        <result column="IS_DELETE" property="isDelete" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, box_code_format_id, qr_repertory_id, qr_repertory_column_id, split_num, create_time, create_by, update_time, update_by, is_delete
+    </sql>
+
+</mapper>