Browse Source

Merge remote-tracking branch 'origin/master' into master

yangyj 11 months ago
parent
commit
7ce24cdb85

+ 7 - 7
blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -523,13 +523,13 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 		});
 		});
 
 
 		//删除不存在文件的档案
 		//删除不存在文件的档案
-		Iterator<ArchivesAutoVO> iterator = pageVoList.iterator();
-		while (iterator.hasNext()) {
-			ArchivesAutoVO autoVO = iterator.next();
-			if (autoVO.getFileN() != null && autoVO.getFileN() == 0) {
-				iterator.remove();
-			}
-		}
+//		Iterator<ArchivesAutoVO> iterator = pageVoList.iterator();
+//		while (iterator.hasNext()) {
+//			ArchivesAutoVO autoVO = iterator.next();
+//			if (autoVO.getFileN() != null && autoVO.getFileN() == 0) {
+//				iterator.remove();
+//			}
+//		}
 
 
 		return iPage.setRecords(pageVoList);
 		return iPage.setRecords(pageVoList);
 	}
 	}

+ 32 - 0
blade-service/blade-business/src/main/java/org/springblade/business/controller/ImageClassificationFileController.java

@@ -4,10 +4,12 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.common.utils.StringUtils;
 import com.alibaba.nacos.common.utils.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.*;
 import io.swagger.annotations.*;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import javassist.bytecode.stackmap.BasicBlock;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
@@ -65,6 +67,7 @@ import java.io.*;
 import java.net.URL;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLConnection;
 import java.text.DecimalFormat;
 import java.text.DecimalFormat;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.*;
 import java.util.List;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -835,4 +838,33 @@ public class ImageClassificationFileController extends BladeController {
             }
             }
         }
         }
     }
     }
+
+
+    /**
+     * 重刷影像资料,有些影像资料因为当时代码有问题,导致合并出来图片丢失或者边框占比太小,实际上就是重新保存
+     */
+    @GetMapping("/reFlushImage")
+    @ApiOperationSupport(order = 999)
+    @ApiOperation(value = "重刷影像资料", notes = "传入合同id")
+    public R<String> reFlushImage(@RequestParam Long contractId) {
+        //查询出当前合同所有图片影像资料
+        List<ImageClassificationFile> list = imageClassificationFileService.list(new LambdaQueryWrapper<ImageClassificationFile>()
+                .eq(ImageClassificationFile::getContractId,contractId)
+                .eq(ImageClassificationFile::getType,2)
+                .lt(ImageClassificationFile::getUpdateTime, LocalDateTime.of(2024,8,21,0,0)));
+        //分别调用update修改
+        int i = 0;
+        for (ImageClassificationFile file : list) {
+            R<Boolean> update = null;
+            try {
+                update = this.update(this.queryById(file.getId() + "").getData());
+            }catch (Exception e){
+
+            }
+            if (update != null && update.getData().equals(true)){
+                i++;
+            }
+        }
+        return R.success("修改"+i+"条数据");
+    }
 }
 }

+ 1 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -1003,6 +1003,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                                         wbsTreePrivate.setProjectId(pawDTO.getProjectId());
                                         wbsTreePrivate.setProjectId(pawDTO.getProjectId());
                                         wbsTreePrivate.setFullName(wbsTreePrivate.getNodeName());
                                         wbsTreePrivate.setFullName(wbsTreePrivate.getNodeName());
                                         wbsTreePrivate.setInitTableId(ObjectUtil.isNotEmpty(tree.getInitTableId()) ? String.valueOf(tree.getInitTableId()) : null);
                                         wbsTreePrivate.setInitTableId(ObjectUtil.isNotEmpty(tree.getInitTableId()) ? String.valueOf(tree.getInitTableId()) : null);
+                                        wbsTreePrivate.setIsAddConceal(0);
                                     }
                                     }
                                     return wbsTreePrivate;
                                     return wbsTreePrivate;
                                 })
                                 })