秘钥重复性校验

mrqcman-service/src/main/java/com/diagbot/facade/MrqcTokenFacade.java

@@ -12,6 +12,7 @@ import com.diagbot.service.UploadService;
 import com.diagbot.service.impl.MrqcTokenServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.RSAEncrypt;
 import com.diagbot.vo.MrqcTokenContentVO;
 import com.diagbot.vo.MrqcTokenDeleteVO;
@@ -27,6 +28,7 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -45,19 +47,25 @@ public class MrqcTokenFacade extends MrqcTokenServiceImpl {
         Date date = DateUtil.now();
         MrqcToken mrqcToken = new MrqcToken();
         BeanUtil.copyProperties(mrqcTokenVO, mrqcToken);
-        // 重复性校验
-        int num = this.count(new QueryWrapper<MrqcToken>()
+        List<MrqcToken> list = this.list(new QueryWrapper<MrqcToken>()
                 .eq("ip", mrqcTokenVO.getIp())
                 .eq("cpu", mrqcTokenVO.getCpu())
-                .eq("server", mrqcTokenVO.getServer())
-                .eq("hospital", mrqcTokenVO.getHospital())
+//                .eq("server", mrqcTokenVO.getServer())
+//                .eq("hospital", mrqcTokenVO.getHospital())
                 .eq("mainboard", mrqcTokenVO.getMainboard())
                 .eq("disk", mrqcTokenVO.getDisk())
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .ne(mrqcTokenVO.getId() != null, "id", mrqcTokenVO.getId())
         );
-        if (num > 0) {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "当前token信息已存在");
+        if (ListUtil.isNotEmpty(list)) {
+            StringBuffer sb = new StringBuffer();
+            sb.append("当前loginKey已生成!<br>" );
+            for (MrqcToken bean : list) {
+                sb.append("服务商【").append(bean.getServer())
+                    .append("】，医院【").append(bean.getHospital())
+                    .append("】<br>");
+            }
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, sb.toString());
         }
         // id为空表示新增，只有新增时才生成loginKey
         if (mrqcTokenVO.getId() == null) {