赵呈明 --应用服务树分类

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

@@ -100,6 +100,7 @@ public class ModelBaseController {
         return ResponseVO.ok(modelService.deleteModel(objId, modelCode));
     }
 
+
     /**
      * 模型-修改
      *

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -40,20 +41,20 @@ public class OcpTenantController {
     }
     @GetMapping("/tenantselect")
     @ApiModelProperty("应用树分类--查询")
-    private Page<OcpTenantGroup> getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword){
+    private ResponseVO<Page<OcpTenantGroup>> getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword){
         Page<OcpTenantGroup> tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize,keyword);
-        return tree;
+        return ResponseVO.ok(tree);
     }
 
     @PostMapping("/tenantinster")
     @ApiModelProperty("新增应用")
-
     public ResponseVO tenantInster(@RequestBody TenanBaseDto TenanBaseDto){
-      boolean falg =   tenantService.getTenanInster(TenanBaseDto);
-      if (falg){
-          return ResponseVO.ok("新建成功！");
-      }
-      return ResponseVO.error("应用code已经存在！");
+        OcpTenantGroup tenanInster = tenantService.getTenanInster(TenanBaseDto);
+        if ("".equals(tenanInster)){
+            return ResponseVO.error("应用添加失败！");
+        }
+          return ResponseVO.ok(tenanInster);
+
     }
 
     @PostMapping("/tenantupdata")

src/main/java/com/pms/ocp/mapper/TenantMapper.java

 package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.dto.TenanBaseDto;
 import com.pms.ocp.model.entity.OcpTenantGroup;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -29,10 +32,11 @@ public interface TenantMapper extends BaseMapper<OcpTenantGroup> {
     List<OcpTenantGroup> selectGroups(String tenantGroupCompanyCode);
 
 
-    //模糊查询
-    List<OcpTenantGroup> queryLike(String keyword);
+    //服务树--查询
+    List<OcpTenantGroup> selectTenantGroupsList(String tenantGroupCode,String tenantGroupCompanyCode);
 
 
+    List<OcpTenantGroup> selectGroupsList(String tenantGroupCompanyCode,String tenantGroupName);
 
 
 }

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

@@ -2,11 +2,13 @@ package com.pms.ocp.model.dto;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.pms.ocp.model.entity.OcpTenantGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.sql.Timestamp;
 
@@ -15,6 +17,7 @@ import java.sql.Timestamp;
  */
 @ApiModel(value = "新增应用封装对象")
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class TenanBaseDto extends OcpTenantGroup {
 
 
@@ -23,122 +26,112 @@ public class TenanBaseDto extends OcpTenantGroup {
     private String objId;
 
     /**
-     * 应用名称
+     * 应用分类编码
      */
-    @ApiModelProperty("应用名称")
-    private String tenantName;
+    @ApiModelProperty("应用分类编码")
+    private String tenantGroupCode;
 
     /**
-     * 应用代码
+     * 应用分类名称
      */
-    @ApiModelProperty("应用代码")
-    private String tenantCode;
+    @ApiModelProperty("应用分类名称")
+    private String tenantGroupName;
 
     /**
-     * 应用分类代码
+     * 分类创建公司
      */
-    @ApiModelProperty("应用分类代码")
-    private String tenantGroupCode;
+    @ApiModelProperty("分类创建公司")
+    private String tenantGroupCompanyCode;
 
     /**
-     * 应用ip
+     * 上级code
      */
-    @ApiModelProperty("应用ip")
-    private String tenantIp;
+    @ApiModelProperty("上级code")
+    private String tenantGroupPcode;
 
     /**
-     * 应用url
+     * 应用类别设备级、生态级等
      */
-    @ApiModelProperty("应用url")
-    private String tenantUrl;
+    @ApiModelProperty("应用类别设备级、生态级等")
+    private String tenantType;
 
     /**
-     * 所属专业
+     * 分类版本
      */
-    @ApiModelProperty("所属专业")
-    private String professionalKind;
+    @ApiModelProperty("分类版本")
+    private String tenantGroupVersion;
 
     /**
-     * 创建者用户ID
+     * 显示顺序
      */
-    @ApiModelProperty("创建者用户ID")
-    private String tenantUserId;
+    @ApiModelProperty("显示顺序")
+    private Integer tenantGroupOrderNo;
 
     /**
-     * 排序
+     * 提交人id
      */
-    @ApiModelProperty("排序")
-    private Integer tenantOrderNo;
+    @ApiModelProperty("提交人id")
+    private String tenantGroupUserId;
 
     /**
-     * 创建时间
+     * 提交人姓名
      */
-    @ApiModelProperty("创建时间")
-    private Timestamp tenantCtime;
+    @ApiModelProperty("提交人姓名")
+    private String tenantGroupUserName;
 
     /**
-     * 最后更新时间
+     * 创建时间
      */
-    @ApiModelProperty("最后更新时间")
-    private Timestamp tenantMtime;
+    @ApiModelProperty("创建时间")
+    private Timestamp tenantGroupCtime;
 
     /**
-     * 部署名称
+     * 修改时间
      */
-    @ApiModelProperty("部署名称")
-    private String deploymentName;
+    @ApiModelProperty("修改时间")
+    private Timestamp tenantGroupMtime;
 
     /**
-     * 描述
+     * 是否删除
      */
-    @ApiModelProperty("描述")
-    private String tenantDescription;
+    @ApiModelProperty("是否删除")
+    private Short isDelete;
 
     /**
-     * 应用状态0:设计态；1:运行态
+     * 应用树层级 1:应用分组层  2:应用层
      */
-    @ApiModelProperty("应用状态0:设计态；1:运行态")
-    private Short tenantState;
+    @ApiModelProperty("应用树层级 1:应用分组层  2:应用层")
+    private Short tenantGroupLevel;
 
-    /**
-     * 建设单位
-     */
-    @ApiModelProperty("建设单位")
-    private String tenantUnit;
 
-    /**
-     * 所属公司编码
-     */
-    @ApiModelProperty("所属公司编码")
-    private String ownerCompanyCode;
 
-    /**
-     * 所属公司名称
-     */
-    @ApiModelProperty("所属公司名称")
-    private String ownerCompanyName;
+    //上级分类名称
 
-    /**
-     * 是否删除0:否;1:是
-     */
-    @ApiModelProperty("是否删除0:否;1:是")
-    private Short isDelete;
+    @ApiModelProperty("上级分类名称")
+    @TableField(exist = false)
+    private String classIfy;
 
-    /**
-     * 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区
-     */
-    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
-    private Short tenantZone;
+    public String getObjId() {
+        return objId;
+    }
 
-    /**
-     * 所属层级 1:应用层;2:平台层;3:网络层;4:感知层;
-     */
-    @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
-    private Short tenantLayer;
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
 
-    /**
-     * 应用版本（当前版本）
-     */
-    @ApiModelProperty("应用版本（当前版本）")
-    private String tenantVersion;
+    public String getTenantGroupCode() {
+        return tenantGroupCode;
+    }
+
+    public void setTenantGroupCode(String tenantGroupCode) {
+        this.tenantGroupCode = tenantGroupCode;
+    }
+
+    public String getClassIfy() {
+        return classIfy;
+    }
+
+    public void setClassIfy(String classIfy) {
+        this.classIfy = classIfy;
+    }
 }

src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java

@@ -109,6 +109,17 @@ public class OcpTenantGroup implements Serializable {
     private Short tenantGroupLevel;
 
 
+    @TableField(exist = false)
+    @ApiModelProperty("模糊查询字段")
+    private String keyword;
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
 
     public static long getSerialVersionUID() {
         return serialVersionUID;

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

@@ -3,8 +3,6 @@ package com.pms.ocp.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.pms.ocp.model.dto.ApiTreeGroupDto;
-import com.pms.ocp.model.dto.OcpApiGroupDtos;
 import com.pms.ocp.model.dto.PageGroupDto;
 import com.pms.ocp.model.entity.OcpApiGroup;
 

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

@@ -23,7 +23,7 @@ public interface TenantService  extends IService<OcpTenantGroup> {
      * @param
      * @return
      */
-    boolean getTenanInster(TenanBaseDto TenanBaseDto);
+    OcpTenantGroup getTenanInster(TenanBaseDto TenanBaseDto);
 
     /**
      * 修改应用

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

@@ -75,6 +75,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
                ocpApiGroup.setApiGroupPcode(ocpApiGroup.getApiGroupCode());
                ocpApiGroup.setApiGroupCode(code);
                mapper.insert(ocpApiGroup);
+               ocpApiGroup.setApiGroupLevel(ocpApiGroup.getApiGroupLevel() + 1);
         return flag;
 
     }

src/main/resources/mapper/OcpTenantGroup.xml

@@ -8,69 +8,33 @@
     </select>
 <!--   二级目录树-->
     <select id="twoTenantGroups" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
-      SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode} ;
+      SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode};
     </select>
 
 <!--三级目录-->
     <select id="selectTenantGroups" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
-      SELECT * FROM ocp_tenant_group WHERE tenant_group_pcode = #{tenantGroupCode} AND  tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = '2';
+      SELECT * FROM ocp_tenant_group WHERE tenant_group_pcode = #{tenantGroupCode} AND  tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = '2' ORDER BY tenant_group_ctime DESC;
     </select>
 
-
+    <select id="selectTenantGroupsList" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
+      SELECT * FROM ocp_tenant_group WHERE tenant_group_pcode = #{tenantGroupCode} AND  tenant_group_company_code = #{tenantGroupCompanyCode}  ORDER BY tenant_group_ctime DESC;
+    </select>
     <select id="selectTenantGroup" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
-      SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode};
+      SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode} ORDER BY tenant_group_ctime DESC;
     </select>
 
 
     <select id="selectGroups" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
         SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = '1' ;
     </select>
-    
-<!--    模糊查询-->
-    <select id="queryLike" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
-        select  * from ocp_tenant_group
-        <where>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_code like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_name  like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_company_code like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_pcode like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_type like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_version like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_order_no like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_user_id like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_user_name like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_ctime like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and  tenant_group_mtime like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and is_delete like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        <if test="keyword !=null and keyword != '' ">
-            and tenant_group_level like CONCAT('%', #{keyword}::text,'%')
-        </if>
-        </where>
+
+<!--    根据创建公司和分类名称获取集合-->
+    <select id="selectGroupsList" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
+        SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_name = #{tenantGroupName};
     </select>
 
 
+
+
+
 </mapper>