diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchDataController.java b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchDataController.java new file mode 100644 index 00000000..1d632ace --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/controller/LawsHomeNormalSearchDataController.java @@ -0,0 +1,56 @@ +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.common.system.base.controller.JeroController; +import com.jero.modules.laws.home.dto.LawsHomeNormalSearchDTO; +import com.jero.modules.laws.home.entity.LawsHomeNormalSearchData; +import com.jero.modules.laws.home.service.ILawsHomeNormalSearchDataService; +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.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + + +/** + * @Description: 首页-一般检索（标题） + * @Author: jero-boot + * @Date: 2023-09-06 + * @Version: V1.0 + */ +@Api(tags = "首页-检索历史") +@RestController +@RequestMapping("/home/lawsHomeNormalSearchData") +@Slf4j +public class LawsHomeNormalSearchDataController extends JeroController { + + @Resource + private ILawsHomeNormalSearchDataService lawsHomeNormalSearchDataService; + + + @AutoLog(value = "首页-一般检索（标题）查询",operateType = 1) + @ApiOperation(value="首页-一般检索（标题）查询", notes="首页-一般检索（标题）查询") + @PostMapping(value = "/getNormalSearchTitlePage") + public Result> getNormalSearchTitlePage(@RequestBody LawsHomeNormalSearchData lawsHomeNormalSearchData, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + // todo 待开发 + return Result.OK(lawsHomeNormalSearchDataService.getNormalSearchTitlePage(lawsHomeNormalSearchData,pageNo,pageSize,req)); + } + + @AutoLog(value = "首页-一般检索（标题）（数据统计）",operateType = 1) + @ApiOperation(value="首页-一般检索（标题）（数据统计）", notes="首页-一般检索（标题）（数据统计）") + @PostMapping(value = "/getNormalSearchTitleCount") + public Result getNormalSearchTitleCount(@RequestBody LawsHomeNormalSearchData lawsHomeNormalSearchData, + HttpServletRequest req) { + // todo 待开发 + return Result.OK(lawsHomeNormalSearchDataService.getNormalSearchTitleCount(lawsHomeNormalSearchData,req)); + } +} 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 index 0dc7f2af..ebb52b4e 100644 --- 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 @@ -10,10 +10,7 @@ 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 org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -31,28 +28,14 @@ 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) { + public Result> getNormalSearchAllPage(@RequestBody LawsHomeNormalSearchDTO homeNormalSearchDTO, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { // todo 待开发 - return Result.OK(lawsHomeSearchService.getNormalSearchAllPage(homeNormalSearchDTO)); + return Result.OK(lawsHomeSearchService.getNormalSearchAllPage(homeNormalSearchDTO,pageNo,pageSize)); } @AutoLog(value = "首页-一般检索（全文）（数据统计）",operateType = 1) @@ -66,8 +49,10 @@ public class LawsHomeSearchController { @AutoLog(value = "首页-高级检索查询",operateType = 1) @ApiOperation(value="首页-高级检索查询", notes="首页-高级检索查询") @PostMapping(value = "/getAdvancedSearchPage") - public Result> getAdvancedSearchPage(@RequestBody LawsHomeNormalSearchDTO homeNormalSearchDTO) { + public Result> getAdvancedSearchPage(@RequestBody LawsHomeNormalSearchDTO homeNormalSearchDTO, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { // todo 待开发 - return Result.OK(lawsHomeSearchService.getAdvancedSearchPage(homeNormalSearchDTO)); + return Result.OK(lawsHomeSearchService.getAdvancedSearchPage(homeNormalSearchDTO,pageNo,pageSize)); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/dto/LawsHomeNormalSearchDTO.java b/laws-modules/src/main/java/com/jero/modules/laws/home/dto/LawsHomeNormalSearchDTO.java index cdeb8ca0..0ba2a335 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/dto/LawsHomeNormalSearchDTO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/dto/LawsHomeNormalSearchDTO.java @@ -25,25 +25,25 @@ public class LawsHomeNormalSearchDTO implements Serializable { @ApiModelProperty(value = "检索方式 1:全文检索 2：标题检索") private String searchMode; /** - * 资源类型 1:国内标准法规 2:海外标准法规 3:企业标准 4:动态消息 (全部传空) + * 资源类型 （数据字典 resource_type） (全部传空) */ - @ApiModelProperty(value = "资源类型 1:国内标准法规 2:海外标准法规 3:企业标准 4:动态消息 (全部传空)") + @ApiModelProperty(value = "资源类型 （数据字典 resource_type） (全部传空)") private String resourceType; /** * 标准类别 （数据字典 海外标准法规：standard_type_overseas 国内标准法规：standard_type） (全部传空) */ @ApiModelProperty(value = "标准类别 （数据字典 海外标准法规：standard_type_overseas 国内标准法规：standard_type） (全部传空)") - private String standardType; + private String standardClass; /** * 动力类型 （数据字典 海外标准法规：POWER_TYPE_DOMESTIC_OVERSEAS 国内标准法规：POWER_TYPE_DOMESTIC） (全部传空) */ @ApiModelProperty(value = "动力类型 （数据字典 海外标准法规：POWER_TYPE_DOMESTIC_OVERSEAS 国内标准法规：POWER_TYPE_DOMESTIC） (全部传空)") - private String powerTypeDomestic; + private String dynamicType; /** * 适用车辆类型 （数据字典 海外标准法规：APPLICATIONS_OVERSEAS 国内标准法规：APPLICATIONS_DOMESTIC） (全部传空) */ @ApiModelProperty(value = "适用车辆类型 （数据字典 海外标准法规：APPLICATIONS_OVERSEAS 国内标准法规：APPLICATIONS_DOMESTIC） (全部传空)") - private String applications; + private String applicableVehicle; /** * 标准类型 （只有国内标准法规 数据字典 standard_property） (全部传空) */ @@ -58,7 +58,7 @@ public class LawsHomeNormalSearchDTO implements Serializable { * 企业标准代号 （只有企业标准 数据字典 enterprise_standard_code） (全部传空) */ @ApiModelProperty(value = "企业标准代号 （只有企业标准 数据字典 enterprise_standard_code (全部传空)") - private String enterpriseStandardCode; + private String standardCode; /** * 标准状态 （只有企业标准 数据字典 enterprise_standard_state） (全部传空) */ @@ -68,5 +68,5 @@ public class LawsHomeNormalSearchDTO implements Serializable { * 标准等级分类 （只有企业标准 数据字典 standard_grade_classify） (全部传空) */ @ApiModelProperty(value = "标准等级分类 （只有企业标准 数据字典 standard_grade_classify (全部传空)") - private String standardGradeClassify; + private String gradeClassification; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchData.java b/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchData.java new file mode 100644 index 00000000..288378bf --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/entity/LawsHomeNormalSearchData.java @@ -0,0 +1,116 @@ +package com.jero.modules.laws.home.entity; + +import com.baomidou.mybatisplus.annotation.*; +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; + +/** + * 首页一般检索（标题）数据，需要同步1:国内标准法规 2:海外标准法规 3:企业标准 4:动态消息数据 + * @author lqt + * @version 1.0 + * @date 2023/11/9 10:28 + */ +@Data +@TableName("laws_home_normal_search_data") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="laws_home_normal_search_data对象", description="首页一般检索（标题）数据") +public class LawsHomeNormalSearchData implements Serializable { + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**资源id*/ + @ApiModelProperty(value = "资源id") + private String resourceId; + /**资源类型*/ + @ApiModelProperty(value = "资源类型") + private String resourceType; + /**标题*/ + @ApiModelProperty(value = "标题") + private String title; + /**正文*/ + @ApiModelProperty(value = "正文") + private String content; + /** + * 发布日期 + */ + @ApiModelProperty(value = "发布日期") + private String releaseDate; + /** + * 标准类别 （数据字典 海外标准法规：standard_type_overseas 国内标准法规：standard_type） (全部传空) + */ + @ApiModelProperty(value = "标准类别 （数据字典 海外标准法规：standard_type_overseas 国内标准法规：standard_type） (全部传空)") + private String standardClass; + /** + * 动力类型 （数据字典 海外标准法规：POWER_TYPE_DOMESTIC_OVERSEAS 国内标准法规：POWER_TYPE_DOMESTIC） (全部传空) + */ + @ApiModelProperty(value = "动力类型 （数据字典 海外标准法规：POWER_TYPE_DOMESTIC_OVERSEAS 国内标准法规：POWER_TYPE_DOMESTIC） (全部传空)") + private String dynamicType; + /** + * 适用车辆类型 （数据字典 海外标准法规：APPLICATIONS_OVERSEAS 国内标准法规：APPLICATIONS_DOMESTIC） (全部传空) + */ + @ApiModelProperty(value = "适用车辆类型 （数据字典 海外标准法规：APPLICATIONS_OVERSEAS 国内标准法规：APPLICATIONS_DOMESTIC） (全部传空)") + private String applicableVehicle; + /** + * 标准类型 （只有国内标准法规 数据字典 standard_property） (全部传空) + */ + @ApiModelProperty(value = "标准类型 （只有国内标准法规 数据字典 standard_property (全部传空)") + private String standardProperty; + /** + * 状态 （国内标准法规/海外标准法规 数据字典 standard_state） (全部传空) + */ + @ApiModelProperty(value = "状态 （国内标准法规/海外标准法规 数据字典 standard_state (全部传空)") + private String standardState; + /** + * 企业标准代号 （只有企业标准 数据字典 enterprise_standard_code） (全部传空) + */ + @ApiModelProperty(value = "企业标准代号 （只有企业标准 数据字典 enterprise_standard_code (全部传空)") + private String standardCode; + /** + * 标准状态 （只有企业标准 数据字典 enterprise_standard_state） (全部传空) + */ + @ApiModelProperty(value = "标准状态 （只有企业标准 数据字典 enterprise_standard_state (全部传空)") + private String enterpriseStandardState; + /** + * 标准等级分类 （只有企业标准 数据字典 standard_grade_classify） (全部传空) + */ + @ApiModelProperty(value = "标准等级分类 （只有企业标准 数据字典 standard_grade_classify (全部传空)") + private String gradeClassification; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy年MM月dd HH:mm:ss") + @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; + + /** + * 检索内容 + */ + @TableField(exist = false) + @ApiModelProperty(value = "检索内容") + private String searchContent; +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeNormalSearchDataMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeNormalSearchDataMapper.java new file mode 100644 index 00000000..0d69957f --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeNormalSearchDataMapper.java @@ -0,0 +1,20 @@ +package com.jero.modules.laws.home.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.laws.home.entity.LawsHomeNormalSearchData; +import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory; +import com.jero.modules.laws.home.vo.LawsHomeNormalSearchVO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author lqt + * @version 1.0 + * @date 2023/11/9 10:45 + */ +public interface LawsHomeNormalSearchDataMapper extends BaseMapper { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeSearchMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeSearchMapper.java new file mode 100644 index 00000000..316d4821 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeSearchMapper.java @@ -0,0 +1,13 @@ +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 LawsHomeSearchMapper extends BaseMapper { + +} diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeNormalSearchDataMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeNormalSearchDataMapper.xml new file mode 100644 index 00000000..9fcec59e --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeNormalSearchDataMapper.xml @@ -0,0 +1,5 @@ + + + + + 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 index 3e23314e..3b672244 100644 --- 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 @@ -1,5 +1,5 @@ - + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml new file mode 100644 index 00000000..1f03e3da --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/xml/LawsHomeSearchMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeNormalSearchDataService.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeNormalSearchDataService.java new file mode 100644 index 00000000..3ae6f40b --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/ILawsHomeNormalSearchDataService.java @@ -0,0 +1,26 @@ +package com.jero.modules.laws.home.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.laws.home.dto.LawsHomeNormalSearchDTO; +import com.jero.modules.laws.home.entity.LawsHomeNormalSearchData; +import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory; +import com.jero.modules.laws.home.vo.LawsHomeNormalSearchStatisticsVO; +import com.jero.modules.laws.home.vo.LawsHomeNormalSearchVO; + +import javax.servlet.http.HttpServletRequest; + +/** + * @author lqt + * @version 1.0 + * @date 2023/11/9 10:39 + */ +public interface ILawsHomeNormalSearchDataService extends IService { + + IPage getNormalSearchTitlePage(LawsHomeNormalSearchData lawsHomeNormalSearchData, + Integer pageNo, Integer pageSize,HttpServletRequest req); + + LawsHomeNormalSearchStatisticsVO getNormalSearchTitleCount(LawsHomeNormalSearchData lawsHomeNormalSearchData, + HttpServletRequest req); + +} 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 index bc77e8d9..797902f2 100644 --- 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 @@ -12,14 +12,10 @@ import com.jero.modules.laws.home.vo.LawsHomeNormalSearchVO; */ public interface ILawsHomeSearchService { - IPage getNormalSearchTitlePage(LawsHomeNormalSearchDTO homeNormalSearchDTO); - - LawsHomeNormalSearchStatisticsVO getNormalSearchTitleCount(LawsHomeNormalSearchDTO homeNormalSearchDTO); - - IPage getNormalSearchAllPage(LawsHomeNormalSearchDTO homeNormalSearchDTO); + IPage getNormalSearchAllPage(LawsHomeNormalSearchDTO homeNormalSearchDTO,Integer pageNo,Integer pageSize); LawsHomeNormalSearchStatisticsVO getNormalSearchAllCount(LawsHomeNormalSearchDTO homeNormalSearchDTO); - IPage getAdvancedSearchPage(LawsHomeNormalSearchDTO homeNormalSearchDTO); + IPage getAdvancedSearchPage(LawsHomeNormalSearchDTO homeNormalSearchDTO,Integer pageNo,Integer pageSize); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeNormalSearchDataServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeNormalSearchDataServiceImpl.java new file mode 100644 index 00000000..ab934474 --- /dev/null +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeNormalSearchDataServiceImpl.java @@ -0,0 +1,108 @@ +package com.jero.modules.laws.home.service.impl; + +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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.laws.home.dto.LawsHomeNormalSearchDTO; +import com.jero.modules.laws.home.entity.LawsHomeNormalSearchData; +import com.jero.modules.laws.home.entity.LawsHomeNormalSearchHistory; +import com.jero.modules.laws.home.mapper.LawsHomeNormalSearchDataMapper; +import com.jero.modules.laws.home.service.ILawsHomeNormalSearchDataService; +import com.jero.modules.laws.home.service.ILawsHomeNormalSearchHistoryService; +import com.jero.modules.laws.home.vo.LawsHomeNormalSearchStatisticsVO; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +/** + * @author lqt + * @version 1.0 + * @date 2023/11/9 10:40 + */ +@Service +public class LawsHomeNormalSearchDataServiceImpl extends ServiceImpl implements ILawsHomeNormalSearchDataService { + + + @Resource + private ILawsHomeNormalSearchHistoryService lawsHomeNormalSearchHistoryService; + + + @Override + @Transactional(rollbackFor = JeroBootException.class) + public IPage getNormalSearchTitlePage(LawsHomeNormalSearchData lawsHomeNormalSearchData, + Integer pageNo,Integer pageSize, + HttpServletRequest req) { + if(StringUtils.isBlank(lawsHomeNormalSearchData.getSearchContent())){ + throw new JeroBootException("请输入检索内容"); + } + // 添加检索历史 + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + LawsHomeNormalSearchHistory lawsHomeNormalSearchHistory = new LawsHomeNormalSearchHistory(); + lawsHomeNormalSearchHistory.setUserId(loginUser.getId()); + lawsHomeNormalSearchHistory.setSearchContent(lawsHomeNormalSearchData.getSearchContent()); + lawsHomeNormalSearchHistoryService.save(lawsHomeNormalSearchHistory); + + // todo 分词 + + + List listWord = new ArrayList<>(); + listWord.add(lawsHomeNormalSearchData.getSearchContent()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsHomeNormalSearchData, req.getParameterMap()); + if(!CollectionUtils.isEmpty(listWord)){ + queryWrapper.and(p->{ + for (int i = 0; i < listWord.size(); i++) { + queryWrapper.gt("instr(title," + listWord.get(i) + ")",0); + if(i != listWord.size() - 1){ + queryWrapper.or(); + } + } + }); + } + Page page = new Page<>(pageNo, pageSize); + IPage pageList = page(page,queryWrapper); + if(!CollectionUtils.isEmpty(pageList.getRecords())){ + List list = pageList.getRecords(); + for (LawsHomeNormalSearchData homeNormalSearchData : list) { + // todo 名词回显高亮 + } + } + return pageList; + } + @Override + public LawsHomeNormalSearchStatisticsVO getNormalSearchTitleCount(LawsHomeNormalSearchData lawsHomeNormalSearchData,HttpServletRequest req) { + if(StringUtils.isBlank(lawsHomeNormalSearchData.getSearchContent())){ + throw new JeroBootException("请输入检索内容"); + } + List listWord = new ArrayList<>(); + listWord.add(lawsHomeNormalSearchData.getSearchContent()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsHomeNormalSearchData, req.getParameterMap()); + if(!CollectionUtils.isEmpty(listWord)){ + queryWrapper.and(p->{ + for (int i = 0; i < listWord.size(); i++) { + queryWrapper.gt("instr(title," + listWord.get(i) + ")",0); + if(i != listWord.size() - 1){ + queryWrapper.or(); + } + } + }); + } + LawsHomeNormalSearchStatisticsVO lawsHomeNormalSearchStatisticsVO = new LawsHomeNormalSearchStatisticsVO(); + LawsHomeNormalSearchData lawsHomeNormalSearchDataObj = getOne(queryWrapper,false); + if(!Objects.isNull(lawsHomeNormalSearchDataObj)){ + + } + return null; + } +} 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 index 9e42380f..7d64c02a 100644 --- 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 @@ -1,18 +1,12 @@ 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 @@ -21,28 +15,8 @@ import javax.annotation.Resource; @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) { + public IPage getNormalSearchAllPage(LawsHomeNormalSearchDTO homeNormalSearchDTO,Integer pageNo,Integer pageSize) { return null; } @@ -52,7 +26,7 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { } @Override - public IPage getAdvancedSearchPage(LawsHomeNormalSearchDTO homeNormalSearchDTO) { + public IPage getAdvancedSearchPage(LawsHomeNormalSearchDTO homeNormalSearchDTO,Integer pageNo,Integer pageSize) { return null; } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java index a8303425..51d35883 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeNormalSearchVO.java @@ -28,9 +28,9 @@ public class LawsHomeNormalSearchVO implements Serializable { @ApiModelProperty(value = "标题") private String title; /** - * 内容 + * 正文 */ - @ApiModelProperty(value = "内容") + @ApiModelProperty(value = "正文") private String content; /** * 发布日期