11111

pom.xml

@@ -65,10 +65,23 @@
             <version>${hutool.version}</version>
         </dependency>
 
+<!--        <dependency>-->
+<!--            <groupId>com.github.xiaoymin</groupId>-->
+<!--            <artifactId>knife4j-spring-boot-starter</artifactId>-->
+<!--            <version>2.0.9</version>-->
+<!--        </dependency>-->
+
+        <!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger2 -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui -->
         <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-            <version>2.0.9</version>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
         </dependency>
 
 

src/main/java/com/project/hyb/biz/controller/ArtArtworksController.java

@@ -4,19 +4,21 @@ package com.project.hyb.biz.controller;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.project.hyb.biz.domain.dto.ArtArtworksDto;
-import com.project.hyb.biz.domain.entity.ArtArtworks;
+import com.project.hyb.biz.domain.dto.MbArtArtworksDto;
+import com.project.hyb.biz.domain.entity.MbArtArtworks;
 import com.project.hyb.biz.domain.entity.SysAttachments;
 import com.project.hyb.biz.domain.request.ArtArtworksPageRequest;
-import com.project.hyb.biz.service.ArtArtworksService;
+import com.project.hyb.biz.service.MbArtArtworksService;
 import com.project.hyb.biz.service.SysAttachmentsService;
 import com.project.hyb.common.response.PageInfo;
 import com.project.hyb.common.response.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -31,18 +33,18 @@ import java.util.stream.Collectors;
  */
 @Api(tags = "藏品")
 @RestController
