update

bailuntec-cost-core/pom.xml

@@ -34,6 +34,8 @@
         <commons.fileupload>1.3.1</commons.fileupload>
         <commons.io>2.4</commons.io>
         <commons-lang3.verson>3.10</commons-lang3.verson>
+        <qiniu-java-sdk.version>[7.2.0, 7.2.99]</qiniu-java-sdk.version>
+
     </properties>
 
     <dependencies>
@@ -140,19 +142,19 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <groupId>org.springframework.boot</groupId>-->
-<!--                    <artifactId>spring-boot-starter-tomcat</artifactId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
+            <!--            <exclusions>-->
+            <!--                <exclusion>-->
+            <!--                    <groupId>org.springframework.boot</groupId>-->
+            <!--                    <artifactId>spring-boot-starter-tomcat</artifactId>-->
+            <!--                </exclusion>-->
+            <!--            </exclusions>-->
         </dependency>
 
-<!--        &lt;!&ndash;undertow servlet 容器&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-undertow</artifactId>-->
-<!--        </dependency>-->
+        <!--        &lt;!&ndash;undertow servlet 容器&ndash;&gt;-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.springframework.boot</groupId>-->
+        <!--            <artifactId>spring-boot-starter-undertow</artifactId>-->
+        <!--        </dependency>-->
 
         <!--mp 增加Mybatis-->
         <dependency>
@@ -166,6 +168,13 @@
             <artifactId>mybatis-plus-generator</artifactId>
         </dependency>
 
+        <!--七牛云文档-->
+        <dependency>
+            <groupId>com.qiniu</groupId>
+            <artifactId>qiniu-java-sdk</artifactId>
+            <version>${qiniu-java-sdk.version}</version>
+        </dependency>
+
         <!--freemarker作为模板-->
         <dependency>
             <groupId>org.freemarker</groupId>

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/service/impl/cost/AbstractCostService.java

