Merge commit '68a860eeeea2093440fe0382f2e0b25c428bfd3f'

Author: mumuzi2023

backend/src/main/java/com/mumu/image/DTO/ImgDTO.java

@@ -1,13 +1,9 @@
 package com.mumu.image.DTO;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import lombok.Getter;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 @Data
@@ -25,8 +21,10 @@ public class ImgDTO {
     private Integer userId;
     private ResponseEntity<byte[]> img;
     private List<String> peoples;
+    private List<String> peoples_nickname;
     private List<String> tags;
     //duplicated
     private String name;
+    private String nickname;
     private String tagName;
 }

backend/src/main/java/com/mumu/image/controller/PeopleController.java

@@ -1,8 +1,11 @@
 package com.mumu.image.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.mumu.image.DTO.ImgDTO;
+import com.mumu.image.entity.People;
 import com.mumu.image.mapper.ImgMapper;
+import com.mumu.image.mapper.PeopleMapper;
 import com.mumu.image.service.PeopleService;
 import com.mumu.utils.AjaxJson;
 import io.swagger.annotations.ApiOperation;
@@ -25,13 +28,25 @@
 public class PeopleController {
     @Autowired
     private PeopleService peopleService;
+    @Autowired
+    private PeopleMapper peopleMapper;
 
     @ApiOperation(value = "更新people name", tags = "people类")
     @PostMapping("/update")
     public AjaxJson update(@RequestParam int userId, @RequestBody List<String> names) {
         return AjaxJson.getSuccessData(peopleService.checkAndInsertPeople(userId, names));
     }
 
+    @ApiOperation(value = "修改people name", tags = "people类")
+    @PostMapping("/change")
+    public AjaxJson change(@RequestParam int userId, @RequestParam String name,@RequestParam String nickname) {
+        return AjaxJson.getSuccessData(peopleService.update(new LambdaUpdateWrapper<People>()
+                .eq(People::getUserId,userId)
+                .eq(People::getName,name)
+                .set(People::getNickname,nickname)
+        ));
+    }
+
     @ApiOperation(value = "删除people name", tags = "people类")
     @PostMapping("/delete")
     public AjaxJson delete(@RequestParam int userId, @RequestBody List<String> names) {

backend/src/main/java/com/mumu/image/entity/People.java

@@ -29,5 +29,7 @@ public class People implements Serializable {
 
     private Boolean valid;
 
+    private String nickname;
+
 
 }

backend/src/main/java/com/mumu/image/service/impl/ImgServiceImpl.java

@@ -74,7 +74,8 @@ public List<ImgDTO> getImagesByTags(ImgDTO img, int offset, int limit, Date star
         // 1️⃣ 先查询符合条件的图片ID
         List<Integer> imgIds = mapper.selectJoinList(Integer.class, new MPJLambdaWrapper<Img>()
                 .select(Img::getImgId) // 只查询 imgId
-                        .eq(img.getAlbumId()!=null,Img::getAlbumId, img.getAlbumId())
+                .eq(img.getAlbumId() != null && img.getAlbumId() != -1, Img::getAlbumId, img.getAlbumId())
+                .isNull(img.getAlbumId() != null && img.getAlbumId() == -1, Img::getAlbumId)
                 .eq(img.getUserId() != null, Img::getUserId, img.getUserId())
                 .eq(img.getImgId() != null, Img::getImgId, img.getImgId())
                 .eq(Img::getValid, true)
@@ -111,6 +112,7 @@ public List<ImgDTO> getImagesByTags(ImgDTO img, int offset, int limit, Date star
                 .selectAll(Img.class) // 查询所有图片字段
                 .select(Tag::getTagName)     // 查询 tagName
                 .select(People::getName)     // 查询 peopleName
+                        .select(People::getNickname)
                 .leftJoin(ImgTag.class, ImgTag::getImgId, Img::getImgId)
                 .leftJoin(Tag.class, Tag::getTagId, ImgTag::getTagId)
                 .leftJoin(ImgPeople.class, ImgPeople::getImgId, Img::getImgId)
@@ -133,6 +135,7 @@ public List<ImgDTO> getImagesByTags(ImgDTO img, int offset, int limit, Date star
                 dto.setTags(new ArrayList<>());
                 dto.setAlbumId(image.getAlbumId());
                 dto.setPeoples(new ArrayList<>());
+                dto.setPeoples_nickname(new ArrayList<>());
 //                String imgName = String.format("%d.jpeg", image.getImgId());
 //                dto.setImg(minioUtilS.download(imgName, ImgPath));
                 return dto;
@@ -145,8 +148,14 @@ public List<ImgDTO> getImagesByTags(ImgDTO img, int offset, int limit, Date star
             }
             // 收集 peopleName
             if (image.getName() != null) {
-                if (!imgMap.get(image.getImgId()).getPeoples().contains(image.getName()))
+                if (!imgMap.get(image.getImgId()).getPeoples().contains(image.getName())) {
                     imgMap.get(image.getImgId()).getPeoples().add(image.getName());
+                    if (image.getNickname() != null) {
+                        imgMap.get(image.getImgId()).getPeoples_nickname().add(image.getNickname());
+                    } else {
+                        imgMap.get(image.getImgId()).getPeoples_nickname().add(image.getName());
+                    }
+                }
             }
         }
 

backend/table.sql

@@ -37,12 +37,12 @@ CREATE TABLE `img_tag`
     PRIMARY KEY (`it_id`)
 );
 
-CREATE TABLE `people`
-(
-    `people_id` int        NOT NULL AUTO_INCREMENT,
+CREATE TABLE `people` (
+    `people_id` int NOT NULL AUTO_INCREMENT,
     `name`      text,
-    `user_id`   int                 DEFAULT NULL,
-    `valid`     tinyint(1) NOT NULL DEFAULT '1',
+    `user_id`   int DEFAULT NULL,
+    `valid`     tinyint(1) NOT NULL DEFAULT 1,
+    `nickname`  text AS (`name`) STORED, -- `TEXT` 类型通常需要 STORED
     PRIMARY KEY (`people_id`)
 );
 CREATE TABLE `tag`