方法调整

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpMessageController.java

@@ -17,7 +17,6 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.Result;
@@ -25,16 +24,16 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.GetTemplateListFormDTO;
 import com.epmet.dto.form.WxMsgAuthInfoFormDTO;
 import com.epmet.dto.form.WxSubscribeMessageFormDTO;
-import com.epmet.dto.form.WxmpTemplateListFormDTO;
 import com.epmet.dto.result.GetTemplateListResultDTO;
 import com.epmet.dto.result.WxMsgAuthInfoResultDTO;
-import com.epmet.dto.result.WxmpTemplateListResultDTO;
 import com.epmet.service.WxmpMessageService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
-import sun.awt.AppContext;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -146,18 +145,4 @@ public class WxmpMessageController {
 		return new Result();
 	}
 
-	/**
-	 * @return
-	 * @Description (外挂)消息-获取订阅消息模板列表
-	 * @author sun
-	 */
-	@PostMapping("wxmptemplatelist")
-	public Result<List<WxmpTemplateListResultDTO>> wxmpTemplateList(@RequestBody WxmpTemplateListFormDTO formDTO) {
-		ValidatorUtils.validateEntity(formDTO, WxmpTemplateListFormDTO.AddUserInternalGroup.class);
-		if (!AppClientConstant.APP_RESI.equals(formDTO.getClientType()) && !AppClientConstant.APP_WORK.equals(formDTO.getClientType())) {
-			return new Result<List<WxmpTemplateListResultDTO>>().error("参数错误，clientType值类型错误！");
-		}
-		return new Result<List<WxmpTemplateListResultDTO>>().ok(wxmpMessageService.wxmpTemplateList(formDTO));
-	}
-
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/WxmpMessageExtController.java

@@ -1,9 +1,12 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.WxmpMessagePushFormDTO;
+import com.epmet.dto.form.WxmpTemplateListFormDTO;
+import com.epmet.dto.result.WxmpTemplateListResultDTO;
 import com.epmet.service.WxmpMessageExtService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,4 +52,18 @@ public class WxmpMessageExtController {
         });
         return new Result();
     }
+
+    /**
+     * @return
+     * @Description (外挂)消息-获取订阅消息模板列表
+     * @author sun
+     */
+    @PostMapping("wxmptemplatelist")
+    public Result<List<WxmpTemplateListResultDTO>> wxmpTemplateList(@RequestBody WxmpTemplateListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, WxmpTemplateListFormDTO.AddUserInternalGroup.class);
+        if (!AppClientConstant.APP_RESI.equals(formDTO.getClientType()) && !AppClientConstant.APP_WORK.equals(formDTO.getClientType())) {
+            return new Result<List<WxmpTemplateListResultDTO>>().error("参数错误，clientType值类型错误！");
+        }
+        return new Result<List<WxmpTemplateListResultDTO>>().ok(wxmpMessageExtService.wxmpTemplateList(formDTO));
+    }
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/WxmpMessageExtService.java

