Merge remote-tracking branch 'origin/master'

operation-control-platform.iml

 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="CheckStyle-IDEA-Module">
-    <option name="configuration">
-      <map />
-    </option>
-  </component>
   <component name="FacetManager">
     <facet type="Spring" name="Spring">
       <configuration />
@@ -82,7 +77,6 @@
     <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.9" level="project" />
     <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.9" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.4.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.4.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.4.2" level="project" />
@@ -115,6 +109,7 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
     <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.7.16" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:4.1.1" level="project" />
     <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.4" level="project" />

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);
 }

src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java

@@ -21,6 +21,8 @@ public class ApiBaseDto implements Serializable {
     @ApiModelProperty("服务编码")
     private String apiCode;
 
+    @ApiModelProperty("服务名称")
+    private String apiName;
     @ApiModelProperty("服务分类编码")
     private String apiGroupCode;
 
@@ -200,4 +202,20 @@ public class ApiBaseDto implements Serializable {
     public void setApiGroupName(String apiGroupName) {
         this.apiGroupName = apiGroupName;
     }
+
+    public String getApiName() {
+        return apiName;
+    }
+
+    public void setApiName(String apiName) {
+        this.apiName = apiName;
+    }
+
+    public Integer getCurrentPage() {
+        return currentPage;
+    }
+
+    public void setCurrentPage(Integer currentPage) {
+        this.currentPage = currentPage;
+    }
 }

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("应用名称")

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() {

src/main/java/com/pms/ocp/model/dto/OcpBaseTiocnDto.java

@@ -31,7 +31,7 @@ public class OcpBaseTiocnDto extends OcpTenantBase implements Serializable {
      * 应用调用的服务数量图标数据
      */
     @ApiModelProperty(value = "应用调用的服务数量图标数据")
-    private String iocn;
+    private byte[] iocn;
 
     @ApiModelProperty(value = "图片类型")
     private Object iocnKind;
@@ -47,11 +47,11 @@ public class OcpBaseTiocnDto extends OcpTenantBase implements Serializable {
         this.iocnType = iocnType;
     }
 
-    public String getIocn() {
+    public byte[] getIocn() {
         return iocn;
     }
 
-    public void setIocn(String iocn) {
+    public void setIocn(byte[] iocn) {
         this.iocn = iocn;
     }
 

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());

src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java

@@ -454,7 +454,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         String ownerCompanyCode = ocpBaseTiocnDto.getOwnerCompanyCode();
         ocpTenantIocn.setCodeNo(tenantCode);
         ocpTenantIocn.setIocnType("tenant");
-//        ocpTenantIocn.setIocn(ocpBaseTiocnDto.getIocn());
+        ocpTenantIocn.setIocn(ocpBaseTiocnDto.getIocn());
         ocpTenantIocn.setCompanyCode(ownerCompanyCode);
         boolean save = ocpTenantIocnService.save(ocpTenantIocn);
         if (save1 && save) {

src/main/resources/application-local.yml

@@ -2,11 +2,11 @@ spring:
   datasource:
     driver-class-name: org.postgresql.Driver
     username: postgres
-    password: 123456
+    password: 1234
     type: com.zaxxer.hikari.HikariDataSource
 #    jdbc-url: jdbc:postgresql://192.168.43.20:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
 #    jdbc-url: jdbc:postgresql://172.20.10.9:33072/pms3?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
-    url: jdbc:postgresql://localhost:5432/test?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
+    url: jdbc:postgresql://localhost:5432/pms_accept?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
 
 knife4j:
   enable: true

src/main/resources/application.yml

 server:
-  port: 8020
+  port: 9999
 #  servlet:
 #    context-path: ${context-path:/pms-ocp}
 

src/main/resources/mapper/OcpTenantBaseMapper.xml

 <?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
+        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