dengsixing 1 month ago
parent
commit
d4cc693ebb

+ 19 - 2
src/main/java/com/project/hyb/biz/service/impl/MbArtArtworksServiceImpl.java

@@ -2,6 +2,8 @@ package com.project.hyb.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -48,7 +50,16 @@ public class MbArtArtworksServiceImpl extends ServiceImpl<MbArtArtworksMapper, M
     @Override
     public PageInfo<MbArtArtworksDto> pageArtArtworks(ArtArtworksPageRequest request) {
         IPage<MbArtArtworksDto> convert = this.page(new Page<>(request.getPageNo(), request.getPageSize()),
-                new LambdaQueryWrapper<MbArtArtworks>().isNotNull(MbArtArtworks::getThumbnail)).convert(v -> BeanUtil.toBean(v, MbArtArtworksDto.class));
+                new LambdaQueryWrapper<MbArtArtworks>().isNotNull(MbArtArtworks::getThumbnail)).convert(v -> {
+            MbArtArtworksDto bean = BeanUtil.toBean(v, MbArtArtworksDto.class);
+            if(StrUtil.isNotEmpty(bean.getThumbnail())){
+                String name = FileUtil.getName(bean.getThumbnail());
+                String prefix = FileUtil.getPrefix(bean.getThumbnail()) + "_750_600";
+                String extName = FileUtil.extName(bean.getThumbnail());
+                bean.setThumbnail(bean.getThumbnail().replace(name, prefix + "." + extName));
+            }
+            return bean;
+        });
         return PageInfo.convert(convert);
     }
 
@@ -78,7 +89,7 @@ public class MbArtArtworksServiceImpl extends ServiceImpl<MbArtArtworksMapper, M
                         .eq(SysAttachments::getModules, "artwork")
                         .eq(SysAttachments::getCategory, 1));
         if(CollUtil.isNotEmpty(imgs)){
-            bean.setImgFiles(imgs.stream().map(v->v.getServerpath() + v.getServername() + "." + v.getExtension()).collect(Collectors.toList()));
+            bean.setImgFiles(imgs.stream().map(v->v.getServerpath() + v.getServername() + "_750_600." + v.getExtension()).collect(Collectors.toList()));
         }
 
         //查询模型文件
@@ -119,6 +130,12 @@ public class MbArtArtworksServiceImpl extends ServiceImpl<MbArtArtworksMapper, M
         //查询模型文件
         Map<String, MbArtArtworksDto> mbArtArtworkMap = list.stream().collect(Collectors.toMap(v -> v.getArtworkUuid(), v->{
             MbArtArtworksDto dto = BeanUtil.toBean(v, MbArtArtworksDto.class);
+            if(StrUtil.isNotEmpty(dto.getThumbnail())){
+                String name = FileUtil.getName(dto.getThumbnail());
+                String prefix = FileUtil.getPrefix(dto.getThumbnail()) + "_750_600";
+                String extName = FileUtil.extName(dto.getThumbnail());
+                dto.setThumbnail(dto.getThumbnail().replace(name, prefix + "." + extName));
+            }
             dto.setDim(1);
             return dto;
         }));

+ 4 - 4
src/main/resources/application-local.yml

@@ -6,15 +6,15 @@ spring:
       datasource:
         #第一个数据源配置
         artmember:
-          url: jdbc:mysql://106.53.107.102:3306/artmember
+          url: jdbc:mysql://159.75.75.84:3306/artmember
           username: root
-          password: mysql123!ROOT.
+          password: 6SD%KraOnB
           driver-class-name: com.mysql.cj.jdbc.Driver
         #第二个数据源配置
         artoffice_museum:
-          url: jdbc:mysql://106.53.107.102:3306/artoffice_museum
+          url: jdbc:mysql://159.75.75.84:3306/artoffice_museum
           username: root
-          password: mysql123!ROOT.
+          password: 6SD%KraOnB
           driver-class-name: com.mysql.cj.jdbc.Driver
 
 pms:

+ 2 - 2
src/main/resources/application-prod.yml

@@ -6,13 +6,13 @@ spring:
       datasource:
         #第一个数据源配置
         artmember:
-          url: jdbc:mysql://159.75.75.84:3306/artmember
+          url: jdbc:mysql://192.168.10.4:3306/artmember
           username: root
           password: 6SD%KraOnB
           driver-class-name: com.mysql.cj.jdbc.Driver
         #第二个数据源配置
         artoffice_museum:
-          url: jdbc:mysql://159.75.75.84:3306/artoffice_museum
+          url: jdbc:mysql://192.168.10.4:3306/artoffice_museum
           username: root
           password: 6SD%KraOnB
           driver-class-name: com.mysql.cj.jdbc.Driver