@@ -2,9 +2,19 @@ package com.epmet.service;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.WxmpMessagePushFormDTO;
+import com.epmet.dto.form.WxmpTemplateListFormDTO;
+import com.epmet.dto.result.WxmpTemplateListResultDTO;
 
 import java.util.List;
 
 public interface WxmpMessageExtService {
+
     Result pushWxmpMessage(List<WxmpMessagePushFormDTO> dto);
+
+    /**
+     * @return
+     * @Description 消息-获取订阅消息模板列表
+     * @author sun
+     */
+    List<WxmpTemplateListResultDTO> wxmpTemplateList(WxmpTemplateListFormDTO formDTO);
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/WxmpMessageService.java

@@ -19,10 +19,8 @@ package com.epmet.service;
 
 import com.epmet.dto.form.GetTemplateListFormDTO;
 import com.epmet.dto.form.WxSubscribeMessageFormDTO;
-import com.epmet.dto.form.WxmpTemplateListFormDTO;
 import com.epmet.dto.result.GetTemplateListResultDTO;
 import com.epmet.dto.result.WxMsgAuthInfoResultDTO;
-import com.epmet.dto.result.WxmpTemplateListResultDTO;
 
 import java.util.List;
 
@@ -57,10 +55,4 @@ public interface WxmpMessageService {
      */
     List<GetTemplateListResultDTO> templateList(GetTemplateListFormDTO formDTO);
 
-    /**
-     * @return
-     * @Description 消息-获取订阅消息模板列表
-     * @author sun
-     */
-    List<WxmpTemplateListResultDTO> wxmpTemplateList(WxmpTemplateListFormDTO formDTO);
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageExtServiceImpl.java

@@ -1,12 +1,11 @@
 package com.epmet.service.impl;
 
-import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ExtConstant;
-import com.epmet.dto.form.UserMessageFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.WxSubscribeMessageFormDTO;
+import com.epmet.dto.result.CustomerTemplateListResultDTO;
-import com.epmet.dto.form.WxmpMessagePushFormDTO;
+import com.epmet.dto.result.WxmpTemplateListResultDTO;
-import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.service.UserMessageService;
 import com.epmet.service.WxmpMessageExtService;
 import com.epmet.service.WxmpMessageService;
@@ -27,9 +26,10 @@ import java.util.List;
 public class WxmpMessageExtServiceImpl implements WxmpMessageExtService {
     @Autowired
     private WxmpMessageService wxmpMessageService;
-
     @Autowired
     private UserMessageService userMessageService;
+    @Autowired
+    private WxmpMessageServiceImpl wxmpMessageServiceImpl;
 
     @Override
     public Result pushWxmpMessage(List<WxmpMessagePushFormDTO> dtos) {
@@ -61,4 +61,23 @@ public class WxmpMessageExtServiceImpl implements WxmpMessageExtService {
         wxmpMessageService.sendWxSubscribeMessage(wxmpMsgList);
         return userMessageService.saveUserMessageList(userMsgList);
     }
+
+    /**
+     * @return
+     * @Description 消息-获取订阅消息模板列表
+     * @author sun
+     */
+    @Override
+    public List<WxmpTemplateListResultDTO> wxmpTemplateList(WxmpTemplateListFormDTO formDTO) {
+        List<WxmpTemplateListResultDTO> resultList = new ArrayList<>();
+        CustomerTemplateListFormDTO dto = ConvertUtils.sourceToTarget(formDTO, CustomerTemplateListFormDTO.class);
+        List<CustomerTemplateListResultDTO> list = wxmpMessageServiceImpl.customerTemplateList(dto);
+        list.forEach(l->{
+            if(formDTO.getClientType().equals(l.getClientType())){
+                WxmpTemplateListResultDTO result = ConvertUtils.sourceToTarget(l, WxmpTemplateListResultDTO.class);
+                resultList.add(result);
+            }
+        });
+        return resultList;
+    }
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java

@@ -424,7 +424,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
      * @Description 查询客户两个端小程序对应的站内信模板Id
      * @author sun
      */
-    private List<CustomerTemplateListResultDTO> customerTemplateList(CustomerTemplateListFormDTO formDTO) {
+    public List<CustomerTemplateListResultDTO> customerTemplateList(CustomerTemplateListFormDTO formDTO) {
         String url = "https://epmet-cloud.elinkservice.cn/api/third/personaltemplate/customertemplatelist";
         String data = HttpClientManager.getInstance().sendPostByJSON(url, JSON.toJSONString(formDTO)).getData();
         logger.info("ThirdLoginServiceImpl.customerTemplateList：httpclient->url:" + url + "，结果->" + data);
@@ -619,23 +619,4 @@ public class WxmpMessageServiceImpl implements WxmpMessageService {
         return staffBasicInfo.getOpenId();
     }
 
-    /**
-     * @return
-     * @Description 消息-获取订阅消息模板列表
-     * @author sun
-     */
-    @Override
-    public List<WxmpTemplateListResultDTO> wxmpTemplateList(WxmpTemplateListFormDTO formDTO) {
-        List<WxmpTemplateListResultDTO> resultList = new ArrayList<>();
-        CustomerTemplateListFormDTO dto = ConvertUtils.sourceToTarget(formDTO, CustomerTemplateListFormDTO.class);
-        List<CustomerTemplateListResultDTO> list = customerTemplateList(dto);
-        list.forEach(l->{
-            if(formDTO.getClientType().equals(l.getClientType())){
-                WxmpTemplateListResultDTO result = ConvertUtils.sourceToTarget(l, WxmpTemplateListResultDTO.class);
-                resultList.add(result);
-            }
-        });
-        return resultList;
-    }
-
 }