【update】ASMS 发布稿上传文件逻辑的调整

db/prod/2024-3-12 UAT文档的调研.sql

@@ -13,7 +13,7 @@ SELECT laws.standard_name, laws.id, laws.standard_number , node.node_code
 FROM laws_domestic_standard AS laws
          LEFT JOIN laws_node_relation AS node
                    ON laws.id = node.unique_relation_flag
-WHERE laws.standard_number LIKE '%—%' AND laws.del_flag != 1  AND node.node_code IS NULL
+WHERE laws.standard_number LIKE '%—%' AND laws.del_flag != 1  AND node.node_code IS NULL;
 
 
 DELETE laws
@@ -24,6 +24,7 @@ WHERE laws.standard_number LIKE '%—%' AND laws.del_flag != 1  AND node.node_co
 
 
 -- 2、删除 ASMS系统中同步的带 长横杠 有体系数据 且 系统中有 短横杠的 标准数据 20240320
+-- 说明有些标准在准入性中，但是重复了 所以被删除了 GB 24545-2019  、 GB 4785-2019 、 GB 18285-2018 、GB 1495-2002
 DELETE
 FROM
     laws_domestic_standard
@@ -65,3 +66,9 @@ standard_number IN ( SELECT * FROM ( SELECT standard_number FROM laws_domestic_s
 
 
 
+-- 5 同步拆分的bug  规范性引用文件 去除后面的空格。
+UPDATE `sys_dict_item` SET `dict_id` = '1702212236079886338', `parent_id` = '0', `item_text` = '规范性引用文件', `en_name` = NULL, `item_value` = 'LRT011', `description` = '法规要求类型字典项', `sort_order` = 11, `status` = 1, `create_by` = 'admin', `create_time` = '2024-03-01 22:06:31', `update_by` = NULL, `update_time` = NULL, `is_tag_dict` = 1, `is_read_only` = 1, `attribute_type` = '1', `del_flag` = '0', `stat_node` = NULL WHERE `id` = '1763566490556428289';
+
+
+
+

laws-modules-docking/src/main/java/com/jero/modules/docking/asms/service/impl/LawsAsmsOpenApiServiceImpl.java

@@ -583,6 +583,19 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
 					paramMap.put("lawCode", code);
 					Map<String, Object> objectMap = asmsPostUtil.sendGetReq2(lawsAsmsOpenApi.getApiUrl(), paramMap);
 					if (Objects.isNull(objectMap)) return;
+
+					// 判断是否有文件信息， 存在则将现有的发布稿信息直接删除？
+					LambdaQueryWrapper<OSSFile> wrapperOss = new LambdaQueryWrapper<>();
+					wrapperOss.eq(OSSFile::getStandardFileType, "publish_of_original"); // 发布稿
+					wrapperOss.eq(OSSFile::getStandardId, id); // 当前标准的id
+					List<OSSFile> fileList = ossFileService.list(wrapperOss);
+					if (fileList.size() > 0){
+						// 很多个的话 删除后重新上传。
+						for (OSSFile file : fileList) {
+							ossFileService.removeById(file.getId());
+						}
+					}
+
 					Map<String, String> standardTextPdf = (Map<String, String>) objectMap.get("standardTextPdf");
 					if (!Objects.isNull(standardTextPdf)){
 						String fileName = standardTextPdf.get("fileName");
@@ -1007,19 +1020,7 @@ public class LawsAsmsOpenApiServiceImpl extends ServiceImpl<LawsAsmsOpenApiMappe
 		ossFile.setStandardId(id);
 		ossFile.setStandardNo(code);
 		ossFile.setStandardFileType("publish_of_original");
-		// 需要先判断原系统中是否存在该文件地址的相关链接，存在则不进行上传了，不存在再上传。
+		ossFileService.save(ossFile);
-		LambdaQueryWrapper<OSSFile> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(OSSFile::getUrl, filePath + url);
-		List<OSSFile> list = ossFileService.list(wrapper);
-		if (list.isEmpty()){
-			ossFileService.save(ossFile);
-		}else if (list.size() > 1){
-			// 很多个的话 删除后重新上传。
-			for (OSSFile file : list) {
-				ossFileService.removeById(file.getId());
-			}
-			ossFileService.save(ossFile);
-		}
 		log.info("存储文件:{},url：{}", fileName, url);
 	}