24282 1 year ago
parent
commit
b37f7cbe32

+ 3 - 1
sd-business/src/main/java/com/sd/business/upload/ObsUploadService.java

@@ -20,6 +20,7 @@ import java.util.StringJoiner;
  */
 @Component
 public class ObsUploadService {
+
     @Value("${obs.ak}")
     private String ak;
 
@@ -42,6 +43,7 @@ public class ObsUploadService {
     private String name;
 
     public String uploadFileByte(ByteArrayInputStream bis, String fileName) {
+
         if (fileName.length() > 100) {
             throw new ServiceException("文件名过长,请缩短后重试!!!");
         }
@@ -74,11 +76,11 @@ public class ObsUploadService {
         return objectKey;
     }
 
-
     /**
      * 获取oss链接客户端
      */
     private ObsClient getObsClient() {
         return new ObsClient(ak, sk, endPoint);
     }
+
 }

+ 2 - 9
sd-business/src/main/java/com/sd/business/util/CodeEnum.java

@@ -4,15 +4,16 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.exception.ServiceException;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Date;
 import java.util.Map;
 
 @Getter
+@AllArgsConstructor
 public enum CodeEnum {
 
     ;
@@ -28,14 +29,6 @@ public enum CodeEnum {
     // service
     private final IService<?> service;
 
-    CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {
-        this.prefix = prefix;
-        this.dateFormat = dateFormat;
-        this.length = length;
-        this.codeFieldName = codeFieldName;
-        this.service = SpringUtil.getBean(serviceCls);
-    }
-
     /**
      * 不够位数的在前面补0,保留num的长度位数字
      */

+ 9 - 10
sd-business/src/main/resources/mapper/warehouse/WarehouseMapper.xml

@@ -2,16 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sd.business.mapper.warehouse.WarehouseMapper">
     <select id="getPage" resultType="com.sd.business.entity.warehouse.vo.WarehouseVo">
-        select
-            w.id,
-            w.type,
-            w.code,
-            w.name,
-            w.remark,
-            w.create_user,
-            w.create_time,
-            w.update_user,
-            w.update_time
+        select w.id,
+               w.type,
+               w.code,
+               w.name,
+               w.remark,
+               w.create_user,
+               w.create_time,
+               w.update_user,
+               w.update_time
         from warehouse w
             ${ew.customSqlSegment}
     </select>