From 932135b4370e3b5c44c5237256c6e13cbf3ae5f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 9 Nov 2023 11:15:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E8=88=AC=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=EF=BC=88=E6=A3=80=E7=B4=A2=E5=8E=86=E5=8F=B2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/controller/HomeSearchController.java | 62 ------------- .../home/service/HomeSearchService.java | 24 ----- .../service/impl/HomeSearchServiceImpl.java | 38 -------- ...LawsHomeNormalSearchHistoryController.java | 90 +++++++++++++++++++ .../controller/LawsHomeSearchController.java | 73 +++++++++++++++ .../home/dto/LawsHomeNormalSearchDTO.java} | 6 +- .../entity/LawsHomeNormalSearchHistory.java | 68 ++++++++++++++ .../LawsHomeNormalSearchHistoryMapper.java | 12 +++ .../xml/LawsHomeNormalSearchHistoryMapper.xml | 5 ++ .../ILawsHomeNormalSearchHistoryService.java | 13 +++ .../home/service/ILawsHomeSearchService.java | 25 ++++++ ...awsHomeNormalSearchHistoryServiceImpl.java | 17 ++++ .../impl/LawsHomeSearchServiceImpl.java | 58 ++++++++++++ .../LawsHomeNormalSearchStatisticsObjVO.java} | 4 +- .../vo/LawsHomeNormalSearchStatisticsVO.java} | 20 ++--- .../home/vo/LawsHomeNormalSearchVO.java} | 4 +- 16 files changed, 378 insertions(+), 141 deletions(-) delete mode 100644 laws-modules/src/main/java/com/jero/modules/home/controller/HomeSearchController.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/home/service/HomeSearchService.java delete mode 100644 laws-modules/src/main/java/com/jero/modules/home/service/impl/HomeSearchServiceImpl.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchHistoryController.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java rename laws-modules/src/main/java/com/jero/modules/{home/dto/HomeNormalSearchDTO.java => laws/home/dto/LawsHomeNormalSearchDTO.java} (95%) create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchHistory.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeNormalSearchHistoryMapper.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeNormalSearchHistoryMapper.xml create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeNormalSearchHistoryService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeSearchService.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeNormalSearchHistoryServiceImpl.java create mode 100644 laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java rename laws-modules/src/main/java/com/jero/modules/{home/vo/HomeNormalSearchStatisticsObjVO.java => laws/home/vo/LawsHomeNormalSearchStatisticsObjVO.java} (81%) rename laws-modules/src/main/java/com/jero/modules/{home/vo/HomeNormalSearchStatisticsVO.java => laws/home/vo/LawsHomeNormalSearchStatisticsVO.java} (77%) rename laws-modules/src/main/java/com/jero/modules/{home/vo/HomeNormalSearchVO.java => laws/home/vo/LawsHomeNormalSearchVO.java} (89%) diff --git a/laws-modules/src/main/java/com/jero/modules/home/controller/HomeSearchController.java b/laws-modules/src/main/java/com/jero/modules/home/controller/HomeSearchController.java deleted file mode 100644 index 161f06ca..00000000 --- a/laws-modules/src/main/java/com/jero/modules/home/controller/HomeSearchController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.jero.modules.home.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.modules.home.dto.HomeNormalSearchDTO; -import com.jero.modules.home.service.HomeSearchService; -import com.jero.modules.home.vo.HomeNormalSearchStatisticsVO; -import com.jero.modules.home.vo.HomeNormalSearchVO; -import com.jero.modules.laws.common.constant.FieldCommon; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.Map; - -/** - * @author lqt - * @version 1.0 - * @date 2023/11/7 15:22 - */ -@Slf4j -@RequestMapping("/home/homeSearch") -@RestController -public class HomeSearchController { - - @Resource - private HomeSearchService homeSearchService; - - @AutoLog(value = "首页-一般检索（数据统计）") - @ApiOperation(value="首页-一般检索（数据统计）", notes="首页-一般检索（数据统计）") - @PostMapping(value = "/getNormalSearchCount") - public Result getNormalSearchCount(@RequestBody HomeNormalSearchDTO homeNormalSearchDTO) { - return Result.OK(homeSearchService.getNormalSearchCount(homeNormalSearchDTO)); - } - - - @AutoLog(value = "首页-一般检索（标题）查询") - @ApiOperation(value="首页-一般检索（标题）查询", notes="首页-一般检索（标题）查询") - @PostMapping(value = "/getNormalSearchTitlePage") - public Result> getNormalSearchTitlePage(@RequestBody HomeNormalSearchDTO homeNormalSearchDTO) { - return Result.OK(homeSearchService.getNormalSearchTitlePage(homeNormalSearchDTO)); - } - - @AutoLog(value = "首页-一般检索（全文）查询") - @ApiOperation(value="首页-一般检索（全文）查询", notes="首页-一般检索（全文）查询") - @PostMapping(value = "/getNormalSearchAllPage") - public Result> getNormalSearchAllPage(@RequestBody HomeNormalSearchDTO homeNormalSearchDTO) { - return Result.OK(homeSearchService.getNormalSearchAllPage(homeNormalSearchDTO)); - } - - @AutoLog(value = "首页-高级检索查询") - @ApiOperation(value="首页-高级检索查询", notes="首页-高级检索查询") - @PostMapping(value = "/getAdvancedSearchPage") - public Result> getAdvancedSearchPage(@RequestBody HomeNormalSearchDTO homeNormalSearchDTO) { - return Result.OK(homeSearchService.getAdvancedSearchPage(homeNormalSearchDTO)); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/home/service/HomeSearchService.java b/laws-modules/src/main/java/com/jero/modules/home/service/HomeSearchService.java deleted file mode 100644 index f622072c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/home/service/HomeSearchService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.jero.modules.home.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.home.dto.HomeNormalSearchDTO; -import com.jero.modules.home.vo.HomeNormalSearchStatisticsVO; -import com.jero.modules.home.vo.HomeNormalSearchVO; - -/** - * @author lqt - * @version 1.0 - * @date 2023/11/7 17:00 - */ -public interface HomeSearchService { - - - HomeNormalSearchStatisticsVO getNormalSearchCount(HomeNormalSearchDTO homeNormalSearchDTO); - - IPage getNormalSearchTitlePage(HomeNormalSearchDTO homeNormalSearchDTO); - - IPage getNormalSearchAllPage(HomeNormalSearchDTO homeNormalSearchDTO); - - IPage getAdvancedSearchPage(HomeNormalSearchDTO homeNormalSearchDTO); - -} diff --git a/laws-modules/src/main/java/com/jero/modules/home/service/impl/HomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/home/service/impl/HomeSearchServiceImpl.java deleted file mode 100644 index b081afff..00000000 --- a/laws-modules/src/main/java/com/jero/modules/home/service/impl/HomeSearchServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jero.modules.home.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.jero.modules.home.dto.HomeNormalSearchDTO; -import com.jero.modules.home.service.HomeSearchService; -import com.jero.modules.home.vo.HomeNormalSearchStatisticsVO; -import com.jero.modules.home.vo.HomeNormalSearchVO; -import org.springframework.stereotype.Service; - -/** - * @author lqt - * @version 1.0 - * @date 2023/11/7 17:00 - */ -@Service -public class HomeSearchServiceImpl implements HomeSearchService { - - - @Override - public HomeNormalSearchStatisticsVO getNormalSearchCount(HomeNormalSearchDTO homeNormalSearchDTO) { - return null; - } - - @Override - public IPage getNormalSearchTitlePage(HomeNormalSearchDTO homeNormalSearchDTO) { - return null; - } - - @Override - public IPage getNormalSearchAllPage(HomeNormalSearchDTO homeNormalSearchDTO) { - return null; - } - - @Override - public IPage getAdvancedSearchPage(HomeNormalSearchDTO homeNormalSearchDTO) { - return null; - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchHistoryController.java b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchHistoryController.java new file mode 100644 index 00000000..371dac5b --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchHistoryController.java @@ -0,0 +1,90 @@ +package com.jero.modules.laws.home.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.common.util.MessageUtils; +import com.jero.modules.laws.common.constant.ResultCommon; +import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory; +import com.jero.modules.laws.home.service.ILawsHomeNormalSearchHistoryService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.Map; + + +/** + * @Description: 首页-检索历史 + * @Author: jero-boot + * @Date: 2023-09-06 + * @Version: V1.0 + */ +@Api(tags = "首页-检索历史") +@RestController +@RequestMapping("/home/lawsHomeNormalSearchHistory") +@Slf4j +public class LawsHomeNormalSearchHistoryController extends JeroController { + + @Resource + private ILawsHomeNormalSearchHistoryService lawsHomeNormalSearchHistoryService; + + /** + * 分页列表查询 + */ +// @RequiresPermissions("sys:innerWorkingGroup:search") + @AutoLog(value = "检索历史-分页列表查询", operateType = 1) + @ApiOperation(value = "检索历史-分页列表查询", notes = "检索历史-分页列表查询") + @GetMapping(value = "/page") + public Result> queryPageList(LawsHomeNormalSearchHistory lawsHomeNormalSearchHistory, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsHomeNormalSearchHistory, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = lawsHomeNormalSearchHistoryService.page(page,queryWrapper); + return Result.OK(pageList); + } + + /** + * 通过id删除 + */ +// @RequiresPermissions("sys:innerWorkingGroup:delete") + @AutoLog(value = "检索历史-通过id删除", operateType = 4) + @ApiOperation(value = "检索历史-通过id删除", notes = "检索历史-通过id删除") + @PostMapping(value = "/delete") + public Result delete(@RequestBody Map map) { + if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) { + throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); + } + + lawsHomeNormalSearchHistoryService.removeById(map.get("id")); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } + + /** + * 批量删除 + */ +// @RequiresPermissions("sys:innerWorkingGroup:delete") + @AutoLog(value = "检索历史-批量删除", operateType = 4) + @ApiOperation(value = "检索历史-批量删除", notes = "检索历史-批量删除") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody Map map) { + if (!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))) { + throw new JeroBootException(ResultCommon.PLEASE_SELECT_DATA); + } + lawsHomeNormalSearchHistoryService.removeByIds(Arrays.asList(map.get("id").split(","))); + return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java new file mode 100644 index 00000000..0dc7f2af --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeSearchController.java @@ -0,0 +1,73 @@ +package com.jero.modules.laws.home.controller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.modules.laws.home.dto.LawsHomeNormalSearchDTO; +import com.jero.modules.laws.home.service.ILawsHomeSearchService; +import com.jero.modules.laws.home.vo.LawsHomeNormalSearchStatisticsVO; +import com.jero.modules.laws.home.vo.LawsHomeNormalSearchVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @author lqt + * @version 1.0 + * @date 2023/11/7 15:22 + */ +@Slf4j +@Api(tags = "首页-搜索中心") +@RequestMapping("/home/lawsHomeSearch") +@RestController +public class LawsHomeSearchController { + + @Resource + private ILawsHomeSearchService lawsHomeSearchService; + + @AutoLog(value = "首页-一般检索（标题）查询",operateType = 1) + @ApiOperation(value="首页-一般检索（标题）查询", notes="首页-一般检索（标题）查询") + @PostMapping(value = "/getNormalSearchTitlePage") + public Result> getNormalSearchTitlePage(@RequestBody LawsHomeNormalSearchDTO homeNormalSearchDTO) { + // todo 待开发 + return Result.OK(lawsHomeSearchService.getNormalSearchTitlePage(homeNormalSearchDTO)); + } + + @AutoLog(value = "首页-一般检索（标题）（数据统计）",operateType = 1) + @ApiOperation(value="首页-一般检索（标题）（数据统计）", notes="首页-一般检索（标题）（数据统计）") + @PostMapping(value = "/getNormalSearchTitleCount") + public Result getNormalSearchTitleCount(@RequestBody LawsHomeNormalSearchDTO homeNormalSearchDTO) { + // todo 待开发 + return Result.OK(lawsHomeSearchService.getNormalSearchTitleCount(homeNormalSearchDTO)); + } + + @AutoLog(value = "首页-一般检索（全文）查询",operateType = 1) + @ApiOperation(value="首页-一般检索（全文）查询", notes="首页-一般检索（全文）查询") + @PostMapping(value = "/getNormalSearchAllPage") + public Result> getNormalSearchAllPage(@RequestBody LawsHomeNormalSearchDTO homeNormalSearchDTO) { + // todo 待开发 + return Result.OK(lawsHomeSearchService.getNormalSearchAllPage(homeNormalSearchDTO)); + } + + @AutoLog(value = "首页-一般检索（全文）（数据统计）",operateType = 1) + @ApiOperation(value="首页-一般检索（全文）（数据统计）", notes="首页-一般检索（全文）（数据统计）") + @PostMapping(value = "/getNormalSearchAllCount") + public Result getNormalSearchAllCount(@RequestBody LawsHomeNormalSearchDTO homeNormalSearchDTO) { + // todo 待开发 + return Result.OK(lawsHomeSearchService.getNormalSearchAllCount(homeNormalSearchDTO)); + } + + @AutoLog(value = "首页-高级检索查询",operateType = 1) + @ApiOperation(value="首页-高级检索查询", notes="首页-高级检索查询") + @PostMapping(value = "/getAdvancedSearchPage") + public Result> getAdvancedSearchPage(@RequestBody LawsHomeNormalSearchDTO homeNormalSearchDTO) { + // todo 待开发 + return Result.OK(lawsHomeSearchService.getAdvancedSearchPage(homeNormalSearchDTO)); + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/home/dto/HomeNormalSearchDTO.java b/laws-modules/src/main/java/com/jero/modules/laws/home/dto/LawsHomeNormalSearchDTO.java similarity index 95% rename from laws-modules/src/main/java/com/jero/modules/home/dto/HomeNormalSearchDTO.java rename to laws-modules/src/main/java/com/jero/modules/laws/home/dto/LawsHomeNormalSearchDTO.java index d85f1d33..cdeb8ca0 100644 --- a/laws-modules/src/main/java/com/jero/modules/home/dto/HomeNormalSearchDTO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/dto/LawsHomeNormalSearchDTO.java @@ -1,4 +1,4 @@ -package com.jero.modules.home.dto; +package com.jero.modules.laws.home.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,13 +12,13 @@ import java.io.Serializable; * @date 2023/11/7 15:53 */ @Data -public class HomeNormalSearchDTO implements Serializable { +public class LawsHomeNormalSearchDTO implements Serializable { /** * 检索内容 */ @ApiModelProperty(value = "检索内容") - private String searchValue; + private String searchContent; /** * 检索方式 1:全文检索 2：标题检索 */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchHistory.java b/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchHistory.java new file mode 100644 index 00000000..4ed973ec --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchHistory.java @@ -0,0 +1,68 @@ +package com.jero.modules.laws.home.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * 检索历史 + * @author lqt + * @version 1.0 + * @date 2023/11/9 10:28 + */ +@Data +@TableName("laws_home_normal_search_history") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_home_normal_search_history对象", description="检索历史") +public class LawsHomeNormalSearchHistory implements Serializable { + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**人员ID*/ + @ApiModelProperty(value = "人员ID") + private String userId; + + /**检索内容*/ + @ApiModelProperty(value = "检索内容") + private String searchContent; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy年MM月dd EEEE") + @ApiModelProperty(value = "创建日期") + private Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + + /**删除状态(0-正常,1-删除)*/ + @ApiModelProperty(value = "删除状态(0-正常,1-删除)") + @TableLogic + private String delFlag; +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeNormalSearchHistoryMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeNormalSearchHistoryMapper.java new file mode 100644 index 00000000..d71fbf97 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeNormalSearchHistoryMapper.java @@ -0,0 +1,12 @@ +package com.jero.modules.laws.home.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory; + +/** + * @author lqt + * @version 1.0 + * @date 2023/11/9 10:45 + */ +public interface LawsHomeNormalSearchHistoryMapper extends BaseMapper { +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeNormalSearchHistoryMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeNormalSearchHistoryMapper.xml new file mode 100644 index 00000000..3e23314e --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeNormalSearchHistoryMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeNormalSearchHistoryService.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeNormalSearchHistoryService.java new file mode 100644 index 00000000..f6d2be82 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeNormalSearchHistoryService.java @@ -0,0 +1,13 @@ +package com.jero.modules.laws.home.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory; + +/** + * @author lqt + * @version 1.0 + * @date 2023/11/9 10:39 + */ +public interface ILawsHomeNormalSearchHistoryService extends IService { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeSearchService.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeSearchService.java new file mode 100644 index 00000000..bc77e8d9 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeSearchService.java @@ -0,0 +1,25 @@ +package com.jero.modules.laws.home.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.laws.home.dto.LawsHomeNormalSearchDTO; +import com.jero.modules.laws.home.vo.LawsHomeNormalSearchStatisticsVO; +import com.jero.modules.laws.home.vo.LawsHomeNormalSearchVO; + +/** + * @author lqt + * @version 1.0 + * @date 2023/11/7 17:00 + */ +public interface ILawsHomeSearchService { + + IPage getNormalSearchTitlePage(LawsHomeNormalSearchDTO homeNormalSearchDTO); + + LawsHomeNormalSearchStatisticsVO getNormalSearchTitleCount(LawsHomeNormalSearchDTO homeNormalSearchDTO); + + IPage getNormalSearchAllPage(LawsHomeNormalSearchDTO homeNormalSearchDTO); + + LawsHomeNormalSearchStatisticsVO getNormalSearchAllCount(LawsHomeNormalSearchDTO homeNormalSearchDTO); + + IPage getAdvancedSearchPage(LawsHomeNormalSearchDTO homeNormalSearchDTO); + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeNormalSearchHistoryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeNormalSearchHistoryServiceImpl.java new file mode 100644 index 00000000..2be377b6 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeNormalSearchHistoryServiceImpl.java @@ -0,0 +1,17 @@ +package com.jero.modules.laws.home.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory; +import com.jero.modules.laws.home.mapper.LawsHomeNormalSearchHistoryMapper; +import com.jero.modules.laws.home.service.ILawsHomeNormalSearchHistoryService; +import org.springframework.stereotype.Service; + +/** + * @author lqt + * @version 1.0 + * @date 2023/11/9 10:40 + */ +@Service +public class LawsHomeNormalSearchHistoryServiceImpl extends ServiceImpl implements ILawsHomeNormalSearchHistoryService { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java new file mode 100644 index 00000000..9e42380f --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java @@ -0,0 +1,58 @@ +package com.jero.modules.laws.home.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.laws.home.dto.LawsHomeNormalSearchDTO; +import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory; +import com.jero.modules.laws.home.service.ILawsHomeNormalSearchHistoryService; +import com.jero.modules.laws.home.service.ILawsHomeSearchService; +import com.jero.modules.laws.home.vo.LawsHomeNormalSearchStatisticsVO; +import com.jero.modules.laws.home.vo.LawsHomeNormalSearchVO; +import org.apache.shiro.SecurityUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * @author lqt + * @version 1.0 + * @date 2023/11/7 17:00 + */ +@Service +public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { + + @Resource + private ILawsHomeNormalSearchHistoryService lawsHomeNormalSearchHistoryService; + + + @Override + public IPage getNormalSearchTitlePage(LawsHomeNormalSearchDTO homeNormalSearchDTO) { + // 添加检索历史 + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + LawsHomeNormalSearchHistory lawsHomeNormalSearchHistory = new LawsHomeNormalSearchHistory(); + lawsHomeNormalSearchHistory.setUserId(loginUser.getId()); + lawsHomeNormalSearchHistory.setSearchContent(homeNormalSearchDTO.getSearchContent()); + lawsHomeNormalSearchHistoryService.save(lawsHomeNormalSearchHistory); + return null; + } + + @Override + public LawsHomeNormalSearchStatisticsVO getNormalSearchTitleCount(LawsHomeNormalSearchDTO homeNormalSearchDTO) { + return null; + } + + @Override + public IPage getNormalSearchAllPage(LawsHomeNormalSearchDTO homeNormalSearchDTO) { + return null; + } + + @Override + public LawsHomeNormalSearchStatisticsVO getNormalSearchAllCount(LawsHomeNormalSearchDTO homeNormalSearchDTO) { + return null; + } + + @Override + public IPage getAdvancedSearchPage(LawsHomeNormalSearchDTO homeNormalSearchDTO) { + return null; + } +} diff --git a/laws-modules/src/main/java/com/jero/modules/home/vo/HomeNormalSearchStatisticsObjVO.java b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchStatisticsObjVO.java similarity index 81% rename from laws-modules/src/main/java/com/jero/modules/home/vo/HomeNormalSearchStatisticsObjVO.java rename to laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchStatisticsObjVO.java index 124d6b5a..d7708991 100644 --- a/laws-modules/src/main/java/com/jero/modules/home/vo/HomeNormalSearchStatisticsObjVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchStatisticsObjVO.java @@ -1,4 +1,4 @@ -package com.jero.modules.home.vo; +package com.jero.modules.laws.home.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,7 +11,7 @@ import java.io.Serializable; * @date 2023/11/7 17:24 */ @Data -public class HomeNormalSearchStatisticsObjVO implements Serializable { +public class LawsHomeNormalSearchStatisticsObjVO implements Serializable { /** * 名称 */ diff --git a/laws-modules/src/main/java/com/jero/modules/home/vo/HomeNormalSearchStatisticsVO.java b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchStatisticsVO.java similarity index 77% rename from laws-modules/src/main/java/com/jero/modules/home/vo/HomeNormalSearchStatisticsVO.java rename to laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchStatisticsVO.java index 0f555daa..e343f805 100644 --- a/laws-modules/src/main/java/com/jero/modules/home/vo/HomeNormalSearchStatisticsVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchStatisticsVO.java @@ -1,4 +1,4 @@ -package com.jero.modules.home.vo; +package com.jero.modules.laws.home.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -12,46 +12,46 @@ import java.util.List; * @date 2023/11/7 17:19 */ @Data -public class HomeNormalSearchStatisticsVO implements Serializable { +public class LawsHomeNormalSearchStatisticsVO implements Serializable { /** * 标准类别 （数据字典 海外标准法规：standard_type_overseas 国内标准法规：standard_type） (全部传空) */ @ApiModelProperty(value = "标准类别 （数据字典 海外标准法规：standard_type_overseas 国内标准法规：standard_type） (全部传空)") - private List standardType; + private List standardType; /** * 动力类型 （数据字典 海外标准法规：POWER_TYPE_DOMESTIC_OVERSEAS 国内标准法规：POWER_TYPE_DOMESTIC） (全部传空) */ @ApiModelProperty(value = "动力类型 （数据字典 海外标准法规：POWER_TYPE_DOMESTIC_OVERSEAS 国内标准法规：POWER_TYPE_DOMESTIC） (全部传空)") - private List powerTypeDomestic; + private List powerTypeDomestic; /** * 适用车辆类型 （数据字典 海外标准法规：APPLICATIONS_OVERSEAS 国内标准法规：APPLICATIONS_DOMESTIC） (全部传空) */ @ApiModelProperty(value = "适用车辆类型 （数据字典 海外标准法规：APPLICATIONS_OVERSEAS 国内标准法规：APPLICATIONS_DOMESTIC） (全部传空)") - private List applications; + private List applications; /** * 标准类型 （只有国内标准法规 数据字典 standard_property） (全部传空) */ @ApiModelProperty(value = "标准类型 （只有国内标准法规 数据字典 standard_property (全部传空)") - private List standardProperty; + private List standardProperty; /** * 状态 （国内标准法规/海外标准法规 数据字典 standard_state） (全部传空) */ @ApiModelProperty(value = "状态 （国内标准法规/海外标准法规 数据字典 standard_state (全部传空)") - private List standardState; + private List standardState; /** * 企业标准代号 （只有企业标准 数据字典 enterprise_standard_code） (全部传空) */ @ApiModelProperty(value = "企业标准代号 （只有企业标准 数据字典 enterprise_standard_code (全部传空)") - private List enterpriseStandardCode; + private List enterpriseStandardCode; /** * 标准状态 （只有企业标准 数据字典 enterprise_standard_state） (全部传空) */ @ApiModelProperty(value = "标准状态 （只有企业标准 数据字典 enterprise_standard_state (全部传空)") - private List enterpriseStandardState; + private List enterpriseStandardState; /** * 标准等级分类 （只有企业标准 数据字典 standard_grade_classify） (全部传空) */ @ApiModelProperty(value = "标准等级分类 （只有企业标准 数据字典 standard_grade_classify (全部传空)") - private List standardGradeClassify; + private List standardGradeClassify; } diff --git a/laws-modules/src/main/java/com/jero/modules/home/vo/HomeNormalSearchVO.java b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java similarity index 89% rename from laws-modules/src/main/java/com/jero/modules/home/vo/HomeNormalSearchVO.java rename to laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java index f1a1741c..a8303425 100644 --- a/laws-modules/src/main/java/com/jero/modules/home/vo/HomeNormalSearchVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java @@ -1,4 +1,4 @@ -package com.jero.modules.home.vo; +package com.jero.modules.laws.home.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,7 +11,7 @@ import java.io.Serializable; * @date 2023/11/7 17:04 */ @Data -public class HomeNormalSearchVO implements Serializable { +public class LawsHomeNormalSearchVO implements Serializable { /** * 业务id */