Merge remote-tracking branch 'origin/saas' into saas

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -177,9 +177,6 @@
             <if test="hid != null">
                 AND hidden_ = #{hid}
             </if>
-            <if test="tenantId != null">
-                AND hidden_ = #{tenantId}
-            </if>
         </where>
         ORDER BY sort_ DESC,id_ DESC
     </select>

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TenantInfoDao.java

@@ -7,6 +7,8 @@ import com.ym.mec.biz.dal.entity.TenantInfo;
 import com.ym.mec.biz.dal.entity.TenantProductSumm;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 public interface TenantInfoDao extends BaseMapper<TenantInfo> {
@@ -20,4 +22,6 @@ public interface TenantInfoDao extends BaseMapper<TenantInfo> {
     TenantInfo queryTenantInfoByOrgan(@Param("organId") Integer organId);
 
     void updatePhone(@Param("newPhone")String newPhone, @Param("oldPhone")String oldPhone);
+
+    List<TenantInfo> queryExpiryTenant(@Param("expiryDate") Date expiryDate);
 }

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 sendToAll(String type, Integer userId, String email, Object... objs);
+    void sendToAll(String type, Integer userId, String email,String phone, Object[] objs);
 }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ym.mec.biz.dal.dao.TenantInfoDao;
 import com.ym.mec.biz.dal.dto.TenantInfoDto;
 import com.ym.mec.biz.dal.entity.TenantInfo;
 import com.ym.mec.biz.dal.entity.TenantProductInfo;
