照片组时间

yudao-module-museums/yudao-module-museums-api/src/main/java/cn/iocoder/yudao/module/museums/enums/ErrorCodeConstants.java

@@ -37,6 +37,7 @@ public class ErrorCodeConstants {
     public static final ErrorCode PHOTO_GROUP_UPLOAD_FAILED = new ErrorCode(1-016-002-001, "照片组上传失败，请检查上传文件");
     public static final ErrorCode PHOTO_GROUP_PACKAGE_FAILED_DECOMPRESS = new ErrorCode(1-016-002-002, "照片组上传失败");
     public static final ErrorCode PHOTO_GROUP_MUST_BE_COMPRESSED_PACKAGE = new ErrorCode(1-016-002-003, "请上传已压缩的图片文件包");
+    public static final ErrorCode PHOTO_GROUP_FORMAT_IS_INCORRECT = new ErrorCode(1-016-002-003, "照片组格式错误");
 
     // ========== 博物馆文件管理 1-016-003-000 ==========
     public static final ErrorCode DOCUMENT_NOT_EXISTS = new ErrorCode(1-016-003-000, "指定的博物馆文件记录不存在");

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/photogroup/PhotoGroupController.java

@@ -12,7 +12,9 @@ import io.swagger.v3.oas.annotations.Operation;
 import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
+import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.*;
 import java.io.IOException;
 
@@ -28,7 +30,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
-import static cn.iocoder.yudao.module.museums.enums.ErrorCodeConstants.INVALID_IMAGE_FORMAT;
+import static cn.iocoder.yudao.module.museums.enums.ErrorCodeConstants.PHOTO_GROUP_FORMAT_IS_INCORRECT;
 import static cn.iocoder.yudao.module.museums.enums.ErrorCodeConstants.PHOTO_GROUP_UPLOAD_FAILED;
 
 import cn.iocoder.yudao.module.museums.controller.admin.photogroup.vo.*;
@@ -108,9 +110,20 @@ public class PhotoGroupController {
     public CommonResult<Integer> importPhotoGroup(
             @NotEmpty @RequestParam("groupName") String groupName,
             @RequestParam(value = "groupDescription", required = false) String groupDescription, // 设置为非必填
-            @RequestParam(value = "groupDate", required = false) LocalDateTime groupDate, // 设置为非必填
+            @RequestParam(value = "groupDate", required = false) String groupDateStr, // 设置为非必填
             @RequestParam("file") MultipartFile file) {
 
+        LocalDateTime groupDate = null;
+        if (groupDate != null) {
+            try {
+                long timestamp = Long.parseLong(groupDateStr);
+                Instant instant = Instant.ofEpochMilli(timestamp);
+                groupDate = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
+            } catch (NumberFormatException e) {
+                throw exception(PHOTO_GROUP_FORMAT_IS_INCORRECT);
+            }
+        }
+
         try {
             // 调用服务层创建照片组并上传照片
             Integer groupId = photoGroupService.importPhotoGroup(groupName, groupDescription, groupDate, file);

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/photogroup/vo/PhotoGroupPageReqVO.java

@@ -32,7 +32,4 @@ public class PhotoGroupPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "照片组上传")
-    private String uploadPhotos;
-
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/photogroup/vo/PhotoGroupRespVO.java

@@ -37,10 +37,6 @@ public class PhotoGroupRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "照片组上传")
-    @ExcelProperty("照片组上传")
-    private String uploadPhotos;
-
     @Schema(description = "照片")
     @ExcelProperty("照片")
     private List<PhotosRespVO> photos;

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/controller/admin/photogroup/vo/PhotoGroupSaveReqVO.java

@@ -24,10 +24,4 @@ public class PhotoGroupSaveReqVO {
     @Schema(description = "照片组简介", example = "你说的对", requiredMode = Schema.RequiredMode.NOT_REQUIRED) // 设置为非必填
     private String groupDescription; // 添加该属性，非必填
 
-//    @Schema(description = "创建时间")
-//    private LocalDateTime createdAt;
-//
-//    @Schema(description = "照片组上传")
-//    private List<String> uploadPhotos;
-
 }

yudao-module-museums/yudao-module-museums-biz/src/main/java/cn/iocoder/yudao/module/museums/dal/dataobject/photogroup/PhotoGroupDO.java

@@ -45,9 +45,4 @@ public class PhotoGroupDO extends BaseDO {
      * 创建时间
      */
     private LocalDateTime createdAt;
-    /**
-     * 照片组上传
-     */
-    private String uploadPhotos;
-
 }