add MALL travel location type
This commit is contained in:
@ -1,59 +0,0 @@
|
||||
package com.imyeyu.api.modules.journal.bean;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author 夜雨
|
||||
* @since 2025-09-30 11:51
|
||||
*/
|
||||
@Data
|
||||
public class Travel {
|
||||
|
||||
private Luggage luggage;
|
||||
|
||||
private List<Guide> guides;
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @author 夜雨
|
||||
* @since 2025-09-30 11:52
|
||||
*/
|
||||
@Data
|
||||
public static class Luggage {
|
||||
|
||||
private List<Item> gao;
|
||||
|
||||
private List<Item> yu;
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @author 夜雨
|
||||
* @since 2025-09-30 11:52
|
||||
*/
|
||||
@Data
|
||||
public static class Item {
|
||||
|
||||
private String name;
|
||||
|
||||
private boolean isTaken;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @author 夜雨
|
||||
* @since 2025-09-30 11:54
|
||||
*/
|
||||
@Data
|
||||
public static class Guide {
|
||||
|
||||
private String title;
|
||||
|
||||
private List<String> images;
|
||||
}
|
||||
}
|
||||
@ -7,7 +7,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.Travel;
|
||||
import com.imyeyu.api.modules.journal.entity.Journal;
|
||||
import com.imyeyu.api.modules.journal.service.JournalService;
|
||||
import com.imyeyu.api.modules.journal.vo.journal.ArchiveRequest;
|
||||
@ -206,24 +205,6 @@ public class JournalController {
|
||||
return journal + journalTravel;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@RequestRateLimit
|
||||
@GetMapping("/travel")
|
||||
public Travel getTravel() {
|
||||
return service.getTravel();
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@PostMapping("/travel/luggage/update")
|
||||
public void updateTravel(@RequestBody Travel.Luggage luggage) {
|
||||
service.updateTravelLuggage(luggage);
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建瞬间(上传的临时文件持久化储存,微信限制单次上传数量)
|
||||
*
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package com.imyeyu.api.modules.journal.controller;
|
||||
|
||||
import com.imyeyu.api.bean.PreviewPage;
|
||||
import com.imyeyu.api.modules.common.bean.MediaAttach;
|
||||
import com.imyeyu.api.modules.common.entity.Attachment;
|
||||
import com.imyeyu.api.modules.common.service.AttachmentService;
|
||||
import com.imyeyu.api.modules.journal.entity.TravelLocation;
|
||||
@ -105,6 +106,7 @@ public class TravelLocationController {
|
||||
Attachment example = new Attachment();
|
||||
example.setBizType(Attachment.BizType.JOURNAL_TRAVEL);
|
||||
example.setBizId(location.getId());
|
||||
example.setAttachTypeValue(MediaAttach.Type.THUMB);
|
||||
attachPage.setEqualsExample(example);
|
||||
}
|
||||
attachPage.setIndex(0);
|
||||
|
||||
@ -39,6 +39,9 @@ public class TravelLocation extends Entity {
|
||||
/** 景点 */
|
||||
ATTRACTION,
|
||||
|
||||
/** 商场 */
|
||||
MALL,
|
||||
|
||||
/** 购物 */
|
||||
SHOPPING,
|
||||
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
package com.imyeyu.api.modules.journal.service;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.Attachment;
|
||||
import com.imyeyu.api.modules.journal.bean.Travel;
|
||||
import com.imyeyu.api.modules.journal.entity.Journal;
|
||||
import com.imyeyu.api.modules.journal.vo.journal.ArchiveRequest;
|
||||
import com.imyeyu.api.modules.journal.vo.journal.JournalRequest;
|
||||
@ -39,8 +38,4 @@ public interface JournalService extends PageableService<Journal>, GettableServic
|
||||
void deleteMoment(Long[] thumbIds) throws TimiException;
|
||||
|
||||
void archiveMoment(ArchiveRequest request) throws TimiException;
|
||||
|
||||
Travel getTravel() throws TimiException;
|
||||
|
||||
void updateTravelLuggage(Travel.Luggage luggage) throws TimiException;
|
||||
}
|
||||
|
||||
@ -3,14 +3,11 @@ package com.imyeyu.api.modules.journal.service.implement;
|
||||
import com.google.gson.Gson;
|
||||
import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
||||
import com.imyeyu.api.modules.common.bean.MediaAttach;
|
||||
import com.imyeyu.api.modules.common.bean.SettingKey;
|
||||
import com.imyeyu.api.modules.common.bean.TempFileMetaData;
|
||||
import com.imyeyu.api.modules.common.entity.Attachment;
|
||||
import com.imyeyu.api.modules.common.entity.Setting;
|
||||
import com.imyeyu.api.modules.common.service.AttachmentService;
|
||||
import com.imyeyu.api.modules.common.service.SettingService;
|
||||
import com.imyeyu.api.modules.common.service.TempFileService;
|
||||
import com.imyeyu.api.modules.journal.bean.Travel;
|
||||
import com.imyeyu.api.modules.journal.entity.Journal;
|
||||
import com.imyeyu.api.modules.journal.mapper.JournalMapper;
|
||||
import com.imyeyu.api.modules.journal.service.JournalService;
|
||||
@ -210,19 +207,4 @@ public class JournalServiceImplement extends AbstractEntityService<Journal, Long
|
||||
throw new TimiException(TimiCode.ERROR).msgKey("TODO archive journal error");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Travel getTravel() throws TimiException {
|
||||
return gson.fromJson(settingService.getAsJsonObject(SettingKey.JOURNAL_TRAVEL), Travel.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateTravelLuggage(Travel.Luggage luggage) throws TimiException {
|
||||
Travel dbTravel = getTravel();
|
||||
dbTravel.setLuggage(luggage);
|
||||
Setting setting = settingService.getByKey(SettingKey.JOURNAL_TRAVEL);
|
||||
setting.setValue(gson.toJson(dbTravel));
|
||||
settingService.update(setting);
|
||||
settingService.clearCache(SettingKey.JOURNAL_TRAVEL);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user