diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java
index 8f8caea7..e1f5daf8 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/controller/setting/NoticeController.java
@@ -31,7 +31,6 @@ public class NoticeController {
*/
@GetMapping("/list")
public Object list(@RequestParam Integer recipient) {
- System.out.println(recipient);
List
list = iSettingNoticeService.list(recipient);
return AjaxResult.success(list);
}
diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java
index 250c66cd..333bdbd1 100644
--- a/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java
+++ b/server/like-admin/src/main/java/com/mdd/admin/service/setting/impl/SettingNoticeServiceImpl.java
@@ -42,7 +42,6 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService {
queryWrapper.orderByAsc("id");
List noticeSettings = noticeSettingMapper.selectList(queryWrapper);
-
List list = new LinkedList<>();
for (NoticeSetting n : noticeSettings) {
NoticeListVo vo = new NoticeListVo();
@@ -54,10 +53,10 @@ public class SettingNoticeServiceImpl implements ISettingNoticeService {
Map mnpMap = ToolsUtil.jsonToMap(n.getMnpNotice());
vo.setType(n.getType()==1?"业务通知":"验证码");
- vo.setSystemStatus(Integer.parseInt(systemMap.get("status")));
- vo.setSmsStatus(Integer.parseInt(smsMap.get("status")));
- vo.setOaStatus(Integer.parseInt(oaMap.get("status")));
- vo.setMnpStatus(Integer.parseInt(mnpMap.get("status")));
+ vo.setSystemStatus(Integer.parseInt(systemMap.getOrDefault("status", "0")));
+ vo.setSmsStatus(Integer.parseInt(smsMap.getOrDefault("status", "0")));
+ vo.setOaStatus(Integer.parseInt(oaMap.getOrDefault("status", "0")));
+ vo.setMnpStatus(Integer.parseInt(mnpMap.getOrDefault("status", "0")));
vo.setCreateTime(TimeUtil.timestampToDate(n.getCreateTime()));
vo.setUpdateTime(TimeUtil.timestampToDate(n.getUpdateTime()));
list.add(vo);
diff --git a/server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java b/server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java
index 8f42961d..55bbc0da 100644
--- a/server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java
+++ b/server/like-front/src/main/java/com/mdd/front/config/FrontConfig.java
@@ -15,6 +15,7 @@ public class FrontConfig {
"/api/config",
"/api/policy",
"/api/search",
+ "/api/hotSearch",
"/api/decorate",
"/api/sms/send",
"/api/upload/image",
diff --git a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java
index 20cc214f..f14b6e5c 100644
--- a/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java
+++ b/server/like-front/src/main/java/com/mdd/front/controller/IndexController.java
@@ -1,8 +1,11 @@
package com.mdd.front.controller;
import com.mdd.common.core.AjaxResult;
+import com.mdd.common.core.PageResult;
import com.mdd.common.validator.annotation.IDMust;
import com.mdd.front.service.IIndexService;
+import com.mdd.front.validate.PageParam;
+import com.mdd.front.vo.article.ArticleListVo;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -79,9 +82,22 @@ public class IndexController {
* @author fzr
* @return Object
*/
+ @GetMapping("/hotSearch")
+ public Object hotSearch() {
+ List list = iIndexService.hotSearch();
+ return AjaxResult.success(list);
+ }
+
+ /**
+ * 搜索
+ *
+ * @author fzr
+ * @return Object
+ */
@GetMapping("/search")
- public Object search() {
- List list = iIndexService.search();
+ public Object search(@Validated PageParam pageParam,
+ @RequestParam Map params) {
+ PageResult list = iIndexService.search(pageParam, params);
return AjaxResult.success(list);
}
diff --git a/server/like-front/src/main/java/com/mdd/front/service/IIndexService.java b/server/like-front/src/main/java/com/mdd/front/service/IIndexService.java
index 77274477..6a48c825 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/IIndexService.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/IIndexService.java
@@ -1,5 +1,9 @@
package com.mdd.front.service;
+import com.mdd.common.core.PageResult;
+import com.mdd.front.validate.PageParam;
+import com.mdd.front.vo.article.ArticleListVo;
+
import java.util.List;
import java.util.Map;
@@ -47,6 +51,15 @@ public interface IIndexService {
* @author fzr
* @return List
*/
- List search();
+ List hotSearch();
+ /**
+ * 搜索
+ *
+ * @author fzr
+ * @param pageParam 分页参数
+ * @param params 搜索参数
+ * @return PageResult
+ */
+ PageResult search(PageParam pageParam, Map params);
}
diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java
index a46c4179..e45e5e15 100644
--- a/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java
+++ b/server/like-front/src/main/java/com/mdd/front/service/impl/IndexServiceImpl.java
@@ -1,8 +1,12 @@
package com.mdd.front.service.impl;
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.extension.plugins.pagination.Page;
+import com.github.yulichang.query.MPJQueryWrapper;
import com.mdd.common.config.GlobalConfig;
+import com.mdd.common.core.PageResult;
import com.mdd.common.entity.article.Article;
import com.mdd.common.entity.decorate.DecoratePage;
import com.mdd.common.entity.decorate.DecorateTabbar;
@@ -13,6 +17,8 @@ import com.mdd.common.mapper.decorate.DecorateTabbarMapper;
import com.mdd.common.mapper.setting.HotSearchMapper;
import com.mdd.common.utils.*;
import com.mdd.front.service.IIndexService;
+import com.mdd.front.validate.PageParam;
+import com.mdd.front.vo.article.ArticleListVo;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -176,7 +182,7 @@ public class IndexServiceImpl implements IIndexService {
* @return List
*/
@Override
- public List search() {
+ public List hotSearch() {
String isHotSearch = ConfigUtil.get("search", "isHotSearch", "0");
List list = new LinkedList<>();
@@ -193,4 +199,38 @@ public class IndexServiceImpl implements IIndexService {
return list;
}
+ /**
+ * 搜索
+ *
+ * @author fzr
+ * @param pageParam 分页参数
+ * @param params 搜索参数
+ * @return PageResult
+ */
+ public PageResult search(PageParam pageParam, Map params) {
+ Integer pageNo = pageParam.getPageNo();
+ Integer pageSize = pageParam.getPageSize();
+
+ MPJQueryWrapper mpjQueryWrapper = new MPJQueryWrapper()
+ .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 iPage = articleMapper.selectJoinPage(
+ new Page<>(pageNo, pageSize),
+ ArticleListVo.class,
+ mpjQueryWrapper);
+
+ for (ArticleListVo vo : iPage.getRecords()) {
+ vo.setCollect(false);
+ vo.setImage(UrlUtil.toAbsoluteUrl(vo.getImage()));
+ vo.setCreateTime(TimeUtil.timestampToDate(vo.getCreateTime()));
+ }
+
+ return PageResult.iPageHandle(iPage);
+ }
+
}