@@ -16,6 +17,8 @@ import java.util.Map;
 
 public interface TenantInfoService extends IService<TenantInfo> {
 
+    TenantInfoDao baseMapper();
+
     void addTenantInfo(TenantInfoDto dto);
 
     void updateTenantInfo(TenantInfoDto dto);
@@ -64,4 +67,6 @@ public interface TenantInfoService extends IService<TenantInfo> {
     Boolean testEmail();
 
     void updatePhone(String newPhone, String oldPhone);
+
+    void checkTenantState();
 }

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

@@ -1,15 +1,14 @@
 package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.biz.dal.dao.TenantAssetsInfoDao;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.entity.TenantConfigDetail.CloudRoomRule;
 import com.ym.mec.biz.dal.enums.TeachModeEnum;
 import com.ym.mec.biz.dal.vo.TenantCloudCourseRecordVo;
-import com.ym.mec.biz.service.TenantAssetsInfoService;
-import com.ym.mec.biz.service.TenantCloudCourseRecordService;
-import com.ym.mec.biz.service.TenantConfigService;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.WrapperUtil;
 import com.ym.mec.thirdparty.yqpay.DateUtils;
@@ -27,6 +26,8 @@ import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import static com.ym.mec.biz.service.impl.TenantInfoSendMsgServiceImpl.INSUFFICIENT;
+
 /**
  * 机构资产信息(TenantAssetsInfo)表服务实现类
  *
@@ -42,6 +43,10 @@ public class TenantAssetsInfoServiceImpl extends ServiceImpl<TenantAssetsInfoDao
     private TenantConfigService tenantConfigService;
     @Autowired
     private TenantCloudCourseRecordService tenantCloudCourseRecordService;
+    @Autowired
+    private TenantInfoSendMsgService tenantInfoSendMsgService;
+    @Autowired
+    private TenantInfoService tenantInfoService;
 
     private final Predicate<String> VipPredicate = (o) -> Objects.equals(o, CourseSchedule.CourseScheduleType.VIP.getCode());
 
@@ -137,8 +142,22 @@ public class TenantAssetsInfoServiceImpl extends ServiceImpl<TenantAssetsInfoDao
             //写流水
             insertRecord(course, coursePrice, 1);
             log.info("deductAmount >>>>>> coursePrice {}  tenantId {}", coursePrice, course.getTenantId());
-            //扣余额
-            baseMapper.deductAmount(coursePrice, course.getTenantId());
+            //查询余额信息
+            TenantAssetsInfo assetsInfo = baseMapper.selectOne(new QueryWrapper<TenantAssetsInfo>()
+                    .eq("tenant_id_", course.getTenantId()));
+            if (Objects.nonNull(assetsInfo)) {
+                //扣余额
+                baseMapper.deductAmount(coursePrice, course.getTenantId());
+                //当前余额
+                BigDecimal balance = assetsInfo.getBalance();
+                //当前余额 减 本次扣费 的剩余额度
+                BigDecimal after = balance.subtract(coursePrice);
+                //当前余额大于300 并且 本次扣除后剩余额度小于300 就发信息提醒
+                if (balance.compareTo(new BigDecimal(300)) > -1 && balance.compareTo(after) < 0) {
+                    TenantInfo t = tenantInfoService.getById(course.getTenantId());
+                    tenantInfoSendMsgService.sendToAll(INSUFFICIENT, t.getUserId(), t.getEmail(), t.getPhone(), new Object[]{t.getName()});
+                }
+            }
         });
 
     }

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

@@ -4,14 +4,17 @@ import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.biz.service.TenantInfoSendMsgService;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
+
+import static com.ym.mec.biz.dal.enums.MessageTypeEnum.*;
 
 @Service
 public class TenantInfoSendMsgServiceImpl implements TenantInfoSendMsgService {
@@ -24,39 +27,73 @@ public class TenantInfoSendMsgServiceImpl implements TenantInfoSendMsgService {
     public static final String OPEN = "open";
     //续费
     public static final String RENEW = "renew";
+    //即将到期提醒
+    public static final String EXPIRATION = "expiration";
+    //云教室余额不足
+    public static final String INSUFFICIENT = "insufficient";
 
-    //发送邮件和短信
-    public static final Object[] sendAll = {MessageSenderPluginContext.MessageSender.EMAIL, MessageSenderPluginContext.MessageSender.AWSMS};
     //开通
     private static final Map<MessageSenderPluginContext.MessageSender, MessageTypeEnum> openMsgEnum = new HashMap<>();
     //续费
     private static final Map<MessageSenderPluginContext.MessageSender, MessageTypeEnum> renewMsgEnum = new HashMap<>();
+    //即将到期提醒
+    private static final Map<MessageSenderPluginContext.MessageSender, MessageTypeEnum> expirationMsgEnum = new HashMap<>();
+    //云教室余额不足
+    private static final Map<MessageSenderPluginContext.MessageSender, MessageTypeEnum> insufficientMsgEnum = new HashMap<>();
     //init
     private static final Map<String, Map<MessageSenderPluginContext.MessageSender, MessageTypeEnum>> sendMsgTypeEn = new HashMap<>();
 
     static {
         //开通
-        openMsgEnum.put(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.EMAIL_TENANT_ACTIVATION_SUCCESSFUL);
-        openMsgEnum.put(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SMS_TENANT_ACTIVATION_SUCCESSFUL);
+        openMsgEnum.put(MessageSenderPluginContext.MessageSender.EMAIL, EMAIL_TENANT_ACTIVATION_SUCCESSFUL);
+        openMsgEnum.put(MessageSenderPluginContext.MessageSender.AWSMS, SMS_TENANT_ACTIVATION_SUCCESSFUL);
         //续费
-        renewMsgEnum.put(MessageSenderPluginContext.MessageSender.EMAIL, MessageTypeEnum.EMAIL_TENANT_RENEWAL_SUCCESSFUL);
-        renewMsgEnum.put(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SMS_TENANT_RENEWAL_SUCCESSFUL);
+        renewMsgEnum.put(MessageSenderPluginContext.MessageSender.EMAIL, EMAIL_TENANT_RENEWAL_SUCCESSFUL);
+        renewMsgEnum.put(MessageSenderPluginContext.MessageSender.AWSMS, SMS_TENANT_RENEWAL_SUCCESSFUL);
+        //即将到期提醒
+        expirationMsgEnum.put(MessageSenderPluginContext.MessageSender.EMAIL, EMAIL_TENANT_EXPIRATION_REMINDERS);
+        expirationMsgEnum.put(MessageSenderPluginContext.MessageSender.AWSMS, SMS_TENANT_EXPIRATION_REMINDERS);
+        //云教室余额不足
+        insufficientMsgEnum.put(MessageSenderPluginContext.MessageSender.EMAIL, EMAIL_TENANT_INSUFFICIENT_BALANCE);
+        insufficientMsgEnum.put(MessageSenderPluginContext.MessageSender.AWSMS, SMS_TENANT_INSUFFICIENT_BALANCE);
+
         //init
         sendMsgTypeEn.put(OPEN, openMsgEnum);
         sendMsgTypeEn.put(RENEW, renewMsgEnum);
+        sendMsgTypeEn.put(EXPIRATION, expirationMsgEnum);
+        sendMsgTypeEn.put(INSUFFICIENT, insufficientMsgEnum);
     }
 
-    //发送邮件及短信提醒
+    /**
+     * 发送邮件及短信提醒
+     *
+     * @param type   OPEN/RENEW/EXPIRATION之类的
+     * @param userId 机构用户id
+     * @param email  发送的地址 电话或者邮件
+     * @param objs   发送的信息
+     */
     @Override
-    public void sendToAll(String type, Integer userId, String email, Object... objs) {
-        Map<Integer, String> receivers = new HashMap<>();
-        receivers.put(userId, email);
-        Arrays.stream(sendAll).forEach(o -> {
-            MessageSenderPluginContext.MessageSender msgType = (MessageSenderPluginContext.MessageSender) o;
-            sysMessageService.batchSendMessage(msgType,
-                    sendMsgTypeEn.get(type).get(msgType), receivers, null, 0, null,
+    public void sendToAll(String type, Integer userId, String email, String phone, Object[] objs) {
+        Map<Integer, String> sendPar = new HashMap<>();
+        if (Objects.isNull(userId)) {
+            return;
+        }
+        if (StringUtils.isNotBlank(email)) {
+            sendPar.put(userId, email);
+            MessageSenderPluginContext.MessageSender emailEn = MessageSenderPluginContext.MessageSender.EMAIL;
+            sysMessageService.batchSendMessage(emailEn,
+                    sendMsgTypeEn.get(type).get(emailEn), sendPar, null, 0, null,
                     "SYSTEM", objs);
-        });
+        }
+
+        if (StringUtils.isNotBlank(phone)) {
+            MessageSenderPluginContext.MessageSender smsEn = MessageSenderPluginContext.MessageSender.AWSMS;
+            sendPar.put(userId, phone);
+            sysMessageService.batchSendMessage(smsEn,
+                    sendMsgTypeEn.get(type).get(smsEn), sendPar, null, 0, null,
+                    "SYSTEM", objs);
+        }
+
     }
 
 }

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

@@ -50,10 +50,16 @@ 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);
 
+    public TenantInfoDao baseMapper() {
+        return baseMapper;
+    }
+
     @Autowired
     private SysUserFeignService sysUserFeignService;
     @Autowired
@@ -88,6 +94,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     private StudentService studentService;
     @Autowired
     private SysMessageService sysMessageService;
+    @Autowired
+    private TenantInfoSendMsgService tenantInfoSendMsgService;
 
     /**
      * 新增机构
@@ -335,12 +343,9 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         Date expiryDate = getExpiryDate(productInfo.getExpiryCount(), productInfo.getExpiryUnit(), now);
         productInfo.setExpiryDate(expiryDate);
         tenantProductInfoService.updateById(productInfo);
-        //发送邮件提醒
-        Map<Integer, String> receivers = new HashMap<>();
-        receivers.put(tenantInfo.getUserId(), tenantInfo.getEmail());
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL,
-                MessageTypeEnum.EMAIL_TENANT_ACTIVATION_SUCCESSFUL, receivers, null, 0, null,
-                "SYSTEM", tenantInfo.getName(), tenantInfo.getPhone(), "123456", "https://online.dayaedu.com");
+        //发送邮件及短信提醒
+        Object[] msg = {tenantInfo.getName(), tenantInfo.getPhone(), "123456", "https://online.dayaedu.com"};
+        tenantInfoSendMsgService.sendToAll(OPEN, tenantInfo.getUserId(), tenantInfo.getEmail(), tenantInfo.getPhone(), msg);
         //释放锁
         bucket.delete();
     }
@@ -499,14 +504,14 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                     1,//临时写死
                     tenantEnum.getCode()
             );
+            //操作续费信息，把续费周期存起来
+            opsRenewInfo(tenantId).set(val, 1, TimeUnit.HOURS);
         } else {
             //续费成功
             renewSuccess(val, productInfo, amount);
             orderState = 1;
         }
         createOrderRecord(tenantId, amount, orderNo, tenantEnum, orderState);
-        //写入续费信息
-        opsRenewInfo(tenantId).set(val, 1, TimeUnit.HOURS);
         log.info("tenant pay >>>>> {} ", result);
         return result;
     }
@@ -525,6 +530,13 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
      * @param amount      续费总金额
      */
     public void renewSuccess(Integer val, TenantProductInfo productInfo, BigDecimal amount) {
+        Integer tenantId = productInfo.getTenantId();
+        RBucket<Object> bucket = redissonClient.getBucket("tenant_renew_success:" + tenantId);
+        if (!bucket.trySet(tenantId, 1, TimeUnit.MINUTES)) {
+            //防止重复修改数据
+            return;
+        }
+
         Date expiryDate;
         Date now = new Date();
         if (productInfo.getExpiryDate().compareTo(now) > 0) {
@@ -539,15 +551,12 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         productInfo.setExpiryCount(productInfo.getExpiryCount() + val);
         tenantProductInfoService.updateById(productInfo);
 
-        TenantInfo tenantInfo = this.getById(productInfo.getTenantId());
-
-        //发送邮件提醒
-        Map<Integer, String> receivers = new HashMap<>();
-        receivers.put(tenantInfo.getUserId(), tenantInfo.getEmail());
-        sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.EMAIL,
-                MessageTypeEnum.EMAIL_TENANT_RENEWAL_SUCCESSFUL, receivers, null, 0, null,
-                "SYSTEM", tenantInfo.getName());
-
+        TenantInfo tenantInfo = this.getById(tenantId);
+        //发送邮件及短信提醒
+        Object[] msg = {tenantInfo.getName()};
+        tenantInfoSendMsgService.sendToAll(RENEW, tenantInfo.getUserId(), tenantInfo.getEmail(), tenantInfo.getPhone(), msg);
+        //释放锁
+        bucket.delete();
     }
 
     private TenantProductInfo getProductInfo(Integer tenantId) {
@@ -798,6 +807,42 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         baseMapper.updatePhone(newPhone, oldPhone);
     }
 
+
+    /**
+     * 监测机构状态
+     */
+    @Override
+    public void checkTenantState() {
+        Date now = LocalDate.now().toDate();
+
+        //查询还差30天和1天过期的机构，并发送邮件和短信
+        Integer[] days = {30, 1};
+        Arrays.stream(days).forEach(d -> checkAndSend(now, d));
+
+        //查询过期并且没有停用的机构，将其停用
+        Date maturity = DateUtils.addDays(now, -1);
+        List<TenantInfo> maturityTenant = baseMapper.queryExpiryTenant(maturity);
+        maturityTenant.forEach(t -> {
+            t.setState(2);
+            t.setUpdatedBy(-1);
+            t.setUpdatedTime(now);
+            this.updateById(t);
+        });
+    }
+
+    private void checkAndSend(Date now, int i) {
+        Date one = DateUtils.addDays(now, i);
+        List<TenantInfo> oneTenant = baseMapper.queryExpiryTenant(one);
+        send(oneTenant, DateUtils.formatDate(one, "yyyy年MM月dd日"));
+    }
+
+    private void send(List<TenantInfo> infoList, String dateStr) {
+        infoList.forEach(t -> {
+            Object[] objects = {t.getName(), dateStr};
+            tenantInfoSendMsgService.sendToAll(EXPIRATION, t.getUserId(), t.getEmail(), t.getPhone(), objects);
+        });
+    }
+
     @Override
     public TenantInfo queryTenantInfoByOrgan(Integer organId) {
         return baseMapper.queryTenantInfoByOrgan(organId);

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

@@ -53,7 +53,16 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
     private TenantAssetsInfoService assetsInfoService;
 
     //订单不存在
-    public static final String PAYMENT_ID_NOT_EXISTS = "payment_id_not_exists";
+    private static final String PAYMENT_ID_NOT_EXISTS = "payment_id_not_exists";
+
+    private static final Map<String, Consumer<TenantOrderRecord>> checkOrder = new HashMap<>();
+
+    {
+        //开通缴费
+        checkOrder.put(TenantOrderRecordEnum.TENANT_OPEN.getCode(), this::open);
+        //续费
+        checkOrder.put(TenantOrderRecordEnum.TENANT_RENEW.getCode(), this::renew);
+    }
 
     @Override
     public PageInfo<TenantOrderRecord> queryPage(TenantOrderRecordDto dto) {
@@ -108,14 +117,6 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
         return result;
     }
 
-    private static final Map<String, Consumer<TenantOrderRecord>> checkOrder = new HashMap<>();
-    {
-        //开通缴费
-        checkOrder.put(TenantOrderRecordEnum.TENANT_OPEN.getCode(), this::open);
-        //续费
-        checkOrder.put(TenantOrderRecordEnum.TENANT_RENEW.getCode(), this::renew);
-    }
-
     @Override
     public void checkTenantOrder() {
         RBucket<Object> bucket = redissonClient.getBucket("tenant_check_order");
@@ -162,9 +163,11 @@ public class TenantOrderRecordServiceImpl extends ServiceImpl<TenantOrderRecordD
         TenantProductInfo productInfo = tenantProductInfoService.getOne(new WrapperUtil<TenantProductInfo>()
                 .hasEq("tenant_id_", record.getTenantId()).queryWrapper().eq("using_", 0));
         //获取机构续费时长
-        Integer val = (Integer) tenantInfoService.opsRenewInfo(record.getTenantId()).get();
+        RBucket<Object> bucket = tenantInfoService.opsRenewInfo(record.getTenantId());
+        Integer val = (Integer) bucket.get();
         //修改产品信息
         tenantInfoService.renewSuccess(val, productInfo, record.getActualAmount());
+        bucket.delete();
     }
 
     //主动去第三方查询订单状态

mec-biz/src/main/resources/config/mybatis/TenantInfoMapper.xml

@@ -94,6 +94,7 @@
             </if>
         </where>
     </select>
+
     <select id="queryTenantInfoProductSumm" resultType="com.ym.mec.biz.dal.entity.TenantProductSumm">
             SELECT t.*, ps.name_ as serverName,
                    tp.pay_date_ as expiryDate,
@@ -110,12 +111,45 @@
                      left join platform_serve_detail psd on tp.serve_detail_id_ = psd.id_
             where t.id_ = #{tenantId}
     </select>
+
     <select id="getOpenTenant" resultType="com.ym.mec.biz.dal.entity.TenantInfo">
         SELECT * FROM tenant_info WHERE id_ = #{tenantId} AND state_ = 1
     </select>
+
     <select id="queryTenantInfoByOrgan" resultType="com.ym.mec.biz.dal.entity.TenantInfo">
         select * from tenant_info
         where id_ = (select tenant_id_ from organization where id_ = #{organId})
     </select>
 
+    <select id="queryExpiryTenant" resultMap="BaseResultMap">
+        SELECT a.id_,
+               a.name_,
+               a.contacts_,
+               a.phone_,
+               address_,
+               a.email_,
+               a.logo_,
+               a.a.customer_service_phone_,
+               a.remark_,
+               a.domain_name_,
+               a.data_source_,
+               a.pay_state_,
+               a.state_,
+               a.created_by_,
+               a.created_time_,
+               a.updated_by_,
+               a.updated_time_,
+               a.tsign_code_,
+               a.tsign_name_,
+               a.area_id_,
+               a.user_id_
+        FROM `tenant_info` AS a
+                 LEFT JOIN `tenant_product_info` AS b
+                           ON a.id_ = b.`tenant_id_`
+        WHERE a.`state_` = 1
+          AND a.`pay_state_` = 1
+          AND b.`using_` = 0
+          AND b.`expiry_date_` = #{expiryDate}
+    </select>
+
 </mapper>

mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java

@@ -230,6 +230,11 @@ public interface TaskRemoteService {
 	@GetMapping("task/checkTenantOrder")
     void checkTenantOrder();
 
+    /**
+     * 每晚12点-检查机构状态
+     */
+    @GetMapping("task/checkTenantState")
+    void checkTenantState();
 
 	/** 兑换码分配数量底告警 */
 	@GetMapping("task/redemptionCodeWarn")

mec-client-api/src/main/java/com/ym/mec/task/fallback/TaskRemoteServiceFallback.java

@@ -1,277 +1,274 @@
 package com.ym.mec.task.fallback;
 
+import com.ym.mec.task.TaskRemoteService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import com.ym.mec.task.TaskRemoteService;
-
-import java.util.Date;
-
 @Component
 public class TaskRemoteServiceFallback implements TaskRemoteService {
 
-	private final static Logger logger = LoggerFactory.getLogger(TaskRemoteServiceFallback.class);
-
-	@Override
-	public void refreshPaymentFeeStatus() {
-		logger.info("更新学生缴费状态的服务调用失败");
-	}
-
-	@Override
-	public void refreshUserMusicGroupPaymentStatusTask() {
-		logger.info("刷新学员乐团付费状态");
-	}
-
-	@Override
-	public void vipGroupAwardedMonthlyRewards() {
-		logger.info("vip课月度奖励的服务调用失败");
-	}
-
-	@Override
-	public void updateCourseScheduleToOverStatus() {
-		logger.info("更新课程状态至已结束服务调用失败");
-	}
-
-	@Override
-	public void pushNoSignOutMessage() {
-		logger.info("推送未签退消息提醒的服务调用失败");
-	}
-
-	@Override
-	public void vipGroupTeacherSalarySettlement() {
-		logger.info("vip课课酬结算的服务调用失败");
-	}
-
-	@Override
-	public void practiceTeacherSalarySettlement() {
-		logger.info("网管课课酬结算的服务调用失败");
-	}
-
-	@Override
-	public void MusicGroupTeacherSalarySettlement() {
-		logger.info("乐团课课酬结算的服务调用失败");
-	}
-
-	@Override
-	public void studentCoursesScheduleRemind() {
-		logger.info("有课提醒的服务调用失败");
-	}
-
-	@Override
-	public void studentSignInRemind() {
-		logger.info("上课提醒的服务调用失败");
-	}
-
-	@Override
-	public void studentHomeworkRemind() {
-		logger.info("学生训练提醒的服务调用失败");
-	}
-
-	@Override
-	public void teacherCoursesScheduleRemind() {
-		logger.info("老师有课提醒的服务调用失败");
-	}
-
-	@Override
-	public void teacherSignInRemind() {
-		logger.info("老师上课提醒的服务调用失败");
-	}
-
-	@Override
-	public void homeworkNoReplyRemind() {
-		logger.info("老师未回复训练提醒的服务调用失败");
-	}
-
-	@Override
-	public void queryOrderStatus() {
-		logger.info("查询订单状态的服务调用失败");
-	}
-
-	@Override
-	public void updateVipGroupToFinishedStatus() {
-		logger.info("更新VIP课程状态至已结束的服务调用失败");
-	}
-
-	@Override
-	public void stopVipGroupWithNoCreate() {
-		logger.info("取消达到报名时间未达到报名人数的vip课失败");
-	}
-
-	@Override
-	public void teacherCourseStatistic() {
-		logger.info("统计老师课酬失败");
-	}
-
-	@Override
-	public void updateHistoryPracticeGroupStatus() {
-		logger.info("历史网管课状态更新失败");
-	}
-
-	@Override
-	public void pushStudyReport() {
-		logger.info("练习报告推送失败");
-	}
-
-	@Override
-	public void pushNeedPostReport() {
-		logger.info("新增待填写月报推送失败");
-	}
-
-	@Override
-	public void createEvaluate() {
-		logger.info("预生成待提交月报失败");
-	}
-
-	@Override
-	public void pushNeedReview2Teacher() {
-		logger.info("新增待填写评论推送失败");
-	}
-
-	@Override
-	public void noStudentsCourseGroupRemind() {
-		logger.info("对外课程组无学生推送失败");
-	}
-
-	@Override
-	public void finishCourseGroup() {
-		logger.info("更新对外课程组至已结束失败");
-	}
-
-	@Override
-	public void exercisesSituationStatistics() {
-		logger.info("学员服务信息统计失败");
-	}
-
-	@Override
-	public void updateStudentOperatingTag() {
-		logger.info("更新学生运营指标失败");
-	}
-
-	@Override
-	public void updateMusicGroupPaymentCalenderStatus() {
-		logger.info("更新乐团缴费日历的状态失败");
-	}
-
-	@Override
-	public void pushWaitSendMessageTask() {
-		logger.info("延时推送执行失败");
-	}
-
-	@Override
-	public void pushTeacherExceptionAttendanceTask() {
-		logger.info("教师异常考勤推送失败");
-	}
-
-	@Override
-	public void updateMusicGroupStudentFeeStatus() {
-		logger.info("更新乐团学员缴费状态失败");
-	}
-
-	@Override
-	public void studentServeRemind() {
-		logger.info("本周应布置课外训练推送失败");
-	}
-
-	@Override
-	public void operatingReport() {
-		logger.info("经营报表生成失败");
-	}
-
-	@Override
-	public void goodsRepertoryFBIWarnTask() {
-		logger.info("商品库存预警推送失败");
-	}
-
-	@Override
-	public void autoAffirmReceiveTask() {
-		logger.info("确认收货执行失败");
-	}
-
-	@Override
-	public void countIndexBaseData() {
-		logger.info("首页数据统计失败");
-	}
-
-	@Override
-	public void inspectionPlan() {
-		logger.info("巡查日程提醒提送失败");
-	}
-
-	@Override
-	public void closeStudentServiceTag() {
-		logger.info("学员服务指标关闭失败");
-	}
-
-	@Override
-	public void updateGrade() {
-		logger.info("学生年级更新失败");
-	}
+    private final static Logger logger = LoggerFactory.getLogger(TaskRemoteServiceFallback.class);
+
+    @Override
+    public void refreshPaymentFeeStatus() {
+        logger.info("更新学生缴费状态的服务调用失败");
+    }
+
+    @Override
+    public void refreshUserMusicGroupPaymentStatusTask() {
+        logger.info("刷新学员乐团付费状态");
+    }
+
+    @Override
+    public void vipGroupAwardedMonthlyRewards() {
+        logger.info("vip课月度奖励的服务调用失败");
+    }
+
+    @Override
+    public void updateCourseScheduleToOverStatus() {
+        logger.info("更新课程状态至已结束服务调用失败");
+    }
+
+    @Override
+    public void pushNoSignOutMessage() {
+        logger.info("推送未签退消息提醒的服务调用失败");
+    }
+
+    @Override
+    public void vipGroupTeacherSalarySettlement() {
+        logger.info("vip课课酬结算的服务调用失败");
+    }
+
+    @Override
+    public void practiceTeacherSalarySettlement() {
+        logger.info("网管课课酬结算的服务调用失败");
+    }
+
+    @Override
+    public void MusicGroupTeacherSalarySettlement() {
+        logger.info("乐团课课酬结算的服务调用失败");
+    }
+
+    @Override
+    public void studentCoursesScheduleRemind() {
+        logger.info("有课提醒的服务调用失败");
+    }
+
+    @Override
+    public void studentSignInRemind() {
+        logger.info("上课提醒的服务调用失败");
+    }
+
+    @Override
+    public void studentHomeworkRemind() {
+        logger.info("学生训练提醒的服务调用失败");
+    }
+
+    @Override
+    public void teacherCoursesScheduleRemind() {
+        logger.info("老师有课提醒的服务调用失败");
+    }
+
+    @Override
+    public void teacherSignInRemind() {
+        logger.info("老师上课提醒的服务调用失败");
+    }
+
+    @Override
+    public void homeworkNoReplyRemind() {
+        logger.info("老师未回复训练提醒的服务调用失败");
+    }
+
+    @Override
+    public void queryOrderStatus() {
+        logger.info("查询订单状态的服务调用失败");
+    }
+
+    @Override
+    public void updateVipGroupToFinishedStatus() {
+        logger.info("更新VIP课程状态至已结束的服务调用失败");
+    }
+
+    @Override
+    public void stopVipGroupWithNoCreate() {
+        logger.info("取消达到报名时间未达到报名人数的vip课失败");
+    }
+
+    @Override
+    public void teacherCourseStatistic() {
+        logger.info("统计老师课酬失败");
+    }
+
+    @Override
+    public void updateHistoryPracticeGroupStatus() {
+        logger.info("历史网管课状态更新失败");
+    }
+
+    @Override
+    public void pushStudyReport() {
+        logger.info("练习报告推送失败");
+    }
+
+    @Override
+    public void pushNeedPostReport() {
+        logger.info("新增待填写月报推送失败");
+    }
+
+    @Override
+    public void createEvaluate() {
+        logger.info("预生成待提交月报失败");
+    }
+
+    @Override
+    public void pushNeedReview2Teacher() {
+        logger.info("新增待填写评论推送失败");
+    }
+
+    @Override
+    public void noStudentsCourseGroupRemind() {
+        logger.info("对外课程组无学生推送失败");
+    }
+
+    @Override
+    public void finishCourseGroup() {
+        logger.info("更新对外课程组至已结束失败");
+    }
+
+    @Override
+    public void exercisesSituationStatistics() {
+        logger.info("学员服务信息统计失败");
+    }
+
+    @Override
+    public void updateStudentOperatingTag() {
+        logger.info("更新学生运营指标失败");
+    }
+
+    @Override
+    public void updateMusicGroupPaymentCalenderStatus() {
+        logger.info("更新乐团缴费日历的状态失败");
+    }
+
+    @Override
+    public void pushWaitSendMessageTask() {
+        logger.info("延时推送执行失败");
+    }
+
+    @Override
+    public void pushTeacherExceptionAttendanceTask() {
+        logger.info("教师异常考勤推送失败");
+    }
+
+    @Override
+    public void updateMusicGroupStudentFeeStatus() {
+        logger.info("更新乐团学员缴费状态失败");
+    }
+
+    @Override
+    public void studentServeRemind() {
+        logger.info("本周应布置课外训练推送失败");
+    }
+
+    @Override
+    public void operatingReport() {
+        logger.info("经营报表生成失败");
+    }
+
+    @Override
+    public void goodsRepertoryFBIWarnTask() {
+        logger.info("商品库存预警推送失败");
+    }
+
+    @Override
+    public void autoAffirmReceiveTask() {
+        logger.info("确认收货执行失败");
+    }
+
+    @Override
+    public void countIndexBaseData() {
+        logger.info("首页数据统计失败");
+    }
+
+    @Override
+    public void inspectionPlan() {
+        logger.info("巡查日程提醒提送失败");
+    }
+
+    @Override
+    public void closeStudentServiceTag() {
+        logger.info("学员服务指标关闭失败");
+    }
+
+    @Override
+    public void updateGrade() {
+        logger.info("学生年级更新失败");
+    }
 
     @Override
     public void maintenanceNotice() {
-		logger.info("乐保到期提醒推送失败");
+        logger.info("乐保到期提醒推送失败");
     }
 
     @Override
     public void maintenanceOldDateAdd() {
-		logger.info("乐保历史数据处理失败");
+        logger.info("乐保历史数据处理失败");
     }
 
-	@Override
-	public void updateStudentTeacherAndSubject() {
-		logger.error("更新学员指导老师和声部信息失败");
-	}
+    @Override
+    public void updateStudentTeacherAndSubject() {
+        logger.error("更新学员指导老师和声部信息失败");
+    }
 
-	@Override
-	public void todayIncomeRemind() {
-		logger.error("推送查看今日收入提醒失败");
-	}
+    @Override
+    public void todayIncomeRemind() {
+        logger.error("推送查看今日收入提醒失败");
+    }
 
-	@Override
-	public void salaryMarkNew() {
-		logger.error("大雅基本工资标记失败");
-	}
+    @Override
+    public void salaryMarkNew() {
+        logger.error("大雅基本工资标记失败");
+    }
 
     @Override
     public void syncImHistoryMessageTask() {
-		logger.error("同步即时通讯聊天记录失败");
+        logger.error("同步即时通讯聊天记录失败");
     }
 
-	@Override
-	public void indexErrDataRecord() {
-		logger.error("历史异常数据记录失败");
-	}
+    @Override
+    public void indexErrDataRecord() {
+        logger.error("历史异常数据记录失败");
+    }
 
-	@Override
-	public void autoCleanPreCourseTask() {
-		logger.error("每天凌晨3点清理所有的乐团预排课");
-	}
+    @Override
+    public void autoCleanPreCourseTask() {
+        logger.error("每天凌晨3点清理所有的乐团预排课");
+    }
 
     @Override
     public void musicSchoolTermPush() {
         logger.error("每天10点推送乐团排课、续费、退团提醒");
     }
 
-	@Override
-	public void memberEndAutoQuitMusic() {
-		logger.error("会员到期自动退团");
-	}
+    @Override
+    public void memberEndAutoQuitMusic() {
+        logger.error("会员到期自动退团");
+    }
 
-	@Override
-	public void cleanStudentMember() {
-		logger.error("学员会员到期状态更新");
-	}
+    @Override
+    public void cleanStudentMember() {
+        logger.error("学员会员到期状态更新");
+    }
 
-	@Override
-	public void cleanStudentCloudStudySequenceDays() {
-		logger.error("清理学员云教练连续使用天数失败");
-	}
+    @Override
+    public void cleanStudentCloudStudySequenceDays() {
+        logger.error("清理学员云教练连续使用天数失败");
+    }
 
-	@Override
-	public void curWeekStudentTrainRemind() {
-		logger.error("本周学员训练提醒失败");
-	}
+    @Override
+    public void curWeekStudentTrainRemind() {
+        logger.error("本周学员训练提醒失败");
+    }
 
     @Override
     public void remarkCountFlag() {
@@ -283,8 +280,13 @@ public class TaskRemoteServiceFallback implements TaskRemoteService {
         logger.error("校验机构付款记录支付状态失败");
     }
 
-	@Override
-	public void redemptionCodeWarn() {
-		logger.error("兑换码分配数量底告警");
-	}
+    @Override
+    public void checkTenantState() {
+        logger.error("校验机构状态失败");
+    }
+
+    @Override
+    public void redemptionCodeWarn() {
+        logger.error("兑换码分配数量底告警");
+    }
 }

mec-common/common-core/src/main/java/com/ym/mec/common/page/WrapperUtil.java

@@ -151,7 +151,7 @@ public class WrapperUtil<T> {
     }
 
     public static List<String> collectToList(String[] b) {
-        return Arrays.stream(b).filter(StrPredicate).collect(Collectors.toList());
+        return Arrays.stream(b).filter(StrPredicate).distinct().collect(Collectors.toList());
     }
 
     /**

mec-task/src/main/java/com/ym/mec/task/jobs/CheckTenantState.java

@@ -0,0 +1,24 @@
+package com.ym.mec.task.jobs;
+
+import com.ym.mec.task.TaskRemoteService;
+import com.ym.mec.task.core.BaseTask;
+import com.ym.mec.task.core.TaskException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author hgw
+ * Created by 2022-01-10
+ */
+@Service
+public class CheckTenantState extends BaseTask {
+
+    @Autowired
+    private TaskRemoteService taskRemoteService;
+
+    @Override
+    public void execute() throws TaskException {
+        taskRemoteService.checkTenantState();
+    }
+
+}

mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -529,4 +529,10 @@ public class TaskController extends BaseController {
     public void checkTenantOrder(){
         tenantOrderRecordService.checkTenantOrder();
     }
+
+    @ApiOperation("每晚12点-检查机构状态")
+    @GetMapping(value = "/checkTenantState")
+    public void checkTenantState(){
+        tenantInfoService.checkTenantState();
+    }
 }