reghao 5 days ago
parent
commit
5012313200

+ 0 - 1
content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/impl/VideoPostServiceImpl.java

@@ -172,7 +172,6 @@ public class VideoPostServiceImpl implements VideoPostService {
         for (VideoUrlDto videoUrlDto : list) {
         for (VideoUrlDto videoUrlDto : list) {
             String videoFileId = videoUrlDto.getObjectId();
             String videoFileId = videoUrlDto.getObjectId();
             try {
             try {
-                int channelCode = videoUrlDto.getChannelCode();
                 int scope = videoScopeUpdate.getScope();
                 int scope = videoScopeUpdate.getScope();
                 ossService.setObjectScope(videoFileId, scope);
                 ossService.setObjectScope(videoFileId, scope);
                 videoPostMapper.updateVideoScope(videoScopeUpdate);
                 videoPostMapper.updateVideoScope(videoScopeUpdate);

+ 5 - 1
file/file-service/src/main/java/cn/reghao/tnb/file/app/rpc/StoreServiceWrapperRouter.java

@@ -72,7 +72,11 @@ public class StoreServiceWrapperRouter implements OssService {
     @Override
     @Override
     public void setObjectScope(String objectId, int scope) {
     public void setObjectScope(String objectId, int scope) {
         if (ossType == OssType.localOss.getCode()) {
         if (ossType == OssType.localOss.getCode()) {
-            ossClientManager.getOssClient().setObjectScope(objectId, ObjectScope.PUBLIC);
+            try {
+                ossClientManager.getOssClient().setObjectScope(objectId, scope);
+            } catch (Exception e) {
+                log.error("{}", e.getMessage());
+            }
         } else if (ossType == OssType.aliyunOss.getCode()) {
         } else if (ossType == OssType.aliyunOss.getCode()) {
         }
         }
     }
     }

+ 5 - 4
search/search-service/src/main/java/cn/reghao/tnb/search/app/model/po/WenshuDoc.java

@@ -57,9 +57,10 @@ public class WenshuDoc extends BaseEntity {
     private String cause;
     private String cause;
     // 法律依据
     // 法律依据
     private transient String legalBasis;
     private transient String legalBasis;
-    @ElementCollection(targetClass = WenshuLegal.class)
+    /*@ElementCollection(targetClass = WenshuLegal.class)
     @LazyCollection(LazyCollectionOption.FALSE)
     @LazyCollection(LazyCollectionOption.FALSE)
-    @CollectionTable(name = "search_wenshu_legals")
+    @CollectionTable(name = "search_wenshu_legals")*/
+    @Transient
     private List<WenshuLegal> legalBasisList;
     private List<WenshuLegal> legalBasisList;
 
 
     public WenshuDoc(long wenshuId, Wenshu wenshu) {
     public WenshuDoc(long wenshuId, Wenshu wenshu) {
@@ -77,9 +78,9 @@ public class WenshuDoc extends BaseEntity {
         this.parties = wenshu.getParties();
         this.parties = wenshu.getParties();
         this.cause = wenshu.getCause();
         this.cause = wenshu.getCause();
         // this.legalBasis = wenshu.getLegalBasis();
         // this.legalBasis = wenshu.getLegalBasis();
-        this.legalBasisList = Arrays.stream(wenshu.getLegalBasis().split(";"))
+        /*this.legalBasisList = Arrays.stream(wenshu.getLegalBasis().split(";"))
                 .map(WenshuLegal::new)
                 .map(WenshuLegal::new)
                 .filter(wenshuLegal -> !wenshuLegal.getLegalBasis().isBlank())
                 .filter(wenshuLegal -> !wenshuLegal.getLegalBasis().isBlank())
-                .collect(Collectors.toList());
+                .collect(Collectors.toList());*/
     }
     }
 }
 }

+ 2 - 2
search/search-service/src/main/java/cn/reghao/tnb/search/app/model/po/WenshuLegal.java

@@ -16,8 +16,8 @@ import jakarta.persistence.Embeddable;
 @NoArgsConstructor
 @NoArgsConstructor
 @Setter
 @Setter
 @Getter
 @Getter
-@Embeddable
+//@Embeddable
 public class WenshuLegal {
 public class WenshuLegal {
-    @Column(columnDefinition = "text")
+//    @Column(columnDefinition = "text")
     private String legalBasis;
     private String legalBasis;
 }
 }