:zap: 代码优化

src/main/java/com/ifast/common/base/CoreService.java

@@ -40,4 +40,11 @@ public interface CoreService<T> extends IService<T> {
      */
     @Deprecated
     EntityWrapper<T> convertToEntityWrapper(Object... params);
+
+    /**
+     * 根据实体查询
+     * @param t
+     * @return
+     */
+    T selectOne(T t);
 }

src/main/java/com/ifast/common/base/CoreServiceImpl.java

@@ -66,4 +66,9 @@ public abstract class CoreServiceImpl<M extends BaseMapper<T>, T> extends Servic
         }
         return ew;
     }
+
+    @Override
+    public T selectOne(T t) {
+        return baseMapper.selectOne(t);
+    }
 }

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

@@ -44,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.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build())).getId()).orderBy("id", false);
+        Wrapper<MpArticleDO> wrapper = new EntityWrapper<>(mpArticleDTO).eq("mpId", mpConfigService.selectOne(MpConfigDO.builder().appId(appId).build()).getId()).orderBy("id", false);
         Page<MpArticleDO> page = mpArticleService.selectPage(getPage(MpArticleDO.class), wrapper);
         return Result.ok(page);
 	}

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

@@ -43,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.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build())).getId()).orderBy("id", false);
+        Wrapper<MpArticleDO> wrapper = new EntityWrapper<>(mpArticleDTO).eq("mpId", mpConfigService.selectOne(MpConfigDO.builder().appId(appId).build()).getId()).orderBy("id", false);
         Page<MpArticleDO> page = mpArticleService.selectPage(getPage(MpArticleDO.class), wrapper);
         return Result.ok(page);
     }
@@ -67,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.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build())).getId());
+        mpArticle.setMpId(mpConfigService.selectOne(MpConfigDO.builder().appId(appId).build()).getId());
         mpArticleService.insert(mpArticle);
         return Result.ok();
     }

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

@@ -70,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.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build())).getId());
+		mpArticle.setMpId(mpConfigService.selectOne(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.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build()));
+        MpConfigDO mpConfig = mpConfigService.selectOne(MpConfigDO.builder().appId(appId).build());
         model.addAttribute("mpConfig", mpConfig);
         return "wxmp/mpConfig/edit";
     }

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

@@ -43,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.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build())).getId());
+        wrapper.eq("mpId", mpConfigService.selectOne(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

@@ -45,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.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build())).getId());
+        mpMenuDTO.setMpid(mpConfigService.selectOne(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/controller/mp/WxMediaController.java

@@ -146,8 +146,9 @@ public class WxMediaController extends AdminBaseController {
     public Result newsGroupsend(String appId, @PathVariable Long articleId) {
         MpArticleDO article = mpArticleService.selectById(articleId);
         WxMpMassOpenIdsMessage message = new WxMpMassOpenIdsMessage();
-        message.addUser(mpFansService.selectById(2L).getOpenid());
-        message.addUser(mpFansService.selectById(2L).getOpenid());
+        // TODO 群发对象
+        message.addUser(mpFansService.selectById(1L).getOpenid());
+        message.addUser(mpFansService.selectById(1L).getOpenid());
         message.setMsgType(convertMsgtype(article.getMsgtype()));
         message.setMediaId(article.getTid());
         try {

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

@@ -1,6 +1,5 @@
 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;
@@ -38,10 +37,10 @@ public class MenuHandler extends AbstractHandler {
 
         String key = wxMessage.getEventKey();
 
-        MpArticleDO mpArticleDO = mpArticleService.selectOne(new EntityWrapper<>(MpArticleDO.builder().keyword(key).build()));
+        MpArticleDO mpArticleDO = mpArticleService.selectOne(MpArticleDO.builder().keyword(key).build());
         if (Objects.isNull(mpArticleDO)) {
             logger.info("未找到与关键字【{}】匹配的回复消息。默认回复key【{}】", key, DEFAULT_ARTICLE_KEYWORD);
-            MpArticleDO defaultArticle = mpArticleService.selectOne(new EntityWrapper<>(MpArticleDO.builder().keyword(DEFAULT_ARTICLE_KEYWORD).build()));
+            MpArticleDO defaultArticle = mpArticleService.selectOne(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,6 +1,5 @@
 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;
@@ -33,7 +32,7 @@ public class UnsubscribeHandler extends AbstractHandler {
             WxSessionManager sessionManager) {
         String openId = wxMessage.getFromUser();
         this.logger.info("用户取消关注 openid: " + openId);
-        MpFansDO fans = mpFansService.selectOne(new EntityWrapper<>(MpFansDO.builder().openid(openId).build()));
+        MpFansDO fans = mpFansService.selectOne(MpFansDO.builder().openid(openId).build());
         fans.setSubscribe(Const.Subscribe.NO);
         mpFansService.updateById(fans);
         return null;

src/main/java/com/ifast/wxmp/service/impl/MpFansServiceImpl.java

@@ -1,6 +1,5 @@
 package com.ifast.wxmp.service.impl;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.ifast.common.base.CoreServiceImpl;
 import com.ifast.common.exception.IFastException;
 import com.ifast.common.type.EnumErrorCode;
@@ -77,7 +76,7 @@ public class MpFansServiceImpl extends CoreServiceImpl<MpFansDao, MpFansDO> impl
         if (StringUtils.isBlank(appId)) {
             appId = WxMpConfigHolder.getCurrentAppId();
         }
-        fans.setMpId(mpConfigService.selectOne(new EntityWrapper(MpConfigDO.builder().appId(appId))).getId());
+        fans.setMpId(mpConfigService.selectOne(MpConfigDO.builder().appId(appId).build()).getId());
 
         log.debug("convert return :{}", fans);
 

src/main/java/com/ifast/wxmp/service/impl/MpMenuServiceImpl.java

@@ -61,7 +61,7 @@ public class MpMenuServiceImpl extends CoreServiceImpl<MpMenuDao, MpMenuDO> impl
     @Override
     public void saveMenu(MpMenuDO mpMenu, String appId) {
         Long parentIdx = mpMenu.getParentidx();
-        MpConfigDO mpConfig = mpConfigService.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build()));
+        MpConfigDO mpConfig = mpConfigService.selectOne(MpConfigDO.builder().appId(appId).build());
         if(Objects.isNull(parentIdx) || parentIdx.equals(MENU_ROOT_IDX)){
             int count = this.selectCount(new EntityWrapper<>(MpMenuDO.builder().parentidx(parentIdx).mpid(mpConfig.getId()).build()));
             if(count >= MAIN_MENU_SIZE){