生成码包修改

供应商添加新字段

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

@@ -69,6 +69,9 @@ public class BaseFactory {
     @ApiModelProperty(value = "是否有效 0-无效 1-有效")
     private Integer valid;
 
+    @ApiModelProperty(value = "生成码包是否需要加密 0-否 1-是")
+    private Integer isQrCodeEncode;
+
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;

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

@@ -419,12 +419,12 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
                 for (int j = 0; j < qrRepertoryColumnList.size(); j++) {
                     QrRepertoryColumnVO qrRepertoryColumn = qrRepertoryColumnList.get(j);
                     Long qrRepertoryColumnId = qrRepertoryColumn.getId();
-                    // 非clone列，设置code和url
+                    // 非clone列，设置code
                     String code = buildUniqueCode(uniqueSet, qrRepertoryColumn, codeSb, paramMap, qrRepertorySerialNumberMap, 0);
                     if (code == null) {
                         throw new RuntimeException("生成码失败，重复生成码次数超过" + REPEAT_BUILD_CODE_TIMES + "次");
                     }
-                    //判断拆分数量是否为空
+                    // 判断拆分数量是否为空
                     int splitNum = 0;
                     if(splitCache.containsKey(qrRepertoryColumnId)){
                         splitNum = splitCache.get(qrRepertoryColumnId).getSplitNum();
@@ -569,9 +569,7 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
      */
     private String buildUniqueCode( HashSet<String> uniqueSet, QrRepertoryColumnVO qrRepertoryColumn, StringBuilder codeSb, Map<String, Object> paramMap, Map<String, QrRepertorySerialNumber> qrRepertorySerialNumberMap, int buildTimes) {
         // 生成码
-        log.info("buildUniqueCode==>进来了");
         buildCodeByClass(qrRepertoryColumn, codeSb, paramMap, qrRepertorySerialNumberMap);
-        log.info("buildUniqueCode==>活着出来了");
         String code = codeSb.toString();
 
         // add成功，说明码没有重复

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

@@ -18,6 +18,7 @@
         <result column="email" property="email"/>
         <result column="max_file_count" property="maxFileCount"/>
         <result column="description" property="description"/>
+        <result column="is_qr_code_encode" property="isQrCodeEncode"/>
         <result column="create_time" property="createTime"/>
         <result column="create_by" property="createBy"/>
         <result column="update_time" property="updateTime"/>
@@ -27,7 +28,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, factory_code, factory_name, factory_type, is_first_factory, province, city, district, address, keyman_name, keyman_mobile, email, max_file_count, description, create_time, create_by, update_time, is_delete,update_by
+        id, factory_code, factory_name, factory_type, is_first_factory, province, city, district, address, keyman_name, keyman_mobile, email, max_file_count, description, is_qr_code_encode, create_time, create_by, update_time, is_delete,update_by
     </sql>
 
 </mapper>