文件题名bug,日志顿号问题

blade-service/blade-business/src/main/java/org/springblade/business/controller/ArchiveFileController.java

@@ -421,7 +421,7 @@ public class ArchiveFileController extends BladeController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("按文件日期排序")
     public R<Boolean> sortByFileTime(@RequestParam Long nodeId){
-        return R.data(this.archiveFileService.sortByFileTime(nodeId));
+        return R.status(this.archiveFileService.sortByFileTime(nodeId));
     }
 
     /**

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

@@ -2528,10 +2528,10 @@ public class ExcelTabController extends BladeController {
                                                             myData = dataDate[0].replace("\"", "") + "-" + dataDate[1].trim().replace("\"", "");
                                                         }
                                                     } else {
-                                                        myData = Func.convert(dataDate, String.class).replaceAll(" ", "");
+                                                        myData = Func.convert(dataDate, String.class).replaceAll(" ", "").replaceAll(",","、");
                                                         if (myData.startsWith("[") && myData.endsWith("]")) {
                                                             // 去掉两端的中括号
-                                                            myData = myData.substring(1, myData.length() - 1);
+                                                            myData=myData.replaceAll("\\[","").replaceAll("]","");
                                                         }
                                                     }
 
@@ -2864,7 +2864,7 @@ public class ExcelTabController extends BladeController {
                                             reData.put(key + "__" + tabData[1], strings);
                                         } else {
                                             if (tabVal.contains("[") && tabVal.contains("]")) {
-                                                String[] strings = new String[]{tabData[0]};
+                                                String[] strings = new String[]{tabData[0].replaceAll("\\[","").replaceAll("]","")};
                                                 reData.put(key + "__" + tabData[1],strings);
                                             } else {
                                                 reData.put(key + "__" + tabData[1], tabData[0]);

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

@@ -860,14 +860,19 @@ public class WbsTreePrivateController extends BladeController {
     @GetMapping("/getTitleRange")
     @ApiOperationSupport(order = 33)
     @ApiOperation(value = "获取题名范围",notes = "获取题名范围")
-    public R<List<TitleRangeVo>> getTitleRange(@RequestParam String projectId){
+    public R<List<TitleRangeVo>> getTitleRange(@RequestParam String projectId,@RequestParam Long nameId){
         List<WbsTreePrivate>list=wbsTreeService.getTitleRange(projectId);
         List<WbsParam> list1 = iWbsParamService.getBaseMapper().selectList(Wrappers.<WbsParam>lambdaQuery().eq(WbsParam::getK, "FILE_TITLE").eq(WbsParam::getProjectId, projectId));
         if(list1.size()>0){
-            List<Long> longs = list1.stream().filter(o->o.getNameType()!=null&&o.getNameType()==2).map(l -> l.getNodeId()).collect(Collectors.toList());
+            Map<Long, Long> map = list1.stream()
+                .filter(o -> o.getNameType() != null && o.getNameType() == 2)
+                .collect(Collectors.toMap(
+                    WbsParam::getNodeId,   // key：nodeId
+                    WbsParam::getNameId    // value：nameId
+                ));
             //判断是否已经被选中
             for (WbsTreePrivate wbsTreePrivate : list) {
-                if(longs.contains(wbsTreePrivate.getId())){
+                if(map.containsKey(wbsTreePrivate.getId())&& !Objects.equals(map.get(wbsTreePrivate.getId()), nameId)){
                     wbsTreePrivate.setStatus(11);
                 }
             }

blade-service/blade-repair/src/main/java/org/springblade/repair/controller/CheckAndRepairController.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.SystemUtils;
+import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.oss.model.BladeFile;
@@ -16,6 +17,7 @@ import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.repair.util.ExcelInfoUtils;
 import org.springblade.repair.util.FileUtils;
 import org.springblade.resource.feign.NewIOSSClient;
+import org.springblade.system.cache.ParamCache;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -318,12 +320,19 @@ public class CheckAndRepairController {
     public void checkPrivateHtmlIsCopy(){
         String sql="select p_key_id,project_id,html_url from m_wbs_tree_private where is_deleted=0 and html_url  NOT LIKE '%privateUrlCopy%' AND type=2";
         List<WbsTreePrivate> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(WbsTreePrivate.class));
+        String sys_isonline = ParamCache.getValue(CommonConstant.SYS_ISONLINE);
+        String projectUrl="";
+        if(sys_isonline.equals("20")){
+            projectUrl="/home/www/wwwroot/Users/hongchuangyanfa/Desktop/privateUrlCopy";
+        }else {
+            projectUrl="/mnt/sdc/Users/hongchuangyanfa/Desktop/privateUrlCopy/";
+        }
         for (WbsTreePrivate wbsTreePrivate : list) {
             if(StringUtils.isNotEmpty(wbsTreePrivate.getHtmlUrl())){
                 String url=wbsTreePrivate.getHtmlUrl();
                 File html = new File(wbsTreePrivate.getHtmlUrl());
                 if(html.exists()){
-                    String project = "/mnt/sdc/Users/hongchuangyanfa/Desktop/privateUrlCopy/"+wbsTreePrivate.getProjectId()+"/";
+                    String project = projectUrl+wbsTreePrivate.getProjectId()+"/";
                     File projectFile = new File(project);
                     if(!projectFile.exists()){
                         projectFile.mkdir();
@@ -359,7 +368,7 @@ public class CheckAndRepairController {
      * 检查private html文件是否存在
      */
     @GetMapping("/checkPrivateHtmlIsExist")
-    @Scheduled(cron = "0  0  12 * * ?")
+    @Scheduled(cron = "0  0  3 * * ?")
     public void checkPrivateHtmlIsExist() throws Exception {
         String sql="select p_key_id, excel_id,html_url from m_wbs_tree_private where html_url IS NOT NULL  and is_deleted=0";
         List<WbsTreePrivate> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(WbsTreePrivate.class));