-@RequestMapping("/hyb/artArtworks")
+@RequestMapping("/artArtworks")
 public class ArtArtworksController {
 
     @Autowired
-    private ArtArtworksService artArtworksService;
+    private MbArtArtworksService artArtworksService;
     @Autowired
     private SysAttachmentsService sysAttachmentsService;
 
     @ApiOperation("首页藏品接口")
     @GetMapping("index/page")
-    public R<PageInfo<ArtArtworksDto>> indexPage(ArtArtworksPageRequest request){
-        PageInfo<ArtArtworksDto> artArtworksDtoPageInfo = artArtworksService.pageArtArtworks(request);
+    public R<PageInfo<MbArtArtworksDto>> indexPage(ArtArtworksPageRequest request){
+        PageInfo<MbArtArtworksDto> artArtworksDtoPageInfo = artArtworksService.pageArtArtworks(request);
         if(CollUtil.isNotEmpty(artArtworksDtoPageInfo.getPageData())){
             return R.ok(artArtworksDtoPageInfo);
         }
@@ -52,52 +54,8 @@ public class ArtArtworksController {
 
     @ApiOperation("藏品列表")
     @GetMapping("list")
-    public R<List<ArtArtworksDto>> list(ArtArtworksPageRequest request){
-        List<ArtArtworks> list = artArtworksService.listArtArtworks(request);
-        if(CollUtil.isEmpty(list)){
-            return R.ok();
-        }
-        List<String> uuids = list.stream().map(v -> v.getArtworkUuid()).collect(Collectors.toList());
-        List<SysAttachments> attachs = sysAttachmentsService.list(
-                new LambdaQueryWrapper<SysAttachments>()
-                        .eq(SysAttachments::getModules, "artwork")
-                        .in(SysAttachments::getRecordid, uuids));
-
-        Map<String, List<SysAttachments>> map = new HashMap<>();
-        attachs.stream().forEach(v->{
-            List<SysAttachments> sysAttachments = map.get(v.getRecordid());
-            if(sysAttachments ==  null){
-                sysAttachments = new ArrayList<>();
-                map.put(v.getRecordid(), sysAttachments);
-            }
-            sysAttachments.add(v);
-        });
-        List<ArtArtworksDto> artArtworksDtos = BeanUtil.copyToList(list, ArtArtworksDto.class);
-        artArtworksDtos.stream().forEach(v->{
-            List<SysAttachments> sysAttachments = map.get(v.getArtworkUuid());
-            Set<Integer> categorys = new HashSet<>();
-            if(CollUtil.isNotEmpty(sysAttachments)){
-                for (SysAttachments sysAttachment : sysAttachments) {
-                    categorys.add(sysAttachment.getCategory());
-                }
-            }
-            if(categorys.size() == 0){
-                v.setDim(0);
-            }else if(categorys.size() == 2){
-                v.setDim(3);
-            }else{
-                if(categorys.contains(6)){
-                    v.setDim(2);
-                }else{
-                    v.setDim(1);
-                }
-            }
-        });
-        if(request.getDim() == 3){
-            return R.ok(artArtworksDtos);
-        }
-
-        return R.ok(artArtworksDtos.stream().filter(v->v.getDim().equals(request.getDim())).collect(Collectors.toList()));
+    public R<List<MbArtArtworksDto>> list(ArtArtworksPageRequest request){
+        return R.ok(artArtworksService.listArtWork(request));
     }
 
     @ApiOperation("获取分类列表")
@@ -108,7 +66,7 @@ public class ArtArtworksController {
 
     @ApiOperation("根据id获取")
     @GetMapping("{id}")
-    public R<ArtArtworksDto> getById(@PathVariable Long id){
+    public R<MbArtArtworksDto> getById(@PathVariable Long id){
         return R.ok(artArtworksService.getArtArtworkById(id));
     }
 

src/main/java/com/project/hyb/biz/controller/ArtAttachmentsController.java

@@ -1,21 +0,0 @@
-package com.project.hyb.biz.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2025-08-05
- */
-@RestController
-@RequestMapping("/pms/artAttachments")
-public class ArtAttachmentsController {
-
-}
-

src/main/java/com/project/hyb/biz/controller/CollCollectionCluesController.java

@@ -33,7 +33,7 @@ import java.io.IOException;
  */
 @Api(tags = "文物征集")
 @RestController
-@RequestMapping("/hyb/collCollectionClues")
+@RequestMapping("/collCollectionClues")
 public class CollCollectionCluesController {
 
     @Autowired

src/main/java/com/project/hyb/biz/controller/NewsPublishController.java

@@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.websocket.server.PathParam;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -42,7 +41,7 @@ import java.util.stream.Collectors;
  */
 @Api(tags = "公布内容")
 @RestController
-@RequestMapping("/hyb/newsPublish")
+@RequestMapping("/newsPublish")
 public class NewsPublishController {
 
     @Autowired
@@ -64,7 +63,7 @@ public class NewsPublishController {
             Set<Long> ids = convert.getRecords().stream().map(v -> v.getId()).collect(Collectors.toSet());
             List<ArtAttachments> artAttachmentsList = artAttachmentsService.list(new LambdaQueryWrapper<ArtAttachments>()
                     .eq(ArtAttachments::getModules, "news_publish")
-                    .in(ArtAttachments::getArtworkid, ids).orderByDesc(com.project.hyb.biz.domain.entity.ArtAttachments::getId));
+                    .in(ArtAttachments::getArtworkid, ids).orderByDesc(ArtAttachments::getId));
             if(CollUtil.isNotEmpty(artAttachmentsList)){
                 newPublic : for (NewsPublishDto record : convert.getRecords()) {
                     artAttachment: for (ArtAttachments artAttachments : artAttachmentsList) {

src/main/java/com/project/hyb/biz/controller/SysAttachmentsController.java

@@ -1,21 +0,0 @@
-package com.project.hyb.biz.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 
- * @since 2025-08-05
- */
-@RestController
-@RequestMapping("/pms/sysAttachments")
-public class SysAttachmentsController {
-
-}
-

src/main/java/com/project/hyb/biz/domain/dto/ArtAttachmentFolderDto.java

@@ -0,0 +1,12 @@
+package com.project.hyb.biz.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class ArtAttachmentFolderDto {
+    private String artworkUuid;
+    private String filePath;
+
+
+
+}

src/main/java/com/project/hyb/biz/domain/dto/ArtArtworksDto.java

@@ -17,7 +17,7 @@ import java.util.List;
  * @since 2025-08-05
  */
 @Data
-public class ArtArtworksDto implements Serializable {
+public class MbArtArtworksDto implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -799,7 +799,7 @@ public class ArtArtworksDto implements Serializable {
     private List<String> imgFiles;
 
     /**
-     * 1-二维，2-三维，3-全部
+     * 1-二维，2-三维
      */
     private Integer dim;
 

src/main/java/com/project/hyb/biz/domain/entity/ArtArtworks.java

@@ -16,7 +16,7 @@ import lombok.Setter;
  * </p>
  *
  * @author 
- * @since 2025-08-05
+ * @since 2025-08-14
  */
 @Getter
 @Setter
@@ -32,11 +32,6 @@ public class ArtArtworks implements Serializable {
     private Long id;
 
     /**
-     * 藏品UUID
-     */
-    private String artworkUuid;
-
-    /**
      * RFID编号
      */
     private String no;
@@ -69,7 +64,7 @@ public class ArtArtworks implements Serializable {
     /**
      * 假删标识
      */
-    @TableLogic
+    @TableLogic(value = "1", delval = "0")
     private Integer recordstatus;
 
     /**
@@ -138,7 +133,7 @@ public class ArtArtworks implements Serializable {
     private String collecompany;
 
     /**
-     * 藏品类别
+     * 类型
      */
     private String categoryno;
 
@@ -192,9 +187,6 @@ public class ArtArtworks implements Serializable {
      */
     private String islock;
 
-    /**
-     * 是否上报
-     */
     private String isreport;
 
     /**
@@ -202,14 +194,8 @@ public class ArtArtworks implements Serializable {
      */
     private String state1;
 
-    /**
-     * 状态2（备用字段）
-     */
     private String state2;
 
-    /**
-     * 状态3（备用字段）
-     */
     private String state3;
 
     /**
@@ -312,24 +298,12 @@ public class ArtArtworks implements Serializable {
      */
     private String auditcontent;
 
-    /**
-     * 入库类别
-     */
     private String stkincategory;
 
-    /**
-     * 出库类别
-     */
     private String stkoutcategory;
 
-    /**
-     * 价格
-     */
     private Float price;
 
-    /**
-     * 来源
-     */
     private String sourcememo;
 
     /**
@@ -342,19 +316,10 @@ public class ArtArtworks implements Serializable {
      */
     private Float saleprice;
 
-    /**
-     * 拍卖行
-     */
     private Integer auctionhouse;
 
-    /**
-     * 购买时间
-     */
     private Date timebuying;
 
-    /**
-     * 国家
-     */
     private String country;
 
     /**
@@ -447,14 +412,8 @@ public class ArtArtworks implements Serializable {
      */
     private String weight;
 
-    /**
-     * 最大长度
-     */
     private String maxlongth;
 
-    /**
-     * 最小长度
-     */
     private String minlongth;
 
     /**
@@ -462,19 +421,10 @@ public class ArtArtworks implements Serializable {
      */
     private String maxwidth;
 
-    /**
-     * 最小宽度
-     */
     private String minwidth;
 
-    /**
-     * 内径
-     */
     private String indiameter;
 
-    /**
-     * 外径
-     */
     private String outdiameter;
 
     /**
@@ -498,6 +448,11 @@ public class ArtArtworks implements Serializable {
     private String intro;
 
     /**
+     * 分类号
+     */
+    private String classifynumber;
+
+    /**
      * 分类号后面的流水号
      */
     private Integer categoryserial;
@@ -677,9 +632,6 @@ public class ArtArtworks implements Serializable {
      */
     private String displaysize;
 
-    /**
-     * 展览工具
-     */
     private String exhibitiontool;
 
     /**
@@ -772,20 +724,72 @@ public class ArtArtworks implements Serializable {
      */
     private String protectlevel;
 
+    private String artworkuuid;
+
+    /**
+     * 通宽
+     */
+    private String fullWidth;
+
+    /**
+     * 通长
+     */
+    private String fullLong;
+
+    /**
+     * 通高
+     */
+    private String fullHeight;
+
+    /**
+     * 质量范围
+     */
+    private String qualityarea;
+
+    /**
+     * 入藏时间范围
+     */
+    private String entrydatearea;
+
+    /**
+     * 入藏年度
+     */
+    private String entryyear;
+
+    /**
+     * 审批人名称
+     */
+    private String auditorname;
+
+    /**
+     * 所在库房名称
+     */
+    private String warehousename;
+
+    /**
+     * 所在库位名称
+     */
+    private String locationname;
+
+    /**
+     * 所属库房名称
+     */
+    private String belongwarehousename;
+
     /**
-     * 浏览次数
+     * 所属库位名称
      */
-    private Integer visitCount;
+    private String belonglocationname;
 
     /**
-     * 点赞量
+     * 是否革命文物
      */
-    private Integer likeCount;
+    private Integer isRevolution;
 
     /**
-     * 钤印
+     * 是否拆分
      */
-    private String officialSeal;
+    private Integer isSplit;
 
 
 }

src/main/java/com/project/hyb/biz/domain/entity/ArtAttachmentFolders.java

@@ -0,0 +1,236 @@
+package com.project.hyb.biz.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2025-08-13
+ */
+@Getter
+@Setter
+@TableName("art_attachment_folders")
+public class ArtAttachmentFolders implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableLogic(value = "1", delval = "0")
+    private Integer recordstatus;
+
+    private String artworkid;
+
+    private String attachmentuuid;
+
+    private String attachmentFolderUuid;
+
+    private Date createdate;
+
+    private Integer creater;
+
+    private String position;
+
+    private String category;
+
+    private String oldcategory;
+
+    private String serverpath;
+
+    private String originname;
+
+    private String servername;
+
+    private String extension;
+
+    private Float sortno;
+
+    private Integer isdefault;
+
+    private String memo;
+
+    private Float size;
+
+    /**
+     * 附件模块
+     */
+    private String modules;
+
+    private Integer original;
+
+    private Date editdate;
+
+    /**
+     * 拍摄日期
+     */
+    private String shootDate;
+
+    /**
+     * 程序名称
+     */
+    private String programName;
+
+    /**
+     * 分辨率
+     */
+    private String resolution;
+
+    /**
+     * 宽度
+     */
+    private String width;
+
+    /**
+     * 高度
+     */
+    private String height;
+
+    /**
+     * 水平分辨率
+     */
+    private String levelResolution;
+
+    /**
+     * 垂直分辨率
+     */
+    private String verticalResolution;
+
+    /**
+     * 位深度
+     */
+    private String depth;
+
+    /**
+     * 分辨率单位
+     */
+    private String resolutionUnit;
+
+    /**
+     * 颜色表示
+     */
+    private String colorRep;
+
+    /**
+     * 压缩的位/像素
+     */
+    private String compressedBits;
+
+    /**
+     * 照相机制造商
+     */
+    private String cameraCreater;
+
+    /**
+     * 照相机型号
+     */
+    private String cameraModel;
+
+    /**
+     * 光圈值
+     */
+    private String aperture;
+
+    /**
+     * 曝光时间
+     */
+    private String exposureTime;
+
+    /**
+     * ISO速度
+     */
+    private String isoSpeed;
+
+    /**
+     * 曝光补偿
+     */
+    private String exposureCom;
+
+    /**
+     * 焦距
+     */
+    private String focalLength;
+
+    /**
+     * 最大光圈
+     */
+    private String maxAperture;
+
+    /**
+     * 测光模式
+     */
+    private String testModel;
+
+    /**
+     * 闪光灯模式
+     */
+    private String flashModel;
+
+    /**
+     * 清晰度
+     */
+    private String clarity;
+
+    /**
+     * 白平衡
+     */
+    private String whiteBalance;
+
+    /**
+     * 时长
+     */
+    private String duration;
+
+    /**
+     * 帧宽度
+     */
+    private String frameWidth;
+
+    /**
+     * 帧高度
+     */
+    private String frameHeight;
+
+    /**
+     * 帧速率
+     */
+    private String frameRate;
+
+    /**
+     * 频道
+     */
+    private String channelNumber;
+
+    /**
+     * 音频采样速率
+     */
+    private String sampleRate;
+
+    private String longitude;
+
+    private String latitude;
+
+    /**
+     * 压缩后的扩展名
+     */
+    private String zoomextension;
+
+    private String purpose;
+
+    /**
+     * 设置
+     */
+    private String deploy;
+
+
+}

src/main/java/com/project/hyb/biz/domain/entity/ArtAttachments.java

@@ -2,6 +2,7 @@ package com.project.hyb.biz.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
@@ -26,6 +27,7 @@ public class ArtAttachments implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @TableLogic(value = "1", delval = "0")
     private Integer recordstatus;
 
     private String artworkid;

src/main/java/com/project/hyb/biz/domain/entity/CollCollectionClues.java

@@ -2,6 +2,7 @@ package com.project.hyb.biz.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
@@ -87,6 +88,7 @@ public class CollCollectionClues implements Serializable {
     /**
      * 逻辑删除
      */
+    @TableLogic(value = "0", delval = "1")
     private Boolean isDeleted;
 
     /**

src/main/java/com/project/hyb/biz/domain/entity/SysAttachments.java

@@ -2,6 +2,7 @@ package com.project.hyb.biz.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
@@ -26,6 +27,7 @@ public class SysAttachments implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @TableLogic(value = "1", delval = "0")
     private Boolean recordstatus;
 
     private String recordid;

src/main/java/com/project/hyb/biz/generate/AutoGenerate.java

@@ -17,8 +17,8 @@ public class AutoGenerate {
 
         String path =System.getProperty("user.dir");
 
-        generate(path,"pms", getTables(new String[]{
-                "news_publish"
+        generate(path,"biz", getTables(new String[]{
+                "art_attachments"
         }));
     }
 
@@ -28,8 +28,8 @@ public class AutoGenerate {
 
 
     public static void  generate(String path,String moduleName,  List<String> tables){
-        FastAutoGenerator.create("jdbc:mysql://106.53.107.102:3306/artoffice_museum",
-            "root","mysql123!ROOT.")
+        FastAutoGenerator.create("jdbc:mysql://159.75.75.84:3306/artoffice_museum",
+            "root","6SD%KraOnB")
                 .globalConfig(builder -> {
                     builder.author("")               //作者
                             .outputDir(path+"\\src\\main\\java")    //输出路径(写到java目录)

src/main/java/com/project/hyb/biz/mapper/ArtArtworksMapper.java

@@ -2,23 +2,17 @@ package com.project.hyb.biz.mapper;
 
 import com.project.hyb.biz.domain.entity.ArtArtworks;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.project.hyb.biz.domain.request.ArtArtworksPageRequest;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
-
 /**
  * <p>
  *  Mapper 接口
  * </p>
  *
  * @author 
- * @since 2025-08-05
+ * @since 2025-08-14
  */
 @Mapper
 public interface ArtArtworksMapper extends BaseMapper<ArtArtworks> {
 
-    List<String> listCategory();
-
-    List<ArtArtworks> listArtArtworks(ArtArtworksPageRequest request);
 }

src/main/java/com/project/hyb/biz/mapper/ArtAttachmentFoldersMapper.java

@@ -0,0 +1,24 @@
+package com.project.hyb.biz.mapper;
+
+import com.project.hyb.biz.domain.dto.ArtAttachmentFolderDto;
+import com.project.hyb.biz.domain.entity.ArtAttachmentFolders;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-08-13
+ */
+@Mapper
+public interface ArtAttachmentFoldersMapper extends BaseMapper<ArtAttachmentFolders> {
+
+     List<ArtAttachmentFolderDto> list4dage(Set<String> artworkUuids);
+
+}

src/main/java/com/project/hyb/biz/service/ArtArtworksService.java

@@ -1,13 +1,7 @@
 package com.project.hyb.biz.service;
 
-import com.project.hyb.biz.domain.dto.ArtArtworksDto;
 import com.project.hyb.biz.domain.entity.ArtArtworks;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.project.hyb.biz.domain.request.ArtArtworksPageRequest;
-import com.project.hyb.common.response.PageInfo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
@@ -15,15 +9,8 @@ import java.util.List;
  * </p>
  *
  * @author 
- * @since 2025-08-05
+ * @since 2025-08-14
  */
 public interface ArtArtworksService extends IService<ArtArtworks> {
 
-    PageInfo<ArtArtworksDto> pageArtArtworks(ArtArtworksPageRequest request);
-
-    List<String> listCategory();
-
-    List<ArtArtworks> listArtArtworks(@Param("param") ArtArtworksPageRequest request);
-
-    ArtArtworksDto getArtArtworkById(Long id);
 }

src/main/java/com/project/hyb/biz/service/ArtAttachmentFoldersService.java

@@ -0,0 +1,21 @@
+package com.project.hyb.biz.service;
+
+import com.project.hyb.biz.domain.dto.ArtAttachmentFolderDto;
+import com.project.hyb.biz.domain.entity.ArtAttachmentFolders;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-08-13
+ */
+public interface ArtAttachmentFoldersService extends IService<ArtAttachmentFolders> {
+
+    List<ArtAttachmentFolderDto> list4dage(Set<String> strings);
+}

src/main/java/com/project/hyb/biz/service/impl/ArtArtworksServiceImpl.java

@@ -1,89 +0,0 @@
-package com.project.hyb.biz.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.project.hyb.biz.domain.dto.ArtArtworksDto;
-import com.project.hyb.biz.domain.entity.ArtArtworks;
-import com.project.hyb.biz.domain.entity.ArtAttachments;
-import com.project.hyb.biz.domain.entity.SysAttachments;
-import com.project.hyb.biz.domain.request.ArtArtworksPageRequest;
-import com.project.hyb.biz.mapper.ArtArtworksMapper;
-import com.project.hyb.biz.service.ArtArtworksService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.project.hyb.biz.service.ArtAttachmentsService;
-import com.project.hyb.biz.service.SysAttachmentsService;
-import com.project.hyb.common.exception.BizException;
-import com.project.hyb.common.response.BizResponseCode;
-import com.project.hyb.common.response.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author 
- * @since 2025-08-05
- */
-@DS("artmember")
-@Service
-public class ArtArtworksServiceImpl extends ServiceImpl<ArtArtworksMapper, ArtArtworks> implements ArtArtworksService {
-
-    @Autowired
-    private SysAttachmentsService sysAttachmentsService;
-
-    @Override
-    public PageInfo<ArtArtworksDto> pageArtArtworks(ArtArtworksPageRequest request) {
-        IPage<ArtArtworksDto> convert = this.page(new Page<>(request.getPageNo(), request.getPageSize())).convert(v -> BeanUtil.toBean(v, ArtArtworksDto.class));
-        return PageInfo.convert(convert);
-    }
-
-    @Override
-    public List<String> listCategory() {
-        return this.getBaseMapper().listCategory();
-    }
-
-    @Override
-    public List<ArtArtworks> listArtArtworks(ArtArtworksPageRequest request) {
-        return this.getBaseMapper().listArtArtworks(request);
-    }
-
-    @Override
-    public ArtArtworksDto getArtArtworkById(Long id) {
-        ArtArtworks byId = this.getById(id);
-        if(byId == null){
-            throw new BizException(BizResponseCode.ERR_10001);
-        }
-
-        ArtArtworksDto bean = BeanUtil.toBean(byId, ArtArtworksDto.class);
-
-        //查询模型文件和图片文件
-        List<SysAttachments> imgs = sysAttachmentsService.list(
-                new LambdaQueryWrapper<SysAttachments>()
-                        .eq(SysAttachments::getRecordid, bean.getArtworkUuid())
-                        .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()));
-        }
-        List<SysAttachments> objs = sysAttachmentsService.list(
-                new LambdaQueryWrapper<SysAttachments>()
-                        .eq(SysAttachments::getRecordid, bean.getArtworkUuid())
-                        .eq(SysAttachments::getModules, "artwork")
-                        .eq(SysAttachments::getCategory, 6));
-        if(CollUtil.isNotEmpty(objs)){
-            bean.setModelFiles(objs.stream().map(v->v.getServerpath() + v.getServername() + "." + v.getExtension()).collect(Collectors.toList()));
-        }
-
-        return bean;
-    }
-}

src/main/java/com/project/hyb/biz/service/impl/ArtAttachmentFoldersServiceImpl.java

@@ -0,0 +1,31 @@
+package com.project.hyb.biz.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.project.hyb.biz.domain.dto.ArtAttachmentFolderDto;
+import com.project.hyb.biz.domain.entity.ArtAttachmentFolders;
+import com.project.hyb.biz.mapper.ArtAttachmentFoldersMapper;
+import com.project.hyb.biz.service.ArtAttachmentFoldersService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-08-13
+ */
+@DS("artoffice_museum")
+@Service
+public class ArtAttachmentFoldersServiceImpl extends ServiceImpl<ArtAttachmentFoldersMapper, ArtAttachmentFolders> implements ArtAttachmentFoldersService {
+
+    @Override
+    public List<ArtAttachmentFolderDto> list4dage(Set<String> strings) {
+        return this.getBaseMapper().list4dage(strings);
+    }
+}

src/main/java/com/project/hyb/biz/service/impl/MbArtArtworksServiceImpl.java

@@ -0,0 +1,144 @@
+package com.project.hyb.biz.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Sets;
+import com.project.hyb.biz.domain.dto.ArtAttachmentFolderDto;
+import com.project.hyb.biz.domain.dto.MbArtArtworksDto;
+import com.project.hyb.biz.domain.entity.*;
+import com.project.hyb.biz.domain.request.ArtArtworksPageRequest;
+import com.project.hyb.biz.mapper.MbArtArtworksMapper;
+import com.project.hyb.biz.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.project.hyb.common.exception.BizException;
+import com.project.hyb.common.response.BizResponseCode;
+import com.project.hyb.common.response.PageInfo;
+import com.project.hyb.common.response.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-08-05
+ */
+@DS("artmember")
+@Service
+public class MbArtArtworksServiceImpl extends ServiceImpl<MbArtArtworksMapper, MbArtArtworks> implements MbArtArtworksService {
+
+    @Autowired
+    private SysAttachmentsService sysAttachmentsService;
+    @Autowired
+    private ArtAttachmentFoldersService artAttachmentFoldersService;
+    @Autowired
+    private ArtArtworksService artArtworksService;
+    @Autowired
+    private ArtAttachmentsService artAttachmentsService;
+
+    @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));
+        return PageInfo.convert(convert);
+    }
+
+    @Override
+    public List<String> listCategory() {
+        return this.getBaseMapper().listCategory();
+    }
+
+    @Override
+    public List<MbArtArtworks> listArtArtworks(ArtArtworksPageRequest request) {
+        return this.getBaseMapper().listArtArtworks(request);
+    }
+
+    @Override
+    public MbArtArtworksDto getArtArtworkById(Long id) {
+        MbArtArtworks byId = this.getById(id);
+        if(byId == null){
+            throw new BizException(BizResponseCode.ERR_10001);
+        }
+
+        MbArtArtworksDto bean = BeanUtil.toBean(byId, MbArtArtworksDto.class);
+
+        //查询图片文件
+        List<SysAttachments> imgs = sysAttachmentsService.list(
+                new LambdaQueryWrapper<SysAttachments>()
+                        .eq(SysAttachments::getRecordid, bean.getArtworkUuid())
+                        .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()));
+        }
+
+        //查询模型文件
+        List<ArtAttachmentFolderDto> artAttachmentFolderDtoList = artAttachmentFoldersService.list4dage(Sets.newHashSet(bean.getArtworkUuid()));
+        if(CollUtil.isNotEmpty(artAttachmentFolderDtoList)){
+            bean.setModelFiles(artAttachmentFolderDtoList.stream().map(v->v.getFilePath()).collect(Collectors.toList()));
+        }
+
+
+//        ArtArtworks artArtworks = artArtworksService.getOne(new LambdaQueryWrapper<ArtArtworks>().eq(ArtArtworks::getArtworkuuid, bean.getArtworkUuid()));
+//
+//        List<ArtAttachments> artAttachmentsList = artAttachmentsService.list(
+//                new LambdaQueryWrapper<ArtAttachments>()
+//                        .eq(ArtAttachments::getArtworkid, artArtworks.getId())
+//                        .eq(ArtAttachments::getModules, "artwork")
+//                        .eq(ArtAttachments::getCategory, 6));
+//
+//        if(CollUtil.isNotEmpty(artAttachmentsList)){
+//            Set<String> attachmentUuids = artAttachmentsList.stream().map(v -> v.getAttachmentUuid()).collect(Collectors.toSet());
+//            List<ArtAttachmentFolders> artAttachmentFolders = artAttachmentFoldersService.list(
+//                    new LambdaQueryWrapper<ArtAttachmentFolders>()
+//                            .eq(ArtAttachmentFolders::getExtension, "4dage")
+//                            .eq(ArtAttachmentFolders::getModules, "artwork")
+//                            .in(ArtAttachmentFolders::getAttachmentuuid, attachmentUuids));
+//            bean.setModelFiles(artAttachmentFolders.stream().map(v->v.getServerpath() + v.getServername()).collect(Collectors.toList()));
+//        }
+
+        return bean;
+    }
+
+    @Override
+    public List<MbArtArtworksDto> listArtWork(ArtArtworksPageRequest request) {
+        List<MbArtArtworks> list = this.listArtArtworks(request);
+        if(CollUtil.isEmpty(list)){
+            return null;
+        }
+
+        //查询模型文件
+        Map<String, MbArtArtworksDto> mbArtArtworkMap = list.stream().collect(Collectors.toMap(v -> v.getArtworkUuid(), v->{
+            MbArtArtworksDto dto = BeanUtil.toBean(v, MbArtArtworksDto.class);
+            dto.setDim(1);
+            return dto;
+        }));
+
+        List<ArtAttachmentFolderDto> artAttachmentFolderDtoList = artAttachmentFoldersService.list4dage(mbArtArtworkMap.keySet());
+        if(CollUtil.isNotEmpty(artAttachmentFolderDtoList)){
+            List<String> artworkUuids = artAttachmentFolderDtoList.stream().map(v -> v.getArtworkUuid()).collect(Collectors.toList());
+            mbArtArtworkMap.keySet().stream().forEach(v->{
+                MbArtArtworksDto mbArtArtworksDto = mbArtArtworkMap.get(v);
+                if(artworkUuids.contains(mbArtArtworksDto.getArtworkUuid())){
+                    mbArtArtworksDto.setDim(2);
+                }
+            });
+        }
+
+        List<MbArtArtworksDto> listAll = new ArrayList<>(mbArtArtworkMap.values());
+        if(request.getDim() == 3){
+            return listAll;
+        }
+
+        return listAll.stream().filter(v->v.getDim().equals(request.getDim())).collect(Collectors.toList());
+    }
+}

src/main/java/com/project/hyb/common/swagger/CustomConstants.java

@@ -1,54 +1,54 @@
-package com.project.hyb.common.swagger;
- 
-/**
- * 自定义的常量接口
- * @author heyunlin
- * @version 1.0
- */
-public interface CustomConstants {
- 
-    /**
-     * 作者
-     */
-    String AUTHOR = "沐雨橙风ιε";
- 
-    /**
-     * 版本号
-     */
-    String VERSION = "1.0.0";
- 
-    /**
-     * 分组名称
-     */
-    String GROUP_NAME = "2.0.9";
- 
-    /**
-     * 控制器类的包路径
-     */
-    String BASE_PACKAGE = "com.project.hyb.biz.controller";
- 
-    /**
-     * 文档标题
-     */
-    String TITLE = "Spring Boot整合knife4j接口文档工具案例项目";
- 
-    /**
-     * 文档描述
-     */
-    String DESCRIPTION = TITLE + "在线API文档";
- 
-    /**
-     * 联系地址
-     */
-    String CONTACT_URL = "https://gitee.com/muyu-chengfeng";
- 
-    /**
-     * 联系邮箱
-     */
-    String CONTACT_EMAIL = "hey163_com@163.com";
- 
-    /**
-     * 服务条款地址
-     */
-    String TERMS_OF_SERVICE_URL = "https://www.apache.org/licenses/LICENSE-2.0";
-}
+//package com.project.hyb.common.swagger;
+//
+///**
+// * 自定义的常量接口
+// * @author heyunlin
+// * @version 1.0
+// */
+//public interface CustomConstants {
+//
+//    /**
+//     * 作者
+//     */
+//    String AUTHOR = "沐雨橙风ιε";
+//
+//    /**
+//     * 版本号
+//     */
+//    String VERSION = "1.0.0";
+//
+//    /**
+//     * 分组名称
+//     */
+//    String GROUP_NAME = "2.0.9";
+//
+//    /**
+//     * 控制器类的包路径
+//     */
+//    String BASE_PACKAGE = "com.project.hyb.biz.controller";
+//
+//    /**
+//     * 文档标题
+//     */
+//    String TITLE = "Spring Boot整合knife4j接口文档工具案例项目";
+//
+//    /**
+//     * 文档描述
+//     */
+//    String DESCRIPTION = TITLE + "在线API文档";
+//
+//    /**
+//     * 联系地址
+//     */
+//    String CONTACT_URL = "https://gitee.com/muyu-chengfeng";
+//
+//    /**
+//     * 联系邮箱
+//     */
+//    String CONTACT_EMAIL = "hey163_com@163.com";
+//
+//    /**
+//     * 服务条款地址
+//     */
+//    String TERMS_OF_SERVICE_URL = "https://www.apache.org/licenses/LICENSE-2.0";
+//}

src/main/java/com/project/hyb/common/swagger/SwaggerConfig.java

@@ -1,79 +1,10 @@
 package com.project.hyb.common.swagger;
 
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.ParameterBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.schema.ModelRef;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
-import springfox.documentation.service.Parameter;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author qwh
- * @Date 2024/6/1 0:10
- */
 @Configuration
-@EnableSwagger2WebMvc
+@EnableSwagger2 // 开启Swagger2(开关)
 public class SwaggerConfig {
-    /**
-     * 配置Swagger的Docket Bean，用于定义API的文档信息和扫描的包路径。
-     *
-     * @return Docket 返回配置好的Docket实例
-     */
-    @Bean
-    public Docket adminApiConfig(){
-        // 初始化参数列表
-        List<Parameter> pars = new ArrayList<>();
-        // 构建用户token参数
-//        ParameterBuilder tokenPar = new ParameterBuilder();
-//        tokenPar.name("adminId")
-//                .description("用户token")
-//                .defaultValue("1")
-//                .modelRef(new ModelRef("string"))
-//                .parameterType("header")
-//                .required(false)
-//                .build();
-//        // 将token参数添加到参数列表
-//        pars.add(tokenPar.build());
-
-        // 创建Docket实例并配置文档信息、包路径选择器、路径选择器等
-        Docket adminApi = new Docket(DocumentationType.SWAGGER_2)
-//                .groupName("adminApi")
-                .apiInfo(adminApiInfo())
-                .select()
-                //扫描的包
-                .apis(RequestHandlerSelectors.basePackage("com.project.hyb.biz.controller"))
-                // 选择处理admin路径下的API
-//                .paths(PathSelectors.regex("/demo/.*"))
-                .build()
-                // 全局操作参数设置
-                .globalOperationParameters(pars);
-        return adminApi;
-    }
-
-    /**
-     * 构建后台管理系统API的详细信息
-     *
-     * @return 返回构建好的ApiInfo对象，包含API文档的标题、描述、版本信息以及联系方式
-     */
-    private ApiInfo adminApiInfo(){
-        // 使用ApiInfoBuilder构建API信息
-        return new ApiInfoBuilder()
-                .title("四维看展-API文档") // 设置文档标题
-                .description("本文档描述了四维看展各端接口定义") // 设置文档描述
-                .version("1.0") // 设置文档版本号
-                .contact(new Contact("username", "http://username.com", "username@gmail.com")) // 设置联系人信息
-                .build(); // 构建并返回ApiInfo对象
-    }
-
 }
 

src/main/resources/application-h2.yml

@@ -1,10 +1,84 @@
+server:
+  port: 8180
+  servlet:
+    context-path: /hyb
+  tomcat:
+    max-http-form-post-size: -1
 spring:
+  application:
+    name: project-hyb
+  jackson:
+    serialization:
+      #关闭jackson转换 实体属性空值校验
+      FAIL_ON_EMPTY_BEANS: false
+      # write-dates-as-timestamps: true    ##开启时间转换为时间戳，默认true
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
   datasource:
-    driver-class-name: org.h2.Driver
-    url: jdbc:h2:mem:isme;MODE=MySQL;DATABASE_TO_LOWER=TRUE
-    username: root
-    password: 123456
-  sql:
-    init:
-      schema-locations: classpath:db/h2.sql
-      mode: always
+    dynamic:
+      #指定一个主数据源,primary表示是主数据源也可以认为是默认数据源，如果不加注解DS(“数据源名字”)则会去主数据源中查询
+      primary: system
+      datasource:
+        #第一个数据源配置
+        artmember:
+          url: jdbc:mysql://8.135.106.227:3306/artmember
+          username: root
+          password: 4dkk2021testproject%
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        #第二个数据源配置
+        artoffice_museum:
+          url: jdbc:mysql://8.135.106.227:3306/artoffice_museum
+          username: root
+          password: 4dkk2021testproject%
+          driver-class-name: com.mysql.cj.jdbc.Driver
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  servlet:
+    multipart:
+      # 设置单个文件大小
+      max-file-size: 10240MB
+      # 设置单次请求文件的总大小
+      max-request-size: 10240MB
+sa-token:
+  token-name: Authorization
+  token-prefix: Bearer
+  jwt-secret-key: xxx
+knife4j:
+  enable: true
+
+mybatis-plus:
+  configuration:
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志
+    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #开启sql日志
+  global-config:
+    db-config:
+      logic-delete-field: enable # 全局逻辑删除字段名
+      logic-delete-value: 0 # 逻辑已删除值。可选，默认值为 0
+      logic-not-delete-value: 1 # 逻辑未删除值。可选，默认值为 1
+log:
+  path: /data/data01/museum_huyaobang_data/server
+
+# 不配默认为false
+tlog:
+  enable-invoke-time-print: true
+
+springdoc:
+  api-docs:
+    path: /api-docs  # API文档的路径
+  swagger-ui:
+    path: /swagger-ui.html  # Swagger UI的路径
+    disable-swagger-default-url: true  # 禁用默认的swagger URL
+    operationsSorter: method  # 方法排序
+    tagsSorter: alpha       # 标签排序
+
+forest:
+  max-connections: 1000        # 连接池最大连接数
+  connect-timeout: 3000        # 连接超时时间，单位为毫秒
+  read-timeout: 6000           # 数据读取超时时间，单位为毫秒
+  max-retry-count: 3     # 最大请求重试次数，默认为 0 次
+  max-retry-interval: 1 # 为最大重试时间间隔, 单位为毫秒，默认为 0 毫秒
+
+#文件存储路径
+filestorage:
+  path: /data/data01/museum_huyaobang_data/filestorage2

src/main/resources/application-prod.yml

@@ -1,27 +1,29 @@
 spring:
-  dynamic:
-    #指定一个主数据源,primary表示是主数据源也可以认为是默认数据源，如果不加注解DS(“数据源名字”)则会去主数据源中查询
-    primary: system
-    datasource:
-      #第一个数据源配置
-      artmember:
-        url: jdbc:mysql://106.53.107.102:3306/artmember
-        username: root
-        password: mysql123!ROOT.
-        driver-class-name: com.mysql.cj.jdbc.Driver
-      #第二个数据源配置
-      artoffice_museum:
-        url: jdbc:mysql://106.53.107.102:3306/artoffice_museum
-        username: root
-        password: mysql123!ROOT.
-        driver-class-name: com.mysql.cj.jdbc.Driver
+  datasource:
+    dynamic:
+      #指定一个主数据源,primary表示是主数据源也可以认为是默认数据源，如果不加注解DS(“数据源名字”)则会去主数据源中查询
+      primary: system
+      datasource:
+        #第一个数据源配置
+        artmember:
+          url: jdbc:mysql://159.75.75.84: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
+          username: root
+          password: 6SD%KraOnB
+          driver-class-name: com.mysql.cj.jdbc.Driver
 
 pms:
   preview: false
 
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #开启sql日志
+#mybatis-plus:
+#  configuration:
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志
 
+#文件存储路径
 filestorage:
-  path:
+  path: /data/data01/museum_huyaobang_data/filestorage

src/main/resources/application.yml

@@ -1,12 +1,14 @@
 server:
   port: 8180
+  servlet:
+    context-path: /hyb
   tomcat:
     max-http-form-post-size: -1
 spring:
   application:
     name: project-hyb
   profiles:
-    active: local
+    active: prod
   jackson:
     serialization:
       #关闭jackson转换 实体属性空值校验
@@ -32,8 +34,8 @@ knife4j:
 
 mybatis-plus:
   configuration:
-#     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志
-    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #开启sql日志
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志
+#    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #开启sql日志
   global-config:
     db-config:
       logic-delete-field: enable # 全局逻辑删除字段名

src/main/resources/mapper/biz/ArtArtworksMapper.xml

@@ -2,33 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.project.hyb.biz.mapper.ArtArtworksMapper">
 
-
-    <select id="listCategory" resultType="java.lang.String">
-        SELECT DISTINCT t.category FROM `art_artworks` t WHERE t.`recordstatus` = 1
-    </select>
-
-    <select id="listArtArtworks" resultType="com.project.hyb.biz.domain.entity.ArtArtworks">
-        select * from art_artworks
-        where recordstatus = 1
-        <if test="grade != null and grade != ''">
-            and grade = #{grade}
-        </if>
-        <if test="category != null and category != ''">
-            and category = #{category}
-        </if>
-        <if test="texture != null and texture != ''">
-            and texture = #{texture}
-        </if>
-        <if test="agetype != null and agetype != ''">
-            and (
-                agetype1 = #{agetype} or
-                agetype2 = #{agetype} or
-                agetype3 = #{agetype} or
-                agetype4 = #{agetype}
-            )
-        </if>
-        <if test="searchText != null and searchText != ''">
-            and name like concat('%', #{searchText}, '%')
-        </if>
-    </select>
 </mapper>

src/main/resources/mapper/biz/ArtAttachmentFoldersMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.project.hyb.biz.mapper.ArtAttachmentFoldersMapper">
+    <select id="list4dage" resultType="com.project.hyb.biz.domain.dto.ArtAttachmentFolderDto">
+        SELECT aa.`artwork_uuid`, CONCAT(b.serverpath,aaf.originname) filepath
+        FROM artmember.art_artworks aa
+        INNER JOIN artoffice_museum.art_artworks a ON aa.artwork_uuid = a.artworkuuid
+        INNER JOIN artoffice_museum.art_attachments b ON a.id = b.artworkid AND b.category = 6 AND a.recordstatus = 1 AND b.recordstatus = 1
+        INNER JOIN artoffice_museum.art_attachment_folders aaf  ON b.attachment_uuid =  aaf.attachmentuuid AND aaf.`recordstatus` = 1
+        AND aaf.`extension` = '4dage'
+        where aa.`artwork_uuid` in
+        <foreach collection="artworkUuids" item="uuid" open="(" close=")" separator=",">
+            #{uuid}
+        </foreach>
+    </select>
+</mapper>