@@ -325,26 +325,25 @@ public abstract class AbstractCostService implements CostService {
         // 费用单状态改为审核驳回，添加驳回理由
         // 修复驳回后提交出现费用单已存在的问题
         // 将后缀添加到  detail_key 字段
-        CostDomain oldCost = this.getCostByCostNo(costCashiercallbackDomain.getCostNo());
-        String oldDetailKey = oldCost.getDetailKey();
-        CostDomain costDomain = new CostDomain();
-        costDomain.setId(oldCost.getId());
+        CostDomain cost = this.getCostByCostNo(costCashiercallbackDomain.getCostNo());
+        String oldDetailKey = cost.getDetailKey();
+
         if (null != oldDetailKey && oldDetailKey.contains("-")) {
             String[] split = oldDetailKey.split("-");
             if (split.length > 1) {
                 int i = Integer.parseInt(split[1]) + 1;
-                costDomain.setDetailKey(split[0] + "-" + i);
+                cost.setDetailKey(split[0] + "-" + i);
             }
         } else {
-            costDomain.setDetailKey(oldCost.getCostNo() + "-" + 1);
+            cost.setDetailKey(cost.getCostNo() + "-" + 1);
         }
-        costDomain.setRejectReason(costCashiercallbackDomain.getPaynote());
-        costDomain.setCostStatus(3);
-        costDomain.setRejectType(2);
-        this.updateById(costDomain);
+        cost.setRejectReason(costCashiercallbackDomain.getPaynote());
+        cost.setCostStatus(3);
+        cost.setRejectType(2);
+        this.updateById(cost);
         log.info("出纳驳回，费用单状态更改成功" + costCashiercallbackDomain);
 
-        costLogService.save(costDomain.getCostNo(), costCashiercallbackDomain.getPayuserid(), "被出纳驳回：" + costCashiercallbackDomain.getPaynote());
+        costLogService.save(cost.getCostNo(), costCashiercallbackDomain.getPayuserid(), "被出纳驳回：" + costCashiercallbackDomain.getPaynote());
     }
 
     void cashierCallbackPass(CostCashiercallbackDomain costCashiercallbackDomain) {

bailuntec-cost-core/src/main/java/com/blt/other/module/cost/utils/CostFileUtil.java

 package com.blt.other.module.cost.utils;
 
+import com.bailuntec.common.JsonUtilByFsJson;
+import com.bailuntec.common.StringUtils;
+import com.bailuntec.common.exception.BizException;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.blt.other.common.util.PathUtil;
+import com.qiniu.common.QiniuException;
+import com.qiniu.common.Zone;
+import com.qiniu.http.Response;
+import com.qiniu.storage.Configuration;
+import com.qiniu.storage.UploadManager;
+import com.qiniu.storage.model.DefaultPutRet;
+import com.qiniu.util.Auth;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.util.UUID;
 
 /**
@@ -48,7 +63,7 @@ public class CostFileUtil {
 
         File dest = new File(fileName);
         // 创建路径
-        if (!dest.exists()) {	//文件不存在则创建文件，先创建目录
+        if (!dest.exists()) {    //文件不存在则创建文件，先创建目录
             File dir = new File(dest.getParent());
             dir.mkdirs();
             dest.createNewFile();
@@ -63,4 +78,58 @@ public class CostFileUtil {
     }
 
 
+    public String saveImage(MultipartFile multipartFile) throws IOException {
+        //临时文件地址
+        String basePath = PathUtil.getBasePath() + PathUtil.getPath("cost/");
+        //文件名
+        String fileName = multipartFile.getOriginalFilename();
+        if (StringUtils.isEmpty(fileName)) {
+            throw new BizException("上传文件为空，请重新上传");
+        }
+        String fileSuffix = fileName.substring(fileName.lastIndexOf("."));
+        String localFileName = IdWorker.getId() + fileSuffix;
+        String filePath = basePath + File.separator + localFileName;
+        File localFile = new File(filePath);
+        File imagePath = new File(basePath);
+        if (!imagePath.exists()) {
+            boolean ignore = imagePath.mkdirs();
+        }
+        multipartFile.transferTo(localFile);
+        return qiniuUpload(localFile);
+    }
+
+    public String qiniuUpload(File localFilePath) {
+        //1、构造一个带指定Zone对象的配置类
+        Configuration cfg = new Configuration(Zone.zone2());
+        //2、其他参数参考类注释
+        UploadManager uploadManager = new UploadManager(cfg);
+        //3、生成上传凭证，然后准备上传
+        String accessKey = "RWQXlbVA7oe3BxnPuFtqkAJocQZkWTwrwYyldklr";
+        String secretKey = "tS2gxsQO26mGoFZJI-x8WSH9X5aPgYMJcyoJdak5";
+        String bucket = "begogirls";
+
+        //默认不指定key的情况下，以文件内容的hash值作为文件名
+        String key = null;
+        Auth auth = Auth.create(accessKey, secretKey);
+        String upToken = auth.uploadToken(bucket);
+        try {
+            Response response = uploadManager.put(localFilePath, key, upToken);
+            //4、解析上传成功的结果
+            DefaultPutRet putRet = JsonUtilByFsJson.jsonToBean(response.bodyString(), DefaultPutRet.class);
+            System.out.println(putRet.key);
+            System.out.println(putRet.hash);
+            return putRet.key;
+        } catch (QiniuException ex) {
+            Response r = ex.response;
+            System.err.println(r.toString());
+            try {
+                System.err.println(r.bodyString());
+            } catch (QiniuException ex2) {
+                //ignore
+            }
+            return null;
+        }
+    }
+
+
 }

bailuntec-cost-core/src/test/java/com/blt/other/OtherApplicationTests.java

@@ -5,6 +5,7 @@ import com.bailuntec.api.bailuntec.oa.OaApi;
 import com.bailuntec.api.bailuntec.oa.response.OaDepartmentResp;
 import com.bailuntec.api.bailuntec.oa.response.OaUserResp;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.blt.other.module.auth.dao.OaDepartmentMapper;
 import com.blt.other.module.auth.model.OaDepartment;
 import com.blt.other.module.auth.model.OaUser;
 import com.blt.other.module.auth.service.IOaDepartmentService;
@@ -25,7 +26,7 @@ import java.util.stream.Collectors;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = OtherApplication.class)
-@ActiveProfiles("test")
+@ActiveProfiles("prod")
 public class OtherApplicationTests {
 
     @Autowired
@@ -34,6 +35,8 @@ public class OtherApplicationTests {
     private IOaUserService oaUserService;
     @Autowired
     private IOaDepartmentService oaDepartmentService;
+    @Resource
+    OaDepartmentMapper oaDepartmentMapper;
 
     //    @Transactional(rollbackFor = Exception.class)
     @Test
@@ -77,7 +80,13 @@ public class OtherApplicationTests {
 
         oaUserService.remove(new LambdaQueryWrapper<>());
         oaUserService.saveBatch(oaUserList);
-//        oaDepartmentService.saveBatch(oaDepartmentList);
+
+        oaDepartmentList.forEach(oaDepartment -> {
+            if (oaDepartmentMapper.selectByDepartmentId(oaDepartment.getDepartmentId())==null){
+                oaDepartment.setUpdateUserId(0);
+                oaDepartmentService.save(oaDepartment);
+            }
+        });
 
     }