:zap: 代码优化

src/main/java/com/ifast/sys/domain/UserDO.java

@@ -1,14 +1,13 @@
 package com.ifast.sys.domain;
 
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
-import org.springframework.format.annotation.DateTimeFormat;
-
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
-
 /**
  * <pre>
  * </pre>

src/main/java/com/ifast/wxmp/builder/NewsBuilder.java

@@ -1,6 +1,8 @@
 package com.ifast.wxmp.builder;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.ifast.common.utils.SpringContextHolder;
+import com.ifast.wxmp.domain.MpArticleDO;
 import com.ifast.wxmp.service.MpArticleService;
 import com.ifast.wxmp.service.WeixinService;
 import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
@@ -22,7 +24,7 @@ public class NewsBuilder extends AbstractBuilder {
 
     @Override
     public WxMpXmlOutMessage build(String keyword, WxMpXmlMessage wxMessage, WeixinService service) {
-        List<WxMpXmlOutNewsMessage.Item> items = SpringContextHolder.getBean(MpArticleService.class).findByKv("keyword", keyword, "msgtype", "news").stream().map(article -> {
+        List<WxMpXmlOutNewsMessage.Item> items = SpringContextHolder.getBean(MpArticleService.class).selectList(new EntityWrapper<>(MpArticleDO.builder().keyword(keyword).msgtype("news").build())).stream().map(article -> {
             WxMpXmlOutNewsMessage.Item item = new WxMpXmlOutNewsMessage.Item();
             item.setDescription(article.getIntroduct());
             item.setPicUrl(article.getImgurl());

src/main/java/com/ifast/wxmp/controller/MpArticleImageController.java

@@ -8,6 +8,7 @@ import com.ifast.common.annotation.Log;
 import com.ifast.common.base.AdminBaseController;
 import com.ifast.common.utils.Result;
 import com.ifast.wxmp.domain.MpArticleDO;
+import com.ifast.wxmp.domain.MpConfigDO;
 import com.ifast.wxmp.service.MpArticleService;
 import com.ifast.wxmp.service.MpConfigService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -43,7 +44,7 @@ public class MpArticleImageController extends AdminBaseController {
 	@GetMapping("/list")
 	@RequiresPermissions("wxmp:mpArticleImage:mpArticle")
 	public Result<Page<MpArticleDO>> list(MpArticleDO mpArticleDTO, String appId){
-        Wrapper<MpArticleDO> wrapper = new EntityWrapper<>(mpArticleDTO).eq("mpId", mpConfigService.findOneByKv("appId", appId).getId()).orderBy("id", false);
+        Wrapper<MpArticleDO> wrapper = new EntityWrapper<>(mpArticleDTO).eq("mpId", mpConfigService.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build())).getId()).orderBy("id", false);
         Page<MpArticleDO> page = mpArticleService.selectPage(getPage(MpArticleDO.class), wrapper);
         return Result.ok(page);
 	}
@@ -67,7 +68,7 @@ public class MpArticleImageController extends AdminBaseController {
 	@PostMapping("/save")
 	@RequiresPermissions("wxmp:mpArticleImage:add")
 	public Result<String> save( MpArticleDO mpArticle, String appId){
-		mpArticle.setMpId(mpConfigService.findOneByKv("appId", appId).getId());
+		mpArticle.setMpId(mpConfigService.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build())).getId());
 		mpArticleService.insert(mpArticle);
         return Result.ok();
 	}

src/main/java/com/ifast/wxmp/controller/MpArticleNewsController.java

@@ -8,6 +8,7 @@ import com.ifast.common.annotation.Log;
 import com.ifast.common.base.AdminBaseController;
 import com.ifast.common.utils.Result;
 import com.ifast.wxmp.domain.MpArticleDO;
+import com.ifast.wxmp.domain.MpConfigDO;
 import com.ifast.wxmp.service.MpArticleService;
 import com.ifast.wxmp.service.MpConfigService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -42,7 +43,7 @@ public class MpArticleNewsController extends AdminBaseController {
     @GetMapping("/list")
     @RequiresPermissions("wxmp:mpArticleNews:mpArticle")
     public Result<Page<MpArticleDO>> list(MpArticleDO mpArticleDTO, String appId) {
-        Wrapper<MpArticleDO> wrapper = new EntityWrapper<>(mpArticleDTO).eq("mpId", mpConfigService.findOneByKv("appId", appId).getId()).orderBy("id", false);
+        Wrapper<MpArticleDO> wrapper = new EntityWrapper<>(mpArticleDTO).eq("mpId", mpConfigService.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build())).getId()).orderBy("id", false);
         Page<MpArticleDO> page = mpArticleService.selectPage(getPage(MpArticleDO.class), wrapper);
         return Result.ok(page);
     }
@@ -66,7 +67,7 @@ public class MpArticleNewsController extends AdminBaseController {
     @PostMapping("/save")
     @RequiresPermissions("wxmp:mpArticleNews:add")
     public Result<String> save(MpArticleDO mpArticle, String appId) {
-        mpArticle.setMpId(mpConfigService.findOneByKv("appId", appId).getId());
+        mpArticle.setMpId(mpConfigService.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build())).getId());
         mpArticleService.insert(mpArticle);
         return Result.ok();
     }

src/main/java/com/ifast/wxmp/controller/MpArticleTxtController.java

@@ -8,6 +8,7 @@ import com.ifast.common.annotation.Log;
 import com.ifast.common.base.AdminBaseController;
 import com.ifast.common.utils.Result;
 import com.ifast.wxmp.domain.MpArticleDO;
+import com.ifast.wxmp.domain.MpConfigDO;
 import com.ifast.wxmp.service.MpArticleService;
 import com.ifast.wxmp.service.MpConfigService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -69,7 +70,7 @@ public class MpArticleTxtController extends AdminBaseController {
 	@RequiresPermissions("wxmp:mpArticleTxt:add")
 	public Result<String> save( MpArticleDO mpArticle, String appId){
 	    mpArticle.setCreatedate(new Date());
-		mpArticle.setMpId(mpConfigService.findOneByKv("appId", appId).getId());
+		mpArticle.setMpId(mpConfigService.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build())).getId());
 		mpArticleService.insert(mpArticle);
         return Result.ok();
 	}

src/main/java/com/ifast/wxmp/controller/MpConfigController.java

@@ -59,7 +59,7 @@ public class MpConfigController extends AdminBaseController {
     @RequiresPermissions("wxmp:mpConfig:edit")
     String edit(String appId, Model model) {
 
-        MpConfigDO mpConfig = mpConfigService.findOneByKv("appId", appId);
+        MpConfigDO mpConfig = mpConfigService.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build()));
         model.addAttribute("mpConfig", mpConfig);
         return "wxmp/mpConfig/edit";
     }

src/main/java/com/ifast/wxmp/controller/MpFansController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.ifast.common.base.AdminBaseController;
 import com.ifast.common.utils.Result;
+import com.ifast.wxmp.domain.MpConfigDO;
 import com.ifast.wxmp.domain.MpFansDO;
 import com.ifast.wxmp.service.MpConfigService;
 import com.ifast.wxmp.service.MpFansService;
@@ -42,7 +43,7 @@ public class MpFansController extends AdminBaseController {
     @RequiresPermissions("wxmp:mpFans:mpFans")
     public Result<Page<MpFansDO>> list(String searchValue, String appId) {
         Wrapper<MpFansDO> wrapper = new EntityWrapper<>();
-        wrapper.eq("mpId", mpConfigService.findOneByKv("appId", appId).getId());
+        wrapper.eq("mpId", mpConfigService.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build())).getId());
         if (StringUtils.isNotBlank(searchValue)) {
             wrapper.andNew().like("nickname", searchValue)
                     .or().like("openid", searchValue)

src/main/java/com/ifast/wxmp/controller/MpMenuController.java

@@ -7,6 +7,7 @@ import com.ifast.common.annotation.Log;
 import com.ifast.common.base.AdminBaseController;
 import com.ifast.common.domain.Tree;
 import com.ifast.common.utils.Result;
+import com.ifast.wxmp.domain.MpConfigDO;
 import com.ifast.wxmp.domain.MpMenuDO;
 import com.ifast.wxmp.service.MpConfigService;
 import com.ifast.wxmp.service.MpMenuService;
@@ -44,7 +45,7 @@ public class MpMenuController extends AdminBaseController {
     @GetMapping("/list")
     @RequiresPermissions("wxmp:mpMenu:mpMenu")
     public List<MpMenuDO> list(MpMenuDO mpMenuDTO, String appId) {
-        mpMenuDTO.setMpid(mpConfigService.findOneByKv("appId", appId).getId());
+        mpMenuDTO.setMpid(mpConfigService.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build())).getId());
         Wrapper<MpMenuDO> wrapper = new EntityWrapper<>(mpMenuDTO).orderBy("parentidx, sort");
         List<MpMenuDO> list = mpMenuService.selectList(wrapper);
         return list;

src/main/java/com/ifast/wxmp/domain/MpConfigDO.java

@@ -3,8 +3,10 @@ package com.ifast.wxmp.domain;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -21,6 +23,8 @@ import java.util.Date;
  @TableName("wx_mp_config")
  @Data
  @Builder
+ @NoArgsConstructor
+ @AllArgsConstructor
 public class MpConfigDO implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/ifast/wxmp/handler/MenuHandler.java

@@ -1,5 +1,6 @@
 package com.ifast.wxmp.handler;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.ifast.wxmp.builder.ImageBuilder;
 import com.ifast.wxmp.builder.NewsBuilder;
 import com.ifast.wxmp.builder.TextBuilder;
@@ -37,10 +38,10 @@ public class MenuHandler extends AbstractHandler {
 
         String key = wxMessage.getEventKey();
 
-        MpArticleDO mpArticleDO = mpArticleService.findOneByKv("keyword", key);
+        MpArticleDO mpArticleDO = mpArticleService.selectOne(new EntityWrapper<>(MpArticleDO.builder().keyword(key).build()));
         if (Objects.isNull(mpArticleDO)) {
             logger.info("未找到与关键字【{}】匹配的回复消息。默认回复key【{}】", key, DEFAULT_ARTICLE_KEYWORD);
-            MpArticleDO defaultArticle = mpArticleService.findOneByKv("keyword", DEFAULT_ARTICLE_KEYWORD);
+            MpArticleDO defaultArticle = mpArticleService.selectOne(new EntityWrapper<>(MpArticleDO.builder().keyword(DEFAULT_ARTICLE_KEYWORD).build()));
             if (Objects.isNull(defaultArticle)) {
                 logger.info("未找到与关键字【{}】匹配的回复消息。回复内容【{}】", DEFAULT_ARTICLE_KEYWORD, DEFAULT_ARTICLE_KEYWORD);
                 return WxMpXmlOutMessage.TEXT().content(DEFAULT_ARTICLE_KEYWORD).fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser()).build();

src/main/java/com/ifast/wxmp/handler/UnsubscribeHandler.java

@@ -1,5 +1,6 @@
 package com.ifast.wxmp.handler;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.ifast.wxmp.domain.MpFansDO;
 import com.ifast.wxmp.pojo.type.Const;
 import com.ifast.wxmp.service.MpFansService;
@@ -32,7 +33,7 @@ public class UnsubscribeHandler extends AbstractHandler {
             WxSessionManager sessionManager) {
         String openId = wxMessage.getFromUser();
         this.logger.info("用户取消关注 openid: " + openId);
-        MpFansDO fans = mpFansService.findOneByKv("openid", openId);
+        MpFansDO fans = mpFansService.selectOne(new EntityWrapper<>(MpFansDO.builder().openid(openId).build()));
         fans.setSubscribe(Const.Subscribe.NO);
         mpFansService.updateById(fans);
         return null;