From a531ebeaef8e8fd2c7fadb1663e8cf4d45c1d636 Mon Sep 17 00:00:00 2001
From: xxxxxwwwww <3040838740@qq.com>
Date: Wed, 30 Mar 2022 15:08:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/ocp/mapper/OcpTenantBaseMapper.java   | 10 +++++--
 .../com/pms/ocp/model/dto/AppRegisterDTO.java |  2 +-
 .../java/com/pms/ocp/model/dto/ImgDTO.java    |  2 +-
 .../service/impl/AppRegisterServiceImpl.java  |  5 ++++
 .../resources/mapper/OcpTenantBaseMapper.xml  | 29 ++++++++++++++-----
 5 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java
index 6532738..3f66a96 100644
--- a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java
@@ -9,10 +9,16 @@ import java.util.List;
 public interface OcpTenantBaseMapper extends BaseMapper<OcpTenantBase> {
 
 
-
-    OcpTenantBase updataIsDelect(String objId,Short isDelete);
+    OcpTenantBase updataIsDelect(String objId, Short isDelete);
 
 
     List<OcpTenantGroupIocnDto> selectAlls();
 
+    /**
+     * 查询数据库中是否有现有应用编码
+     *
+     * @param appCode
+     * @return
+     */
+    int queryCount(String appCode);
 }
diff --git a/src/main/java/com/pms/ocp/model/dto/AppRegisterDTO.java b/src/main/java/com/pms/ocp/model/dto/AppRegisterDTO.java
index 6822d9b..b6e43c9 100644
--- a/src/main/java/com/pms/ocp/model/dto/AppRegisterDTO.java
+++ b/src/main/java/com/pms/ocp/model/dto/AppRegisterDTO.java
@@ -27,7 +27,7 @@ public class AppRegisterDTO {
 
 
     @ApiModelProperty("应用图标")
-    @NotBlank(message = "应用图标不能为空", groups = CreateGroups.class)
+//    @NotBlank(message = "应用图标不能为空", groups = CreateGroups.class)
     private byte[] imgUrl;
 
     @ApiModelProperty("应用名称")
diff --git a/src/main/java/com/pms/ocp/model/dto/ImgDTO.java b/src/main/java/com/pms/ocp/model/dto/ImgDTO.java
index f4d59e7..cd4f9b6 100644
--- a/src/main/java/com/pms/ocp/model/dto/ImgDTO.java
+++ b/src/main/java/com/pms/ocp/model/dto/ImgDTO.java
@@ -19,7 +19,7 @@ public class ImgDTO {
     private String tenantCode;
 
     @ApiModelProperty(value = "应用预览url")
-    @NotBlank(message = "应用预览url不能为空", groups = CreateGroups.class)
+//    @NotBlank(message = "应用预览url不能为空", groups = CreateGroups.class)
     private byte[] img;
 
     public String getTenantCode() {
diff --git a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java
index 735a10c..e450017 100644
--- a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java
@@ -49,6 +49,11 @@ public class AppRegisterServiceImpl implements AppRegisterService {
     @Override
     public ResponseVO addApp(AppRegisterDTO appRegisterDTO) {
 
+        int count = ocpTenantBaseMapper.queryCount(appRegisterDTO.getAppCode());
+        if (count != 0) {
+            return ResponseVO.error("应用编码有重复");
+        }
+
         OcpTenantIocn ocpTenantIocn = new OcpTenantIocn();
         ocpTenantIocn.setIocnType("tenant");
         ocpTenantIocn.setCodeNo(appRegisterDTO.getAppCode());
diff --git a/src/main/resources/mapper/OcpTenantBaseMapper.xml b/src/main/resources/mapper/OcpTenantBaseMapper.xml
index 230120b..9d7566c 100644
--- a/src/main/resources/mapper/OcpTenantBaseMapper.xml
+++ b/src/main/resources/mapper/OcpTenantBaseMapper.xml
@@ -1,20 +1,35 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.pms.ocp.mapper.OcpTenantBaseMapper" >
+<mapper namespace="com.pms.ocp.mapper.OcpTenantBaseMapper">
     <select id="getOtbList" resultType="com.pms.ocp.model.entity.OcpTenantBase">
-        select * from ocp_tenant_base otb
-        LEFT JOIN ocp_tenant_extent ote
-        on otb.tenant_code = ote.tenant_code
+        select *
+        from ocp_tenant_base otb
+                 LEFT JOIN ocp_tenant_extent ote
+                           on otb.tenant_code = ote.tenant_code
         where otb.obj_id = #{objId}
     </select>
 
     <select id="updataIsDelect" resultType="com.pms.ocp.model.entity.OcpTenantBase">
-        UPDATE ocp_tenant_base SET is_delete = #{isDelete} WHERE obj_id = #{objId};
+        UPDATE ocp_tenant_base
+        SET is_delete = #{isDelete}
+        WHERE obj_id = #{objId};
     </select>
 
     <select id="selectAlls" resultType="com.pms.ocp.model.dto.OcpTenantGroupIocnDto">
-       SELECT * FROM ocp_tenant_base AS base ,ocp_tenant_extent AS extent,ocp_tenant_iocn as iocn
-  WHERE base.tenant_code = extent.tenant_code and base.tenant_code = code_no and iocn.iocn_kind is null ORDER BY base.tenant_mtime DESC;
+        SELECT *
+        FROM ocp_tenant_base AS base,
+             ocp_tenant_extent AS extent,
+             ocp_tenant_iocn as iocn
+        WHERE base.tenant_code = extent.tenant_code
+          and base.tenant_code = code_no
+          and iocn.iocn_kind is null
+        ORDER BY base.tenant_mtime DESC;
+    </select>
+
+    <select id="queryCount" resultType="java.lang.Integer">
+        select count(0)
+        from ocp_tenant_base
+        where tenant_code = #{appCode}
     </select>
 
 </mapper>
\ No newline at end of file
-- 
2.26.0