From 17b20a3d4b43a5945316047a5248186d67c56b58 Mon Sep 17 00:00:00 2001 From: Cxx0822 <1556464090@qq.com> Date: Wed, 1 Apr 2026 23:24:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=A5=96=E7=8A=B6?= =?UTF-8?q?=E8=AF=81=E4=B9=A6=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AnniversaryController.java | 2 +- .../cxx/home/controller/AssetController.java | 2 +- .../cxx/home/controller/AuthController.java | 8 -- .../cxx/home/controller/AwardController.java | 55 +++++++++++ .../cxx/home/controller/HealthController.java | 2 +- .../home/controller/JournalController.java | 2 +- .../cxx/home/controller/KpiController.java | 2 +- .../cxx/home/controller/LedgerController.java | 2 +- .../home/controller/PasswordController.java | 2 +- .../home/controller/ProductController.java | 3 +- .../cxx/home/converter/AwardConverter.java | 18 ++++ .../cxx/home/converter/HealthConverter.java | 2 +- .../cxx/home/converter/JournalConverter.java | 2 +- .../com/cxx/home/converter/KpiConverter.java | 2 +- .../cxx/home/converter/ProductConverter.java | 2 +- .../java/com/cxx/home/dao/AnniversaryDao.java | 2 +- .../main/java/com/cxx/home/dao/AssetDao.java | 2 +- .../main/java/com/cxx/home/dao/AwardDao.java | 16 ++++ .../java/com/cxx/home/dao/JournalDao.java | 2 +- .../main/java/com/cxx/home/dao/LedgerDao.java | 2 +- .../java/com/cxx/home/dao/PasswordDao.java | 4 +- .../java/com/cxx/home/dao/ProductDao.java | 2 +- .../dto/{anniversary => }/AnniversaryDto.java | 2 +- .../cxx/home/dto/{asset => }/AssetDto.java | 2 +- .../main/java/com/cxx/home/dto/AwardDto.java | 43 +++++++++ .../dto/{health => }/HealthRecordDto.java | 3 +- .../home/dto/{journal => }/JournalDto.java | 2 +- .../com/cxx/home/dto/{kpi => }/KpiDto.java | 2 +- .../cxx/home/dto/{ledger => }/LedgerDto.java | 2 +- .../home/dto/{password => }/PasswordDto.java | 2 +- .../home/dto/{product => }/ProductDto.java | 2 +- .../main/java/com/cxx/home/entity/Award.java | 32 +++++++ .../java/com/cxx/home/entity/AwardImage.java | 15 +++ .../com/cxx/home/mapper/AwardImageMapper.java | 9 ++ .../java/com/cxx/home/mapper/AwardMapper.java | 9 ++ .../cxx/home/service/AnniversaryService.java | 2 +- .../com/cxx/home/service/AssetService.java | 2 +- .../com/cxx/home/service/AwardService.java | 18 ++++ .../com/cxx/home/service/HealthService.java | 2 +- .../com/cxx/home/service/JournalService.java | 2 +- .../java/com/cxx/home/service/KpiService.java | 2 +- .../com/cxx/home/service/LedgerService.java | 2 +- .../com/cxx/home/service/PasswordService.java | 2 +- .../com/cxx/home/service/ProductService.java | 2 +- .../service/impl/AnniversaryServiceImpl.java | 3 +- .../home/service/impl/AssetServiceImpl.java | 2 +- .../home/service/impl/AwardServiceImpl.java | 93 +++++++++++++++++++ .../home/service/impl/HealthServiceImpl.java | 4 +- .../home/service/impl/JournalServiceImpl.java | 2 +- .../cxx/home/service/impl/KpiServiceImpl.java | 2 +- .../home/service/impl/LedgerServiceImpl.java | 2 +- .../service/impl/PasswordServiceImpl.java | 4 +- .../home/service/impl/ProductServiceImpl.java | 2 +- .../java/com/cxx/home/vo/AwardQueryVo.java | 13 +++ .../resources/mapper/AnniversaryMapper.xml | 2 +- .../src/main/resources/mapper/AssetMapper.xml | 2 +- .../src/main/resources/mapper/AwardMapper.xml | 46 +++++++++ .../main/resources/mapper/JournalMapper.xml | 2 +- .../main/resources/mapper/LedgerMapper.xml | 2 +- .../main/resources/mapper/PasswordMapper.xml | 18 ++-- .../main/resources/mapper/ProductMapper.xml | 2 +- 61 files changed, 425 insertions(+), 71 deletions(-) create mode 100644 home-service/src/main/java/com/cxx/home/controller/AwardController.java create mode 100644 home-service/src/main/java/com/cxx/home/converter/AwardConverter.java create mode 100644 home-service/src/main/java/com/cxx/home/dao/AwardDao.java rename home-service/src/main/java/com/cxx/home/dto/{anniversary => }/AnniversaryDto.java (95%) rename home-service/src/main/java/com/cxx/home/dto/{asset => }/AssetDto.java (95%) create mode 100644 home-service/src/main/java/com/cxx/home/dto/AwardDto.java rename home-service/src/main/java/com/cxx/home/dto/{health => }/HealthRecordDto.java (94%) rename home-service/src/main/java/com/cxx/home/dto/{journal => }/JournalDto.java (97%) rename home-service/src/main/java/com/cxx/home/dto/{kpi => }/KpiDto.java (96%) rename home-service/src/main/java/com/cxx/home/dto/{ledger => }/LedgerDto.java (97%) rename home-service/src/main/java/com/cxx/home/dto/{password => }/PasswordDto.java (95%) rename home-service/src/main/java/com/cxx/home/dto/{product => }/ProductDto.java (97%) create mode 100644 home-service/src/main/java/com/cxx/home/entity/Award.java create mode 100644 home-service/src/main/java/com/cxx/home/entity/AwardImage.java create mode 100644 home-service/src/main/java/com/cxx/home/mapper/AwardImageMapper.java create mode 100644 home-service/src/main/java/com/cxx/home/mapper/AwardMapper.java create mode 100644 home-service/src/main/java/com/cxx/home/service/AwardService.java create mode 100644 home-service/src/main/java/com/cxx/home/service/impl/AwardServiceImpl.java create mode 100644 home-service/src/main/java/com/cxx/home/vo/AwardQueryVo.java create mode 100644 home-service/src/main/resources/mapper/AwardMapper.xml diff --git a/home-service/src/main/java/com/cxx/home/controller/AnniversaryController.java b/home-service/src/main/java/com/cxx/home/controller/AnniversaryController.java index dbcb121..8db8647 100644 --- a/home-service/src/main/java/com/cxx/home/controller/AnniversaryController.java +++ b/home-service/src/main/java/com/cxx/home/controller/AnniversaryController.java @@ -3,7 +3,7 @@ package com.cxx.home.controller; import com.cxx.common.ReadView; import com.cxx.common.WriteView; import com.cxx.common.dto.StatsChartDto; -import com.cxx.home.dto.anniversary.AnniversaryDto; +import com.cxx.home.dto.AnniversaryDto; import com.cxx.home.service.AnniversaryService; import com.fasterxml.jackson.annotation.JsonView; import io.swagger.v3.oas.annotations.Operation; diff --git a/home-service/src/main/java/com/cxx/home/controller/AssetController.java b/home-service/src/main/java/com/cxx/home/controller/AssetController.java index 9e53354..9a746a6 100644 --- a/home-service/src/main/java/com/cxx/home/controller/AssetController.java +++ b/home-service/src/main/java/com/cxx/home/controller/AssetController.java @@ -2,7 +2,7 @@ package com.cxx.home.controller; import com.cxx.common.ReadView; import com.cxx.common.WriteView; -import com.cxx.home.dto.asset.AssetDto; +import com.cxx.home.dto.AssetDto; import com.cxx.home.service.AssetService; import com.fasterxml.jackson.annotation.JsonView; import io.swagger.v3.oas.annotations.Operation; diff --git a/home-service/src/main/java/com/cxx/home/controller/AuthController.java b/home-service/src/main/java/com/cxx/home/controller/AuthController.java index 08d95da..e3b9d88 100644 --- a/home-service/src/main/java/com/cxx/home/controller/AuthController.java +++ b/home-service/src/main/java/com/cxx/home/controller/AuthController.java @@ -1,16 +1,8 @@ package com.cxx.home.controller; import cn.dev33.satoken.stp.StpUtil; -import com.cxx.common.ReadView; -import com.cxx.common.WriteView; -import com.cxx.common.dto.StatsChartDto; -import com.cxx.home.dto.anniversary.AnniversaryDto; -import com.cxx.home.service.AnniversaryService; -import com.fasterxml.jackson.annotation.JsonView; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/home-service/src/main/java/com/cxx/home/controller/AwardController.java b/home-service/src/main/java/com/cxx/home/controller/AwardController.java new file mode 100644 index 0000000..e1f30a7 --- /dev/null +++ b/home-service/src/main/java/com/cxx/home/controller/AwardController.java @@ -0,0 +1,55 @@ +package com.cxx.home.controller; + +import com.cxx.common.ReadView; +import com.cxx.common.WriteView; +import com.cxx.home.dto.AwardDto; +import com.cxx.home.service.AwardService; +import com.cxx.home.vo.AwardQueryVo; +import com.fasterxml.jackson.annotation.JsonView; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/award") +@Tag(name = "证书奖状") +public class AwardController { + @Resource + private AwardService awardService; + + @Operation(summary = "新增证书奖状") + @PostMapping("") + public Boolean addAward(@RequestBody @JsonView(WriteView.class) @Validated AwardDto dto) { + return awardService.addAward(dto); + } + + @Operation(summary = "更新证书奖状") + @PutMapping("/{id}") + public Boolean updateAward(@PathVariable("id") long id, + @RequestBody @JsonView(WriteView.class) @Validated AwardDto dto) { + return awardService.updateAward(id, dto); + } + + @Operation(summary = "删除证书奖状") + @DeleteMapping("/{id}") + public Boolean deleteAward(@PathVariable("id") long id) { + return awardService.deleteAward(id); + } + + @Operation(summary = "查询所有证书奖状") + @GetMapping("") + public @JsonView(ReadView.class) List queryAwardList(AwardQueryVo vo) { + return awardService.queryAwardList(vo); + } + + @Operation(summary = "查询证书奖状") + @GetMapping("/{id}") + public @JsonView(ReadView.class) AwardDto queryAward(@PathVariable("id") long id) { + return awardService.queryAward(id); + } +} + \ No newline at end of file diff --git a/home-service/src/main/java/com/cxx/home/controller/HealthController.java b/home-service/src/main/java/com/cxx/home/controller/HealthController.java index 7d44f9c..928ce84 100644 --- a/home-service/src/main/java/com/cxx/home/controller/HealthController.java +++ b/home-service/src/main/java/com/cxx/home/controller/HealthController.java @@ -2,7 +2,7 @@ package com.cxx.home.controller; import com.cxx.common.ReadView; import com.cxx.common.WriteView; -import com.cxx.home.dto.health.HealthRecordDto; +import com.cxx.home.dto.HealthRecordDto; import com.cxx.home.service.HealthService; import com.cxx.home.vo.HealthQueryVo; import com.fasterxml.jackson.annotation.JsonView; diff --git a/home-service/src/main/java/com/cxx/home/controller/JournalController.java b/home-service/src/main/java/com/cxx/home/controller/JournalController.java index e98ae09..f5481aa 100644 --- a/home-service/src/main/java/com/cxx/home/controller/JournalController.java +++ b/home-service/src/main/java/com/cxx/home/controller/JournalController.java @@ -3,7 +3,7 @@ package com.cxx.home.controller; import com.cxx.common.ReadView; import com.cxx.common.WriteView; -import com.cxx.home.dto.journal.JournalDto; +import com.cxx.home.dto.JournalDto; import com.cxx.home.service.JournalService; import com.cxx.home.vo.JournalQueryVo; import com.fasterxml.jackson.annotation.JsonView; diff --git a/home-service/src/main/java/com/cxx/home/controller/KpiController.java b/home-service/src/main/java/com/cxx/home/controller/KpiController.java index cf2193f..0dd7074 100644 --- a/home-service/src/main/java/com/cxx/home/controller/KpiController.java +++ b/home-service/src/main/java/com/cxx/home/controller/KpiController.java @@ -2,7 +2,7 @@ package com.cxx.home.controller; import com.cxx.common.ReadView; import com.cxx.common.WriteView; -import com.cxx.home.dto.kpi.KpiDto; +import com.cxx.home.dto.KpiDto; import com.cxx.home.service.KpiService; import com.cxx.home.vo.KpiQueryVo; import com.fasterxml.jackson.annotation.JsonView; diff --git a/home-service/src/main/java/com/cxx/home/controller/LedgerController.java b/home-service/src/main/java/com/cxx/home/controller/LedgerController.java index a15d17d..e15c49e 100644 --- a/home-service/src/main/java/com/cxx/home/controller/LedgerController.java +++ b/home-service/src/main/java/com/cxx/home/controller/LedgerController.java @@ -2,7 +2,7 @@ package com.cxx.home.controller; import com.cxx.common.ReadView; import com.cxx.common.WriteView; -import com.cxx.home.dto.ledger.LedgerDto; +import com.cxx.home.dto.LedgerDto; import com.cxx.home.service.LedgerService; import com.fasterxml.jackson.annotation.JsonView; import io.swagger.v3.oas.annotations.Operation; diff --git a/home-service/src/main/java/com/cxx/home/controller/PasswordController.java b/home-service/src/main/java/com/cxx/home/controller/PasswordController.java index 2dbc53f..73d1bd7 100644 --- a/home-service/src/main/java/com/cxx/home/controller/PasswordController.java +++ b/home-service/src/main/java/com/cxx/home/controller/PasswordController.java @@ -2,7 +2,7 @@ package com.cxx.home.controller; import com.cxx.common.ReadView; import com.cxx.common.WriteView; -import com.cxx.home.dto.password.PasswordDto; +import com.cxx.home.dto.PasswordDto; import com.cxx.home.service.PasswordService; import com.cxx.home.vo.PasswordQueryVo; import com.fasterxml.jackson.annotation.JsonView; diff --git a/home-service/src/main/java/com/cxx/home/controller/ProductController.java b/home-service/src/main/java/com/cxx/home/controller/ProductController.java index b33a38a..235df78 100644 --- a/home-service/src/main/java/com/cxx/home/controller/ProductController.java +++ b/home-service/src/main/java/com/cxx/home/controller/ProductController.java @@ -1,9 +1,8 @@ - package com.cxx.home.controller; import com.cxx.common.ReadView; import com.cxx.common.WriteView; -import com.cxx.home.dto.product.ProductDto; +import com.cxx.home.dto.ProductDto; import com.cxx.home.service.ProductService; import com.cxx.home.vo.ProductQueryVo; import com.fasterxml.jackson.annotation.JsonView; diff --git a/home-service/src/main/java/com/cxx/home/converter/AwardConverter.java b/home-service/src/main/java/com/cxx/home/converter/AwardConverter.java new file mode 100644 index 0000000..987e456 --- /dev/null +++ b/home-service/src/main/java/com/cxx/home/converter/AwardConverter.java @@ -0,0 +1,18 @@ +package com.cxx.home.converter; + +import com.cxx.home.dto.AwardDto; +import com.cxx.home.entity.Award; +import org.mapstruct.Mapper; + +import java.util.List; + +@Mapper(componentModel = "spring") +public interface AwardConverter { + Award toEntity(AwardDto dto); + + List toEntities(List dto); + + AwardDto toDto(Award entities); + + List toDtos(List entities); +} diff --git a/home-service/src/main/java/com/cxx/home/converter/HealthConverter.java b/home-service/src/main/java/com/cxx/home/converter/HealthConverter.java index 731af61..c73a146 100644 --- a/home-service/src/main/java/com/cxx/home/converter/HealthConverter.java +++ b/home-service/src/main/java/com/cxx/home/converter/HealthConverter.java @@ -1,6 +1,6 @@ package com.cxx.home.converter; -import com.cxx.home.dto.health.HealthRecordDto; +import com.cxx.home.dto.HealthRecordDto; import com.cxx.home.entity.HealthRecord; import org.mapstruct.Mapper; diff --git a/home-service/src/main/java/com/cxx/home/converter/JournalConverter.java b/home-service/src/main/java/com/cxx/home/converter/JournalConverter.java index 7bdc7a5..d680f4f 100644 --- a/home-service/src/main/java/com/cxx/home/converter/JournalConverter.java +++ b/home-service/src/main/java/com/cxx/home/converter/JournalConverter.java @@ -1,6 +1,6 @@ package com.cxx.home.converter; -import com.cxx.home.dto.journal.JournalDto; +import com.cxx.home.dto.JournalDto; import com.cxx.home.entity.Journal; import org.mapstruct.Mapper; diff --git a/home-service/src/main/java/com/cxx/home/converter/KpiConverter.java b/home-service/src/main/java/com/cxx/home/converter/KpiConverter.java index 538cd07..55c03d2 100644 --- a/home-service/src/main/java/com/cxx/home/converter/KpiConverter.java +++ b/home-service/src/main/java/com/cxx/home/converter/KpiConverter.java @@ -1,6 +1,6 @@ package com.cxx.home.converter; -import com.cxx.home.dto.kpi.KpiDto; +import com.cxx.home.dto.KpiDto; import com.cxx.home.entity.Kpi; import org.mapstruct.Mapper; diff --git a/home-service/src/main/java/com/cxx/home/converter/ProductConverter.java b/home-service/src/main/java/com/cxx/home/converter/ProductConverter.java index 13f7866..bcadce9 100644 --- a/home-service/src/main/java/com/cxx/home/converter/ProductConverter.java +++ b/home-service/src/main/java/com/cxx/home/converter/ProductConverter.java @@ -1,6 +1,6 @@ package com.cxx.home.converter; -import com.cxx.home.dto.product.ProductDto; +import com.cxx.home.dto.ProductDto; import com.cxx.home.entity.Product; import org.mapstruct.Mapper; diff --git a/home-service/src/main/java/com/cxx/home/dao/AnniversaryDao.java b/home-service/src/main/java/com/cxx/home/dao/AnniversaryDao.java index e148add..7f7690e 100644 --- a/home-service/src/main/java/com/cxx/home/dao/AnniversaryDao.java +++ b/home-service/src/main/java/com/cxx/home/dao/AnniversaryDao.java @@ -1,7 +1,7 @@ package com.cxx.home.dao; import com.cxx.common.dto.StatsChartDto; -import com.cxx.home.dto.anniversary.AnniversaryDto; +import com.cxx.home.dto.AnniversaryDto; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/home-service/src/main/java/com/cxx/home/dao/AssetDao.java b/home-service/src/main/java/com/cxx/home/dao/AssetDao.java index b222e02..2edc805 100644 --- a/home-service/src/main/java/com/cxx/home/dao/AssetDao.java +++ b/home-service/src/main/java/com/cxx/home/dao/AssetDao.java @@ -1,6 +1,6 @@ package com.cxx.home.dao; -import com.cxx.home.dto.asset.AssetDto; +import com.cxx.home.dto.AssetDto; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/home-service/src/main/java/com/cxx/home/dao/AwardDao.java b/home-service/src/main/java/com/cxx/home/dao/AwardDao.java new file mode 100644 index 0000000..472b23a --- /dev/null +++ b/home-service/src/main/java/com/cxx/home/dao/AwardDao.java @@ -0,0 +1,16 @@ +package com.cxx.home.dao; + +import com.cxx.home.dto.AwardDto; +import com.cxx.home.vo.AwardQueryVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface AwardDao { + List queryAwardList(@Param("query") AwardQueryVo query); + + void insertAwardImage(@Param("awardId") Long awardId, + @Param("list") List imageFiles); +} diff --git a/home-service/src/main/java/com/cxx/home/dao/JournalDao.java b/home-service/src/main/java/com/cxx/home/dao/JournalDao.java index 72f2349..62144e6 100644 --- a/home-service/src/main/java/com/cxx/home/dao/JournalDao.java +++ b/home-service/src/main/java/com/cxx/home/dao/JournalDao.java @@ -1,6 +1,6 @@ package com.cxx.home.dao; -import com.cxx.home.dto.journal.JournalDto; +import com.cxx.home.dto.JournalDto; import com.cxx.home.vo.JournalQueryVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/home-service/src/main/java/com/cxx/home/dao/LedgerDao.java b/home-service/src/main/java/com/cxx/home/dao/LedgerDao.java index badb22a..4706e23 100644 --- a/home-service/src/main/java/com/cxx/home/dao/LedgerDao.java +++ b/home-service/src/main/java/com/cxx/home/dao/LedgerDao.java @@ -1,6 +1,6 @@ package com.cxx.home.dao; -import com.cxx.home.dto.ledger.LedgerDto; +import com.cxx.home.dto.LedgerDto; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/home-service/src/main/java/com/cxx/home/dao/PasswordDao.java b/home-service/src/main/java/com/cxx/home/dao/PasswordDao.java index bb83403..e97f176 100644 --- a/home-service/src/main/java/com/cxx/home/dao/PasswordDao.java +++ b/home-service/src/main/java/com/cxx/home/dao/PasswordDao.java @@ -1,6 +1,6 @@ package com.cxx.home.dao; -import com.cxx.home.dto.password.PasswordDto; +import com.cxx.home.dto.PasswordDto; import com.cxx.home.vo.PasswordQueryVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -9,7 +9,7 @@ import java.util.List; @Mapper public interface PasswordDao { - List query(@Param("query") PasswordQueryVo query); + List queryPasswordList(@Param("query") PasswordQueryVo query); List queryCategory(); } diff --git a/home-service/src/main/java/com/cxx/home/dao/ProductDao.java b/home-service/src/main/java/com/cxx/home/dao/ProductDao.java index 46079d1..3ed448e 100644 --- a/home-service/src/main/java/com/cxx/home/dao/ProductDao.java +++ b/home-service/src/main/java/com/cxx/home/dao/ProductDao.java @@ -1,6 +1,6 @@ package com.cxx.home.dao; -import com.cxx.home.dto.product.ProductDto; +import com.cxx.home.dto.ProductDto; import com.cxx.home.vo.ProductQueryVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/home-service/src/main/java/com/cxx/home/dto/anniversary/AnniversaryDto.java b/home-service/src/main/java/com/cxx/home/dto/AnniversaryDto.java similarity index 95% rename from home-service/src/main/java/com/cxx/home/dto/anniversary/AnniversaryDto.java rename to home-service/src/main/java/com/cxx/home/dto/AnniversaryDto.java index 5bbbff6..10c2049 100644 --- a/home-service/src/main/java/com/cxx/home/dto/anniversary/AnniversaryDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/AnniversaryDto.java @@ -1,4 +1,4 @@ -package com.cxx.home.dto.anniversary; +package com.cxx.home.dto; import com.cxx.common.PlainView; import com.cxx.common.ReadView; diff --git a/home-service/src/main/java/com/cxx/home/dto/asset/AssetDto.java b/home-service/src/main/java/com/cxx/home/dto/AssetDto.java similarity index 95% rename from home-service/src/main/java/com/cxx/home/dto/asset/AssetDto.java rename to home-service/src/main/java/com/cxx/home/dto/AssetDto.java index ca8c888..d407f8f 100644 --- a/home-service/src/main/java/com/cxx/home/dto/asset/AssetDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/AssetDto.java @@ -1,4 +1,4 @@ -package com.cxx.home.dto.asset; +package com.cxx.home.dto; import com.cxx.common.PlainView; import com.cxx.common.ReadView; diff --git a/home-service/src/main/java/com/cxx/home/dto/AwardDto.java b/home-service/src/main/java/com/cxx/home/dto/AwardDto.java new file mode 100644 index 0000000..4731713 --- /dev/null +++ b/home-service/src/main/java/com/cxx/home/dto/AwardDto.java @@ -0,0 +1,43 @@ +package com.cxx.home.dto; + +import com.cxx.common.PlainView; +import com.cxx.common.ReadView; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonView; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +import java.util.Date; +import java.util.List; + +@Getter +@Setter +@JsonView(PlainView.class) +public class AwardDto { + @Schema(description = "id") + @JsonView(ReadView.class) + private Long id; + + @Schema(description = "名称") + private String name; + + @Schema(description = "类型") + private String type; + + @Schema(description = "日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date date; + + @Schema(description = "地点") + private String location; + + @Schema(description = "所属人") + private String owner; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "图片路径") + private List imageList; +} diff --git a/home-service/src/main/java/com/cxx/home/dto/health/HealthRecordDto.java b/home-service/src/main/java/com/cxx/home/dto/HealthRecordDto.java similarity index 94% rename from home-service/src/main/java/com/cxx/home/dto/health/HealthRecordDto.java rename to home-service/src/main/java/com/cxx/home/dto/HealthRecordDto.java index 6acd908..3886b6b 100644 --- a/home-service/src/main/java/com/cxx/home/dto/health/HealthRecordDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/HealthRecordDto.java @@ -1,4 +1,4 @@ -package com.cxx.home.dto.health; +package com.cxx.home.dto; import com.cxx.common.PlainView; import com.cxx.common.ReadView; @@ -9,7 +9,6 @@ import lombok.Getter; import lombok.Setter; import java.time.LocalDate; -import java.time.LocalDateTime; import java.time.LocalTime; @Getter diff --git a/home-service/src/main/java/com/cxx/home/dto/journal/JournalDto.java b/home-service/src/main/java/com/cxx/home/dto/JournalDto.java similarity index 97% rename from home-service/src/main/java/com/cxx/home/dto/journal/JournalDto.java rename to home-service/src/main/java/com/cxx/home/dto/JournalDto.java index c776e71..2180df2 100644 --- a/home-service/src/main/java/com/cxx/home/dto/journal/JournalDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/JournalDto.java @@ -1,4 +1,4 @@ -package com.cxx.home.dto.journal; +package com.cxx.home.dto; import com.cxx.common.PlainView; import com.cxx.common.ReadView; diff --git a/home-service/src/main/java/com/cxx/home/dto/kpi/KpiDto.java b/home-service/src/main/java/com/cxx/home/dto/KpiDto.java similarity index 96% rename from home-service/src/main/java/com/cxx/home/dto/kpi/KpiDto.java rename to home-service/src/main/java/com/cxx/home/dto/KpiDto.java index 72ca337..a84e9fb 100644 --- a/home-service/src/main/java/com/cxx/home/dto/kpi/KpiDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/KpiDto.java @@ -1,4 +1,4 @@ -package com.cxx.home.dto.kpi; +package com.cxx.home.dto; import com.cxx.common.PlainView; import com.cxx.common.ReadView; diff --git a/home-service/src/main/java/com/cxx/home/dto/ledger/LedgerDto.java b/home-service/src/main/java/com/cxx/home/dto/LedgerDto.java similarity index 97% rename from home-service/src/main/java/com/cxx/home/dto/ledger/LedgerDto.java rename to home-service/src/main/java/com/cxx/home/dto/LedgerDto.java index 750f45c..41f5cdf 100644 --- a/home-service/src/main/java/com/cxx/home/dto/ledger/LedgerDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/LedgerDto.java @@ -1,4 +1,4 @@ -package com.cxx.home.dto.ledger; +package com.cxx.home.dto; import com.cxx.common.PlainView; import com.cxx.common.ReadView; diff --git a/home-service/src/main/java/com/cxx/home/dto/password/PasswordDto.java b/home-service/src/main/java/com/cxx/home/dto/PasswordDto.java similarity index 95% rename from home-service/src/main/java/com/cxx/home/dto/password/PasswordDto.java rename to home-service/src/main/java/com/cxx/home/dto/PasswordDto.java index bdcd853..b99ea69 100644 --- a/home-service/src/main/java/com/cxx/home/dto/password/PasswordDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/PasswordDto.java @@ -1,4 +1,4 @@ -package com.cxx.home.dto.password; +package com.cxx.home.dto; import com.cxx.common.PlainView; import com.cxx.common.ReadView; diff --git a/home-service/src/main/java/com/cxx/home/dto/product/ProductDto.java b/home-service/src/main/java/com/cxx/home/dto/ProductDto.java similarity index 97% rename from home-service/src/main/java/com/cxx/home/dto/product/ProductDto.java rename to home-service/src/main/java/com/cxx/home/dto/ProductDto.java index d70a3ad..0116fb7 100644 --- a/home-service/src/main/java/com/cxx/home/dto/product/ProductDto.java +++ b/home-service/src/main/java/com/cxx/home/dto/ProductDto.java @@ -1,4 +1,4 @@ -package com.cxx.home.dto.product; +package com.cxx.home.dto; import com.cxx.common.PlainView; import com.cxx.common.ReadView; diff --git a/home-service/src/main/java/com/cxx/home/entity/Award.java b/home-service/src/main/java/com/cxx/home/entity/Award.java new file mode 100644 index 0000000..16797a4 --- /dev/null +++ b/home-service/src/main/java/com/cxx/home/entity/Award.java @@ -0,0 +1,32 @@ +package com.cxx.home.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.cxx.framework.data.AbstractEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("award") +public class Award extends AbstractEntity { + @TableField("name") + private String name; + + @TableField("type") + private String type; + + @TableField("date") + private Date date; + + @TableField("location") + private String location; + + @TableField("owner") + private String owner; + + @TableField("remark") + private String remark; +} diff --git a/home-service/src/main/java/com/cxx/home/entity/AwardImage.java b/home-service/src/main/java/com/cxx/home/entity/AwardImage.java new file mode 100644 index 0000000..c611447 --- /dev/null +++ b/home-service/src/main/java/com/cxx/home/entity/AwardImage.java @@ -0,0 +1,15 @@ +package com.cxx.home.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("award_image") +public class AwardImage { + @TableField("award_id") + private Long awardId; + + @TableField("image_url") + private String imageUrl; +} diff --git a/home-service/src/main/java/com/cxx/home/mapper/AwardImageMapper.java b/home-service/src/main/java/com/cxx/home/mapper/AwardImageMapper.java new file mode 100644 index 0000000..de0892c --- /dev/null +++ b/home-service/src/main/java/com/cxx/home/mapper/AwardImageMapper.java @@ -0,0 +1,9 @@ +package com.cxx.home.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cxx.home.entity.AwardImage; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AwardImageMapper extends BaseMapper { +} \ No newline at end of file diff --git a/home-service/src/main/java/com/cxx/home/mapper/AwardMapper.java b/home-service/src/main/java/com/cxx/home/mapper/AwardMapper.java new file mode 100644 index 0000000..45496b2 --- /dev/null +++ b/home-service/src/main/java/com/cxx/home/mapper/AwardMapper.java @@ -0,0 +1,9 @@ +package com.cxx.home.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.cxx.home.entity.Award; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AwardMapper extends BaseMapper { +} \ No newline at end of file diff --git a/home-service/src/main/java/com/cxx/home/service/AnniversaryService.java b/home-service/src/main/java/com/cxx/home/service/AnniversaryService.java index 446a374..92dbc11 100644 --- a/home-service/src/main/java/com/cxx/home/service/AnniversaryService.java +++ b/home-service/src/main/java/com/cxx/home/service/AnniversaryService.java @@ -1,7 +1,7 @@ package com.cxx.home.service; import com.cxx.common.dto.StatsChartDto; -import com.cxx.home.dto.anniversary.AnniversaryDto; +import com.cxx.home.dto.AnniversaryDto; import java.util.List; diff --git a/home-service/src/main/java/com/cxx/home/service/AssetService.java b/home-service/src/main/java/com/cxx/home/service/AssetService.java index 739e03e..9888ecd 100644 --- a/home-service/src/main/java/com/cxx/home/service/AssetService.java +++ b/home-service/src/main/java/com/cxx/home/service/AssetService.java @@ -1,6 +1,6 @@ package com.cxx.home.service; -import com.cxx.home.dto.asset.AssetDto; +import com.cxx.home.dto.AssetDto; import java.util.List; diff --git a/home-service/src/main/java/com/cxx/home/service/AwardService.java b/home-service/src/main/java/com/cxx/home/service/AwardService.java new file mode 100644 index 0000000..f0a587e --- /dev/null +++ b/home-service/src/main/java/com/cxx/home/service/AwardService.java @@ -0,0 +1,18 @@ +package com.cxx.home.service; + +import com.cxx.home.dto.AwardDto; +import com.cxx.home.vo.AwardQueryVo; + +import java.util.List; + +public interface AwardService { + Boolean addAward(AwardDto dto); + + Boolean updateAward(Long id, AwardDto dto); + + Boolean deleteAward(Long id); + + AwardDto queryAward(Long id); + + List queryAwardList(AwardQueryVo vo); +} diff --git a/home-service/src/main/java/com/cxx/home/service/HealthService.java b/home-service/src/main/java/com/cxx/home/service/HealthService.java index 6799f7d..c8b2d62 100644 --- a/home-service/src/main/java/com/cxx/home/service/HealthService.java +++ b/home-service/src/main/java/com/cxx/home/service/HealthService.java @@ -1,7 +1,7 @@ package com.cxx.home.service; -import com.cxx.home.dto.health.HealthRecordDto; +import com.cxx.home.dto.HealthRecordDto; import com.cxx.home.vo.HealthQueryVo; import java.util.List; diff --git a/home-service/src/main/java/com/cxx/home/service/JournalService.java b/home-service/src/main/java/com/cxx/home/service/JournalService.java index be3f293..30455eb 100644 --- a/home-service/src/main/java/com/cxx/home/service/JournalService.java +++ b/home-service/src/main/java/com/cxx/home/service/JournalService.java @@ -1,6 +1,6 @@ package com.cxx.home.service; -import com.cxx.home.dto.journal.JournalDto; +import com.cxx.home.dto.JournalDto; import com.cxx.home.vo.JournalQueryVo; import java.util.List; diff --git a/home-service/src/main/java/com/cxx/home/service/KpiService.java b/home-service/src/main/java/com/cxx/home/service/KpiService.java index 7a4b534..8b3c15e 100644 --- a/home-service/src/main/java/com/cxx/home/service/KpiService.java +++ b/home-service/src/main/java/com/cxx/home/service/KpiService.java @@ -1,6 +1,6 @@ package com.cxx.home.service; -import com.cxx.home.dto.kpi.KpiDto; +import com.cxx.home.dto.KpiDto; import com.cxx.home.vo.KpiQueryVo; import java.util.List; diff --git a/home-service/src/main/java/com/cxx/home/service/LedgerService.java b/home-service/src/main/java/com/cxx/home/service/LedgerService.java index 8afbcf1..73d29fc 100644 --- a/home-service/src/main/java/com/cxx/home/service/LedgerService.java +++ b/home-service/src/main/java/com/cxx/home/service/LedgerService.java @@ -1,6 +1,6 @@ package com.cxx.home.service; -import com.cxx.home.dto.ledger.LedgerDto; +import com.cxx.home.dto.LedgerDto; import java.util.List; diff --git a/home-service/src/main/java/com/cxx/home/service/PasswordService.java b/home-service/src/main/java/com/cxx/home/service/PasswordService.java index f1b66cc..dd2a738 100644 --- a/home-service/src/main/java/com/cxx/home/service/PasswordService.java +++ b/home-service/src/main/java/com/cxx/home/service/PasswordService.java @@ -1,6 +1,6 @@ package com.cxx.home.service; -import com.cxx.home.dto.password.PasswordDto; +import com.cxx.home.dto.PasswordDto; import com.cxx.home.vo.PasswordQueryVo; import java.util.List; diff --git a/home-service/src/main/java/com/cxx/home/service/ProductService.java b/home-service/src/main/java/com/cxx/home/service/ProductService.java index 956dbd4..eca3315 100644 --- a/home-service/src/main/java/com/cxx/home/service/ProductService.java +++ b/home-service/src/main/java/com/cxx/home/service/ProductService.java @@ -1,7 +1,7 @@ package com.cxx.home.service; -import com.cxx.home.dto.product.ProductDto; +import com.cxx.home.dto.ProductDto; import com.cxx.home.vo.ProductQueryVo; import java.util.List; diff --git a/home-service/src/main/java/com/cxx/home/service/impl/AnniversaryServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/AnniversaryServiceImpl.java index 9245af1..2b11fe9 100644 --- a/home-service/src/main/java/com/cxx/home/service/impl/AnniversaryServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/AnniversaryServiceImpl.java @@ -3,7 +3,7 @@ package com.cxx.home.service.impl; import com.cxx.common.dto.StatsChartDto; import com.cxx.framework.web.CustomException; import com.cxx.home.dao.AnniversaryDao; -import com.cxx.home.dto.anniversary.AnniversaryDto; +import com.cxx.home.dto.AnniversaryDto; import com.cxx.home.entity.Anniversary; import com.cxx.home.mapper.AnniversaryMapper; import com.cxx.home.service.AnniversaryService; @@ -21,7 +21,6 @@ public class AnniversaryServiceImpl implements AnniversaryService { @Resource private AnniversaryMapper anniversaryMapper; - @Override public Boolean addAnniversary(AnniversaryDto anniversaryDto) { Anniversary anniversary = new Anniversary(); diff --git a/home-service/src/main/java/com/cxx/home/service/impl/AssetServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/AssetServiceImpl.java index ede95af..8038edc 100644 --- a/home-service/src/main/java/com/cxx/home/service/impl/AssetServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/AssetServiceImpl.java @@ -2,7 +2,7 @@ package com.cxx.home.service.impl; import com.cxx.framework.web.CustomException; import com.cxx.home.dao.AssetDao; -import com.cxx.home.dto.asset.AssetDto; +import com.cxx.home.dto.AssetDto; import com.cxx.home.entity.Asset; import com.cxx.home.mapper.AssetMapper; import com.cxx.home.service.AssetService; diff --git a/home-service/src/main/java/com/cxx/home/service/impl/AwardServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/AwardServiceImpl.java new file mode 100644 index 0000000..ee24895 --- /dev/null +++ b/home-service/src/main/java/com/cxx/home/service/impl/AwardServiceImpl.java @@ -0,0 +1,93 @@ +package com.cxx.home.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.cxx.framework.web.CustomException; +import com.cxx.home.converter.AwardConverter; +import com.cxx.home.dao.AwardDao; +import com.cxx.home.dto.AwardDto; +import com.cxx.home.entity.Award; +import com.cxx.home.entity.AwardImage; +import com.cxx.home.mapper.AwardImageMapper; +import com.cxx.home.mapper.AwardMapper; +import com.cxx.home.service.AwardService; +import com.cxx.home.vo.AwardQueryVo; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +public class AwardServiceImpl implements AwardService { + @Resource + private AwardDao awardDao; + + @Resource + private AwardMapper awardMapper; + + @Resource + private AwardImageMapper awardImageMapper; + + @Resource + private AwardConverter awardConverter; + + @Override + @Transactional + public Boolean addAward(AwardDto dto) { + Award award = awardConverter.toEntity(dto); + awardMapper.insert(award); + + insertAwardImage(award.getId(), dto.getImageList()); + + return Boolean.TRUE; + } + + @Override + @Transactional + public Boolean updateAward(Long id, AwardDto dto) { + if (awardMapper.selectById(id) == null) { + throw new CustomException("该证书不存在"); + } + + Award award = awardConverter.toEntity(dto); + award.setId(id); + + awardMapper.updateById(award); + + deleteAwardImage(id); + insertAwardImage(id, dto.getImageList()); + + return Boolean.TRUE; + } + + @Override + @Transactional + public Boolean deleteAward(Long id) { + return awardMapper.deleteById(id) == 1; + } + + @Override + public AwardDto queryAward(Long id) { + if (awardMapper.selectById(id) == null) { + throw new CustomException("该证书不存在"); + } + + return awardConverter.toDto(awardMapper.selectById(id)); + } + + @Override + public List queryAwardList(AwardQueryVo vo) { + return awardDao.queryAwardList(vo); + } + + private void insertAwardImage(Long awardId, List imageList) { + if (!imageList.isEmpty()) { + awardDao.insertAwardImage(awardId, imageList); + } + } + + private void deleteAwardImage(Long id) { + awardImageMapper.delete(Wrappers.lambdaQuery(AwardImage.class).eq(AwardImage::getAwardId, id)); + } +} diff --git a/home-service/src/main/java/com/cxx/home/service/impl/HealthServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/HealthServiceImpl.java index a9f256f..89a3af6 100644 --- a/home-service/src/main/java/com/cxx/home/service/impl/HealthServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/HealthServiceImpl.java @@ -3,7 +3,7 @@ package com.cxx.home.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cxx.home.converter.HealthConverter; -import com.cxx.home.dto.health.HealthRecordDto; +import com.cxx.home.dto.HealthRecordDto; import com.cxx.home.entity.HealthRecord; import com.cxx.home.mapper.HealthRecordMapper; import com.cxx.home.service.HealthService; @@ -11,9 +11,7 @@ import com.cxx.home.vo.HealthQueryVo; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; -import java.time.Duration; import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.List; @Service diff --git a/home-service/src/main/java/com/cxx/home/service/impl/JournalServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/JournalServiceImpl.java index f68e2fe..6fdd182 100644 --- a/home-service/src/main/java/com/cxx/home/service/impl/JournalServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/JournalServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cxx.framework.web.CustomException; import com.cxx.home.converter.JournalConverter; import com.cxx.home.dao.JournalDao; -import com.cxx.home.dto.journal.JournalDto; +import com.cxx.home.dto.JournalDto; import com.cxx.home.entity.Journal; import com.cxx.home.mapper.JournalMapper; import com.cxx.home.service.JournalService; diff --git a/home-service/src/main/java/com/cxx/home/service/impl/KpiServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/KpiServiceImpl.java index e12e0da..a4d692e 100644 --- a/home-service/src/main/java/com/cxx/home/service/impl/KpiServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/KpiServiceImpl.java @@ -3,7 +3,7 @@ package com.cxx.home.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cxx.framework.web.CustomException; import com.cxx.home.converter.KpiConverter; -import com.cxx.home.dto.kpi.KpiDto; +import com.cxx.home.dto.KpiDto; import com.cxx.home.entity.Kpi; import com.cxx.home.mapper.KpiMapper; import com.cxx.home.service.KpiService; diff --git a/home-service/src/main/java/com/cxx/home/service/impl/LedgerServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/LedgerServiceImpl.java index 7a063dc..e005be0 100644 --- a/home-service/src/main/java/com/cxx/home/service/impl/LedgerServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/LedgerServiceImpl.java @@ -2,7 +2,7 @@ package com.cxx.home.service.impl; import com.cxx.framework.web.CustomException; import com.cxx.home.dao.LedgerDao; -import com.cxx.home.dto.ledger.LedgerDto; +import com.cxx.home.dto.LedgerDto; import com.cxx.home.entity.Ledger; import com.cxx.home.mapper.LedgerMapper; import com.cxx.home.service.LedgerService; diff --git a/home-service/src/main/java/com/cxx/home/service/impl/PasswordServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/PasswordServiceImpl.java index 1d3b2ac..bb1175b 100644 --- a/home-service/src/main/java/com/cxx/home/service/impl/PasswordServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/PasswordServiceImpl.java @@ -3,7 +3,7 @@ package com.cxx.home.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cxx.framework.web.CustomException; import com.cxx.home.dao.PasswordDao; -import com.cxx.home.dto.password.PasswordDto; +import com.cxx.home.dto.PasswordDto; import com.cxx.home.entity.Password; import com.cxx.home.mapper.PasswordMapper; import com.cxx.home.service.PasswordService; @@ -61,7 +61,7 @@ public class PasswordServiceImpl implements PasswordService { @Override public List query(PasswordQueryVo query) { - List passwordList = passwordDao.query(query); + List passwordList = passwordDao.queryPasswordList(query); passwordList.forEach(item -> item.setPassword(CommonUtils.decryptStr(secretKey, item.getPassword()))); return passwordList; diff --git a/home-service/src/main/java/com/cxx/home/service/impl/ProductServiceImpl.java b/home-service/src/main/java/com/cxx/home/service/impl/ProductServiceImpl.java index 90e7529..8e7cd17 100644 --- a/home-service/src/main/java/com/cxx/home/service/impl/ProductServiceImpl.java +++ b/home-service/src/main/java/com/cxx/home/service/impl/ProductServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cxx.framework.web.CustomException; import com.cxx.home.converter.ProductConverter; import com.cxx.home.dao.ProductDao; -import com.cxx.home.dto.product.ProductDto; +import com.cxx.home.dto.ProductDto; import com.cxx.home.entity.*; import com.cxx.home.mapper.*; import com.cxx.home.service.ProductService; diff --git a/home-service/src/main/java/com/cxx/home/vo/AwardQueryVo.java b/home-service/src/main/java/com/cxx/home/vo/AwardQueryVo.java new file mode 100644 index 0000000..4fe10fb --- /dev/null +++ b/home-service/src/main/java/com/cxx/home/vo/AwardQueryVo.java @@ -0,0 +1,13 @@ + +package com.cxx.home.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class AwardQueryVo { + @Schema(description = "类型") + private String type; +} \ No newline at end of file diff --git a/home-service/src/main/resources/mapper/AnniversaryMapper.xml b/home-service/src/main/resources/mapper/AnniversaryMapper.xml index f84c702..454b764 100644 --- a/home-service/src/main/resources/mapper/AnniversaryMapper.xml +++ b/home-service/src/main/resources/mapper/AnniversaryMapper.xml @@ -1,7 +1,7 @@ - SELECT id AS id, title AS title, date AS date, diff --git a/home-service/src/main/resources/mapper/AssetMapper.xml b/home-service/src/main/resources/mapper/AssetMapper.xml index 7a7b14b..a792f27 100644 --- a/home-service/src/main/resources/mapper/AssetMapper.xml +++ b/home-service/src/main/resources/mapper/AssetMapper.xml @@ -1,7 +1,7 @@ - SELECT id AS id, category AS category, NAME AS NAME, diff --git a/home-service/src/main/resources/mapper/AwardMapper.xml b/home-service/src/main/resources/mapper/AwardMapper.xml new file mode 100644 index 0000000..15629fa --- /dev/null +++ b/home-service/src/main/resources/mapper/AwardMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + INSERT INTO award_image (award_id, image_url) VALUES + + (#{awardId}, #{item}) + + + diff --git a/home-service/src/main/resources/mapper/JournalMapper.xml b/home-service/src/main/resources/mapper/JournalMapper.xml index 489d51f..f42c0e4 100644 --- a/home-service/src/main/resources/mapper/JournalMapper.xml +++ b/home-service/src/main/resources/mapper/JournalMapper.xml @@ -1,7 +1,7 @@ - SELECT id AS id, date AS date, location AS location, diff --git a/home-service/src/main/resources/mapper/LedgerMapper.xml b/home-service/src/main/resources/mapper/LedgerMapper.xml index 46e5ebb..d8e6191 100644 --- a/home-service/src/main/resources/mapper/LedgerMapper.xml +++ b/home-service/src/main/resources/mapper/LedgerMapper.xml @@ -1,7 +1,7 @@ - SELECT id AS id, book AS book, category AS category, diff --git a/home-service/src/main/resources/mapper/PasswordMapper.xml b/home-service/src/main/resources/mapper/PasswordMapper.xml index f2d1233..0b063ca 100644 --- a/home-service/src/main/resources/mapper/PasswordMapper.xml +++ b/home-service/src/main/resources/mapper/PasswordMapper.xml @@ -1,16 +1,16 @@ - SELECT - id AS id, - title AS title, - website AS website, - username AS username, - password AS password, - category AS category, - owner AS owner, - remark AS remark + id AS id, + title AS title, + website AS website, + username AS username, + password AS password, + category AS category, + owner AS owner, + remark AS remark FROM password diff --git a/home-service/src/main/resources/mapper/ProductMapper.xml b/home-service/src/main/resources/mapper/ProductMapper.xml index bea7424..9c554b9 100644 --- a/home-service/src/main/resources/mapper/ProductMapper.xml +++ b/home-service/src/main/resources/mapper/ProductMapper.xml @@ -1,7 +1,7 @@ - SELECT id AS id, name AS name,