修改 一个机构只有一个开通协议

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.biz.dal.entity.TenantContractRecord;
+import com.ym.mec.biz.dal.entity.TenantContractRecord.TenantContractRecordEnum;
 import com.ym.mec.common.page.PageInfo;
 
 import java.util.Map;
@@ -14,7 +15,7 @@ import java.util.Map;
  */
 public interface TenantContractRecordService extends IService<TenantContractRecord> {
 
-    int insertContractRecord(Integer tenantId, String contractPath, TenantContractRecord.TenantContractRecordEnum en);
+    int insertContractRecord(Integer tenantId, String contractPath, TenantContractRecordEnum en);
 
     PageInfo<TenantContractRecord> queryPage(Map<String, Object> param);
 }

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

@@ -1,10 +1,12 @@
 package com.ym.mec.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.biz.dal.dao.TenantContractRecordDao;
 import com.ym.mec.biz.dal.entity.TenantContractRecord;
+import com.ym.mec.biz.dal.entity.TenantContractRecord.TenantContractRecordEnum;
 import com.ym.mec.biz.service.TenantContractRecordService;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageUtil;
@@ -16,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 机构协议记录表(TenantContractRecord)表服务实现类
@@ -37,7 +40,15 @@ public class TenantContractRecordServiceImpl extends ServiceImpl<TenantContractR
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int insertContractRecord(Integer tenantId, String contractPath, TenantContractRecord.TenantContractRecordEnum en) {
+    public int insertContractRecord(Integer tenantId, String contractPath, TenantContractRecordEnum en) {
+        //一个机构只能创建一个开通协议
+        TenantContractRecord open = this.getOne(new QueryWrapper<>(new TenantContractRecord())
+                .eq("tenant_id", tenantId)
+                .eq("type", TenantContractRecordEnum.OPEN.getType()));
+        if (Objects.nonNull(open)) {
+            return 1;
+        }
+
         Date now = new Date();
         TenantContractRecord record = new TenantContractRecord();
         record.setContractName(en.getMsg());

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

@@ -655,7 +655,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
      */
     private String getContractAndUpLoad(Integer tenantId, TenantContractRecordEnum en, Integer val) {
         RBucket<Object> bucket = redissonClient.getBucket("getContractAndUpLoad:" + tenantId + ":" + en.getType());
-        if (!bucket.trySet(tenantId, 30, TimeUnit.SECONDS)) {
+        if (!bucket.trySet(tenantId, 15, TimeUnit.SECONDS)) {
             return null;
         }
         Date now = new Date();