优化代码
This commit is contained in:
parent
4bc1e28685
commit
36e4ea6cf1
|
|
@ -110,23 +110,6 @@ public class IndexController {
|
||||||
return AjaxResult.success(list);
|
return AjaxResult.success(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 搜索
|
|
||||||
*
|
|
||||||
* @author fzr
|
|
||||||
* @param pageValidate 分页参数
|
|
||||||
* @param params 搜素参数
|
|
||||||
* @return AjaxResult<PageResult<ArticleListVo>>
|
|
||||||
*/
|
|
||||||
@NotLogin
|
|
||||||
@GetMapping("/search")
|
|
||||||
@ApiOperation(value="搜索文章")
|
|
||||||
public AjaxResult<PageResult<ArticleListedVo>> search(@Validated PageValidate pageValidate,
|
|
||||||
@RequestParam Map<String, String> params) {
|
|
||||||
PageResult<ArticleListedVo> list = iIndexService.search(pageValidate, params);
|
|
||||||
return AjaxResult.success(list);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 发送短信
|
* 发送短信
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -53,13 +53,4 @@ public interface IIndexService {
|
||||||
*/
|
*/
|
||||||
List<String> hotSearch();
|
List<String> hotSearch();
|
||||||
|
|
||||||
/**
|
|
||||||
* 搜索
|
|
||||||
*
|
|
||||||
* @author fzr
|
|
||||||
* @param pageValidate 分页参数
|
|
||||||
* @param params 搜索参数
|
|
||||||
* @return PageResult<ArticleListVo>
|
|
||||||
*/
|
|
||||||
PageResult<ArticleListedVo> search(PageValidate pageValidate, Map<String, String> params);
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,8 @@
|
||||||
package com.mdd.front.service.impl;
|
package com.mdd.front.service.impl;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Assert;
|
import com.baomidou.mybatisplus.core.toolkit.Assert;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
||||||
import com.github.yulichang.query.MPJQueryWrapper;
|
|
||||||
import com.mdd.common.config.GlobalConfig;
|
import com.mdd.common.config.GlobalConfig;
|
||||||
import com.mdd.common.core.PageResult;
|
|
||||||
import com.mdd.common.entity.article.Article;
|
import com.mdd.common.entity.article.Article;
|
||||||
import com.mdd.common.entity.DecoratePage;
|
import com.mdd.common.entity.DecoratePage;
|
||||||
import com.mdd.common.entity.DecorateTabbar;
|
import com.mdd.common.entity.DecorateTabbar;
|
||||||
|
|
@ -17,8 +13,6 @@ import com.mdd.common.mapper.DecorateTabbarMapper;
|
||||||
import com.mdd.common.mapper.setting.HotSearchMapper;
|
import com.mdd.common.mapper.setting.HotSearchMapper;
|
||||||
import com.mdd.common.util.*;
|
import com.mdd.common.util.*;
|
||||||
import com.mdd.front.service.IIndexService;
|
import com.mdd.front.service.IIndexService;
|
||||||
import com.mdd.front.validate.common.PageValidate;
|
|
||||||
import com.mdd.front.vo.article.ArticleListedVo;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
|
@ -207,38 +201,4 @@ public class IndexServiceImpl implements IIndexService {
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 搜索
|
|
||||||
*
|
|
||||||
* @author fzr
|
|
||||||
* @param pageValidate 分页参数
|
|
||||||
* @param params 搜索参数
|
|
||||||
* @return PageResult<ArticleListVo>
|
|
||||||
*/
|
|
||||||
public PageResult<ArticleListedVo> search(PageValidate pageValidate, Map<String, String> params) {
|
|
||||||
Integer pageNo = pageValidate.getPageNo();
|
|
||||||
Integer pageSize = pageValidate.getPageSize();
|
|
||||||
|
|
||||||
MPJQueryWrapper<Article> mpjQueryWrapper = new MPJQueryWrapper<Article>()
|
|
||||||
.selectAll(Article.class)
|
|
||||||
.select("ac.name as category")
|
|
||||||
.innerJoin("?_article_category ac ON ac.id=t.cid".replace("?_", GlobalConfig.tablePrefix))
|
|
||||||
.eq("t.is_delete", 0)
|
|
||||||
.like("t.title", params.get("keyword"))
|
|
||||||
.orderByDesc(Arrays.asList("t.sort", "t.id"));
|
|
||||||
|
|
||||||
IPage<ArticleListedVo> iPage = articleMapper.selectJoinPage(
|
|
||||||
new Page<>(pageNo, pageSize),
|
|
||||||
ArticleListedVo.class,
|
|
||||||
mpjQueryWrapper);
|
|
||||||
|
|
||||||
for (ArticleListedVo vo : iPage.getRecords()) {
|
|
||||||
vo.setCollect(false);
|
|
||||||
vo.setImage(UrlUtils.toAbsoluteUrl(vo.getImage()));
|
|
||||||
vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime()));
|
|
||||||
}
|
|
||||||
|
|
||||||
return PageResult.iPageHandle(iPage);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -374,7 +374,7 @@ public class LoginServiceImpl implements ILoginService {
|
||||||
*/
|
*/
|
||||||
private LoginTokenVo __loginToken(Integer userId, String mobile, Integer terminal) {
|
private LoginTokenVo __loginToken(Integer userId, String mobile, Integer terminal) {
|
||||||
// 实现账号登录
|
// 实现账号登录
|
||||||
StpUtil.login(userId, terminal);
|
StpUtil.login(userId, String.valueOf(terminal));
|
||||||
|
|
||||||
// 更新登录信息
|
// 更新登录信息
|
||||||
User user = new User();
|
User user = new User();
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,6 @@ public class UserServiceImpl implements IUserService {
|
||||||
UserAuth userAuth = userAuthMapper.selectOne(new QueryWrapper<UserAuth>()
|
UserAuth userAuth = userAuthMapper.selectOne(new QueryWrapper<UserAuth>()
|
||||||
.select("id,openid")
|
.select("id,openid")
|
||||||
.eq("user_id", userId)
|
.eq("user_id", userId)
|
||||||
.eq("client", ClientEnum.MNP.getCode())
|
|
||||||
.last("limit 1"));
|
.last("limit 1"));
|
||||||
|
|
||||||
UserInfoVo vo = new UserInfoVo();
|
UserInfoVo vo = new UserInfoVo();
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ mybatis-plus:
|
||||||
|
|
||||||
# Sa-token配置
|
# Sa-token配置
|
||||||
sa-token:
|
sa-token:
|
||||||
token-name: like-token # token的名称
|
token-name: token # token的名称
|
||||||
timeout: 2592000 # token有效期单位s(默认30天,-1代表永不过期)
|
timeout: 2592000 # token有效期单位s(默认30天,-1代表永不过期)
|
||||||
activity-timeout: -1 # token临时有效期(指定时间无操作掉线)
|
activity-timeout: -1 # token临时有效期(指定时间无操作掉线)
|
||||||
is-concurrent: true # 是否允许同一账号并发登录
|
is-concurrent: true # 是否允许同一账号并发登录
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue