优化代码

mec-biz/src/main/java/com/ym/mec/biz/service/TenantInfoSendMsgService.java

@@ -2,5 +2,5 @@ package com.ym.mec.biz.service;
 
 public interface TenantInfoSendMsgService {
 
-    void platformSendToAll(String type, String email, String phone, Object[] objs);
+    void platformSendToAll(String email, String phone, Object[] objs);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantAssetsInfoServiceImpl.java

@@ -26,8 +26,6 @@ import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import static com.ym.mec.biz.service.impl.TenantInfoSendMsgServiceImpl.PLATFORM_SEND;
-
 /**
  * 机构资产信息(TenantAssetsInfo)表服务实现类
  *
@@ -155,7 +153,7 @@ public class TenantAssetsInfoServiceImpl extends ServiceImpl<TenantAssetsInfoDao
                 //当前余额大于300 并且 本次扣除后剩余额度小于300 就发信息提醒
                 if (balance.compareTo(new BigDecimal(300)) > -1 && balance.compareTo(after) < 0) {
                     TenantInfo t = tenantInfoService.getById(course.getTenantId());
-                    tenantInfoSendMsgService.platformSendToAll(PLATFORM_SEND, t.getEmail(), t.getPhone(), new Object[]{t.getName()});
+                    tenantInfoSendMsgService.platformSendToAll(t.getEmail(), t.getPhone(), new Object[]{t.getName()});
                 }
             }
         });

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoSendMsgServiceImpl.java

@@ -34,26 +34,22 @@ public class TenantInfoSendMsgServiceImpl implements TenantInfoSendMsgService {
     public static final MessageSenderPluginContext.MessageSender[] SENDER_ALL_ENUM = {MessageSenderPluginContext.MessageSender.EMAIL, MessageSenderPluginContext.MessageSender.AWSMS};
     //平台向机构发送信息 开通、续费、即将到期提醒、云教室余额不足
     private static final Map<MessageSenderPluginContext.MessageSender, MessageTypeEnum> PLATFORM_ALL_MSG_ENUM = new HashMap<>();
-    //init
-    private static final Map<String, Map<MessageSenderPluginContext.MessageSender, MessageTypeEnum>> SEND_MSG_TYPE = new HashMap<>();
 
     static {
         //开通、续费、即将到期提醒、云教室余额不足 以上都是平台向机构发信息
         PLATFORM_ALL_MSG_ENUM.put(MessageSenderPluginContext.MessageSender.EMAIL, EMAIL_TENANT_ACTIVATION_SUCCESSFUL);
         PLATFORM_ALL_MSG_ENUM.put(MessageSenderPluginContext.MessageSender.AWSMS, SMS_TENANT_ACTIVATION_SUCCESSFUL);
-        //init
-        SEND_MSG_TYPE.put(PLATFORM_SEND, PLATFORM_ALL_MSG_ENUM);
     }
 
     /**
      * 以平台的名义发送邮件及短信
      *
-     * @param type  OPEN/RENEW/EXPIRATION之类的
      * @param email 发送的地址 电话或者邮件
      * @param objs  发送的信息
      */
     @Override
-    public void platformSendToAll(String type, String email, String phone, Object[] objs) {
+    public void platformSendToAll(String email, String phone, Object[] objs) {
+        log.info("platformSendToAll>>> ing...");
         Map<Integer, String> sendPar = new HashMap<>();
         Integer userId = tenantInfoDao.queryUserByTenantId(-1);
         if (Objects.isNull(userId)) {
@@ -61,10 +57,10 @@ public class TenantInfoSendMsgServiceImpl implements TenantInfoSendMsgService {
         }
         sendPar.put(userId, email);
         if (StringUtils.isNotBlank(email) && StringUtils.isNotBlank(phone)) {
+            log.info("platformSendToAll>>> email {} phone {} objs {} sendPar {}", email, phone, objs, sendPar);
             Arrays.stream(SENDER_ALL_ENUM).forEach(en -> sysMessageService.batchSendMessage(en,
-                    SEND_MSG_TYPE.get(type).get(en), sendPar, null, 0, null,
+                    PLATFORM_ALL_MSG_ENUM.get(en), sendPar, null, 0, null,
                     "SYSTEM", objs));
-
         }
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantInfoServiceImpl.java

@@ -48,8 +48,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import static com.ym.mec.biz.service.impl.TenantInfoSendMsgServiceImpl.*;
-
 @Service
 public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo> implements TenantInfoService {
     private static final Logger log = LoggerFactory.getLogger(TenantInfoServiceImpl.class);
@@ -345,7 +343,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         tenantProductInfoService.updateById(productInfo);
         //发送邮件及短信提醒
         Object[] msg = {tenantInfo.getName(), tenantInfo.getPhone(), "123456", "https://online.dayaedu.com"};
-        tenantInfoSendMsgService.platformSendToAll(PLATFORM_SEND, tenantInfo.getEmail(), tenantInfo.getPhone(), msg);
+        tenantInfoSendMsgService.platformSendToAll(tenantInfo.getEmail(), tenantInfo.getPhone(), msg);
         //释放锁
         bucket.delete();
     }
@@ -443,7 +441,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
      */
     public Map<String, Object> tenantOpenPay(Integer tenantId) throws Exception {
         SysConfig config = sysConfigService.findByParamName("platform_collection_organ");
-        if(Objects.isNull(config)){
+        if (Objects.isNull(config)) {
             throw new BizException("未查询到机构收款分部信息！");
         }
 
@@ -489,7 +487,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
      */
     public Map<String, Object> tenantRenewPay(Integer tenantId, Integer val) throws Exception {
         SysConfig config = sysConfigService.findByParamName("platform_collection_organ");
-        if(Objects.isNull(config)){
+        if (Objects.isNull(config)) {
             throw new BizException("未查询到机构收款分部信息！");
         }
 
@@ -574,7 +572,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         TenantInfo tenantInfo = this.getById(tenantId);
         //发送邮件及短信提醒
         Object[] msg = {tenantInfo.getName()};
-        tenantInfoSendMsgService.platformSendToAll(PLATFORM_SEND, tenantInfo.getEmail(), tenantInfo.getPhone(), msg);
+        tenantInfoSendMsgService.platformSendToAll(tenantInfo.getEmail(), tenantInfo.getPhone(), msg);
         //释放锁
         bucket.delete();
     }
@@ -707,7 +705,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     @Override
     public Map<String, Object> recharge(Integer tenantId, BigDecimal amount) throws Exception {
         SysConfig config = sysConfigService.findByParamName("platform_collection_organ");
-        if(Objects.isNull(config)){
+        if (Objects.isNull(config)) {
             throw new BizException("未查询到机构收款分部信息！");
         }
         log.error("机构 " + tenantId.toString() + "充值");
@@ -777,14 +775,14 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
 
     @Override
     public void saveTenantContextHolder(HttpServletRequest request) {
-    	
-    	final String TENANT_ID = "tenantId";
+
+        final String TENANT_ID = "tenantId";
         String tenantId = request.getParameter(TENANT_ID);
-        
-        if(StringUtils.isBlank(tenantId)){
-        	tenantId = request.getHeader(TENANT_ID);
+
+        if (StringUtils.isBlank(tenantId)) {
+            tenantId = request.getHeader(TENANT_ID);
         }
-        
+
         if (StringUtils.isBlank(tenantId)) {
             SysUser sysUser = sysUserFeignService.queryUserInfo();
             if (sysUser != null && sysUser.getTenantId() != null) {
@@ -842,7 +840,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     private void send(List<TenantInfo> infoList, String dateStr) {
         infoList.forEach(t -> {
             Object[] objects = {t.getName(), dateStr};
-            tenantInfoSendMsgService.platformSendToAll(PLATFORM_SEND, t.getEmail(), t.getPhone(), objects);
+            tenantInfoSendMsgService.platformSendToAll(t.getEmail(), t.getPhone(), objects);
         });
     }