oss 提交

blade-common/src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -60,6 +60,8 @@ public interface CommonConstant {
 
 	String SYS_LOCAL_URL = "sys.local.url";
 
+	String SYS_FILE_NET_URL = "sys.file.net.url";
+
 	String SYS_USER_TASK_BATCH = "sys.user.task.batch";
 
 	String JL_THE_LOG = "JL.theLog";

blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java

@@ -46,7 +46,7 @@ public interface LauncherConstant {
 	String APPLICATION_XXLJOB_ADMIN_NAME = APPLICATION_NAME_PREFIX + "xxljob-admin";
 
 	/**
-	 * nacos dev 地址 172.31.222.127
+	 * nacos dev 地址 172.31.222.127   127.0.0.107
 	 */
 	String NACOS_DEV_ADDR = "127.0.0.1:8848";
 

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -608,8 +608,9 @@ public class ExcelTabController extends BladeController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "pkeyId", value = "pkeyId", required = true)
     })
-    public R getExcelHtmlByBuss(Long pkeyId) throws IOException {
-
+    public R getExcelHtmlByBuss(Long pkeyId) throws Exception {
+        String file_path = ParamCache.getValue(CommonConstant.SYS_LOCAL_URL);
+        String sys_file_net_url = ParamCache.getValue(CommonConstant.SYS_FILE_NET_URL);
         WbsTreeContract wbsTreeContract = wbsTreeContractService.getBaseMapper().selectOne(Wrappers.<WbsTreeContract>query().lambda()
                 .eq(WbsTreeContract::getPKeyId, pkeyId));
         if (wbsTreeContract == null) {
@@ -618,9 +619,16 @@ public class ExcelTabController extends BladeController {
         if (wbsTreeContract.getHtmlUrl() == null) {
             return R.fail("暂无表单!");
         }
-        File file1 = ResourceUtil.getFile(wbsTreeContract.getHtmlUrl());
-//        File file1 = ResourceUtil.getFile("C:\\Users\\泓创研发01\\Desktop\\privateUrl\\1578963584895942656.html");
-        FileInputStream fileInputStream = new FileInputStream(file1);
+
+        String fileUrl = wbsTreeContract.getHtmlUrl();
+        File file1 = ResourceUtil.getFile(fileUrl);
+        InputStream fileInputStream = null;
+        if(file1.exists()){
+            fileInputStream = new FileInputStream(file1);;
+        }else{
+            String path = sys_file_net_url+fileUrl.replaceAll("//","/").replaceAll(file_path,"");
+            fileInputStream = CommonUtil.getOSSInputStream(path);
+        }
 
         String htmlString = IoUtil.readToString(fileInputStream);
         htmlString = htmlString.replaceAll("placeholder", "placeholderxx");
@@ -686,10 +694,10 @@ public class ExcelTabController extends BladeController {
 //            }
 //        }
         WbsTreeContract process = this.wbsTreeContractService.getOne(Wrappers.<WbsTreeContract>lambdaQuery()
-                .eq(WbsTreeContract::getId,wbsTreeContract.getParentId())
-                .eq(WbsTreeContract::getContractId,wbsTreeContract.getContractId())
-                .eq(WbsTreeContract::getWbsId,wbsTreeContract.getWbsId()).last( "limit 1"));
-        if(process!=null) {
+                .eq(WbsTreeContract::getId, wbsTreeContract.getParentId())
+                .eq(WbsTreeContract::getContractId, wbsTreeContract.getContractId())
+                .eq(WbsTreeContract::getWbsId, wbsTreeContract.getWbsId()).last("limit 1"));
+        if (process != null) {
             this.excelTabService.gsColor(pkeyId, process.getPKeyId().toString(), wbsTreeContract.getProjectId(), doc);
         }
         doc.select("Col").remove();

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/SaveUserInfoByProjectClientImpl.java

@@ -54,7 +54,19 @@ public class SaveUserInfoByProjectClientImpl implements SaveUserInfoByProjectCli
         obj.setContractId(String.valueOf(contractId));
         obj.setRoleId(String.valueOf(roleId));
         obj.setStatus(1);
-        saveUserInfoByProjectService.save(obj);
+
+        List<SaveUserInfoByProjectDTO> saveUserInfozList = saveUserInfoByProjectService.getBaseMapper().selectList(Wrappers.<SaveUserInfoByProjectDTO>query().lambda()
+                .eq(SaveUserInfoByProjectDTO::getUserId, userId)
+                .isNull(SaveUserInfoByProjectDTO::getPostId)
+                .eq(SaveUserInfoByProjectDTO::getContractId, contractId));
+
+        if(saveUserInfozList ==null && saveUserInfozList.size()==0){
+            saveUserInfoByProjectService.getBaseMapper().delete(Wrappers.<SaveUserInfoByProjectDTO>query().lambda()
+                    .eq(SaveUserInfoByProjectDTO::getUserId, userId)
+                    .isNull(SaveUserInfoByProjectDTO::getPostId)
+                    .eq(SaveUserInfoByProjectDTO::getContractId, contractId));
+            saveUserInfoByProjectService.save(obj);
+        }
     }