diff --git a/src/main/java/com/imyeyu/api/config/dbsource/TimiServerDBConfig.java b/src/main/java/com/imyeyu/api/config/dbsource/TimiServerDBConfig.java index d707ec9..02fa8b4 100644 --- a/src/main/java/com/imyeyu/api/config/dbsource/TimiServerDBConfig.java +++ b/src/main/java/com/imyeyu/api/config/dbsource/TimiServerDBConfig.java @@ -81,6 +81,7 @@ public class TimiServerDBConfig { mapperLocations.add("classpath:mapper/blog/**/*.xml"); mapperLocations.add("classpath:mapper/common/**/*.xml"); mapperLocations.add("classpath:mapper/system/**/*.xml"); + mapperLocations.add("classpath:mapper/journal/**/*.xml"); mapperLocations.add("classpath:mapper/minecraft/**/*.xml"); for (int i = 0; i < mapperLocations.size(); i++) { resources.addAll(List.of(resourceResolver.getResources(mapperLocations.get(i)))); diff --git a/src/main/java/com/imyeyu/api/modules/journal/bean/Location.java b/src/main/java/com/imyeyu/api/modules/journal/bean/Location.java new file mode 100644 index 0000000..a223e35 --- /dev/null +++ b/src/main/java/com/imyeyu/api/modules/journal/bean/Location.java @@ -0,0 +1,30 @@ +package com.imyeyu.api.modules.journal.bean; + +import com.imyeyu.api.modules.journal.entity.Journal; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 经纬度位置 + * + * @author 夜雨 + * @since 2025-12-05 15:26 + */ +@Data +@NoArgsConstructor +public class Location { + + /** 经度 */ + private Double lng; + + /** 维度 */ + private Double lat; + + private String text; + + public Location(Journal journal) { + this.lat = journal.getLat(); + this.lng = journal.getLng(); + this.text = journal.getLocation(); + } +} diff --git a/src/main/java/com/imyeyu/api/modules/journal/controller/JournalController.java b/src/main/java/com/imyeyu/api/modules/journal/controller/JournalController.java index c9a11a0..1708e8f 100644 --- a/src/main/java/com/imyeyu/api/modules/journal/controller/JournalController.java +++ b/src/main/java/com/imyeyu/api/modules/journal/controller/JournalController.java @@ -6,7 +6,6 @@ import com.imyeyu.api.modules.common.bean.SettingKey; import com.imyeyu.api.modules.common.entity.Attachment; import com.imyeyu.api.modules.common.service.AttachmentService; import com.imyeyu.api.modules.common.service.SettingService; -import com.imyeyu.api.modules.journal.bean.Location; import com.imyeyu.api.modules.journal.bean.Travel; import com.imyeyu.api.modules.journal.entity.Journal; import com.imyeyu.api.modules.journal.service.JournalService; @@ -35,6 +34,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.List; /** @@ -167,27 +167,30 @@ public class JournalController { return result; } - /** - * 所有记录日期列表 - * - * @return - */ @AOPLog @RequestRateLimit - @GetMapping("/list/date") - public Long[] listDate() { - return service.listDate(); - } + @PostMapping("/list/ids") + public List listByIds(@RequestBody Long[] ids) { + List result = new ArrayList<>(); - /** - * 所有记录位置列表 - * - * @return - */ - @RequestRateLimit - @GetMapping("/list/location") - public List listLocation() { - return null; + List journals = service.listByIds(ids); + for (int i = 0; i < journals.size(); i++) { + Journal journal = journals.get(i); + JournalResponse resp = new JournalResponse(); + Page attachPage = new Page<>(); + { + Attachment example = new Attachment(); + example.setBizType(Attachment.BizType.JOURNAL); + example.setBizId(journal.getId()); + attachPage.setEqualsExample(example); + } + attachPage.setIndex(0); + attachPage.setSize(Long.MAX_VALUE); + resp.setItems(attachmentService.page(attachPage).getList()); + BeanUtils.copyProperties(journal, resp); + result.add(resp); + } + return result; } /** diff --git a/src/main/java/com/imyeyu/api/modules/journal/mapper/JournalMapper.java b/src/main/java/com/imyeyu/api/modules/journal/mapper/JournalMapper.java index b52a08e..d37f1f0 100644 --- a/src/main/java/com/imyeyu/api/modules/journal/mapper/JournalMapper.java +++ b/src/main/java/com/imyeyu/api/modules/journal/mapper/JournalMapper.java @@ -2,7 +2,8 @@ package com.imyeyu.api.modules.journal.mapper; import com.imyeyu.api.modules.journal.entity.Journal; import com.imyeyu.spring.mapper.BaseMapper; -import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @author 夜雨 @@ -10,6 +11,5 @@ import org.apache.ibatis.annotations.Select; */ public interface JournalMapper extends BaseMapper { - @Select("SELECT created_at FROM `journal` WHERE `deleted_at` IS NULL") - Long[] listDate(); + List listByIds(Long[] ids); } diff --git a/src/main/java/com/imyeyu/api/modules/journal/service/JournalService.java b/src/main/java/com/imyeyu/api/modules/journal/service/JournalService.java index 3cc459a..30569df 100644 --- a/src/main/java/com/imyeyu/api/modules/journal/service/JournalService.java +++ b/src/main/java/com/imyeyu/api/modules/journal/service/JournalService.java @@ -19,12 +19,12 @@ import java.util.List; */ public interface JournalService extends PageableService, GettableService, DeletableService { - Long[] listDate() throws TimiException; - void create(JournalRequest request) throws TimiException; void update(UpdateRequest request) throws TimiException; + List listByIds(Long... ids); + /** * 过滤已存在瞬间 * diff --git a/src/main/java/com/imyeyu/api/modules/journal/service/implement/JournalServiceImplement.java b/src/main/java/com/imyeyu/api/modules/journal/service/implement/JournalServiceImplement.java index dc75716..11f0f9b 100644 --- a/src/main/java/com/imyeyu/api/modules/journal/service/implement/JournalServiceImplement.java +++ b/src/main/java/com/imyeyu/api/modules/journal/service/implement/JournalServiceImplement.java @@ -59,11 +59,6 @@ public class JournalServiceImplement extends AbstractEntityService listByIds(Long... ids) { + return mapper.listByIds(ids); + } + @Override public String[] filterExistMoment(String[] md5s) throws TimiException { if (TimiJava.isEmpty(md5s)) { diff --git a/src/main/resources/mapper/journal/JournalMapper.xml b/src/main/resources/mapper/journal/JournalMapper.xml new file mode 100644 index 0000000..a93c279 --- /dev/null +++ b/src/main/resources/mapper/journal/JournalMapper.xml @@ -0,0 +1,20 @@ + + + + journal + +