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/QrBoxMapping.java

@@ -0,0 +1,89 @@
+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 QrBoxMapping {
+
+	@Schema(name = "id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+	@Schema(name = "条码序号")
+    private String boxCode;
+
+	@Schema(name = "起始序号")
+    private Long indexBegin;
+
+	@Schema(name = "结束序号")
+    private Long indexEnd;
+
+	@Schema(name = "起始二维码")
+    private String beginQrCode;
+
+	@Schema(name = "结束二维码")
+    private String endQrCode;
+
+	@Schema(name = "条数")
+    private Long qrCodeCount;
+
+	@Schema(name = "激活状态")
+    private Integer activeStatus;
+
+	@Schema(name = "激活时间")
+    private LocalDateTime activeTime;
+
+	@Schema(name = "激活人id")
+    private Long activeUserId;
+
+	@Schema(name = "激活人姓名")
+    private String activeUserName;
+
+	@Schema(name = "码包id")
+    private Long packageId;
+
+	@Schema(name = "项目号")
+    private String projectNo;
+
+	@Schema(name = "版号")
+    private String boardNo;
+
+	@Schema(name = "备注")
+    private String remark;
+
+	@Schema(name = "创建人姓名")
+    private String createUserName;
+
+	@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/entity/QrIndex.java

@@ -0,0 +1,47 @@
+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 QrIndex {
+
+	@Schema(name = "id")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+	@Schema(name = "已生成码包位置（下一次获取从+1开始，然后保存实际结束数字）")
+    private Long indexCurrent;
+
+	@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/QrBoxMappingMapper.java

@@ -0,0 +1,15 @@
+package com.abi.qms.platform.dao.mapper;
+
+import com.abi.qms.platform.dao.entity.QrBoxMapping;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 箱码关联表 Mapper 接口
+ * </p>
+ *
+ * @author Andy.Tan
+ */
+public interface QrBoxMappingMapper extends BaseMapper<QrBoxMapping> {
+
+}

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

@@ -0,0 +1,15 @@
+package com.abi.qms.platform.dao.mapper;
+
+import com.abi.qms.platform.dao.entity.QrIndex;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 码生成递增序列表 Mapper 接口
+ * </p>
+ *
+ * @author Andy.Tan
+ */
+public interface QrIndexMapper extends BaseMapper<QrIndex> {
+
+}

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

@@ -79,10 +79,6 @@ public class TokenInterceptor implements HandlerInterceptor {
             userInfo.setId(Long.valueOf(userId));
             userInfo.setUserName(userName);
             userInfo.setRoleCode(roleCode);
-            if(Objects.nonNull(userMap.get("factoryId"))) {
-                Long factoryId = userMap.get("factoryId").asLong();
-                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,7 +63,6 @@ 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/resources/dao/mapper/QrBoxMappingMapper.xml

@@ -0,0 +1,35 @@
+<?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.QrBoxMappingMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.QrBoxMapping">
+        <id column="ID" property="id" />
+        <result column="BOX_CODE" property="boxCode" />
+        <result column="INDEX_BEGIN" property="indexBegin" />
+        <result column="INDEX_END" property="indexEnd" />
+        <result column="BEGIN_QR_CODE" property="beginQrCode" />
+        <result column="END_QR_CODE" property="endQrCode" />
+        <result column="QR_CODE_COUNT" property="qrCodeCount" />
+        <result column="ACTIVE_STATUS" property="activeStatus" />
+        <result column="ACTIVE_TIME" property="activeTime" />
+        <result column="ACTIVE_USER_ID" property="activeUserId" />
+        <result column="ACTIVE_USER_NAME" property="activeUserName" />
+        <result column="PACKAGE_ID" property="packageId" />
+        <result column="PROJECT_NO" property="projectNo" />
+        <result column="BOARD_NO" property="boardNo" />
+        <result column="REMARK" property="remark" />
+        <result column="CREATE_USER_NAME" property="createUserName" />
+        <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, index_begin, index_end, begin_qr_code, end_qr_code, qr_code_count, active_status, active_time, active_user_id, active_user_name, package_id, project_no, board_no, remark, create_user_name, create_time, create_by, update_time, update_by, is_delete
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,21 @@
+<?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.QrIndexMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.QrIndex">
+        <id column="ID" property="id" />
+        <result column="INDEX_CURRENT" property="indexCurrent" />
+        <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, INDEX_CURRENT, CREATE_TIME, CREATE_BY, UPDATE_TIME, UPDATE_BY, IS_DELETE
+    </sql>
+
+</mapper>