在线收集bug

blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/LargeFileEndpoint.java

@@ -359,6 +359,8 @@ public class LargeFileEndpoint {
 				long l = System.currentTimeMillis();
 				System.out.println("kaishi===================================="+l);
 				BladeFile bladeFile = ossBuilder.template().putFile(param.getFilename(),inputStream);
+				System.out.println("param.getFilename()===================================="+param.getFilename());
+				System.out.println("bladeFile===================================="+bladeFile.getOriginalName());
 				long l1 = System.currentTimeMillis();
 				System.out.println("jieshu===================================="+(l1-l));
 

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/ArchiveFileClient.java

@@ -108,4 +108,7 @@ public interface ArchiveFileClient {
      */
     @PostMapping(API_PREFIX + "/getAllPdfFileUrlByProjectIdAndFileType")
     List<ArchiveFile> getAllPdfFileUrlByProjectIdAndFileType(@RequestParam Long projectId);
+
+    @PostMapping(API_PREFIX + "/updateArchiveFileByBoxNameOne")
+    boolean updateArchiveFileByBoxNameOne(@RequestParam String boxName,@RequestParam Integer boxNumber);
 }

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

@@ -18,7 +18,7 @@ public interface ArchiveTreeContractClient {
     String API_PREFIX = "/api/manager/archiveContract";
 
     @PostMapping(API_PREFIX + "/queryAllChildByAncestors")
-    List<ArchiveTreeContract> queryAllChildByAncestors(@RequestParam String id);
+    List<ArchiveTreeContract> queryAllChildByAncestors(@RequestParam String id,@RequestParam Long contractId);
 
 
     @PostMapping(API_PREFIX + "/getHavedFileNodeByProjectID")

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileAutoController.java

@@ -98,7 +98,7 @@ public class ArchiveFileAutoController extends BladeController {
                     this.archiveFileClient.saveArchiveFile(saveVos);
                     archive.setFileN(saveVos.getSize());
                     archive.setPageN(pageN);
-                    List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(saveVos.getNodeId());
+                    List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(saveVos.getNodeId(),saveVos.getContractId() == null?null:Long.parseLong(saveVos.getContractId()));
                     if(archiveTreeContracts != null && archiveTreeContracts.size() >0){
                         archive.setTreeSort(archiveTreeContracts.get(0).getTreeSort());
                         if (archiveTreeContracts.get(0).getStorageType()!= null){
@@ -132,7 +132,7 @@ public class ArchiveFileAutoController extends BladeController {
         if(queryVo.getNodeIds() == null || queryVo.getNodeIds().equals("")){
             return  R.data(null);
         }
-        List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(queryVo.getNodeIds());
+        List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(queryVo.getNodeIds(),queryVo.getContractId());
         if(archiveTreeContracts != null && archiveTreeContracts.size() > 0){
             List<String> ids = JSONArray.parseArray(JSONObject.toJSONString(archiveTreeContracts.stream().map(ArchiveTreeContract::getId).distinct().collect(Collectors.toList())), String.class);
             ids.add(queryVo.getNodeIds());

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

@@ -115,7 +115,7 @@ public class ArchiveFileController extends BladeController {
         if(queryVo.getNodeIds().isEmpty() || queryVo.getNodeIds().equals("")){
             return  R.data(null);
         }
-        List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(queryVo.getNodeIds());
+        List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(queryVo.getNodeIds(),queryVo.getContractId() == null?null:Long.parseLong(queryVo.getContractId()));
         if(archiveTreeContracts != null && archiveTreeContracts.size() > 0){
             List<String> ids = JSONArray.parseArray(JSONObject.toJSONString(archiveTreeContracts.stream().map(ArchiveTreeContract::getId).distinct().collect(Collectors.toList())), String.class);
             ids.add(queryVo.getNodeIds());
@@ -311,4 +311,13 @@ public class ArchiveFileController extends BladeController {
         }
         return R.data(true);
     }
+    /**
+     * 删除分盒
+     */
+    @PostMapping("/removeAllocation")
+    @ApiOperationSupport(order = 7)
+    @ApiOperation(value = "删除分盒", notes = "传入ids")
+    public R removeAllocation(@RequestParam String boxName,@RequestParam Integer boxNumber) {
+        return R.status(this.archiveFileClient.updateArchiveFileByBoxNameOne(boxName,boxNumber));
+    }
 }

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -101,7 +101,7 @@ public class ArchivesAutoController extends BladeController {
 		if(queryVo.getNodeIds() == null || queryVo.getNodeIds().equals("")){
 			return  R.data(null);
 		}
-		List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(queryVo.getNodeIds());
+		List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(queryVo.getNodeIds(),queryVo.getContractId());
 		if(archiveTreeContracts != null && archiveTreeContracts.size() > 0){
 			List<String> ids = JSONArray.parseArray(JSONObject.toJSONString(archiveTreeContracts.stream().map(ArchiveTreeContract::getId).distinct().collect(Collectors.toList())), String.class);
 			ids.add(queryVo.getNodeIds());

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -67,26 +67,29 @@
 
 
     <select id="selectArchivesAutoFileCount" resultType="java.lang.Integer">
-        select count(id) from u_archives_auto where is_deleted = 0 and is_archive = 1
+        select count(id) from u_archives_auto u where u.is_deleted = 0
         <if test="vo.projectId != null and vo.projectId != ''">
-            and project_id = #{vo.projectId}
+            and u.project_id = #{vo.projectId}
+        </if>
+        <if test="vo.queryValue != null and vo.queryValue != ''">
+            and (u.name  like concat('%',#{vo.queryValue},'%') or u.file_number  like concat('%',#{vo.queryValue},'%'))
         </if>
         <if test="vo.isAutoFile != null and vo.isAutoFile != ''">
-            and is_auto_file = #{vo.isAutoFile}
+            and u.is_auto_file = #{vo.isAutoFile}
         </if>
         <choose>
             <when test="vo.isArchive != null and vo.isArchive != ''">
-                and  is_auto_file = #{vo.isArchive}
+                and  u.is_archive = #{vo.isArchive}
             </when>
             <otherwise>
-                and (is_auto_file is null or is_auto_file != 1)
+                and (u.is_archive is null or u.is_archive != 1)
             </otherwise>
         </choose>
         <if test="vo.isAutoFile != null and vo.isAutoFile != ''">
-            and is_auto_file = #{vo.isAutoFile}
+            and u.is_auto_file = #{vo.isAutoFile}
         </if>
         <if test="vo.nodeIds != null and vo.nodeIds != ''">
-            and node_id in
+            and u.node_id in
             <foreach collection="vo.nodeIdArray" item="nodeId" open="(" separator="," close=")">
                 #{nodeId}
             </foreach>
@@ -94,28 +97,32 @@
     </select>
 
     <select id="selectArchivesAutoFilePage" resultMap="archivesAutoResultMap">
-        select * from u_archives_auto where is_deleted = 0
+        select * from u_archives_auto u where u.is_deleted = 0
         <if test="vo.projectId != null and vo.projectId != ''">
-            and project_id = #{vo.projectId}
+            and u.project_id = #{vo.projectId}
+        </if>
+        <if test="vo.queryValue != null and vo.queryValue != ''">
+            and (u.name  like concat('%',#{vo.queryValue},'%') or u.file_number  like concat('%',#{vo.queryValue},'%'))
         </if>
         <choose>
             <when test="vo.isArchive != null and vo.isArchive != ''">
-                and  is_auto_file = #{vo.isArchive}
+                and  u.is_archive = #{vo.isArchive}
             </when>
             <otherwise>
-                and (is_auto_file is null or is_auto_file != 1)
+                and (u.is_archive is null or u.is_archive != 1)
             </otherwise>
         </choose>
         <if test="vo.isAutoFile != null and vo.isAutoFile != ''">
-            and is_auto_file = #{vo.isAutoFile}
+            and u.is_auto_file = #{vo.isAutoFile}
         </if>
         <if test="vo.nodeIds != null and vo.nodeIds != ''">
-            and node_id in
+            and u.node_id in
             <foreach collection="vo.nodeIdArray" item="nodeId" open="(" separator="," close=")">
                 #{nodeId}
             </foreach>
         </if>
-        order by tree_sort,auto_file_sort,file_number asc
+        order by u.tree_sort,u.auto_file_sort,u.file_number asc
+        limit #{current}, #{size}
     </select>
 
     <update id="updateArchivesAutoFileByNodeId" >

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/ArchiveFileClientImpl.java

@@ -232,5 +232,10 @@ public class ArchiveFileClientImpl implements ArchiveFileClient {
         return fileMapper.getAllPdfFileUrlByProjectIdAndFileType(projectId);
     }
 
+    @Override
+    public boolean updateArchiveFileByBoxNameOne(String boxName, Integer boxNumber) {
+        return this.iArchiveFileService.updateArchiveFileByBoxNameOne(boxName,boxNumber);
+    }
+
 
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ArchiveFileMapper.xml

@@ -145,6 +145,7 @@
             )
         </if>
         order by sort,create_time DESC
+        limit #{current}, #{size}
     </select>
 
     <select id="selectArchiveFilePageByBoxNameCount" resultType="java.lang.Integer">
@@ -158,9 +159,6 @@
         <if test="vo.projectId != null and vo.projectId != ''">
             and project_id = #{vo.projectId}
         </if>
-        <if test="vo.contractId != null and vo.contractId != ''">
-            and contract_id = #{vo.contractId}
-        </if>
         <if test="vo.nodeIds != null and vo.nodeIds != ''">
             and node_id in
             <foreach collection="vo.nodeIdArray" item="nodeId" open="(" separator="," close=")">
@@ -188,6 +186,7 @@
             )
         </if>
         order by box_number,sort,create_time DESC
+
     </select>
     <select id="selectArchiveFilePageByBoxName" resultMap="archiveFileResultMap">
         select * from u_archive_file where is_deleted = 0 and (is_auto_file is null or is_auto_file != 1)
@@ -200,9 +199,6 @@
         <if test="vo.projectId != null and vo.projectId != ''">
             and project_id = #{vo.projectId}
         </if>
-        <if test="vo.contractId != null and vo.contractId != ''">
-            and contract_id = #{vo.contractId}
-        </if>
         <if test="vo.nodeIds != null and vo.nodeIds != ''">
             and node_id in
             <foreach collection="vo.nodeIdArray" item="nodeId" open="(" separator="," close=")">
@@ -230,6 +226,7 @@
             )
         </if>
         order by box_number,sort,create_time DESC
+        limit #{current}, #{size}
     </select>
     <select id="getDeleteDataByIds" resultType="org.springblade.business.entity.ArchiveFile">
         select * from u_archive_file where id in

blade-service/blade-business/src/main/java/org/springblade/business/service/IArchiveFileService.java

@@ -67,4 +67,6 @@ public interface IArchiveFileService extends BaseService<ArchiveFile> {
 	boolean updateArchiveFileByNodeId(String ids, String nodeId);
 
 	List<ArchiveFile> getArchiveFileByArchivesId(String archivesIds,String fileIds);
+
+	boolean updateArchiveFileByBoxNameOne(String boxName, Integer boxNumber);
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ArchiveFileServiceImpl.java

@@ -156,6 +156,11 @@ public class ArchiveFileServiceImpl extends BaseServiceImpl<ArchiveFileMapper, A
 		}
 	}
 
+	@Override
+	public boolean updateArchiveFileByBoxNameOne(String boxName, Integer boxNumber) {
+		return baseMapper.updateArchiveFileByBoxNameOne(boxName,boxNumber);
+	}
+
 
 	@Override
 	public IPage<ArchiveFileVO> selectArchiveFilePageByBoxName(ArchiveFileVO vo) {

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

@@ -19,8 +19,11 @@ public class ArchiveTreeContractImpl implements ArchiveTreeContractClient {
     private ArchiveTreeContractMapper archiveTreeContractMapper;
 
     @Override
-    public List<ArchiveTreeContract> queryAllChildByAncestors(String id) {
-        List<ArchiveTreeContract> archiveTreeList = this.archiveTreeContractService.list(Wrappers.<ArchiveTreeContract>lambdaQuery().like(ArchiveTreeContract::getAncestors, id));
+    public List<ArchiveTreeContract> queryAllChildByAncestors(String id,Long contractId) {
+        String authCode = this.archiveTreeContractService.getAuthCode(contractId);
+
+//        List<ArchiveTreeContract> archiveTreeList = this.archiveTreeContractService.list(Wrappers.<ArchiveTreeContract>lambdaQuery().like(ArchiveTreeContract::getAncestors, id));
+        List<ArchiveTreeContract> archiveTreeList = archiveTreeContractMapper.getAuthCodeList(id,authCode,contractId);
         if(archiveTreeList == null || archiveTreeList.size() <= 0){
             //有可能已经是最底节点
             archiveTreeList = new ArrayList<>();

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.java

@@ -84,4 +84,6 @@ public interface ArchiveTreeContractMapper extends BaseMapper<ArchiveTreeContrac
     List<ArchiveTreeContractVO3> getArchiveTreeByNodeType2(@Param("projectId")Long projectId);
 
 	List<ArchiveTreeContractVO3> getChildrenNodeByNodeId(@Param("nodeId") Long nodeId);
+
+	List<ArchiveTreeContract> getAuthCodeList(@Param("id") String id,@Param("authCode") String authCode,@Param("contractId") Long contractId);
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.xml

@@ -394,5 +394,18 @@
             as notExsitChild
         from m_archive_tree_contract matc1 WHERE matc1.parent_id = #{nodeId} and matc1.is_deleted =0
     </select>
+    <select id="getAuthCodeList" resultMap="archiveTreeContractResultMap">
+        SELECT
+        d.id
+        FROM
+        m_archive_tree_contract d
+        WHERE
+        d.is_deleted = 0
+        AND d.ancestors like concat('%',#{id},'%')
 
+        <if test="authCode !=null and authCode !=''">
+            AND (d.tree_code = #{authCode} or d.tree_code = #{contractId} or d.parent_id = 0)
+        </if>
+        ORDER BY d.sort
+    </select>
 </mapper>

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IArchiveTreeContractService.java

@@ -99,4 +99,5 @@ public interface IArchiveTreeContractService extends BaseService<ArchiveTreeCont
     List<ArchiveTreeContractVO3> getArchiveTreeByNodeType(Long projectId, Long nodeType);
 
 	List<ArchiveTreeContractVO3> getChildrenNodeByNodeId(Long nodeId);
+	String getAuthCode(Long contractId);
 }