Merge remote-tracking branch 'origin/master'

src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java

@@ -130,8 +130,15 @@ public class PmsApiDetailsController {
 
     @ApiOperation("服务分类——编辑服务")
     @PostMapping("/update")
-    public ResponseResult update(@RequestBody  PmsApiMangageApi pmsApiMangageApi) {
-        return pmsApiManagementService.updateApi(pmsApiMangageApi);
+    public ResponseVO update(@RequestBody  PmsApiMangageApi pmsApiMangageApi) {
+        PmsApiMangageApi pmsApiMangageApi1 = pmsApiManagementService.updateApi(pmsApiMangageApi);
+        if (pmsApiMangageApi1.getBoole()){
+            return ResponseVO.ok(pmsApiMangageApi1);
+        }else {
+            return ResponseVO.error("修改失败");
+
+        }
+
     }
 
     @ApiOperation("模型分类导航")

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/mapper/PmsApiManagementMapper.java

@@ -30,9 +30,7 @@ public interface PmsApiManagementMapper extends BaseMapper<PmsApiManagement> {
 
     List<PmsApiManagement> getList(PmsApiManagement pmsApiManagement);
 
+    int updateExent(PmsApiMangageApi pmsApiMangageApi);
 
-
-
-
-
+    int uodateIcon(PmsApiMangageApi pmsApiMangageApi);
 }

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/entity/PmsApiMangageApi.java

@@ -158,6 +158,18 @@ public class PmsApiMangageApi {
     @ApiModelProperty("关系创建用户")
     private String apiTenantRelUserName;
 
+    @ApiModelProperty("是否成功")
+    private boolean boole;
+
+
+    public boolean getBoole() {
+        return boole;
+    }
+
+    public void setBoole(boolean boole) {
+        this.boole = boole;
+    }
+
     public String getObjId() {
         return objId;
     }

src/main/java/com/pms/ocp/model/vo/OcpApiBaseVo.java

@@ -49,6 +49,10 @@ public class OcpApiBaseVo implements Serializable {
     @ApiModelProperty(value = "建设单位")
     @Excel(name = "建设单位")
     private String apiUnit;
+    @ApiModelProperty(value = "查询开始时间")
+    private String startTime;
+    @ApiModelProperty(value = "查询结束时间")
+    private String endTime;
     @ApiModelProperty(value = "出参入参")
     private List<OcpApiParam> apiParams;
     @ApiModelProperty(value = "出参集合")

src/main/java/com/pms/ocp/service/PmsApiManagementService.java

@@ -29,7 +29,7 @@ public interface PmsApiManagementService extends IService<PmsApiManagement> {
 
     ResponseResult deleteApi(PmsApiMangageApi pmsApiMangageApi);
 
-    ResponseResult updateApi(PmsApiMangageApi pmsApiMangageApi);
+    PmsApiMangageApi updateApi(PmsApiMangageApi pmsApiMangageApi);
 
     ResponseVO<List<OcpApiGroupVo>> getApiNavigation();
 

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/OcpTenantIocnServiceImpl.java

@@ -15,7 +15,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
@@ -42,7 +45,7 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
      */
     @Override
     public List<OcpTenantGroupIocnDto> getApplyUserList() {
-      /*  List<OcpTenantGroupIocnDto> groupIocnDtos = new ArrayList<>();
+  /*      List<OcpTenantGroupIocnDto> groupIocnDtos = new ArrayList<>();
         List<OcpTenantBase> ocpTenantBases = ocpTenantBaseMapper.selectList(null);
         List<OcpTenantIocn> ocpTenantIocns = ocpTenantIocnMapper.selectList(null);
         List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(null);
@@ -74,10 +77,18 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
             }
 
         }*/
-        List<OcpTenantGroupIocnDto> groupIocnDtos = ocpTenantBaseMapper.selectAlls();
+        //pish
+        List<OcpTenantGroupIocnDto> lists = new ArrayList<>();
+       List<OcpTenantGroupIocnDto> groupIocnDtos = ocpTenantBaseMapper.selectAlls();
+        for (OcpTenantGroupIocnDto groupIocnDto : groupIocnDtos) {
+            Short isDelete = groupIocnDto.getIsDelete();
+            if (isDelete == 0){
+                lists.add(groupIocnDto);
+            }
+        }
 
 
-        return groupIocnDtos;
+        return lists;
 
     }
 
@@ -96,6 +107,11 @@ public class OcpTenantIocnServiceImpl extends ServiceImpl<OcpTenantIocnMapper, O
             list.add(iocn);
         }
 
+
+        //去重
+//        msgs = msgs.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Msg :: getMsgId))), ArrayList::new));
+
+
         for (byte[] bytes : list) {
             if (!(list.contains(bytes))){
                 list.add(bytes);

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

@@ -67,8 +67,6 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
         pmsApiMangageApi.setObjId(randomString);
         pmsApiMangageApi.setApiCtime(pmsApiMangageApi.getApiMtime());
         pmsApiManagementMapper.addPamm(pmsApiMangageApi);
-        pmsApiMangageApi.setApiCode(pmsApiMangageApi.getApiGroupName());
-        pmsApiManagementMapper.addOag(pmsApiMangageApi);
         return pmsApiMangageApi;
     }
 
@@ -83,11 +81,16 @@ public class PmsApiManagementServiceImpl extends ServiceImpl<PmsApiManagementMap
         }
 
     @Override
-    public ResponseResult updateApi(PmsApiMangageApi pmsApiMangageApi) {
-        pmsApiManagementMapper.updatePamm(pmsApiMangageApi);
-        pmsApiMangageApi.setApiCode(pmsApiMangageApi.getApiGroupName());
-        pmsApiManagementMapper.updateOag(pmsApiMangageApi);
-        return new ResponseResult(CommonCode.SUCCESS);
+    public PmsApiMangageApi updateApi(PmsApiMangageApi pmsApiMangageApi) {
+        int i = pmsApiManagementMapper.updatePamm(pmsApiMangageApi);
+        //pmsApiManagementMapper.updateExent(pmsApiMangageApi);
+        //pmsApiManagementMapper.uodateIcon(pmsApiMangageApi);
+        if(i==0){
+            pmsApiMangageApi.setBoole(false);
+        }else {
+            pmsApiMangageApi.setBoole(true);
+        }
+        return pmsApiMangageApi;
     }
 
     @Override

src/main/resources/application-local.yml

@@ -6,7 +6,7 @@ spring:
     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/pms_accept?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
+    url: jdbc:postgresql://localhost:5432/postgres?currentSchema=operating_platform&stringtype=unspecified&TimeZone=Asia/Shanghai&useAffectedRows=true
 
 knife4j:
   enable: true

src/main/resources/mapper/OcpApiGroupMapper.xml

@@ -92,17 +92,24 @@
             <if test="apiUnit !=null and apiUnit!=''">
                 and oab.api_unit = #{apiUnit}
             </if>
+            <if test="professionalKind !=null and professionalKind!=''">
+                and oab.professional_kind = #{professionalKind}
+            </if>
+            <if test="apiUserName !=null and apiUserName!=''">
+                and oab.api_user_name like CONCAT('%', #{apiUserName}::text,'%')
+            </if>
+
             <if test="apiPromotion !=null and apiPromotion!=''">
                 and oab.api_promotion = #{apiPromotion}
             </if>
-            <if test="startCTime !=null  ">
+            <if test="startTime !=null  ">
                 <![CDATA[
-                and oab.api_ctime >= #{startCTime}
+                and oab.api_ctime >= #{startTime}
                 ]]>
             </if>
-            <if test="endCTime !=null  ">
+            <if test="endTime !=null  ">
                 <![CDATA[
-            and oab.api_ctime <= #{endCTime}
+            and oab.api_ctime <= #{endTime}
             ]]>
             </if>
             <if test="keyword !=null and keyword != '' ">

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