11111

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

@@ -14,6 +14,7 @@ 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.apache.catalina.core.ApplicationContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -70,6 +71,15 @@ public class ArtArtworksController {
         return R.ok(artArtworksService.getArtArtworkById(id));
     }
 
+//    @Autowired
+    private ApplicationContext ctx;
+
+    @ApiOperation("根据id获取")
+    @GetMapping("stop")
+    public R<Void> stop(){
+        return R.ok();
+    }
+
 
 }
 

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

@@ -53,7 +53,7 @@ public class NewsPublishController {
     @GetMapping("page")
     public R<PageInfo<NewsPublishDto>> page(NewsPublicPageRequest request){
         LambdaQueryWrapper<NewsPublish> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.orderByDesc(NewsPublish::getId);
+        queryWrapper.orderByDesc(NewsPublish::getPinnedAt, NewsPublish::getPlatformPublishTime);
         if(StrUtil.isNotEmpty(request.getSearchText())){
             queryWrapper.like(NewsPublish::getTitle, request.getSearchText());
         }

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

@@ -798,6 +798,12 @@ public class MbArtArtworksDto implements Serializable {
     @ApiModelProperty("图片文件列表")
     private List<String> imgFiles;
 
+    @ApiModelProperty("音频文件列表")
+    private List<String> audioFiles;
+
+    @ApiModelProperty("视频文件列表")
+    private List<String> videoFiles;
+
     /**
      * 1-二维，2-三维
      */

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

@@ -103,5 +103,7 @@ public class NewsPublish implements Serializable {
 
     private String description;
 
+    private Date pinnedAt;
+
 
 }

src/main/java/com/project/hyb/biz/domain/request/ArtArtworksPageRequest.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -36,7 +37,8 @@ public class ArtArtworksPageRequest extends PageRequest {
     @ApiModelProperty("维度(1-二维，2-三维，3-全部)")
     private Integer dim;
 
-
+    @ApiModelProperty("排序列表")
+    private List<String> orderbyList;
 
 
 }

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

@@ -82,14 +82,19 @@ public class MbArtArtworksServiceImpl extends ServiceImpl<MbArtArtworksMapper, M
 
         MbArtArtworksDto bean = BeanUtil.toBean(byId, MbArtArtworksDto.class);
 
-        //查询图片文件
-        List<SysAttachments> imgs = sysAttachmentsService.list(
+        //查询多媒体文件
+        List<SysAttachments> medias = 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() + "_750_600." + v.getExtension()).collect(Collectors.toList()));
+                        .in(SysAttachments::getCategory, 1,2,3));
+        if(CollUtil.isNotEmpty(medias)){
+            //图片
+            bean.setImgFiles(medias.stream().filter(v->v.getCategory() == 1).map(v->v.getServerpath() + v.getServername() + "_750_600." + v.getExtension()).collect(Collectors.toList()));
+            //音频
+            bean.setAudioFiles(medias.stream().filter(v->v.getCategory() == 2).map(v->v.getServerpath() + v.getServername() + v.getExtension()).collect(Collectors.toList()));
+            //视频
+            bean.setVideoFiles(medias.stream().filter(v->v.getCategory() == 3).map(v->v.getServerpath() + v.getServername() + v.getExtension()).collect(Collectors.toList()));
         }
 
         //查询模型文件
@@ -98,25 +103,6 @@ public class MbArtArtworksServiceImpl extends ServiceImpl<MbArtArtworksMapper, M
             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;
     }
 

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

@@ -21,14 +21,42 @@
         </if>
         <if test="agetype != null and agetype != ''">
             and (
-                agetype1 = #{agetype} or
-                agetype2 = #{agetype} or
-                agetype3 = #{agetype} or
-                agetype4 = #{agetype}
+                agetype1 = #{agetype}
+<!--                or agetype2 = #{agetype} -->
+<!--                or agetype3 = #{agetype} -->
+<!--                or agetype4 = #{agetype}-->
             )
         </if>
         <if test="searchText != null and searchText != ''">
             and name like concat('%', #{searchText}, '%')
         </if>
+        <if test="orderBy != null and orderBy == 'grade'">
+            ORDER BY FIELD(grade,
+            <foreach collection="orderbyList" item="item" separator=",">
+                #{item}
+            </foreach>
+           )
+        </if>
+        <if test="orderBy != null and orderBy == 'category'">
+            ORDER BY FIELD(category,
+            <foreach collection="orderbyList" item="item" separator=",">
+                #{item}
+            </foreach>
+            )
+        </if>
+        <if test="orderBy != null and orderBy == 'texture'">
+            ORDER BY FIELD(texture,
+            <foreach collection="orderbyList" item="item" separator=",">
+                #{item}
+            </foreach>
+            )
+        </if>
+        <if test="orderBy != null and orderBy == 'agetype'">
+            ORDER BY FIELD(agetype,
+            <foreach collection="orderbyList" item="item" separator=",">
+                #{item}
+            </foreach>
+            )
+        </if>
     </select>
 </mapper>