Переглянути джерело

获取模型关联服务列表接口

ZhuDeKang 6 місяців тому
батько
коміт
e8f8fb956f

+ 12 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/PtServiceController.java

@@ -9,6 +9,7 @@ import com.ruoyi.interfaces.core.page.Page;
 import com.ruoyi.interfaces.core.page.PageParam;
 import com.ruoyi.interfaces.core.page.PageParam;
 import com.ruoyi.interfaces.core.page.PageUtils;
 import com.ruoyi.interfaces.core.page.PageUtils;
 import com.ruoyi.interfaces.domain.*;
 import com.ruoyi.interfaces.domain.*;
+import com.ruoyi.interfaces.domain.vo.MdModelInfoVo;
 import com.ruoyi.interfaces.mapper.PtServiceMapper;
 import com.ruoyi.interfaces.mapper.PtServiceMapper;
 import com.ruoyi.interfaces.mapper.PtServiceParamMapper;
 import com.ruoyi.interfaces.mapper.PtServiceParamMapper;
 import com.ruoyi.interfaces.service.PtServiceFileService;
 import com.ruoyi.interfaces.service.PtServiceFileService;
@@ -84,6 +85,17 @@ public class PtServiceController extends BaseController {
         return sysCateService.findAllO(criteria);
         return sysCateService.findAllO(criteria);
     }
     }
 
 
+    /**
+     * 获取模型关联服务列表
+     * @param par
+     * @return
+     */
+    @GetMapping("/modelService")
+    public AjaxResult modelService(MdModelInfoVo par){
+        return AjaxResult.success(ptServiceService.modelService(par));
+    }
+
+
     @ApiOperation("根据主键获取数据")
     @ApiOperation("根据主键获取数据")
     @RequestMapping(value = "/get")
     @RequestMapping(value = "/get")
     public AjaxResult get(@RequestParam String srvId) {
     public AjaxResult get(@RequestParam String srvId) {

+ 3 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/PtService.java

@@ -25,6 +25,9 @@ public class PtService implements Serializable {
     @TableId(value = "SRV_ID", type = IdType.ASSIGN_UUID)
     @TableId(value = "SRV_ID", type = IdType.ASSIGN_UUID)
     @ApiModelProperty("srvId")
     @ApiModelProperty("srvId")
     private String srvId;
     private String srvId;
+
+    @ApiModelProperty("模型id")
+    private String mdid;
     @ApiModelProperty("目录ID")
     @ApiModelProperty("目录ID")
     private String cateCode;
     private String cateCode;
     @ApiModelProperty("服务名称")
     @ApiModelProperty("服务名称")

+ 41 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/vo/MdModelInfoVo.java

@@ -0,0 +1,41 @@
+package com.ruoyi.interfaces.domain.vo;
+
+import com.ruoyi.interfaces.domain.MdModelInfo;
+import com.ruoyi.interfaces.domain.PtService;
+
+import java.util.Date;
+import java.util.List;
+
+public class MdModelInfoVo extends MdModelInfo {
+    /**
+     * 服务列表
+     */
+    private List<PtService> serviceList;
+
+
+    public List<PtService> getServiceList() {
+        return serviceList;
+    }
+
+    public void setServiceList(List<PtService> serviceList) {
+        this.serviceList = serviceList;
+    }
+
+    public MdModelInfoVo(){
+
+    }
+
+    public MdModelInfoVo(String mdid, String fileid, List<PtService> serviceList) {
+        super(mdid, fileid);
+        this.serviceList = serviceList;
+    }
+
+    public MdModelInfoVo(String mdid, String name, String enname, String cateid, String devlang, String version, String intro, String type, String tags, Long author, Integer isPublic, Integer isApproved, Integer status, String className, String mdUnit, String mdContact, String developer, Integer msgFlag, String msgWebHook, Integer mdCPU, Integer mdGpu, String mdRunEnv, String mdRunCmd, String mdInOutName, String mdInOutNameEn, String mirrorImageEg, String mirrorImageUrl, String mirrorImageDesc, Date modifyBy, String registrant, List<PtService> serviceList) {
+        super(mdid, name, enname, cateid, devlang, version, intro, type, tags, author, isPublic, isApproved, status, className, mdUnit, mdContact, developer, msgFlag, msgWebHook, mdCPU, mdGpu, mdRunEnv, mdRunCmd, mdInOutName, mdInOutNameEn, mirrorImageEg, mirrorImageUrl, mirrorImageDesc, modifyBy, registrant);
+        this.serviceList = serviceList;
+    }
+
+    public MdModelInfoVo(List<PtService> serviceList) {
+        this.serviceList = serviceList;
+    }
+}

+ 6 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/mapper/PtServiceMapper.java

@@ -2,13 +2,17 @@ package com.ruoyi.interfaces.mapper;
 
 
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.interfaces.domain.PtService;
 import com.ruoyi.interfaces.domain.PtService;
+import com.ruoyi.interfaces.domain.vo.MdModelInfoVo;
 import com.ruoyi.interfaces.domain.vo.PtServiceVo;
 import com.ruoyi.interfaces.domain.vo.PtServiceVo;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
 import java.util.List;
 import java.util.List;
 
 
 @Repository
 @Repository
+@DataSource(DataSourceType.SLAVE)
 public interface PtServiceMapper extends BaseMapper<PtService> {
 public interface PtServiceMapper extends BaseMapper<PtService> {
 
 
     /**
     /**
@@ -61,6 +65,8 @@ public interface PtServiceMapper extends BaseMapper<PtService> {
 
 
     List<PtService> listOfTmTop20();
     List<PtService> listOfTmTop20();
 
 
+    List<MdModelInfoVo> selectModelService(MdModelInfoVo par);
+
  /*   int insertSelective(PtServiceWithBLOBs record);
  /*   int insertSelective(PtServiceWithBLOBs record);
 
 
     PtServiceWithBLOBs selectByPrimaryKey(String srvId);
     PtServiceWithBLOBs selectByPrimaryKey(String srvId);

+ 3 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/PtServiceService.java

@@ -2,6 +2,7 @@ package com.ruoyi.interfaces.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.interfaces.domain.PtService;
 import com.ruoyi.interfaces.domain.PtService;
+import com.ruoyi.interfaces.domain.vo.MdModelInfoVo;
 
 
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -44,4 +45,6 @@ public interface PtServiceService extends IService<PtService> {
     Map<String, List<PtService>> getRankingList();
     Map<String, List<PtService>> getRankingList();
 
 
     PtService get(String srvId);
     PtService get(String srvId);
+
+    List<MdModelInfoVo> modelService(MdModelInfoVo par);
 }
 }

+ 12 - 0
ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/PtServiceServiceImpl.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.utils.RedisOperator;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.interfaces.domain.PtService;
 import com.ruoyi.interfaces.domain.PtService;
+import com.ruoyi.interfaces.domain.vo.MdModelInfoVo;
 import com.ruoyi.interfaces.mapper.PtServiceMapper;
 import com.ruoyi.interfaces.mapper.PtServiceMapper;
 import com.ruoyi.interfaces.mapper.PtServiceParamMapper;
 import com.ruoyi.interfaces.mapper.PtServiceParamMapper;
 import com.ruoyi.interfaces.service.PtServiceService;
 import com.ruoyi.interfaces.service.PtServiceService;
@@ -112,4 +113,15 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
         return ptServiceMapper.selectByPrimaryKey(srvId);
         return ptServiceMapper.selectByPrimaryKey(srvId);
     }
     }
 
 
+    /**
+     * 获取模型关联服务
+     * @param par
+     * @return
+     */
+    @Override
+    public List<MdModelInfoVo> modelService(MdModelInfoVo par) {
+
+        return ptServiceMapper.selectModelService(par);
+    }
+
 }
 }

+ 153 - 5
ruoyi-api-patform/src/main/resources/mapper/interfaces/PtServiceMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.ruoyi.interfaces.mapper.PtServiceMapper">
 <mapper namespace="com.ruoyi.interfaces.mapper.PtServiceMapper">
     <resultMap id="BaseResultMap" type="com.ruoyi.interfaces.domain.PtService">
     <resultMap id="BaseResultMap" type="com.ruoyi.interfaces.domain.PtService">
         <id column="SRV_ID" jdbcType="VARCHAR" property="srvId"/>
         <id column="SRV_ID" jdbcType="VARCHAR" property="srvId"/>
+        <id column="MDID" jdbcType="VARCHAR" property="mdid"/>
         <result column="CATE_CODE" jdbcType="VARCHAR" property="cateCode"/>
         <result column="CATE_CODE" jdbcType="VARCHAR" property="cateCode"/>
         <result column="NAME" jdbcType="VARCHAR" property="name"/>
         <result column="NAME" jdbcType="VARCHAR" property="name"/>
         <result column="TYPE" jdbcType="VARCHAR" property="type"/>
         <result column="TYPE" jdbcType="VARCHAR" property="type"/>
@@ -81,7 +82,7 @@
     </resultMap>
     </resultMap>
 
 
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
-        SRV_ID
+        SRV_ID ,MDID
         , CATE_CODE, NAME, TYPE, INTRO, STATUS, USER_ID,
         , CATE_CODE, NAME, TYPE, INTRO, STATUS, USER_ID,
     DEVELOP_UNIT,DEVELOP_CONTACTER,MAINTAIN_UNIT,MAINTAIN_CONTACER,
     DEVELOP_UNIT,DEVELOP_CONTACTER,MAINTAIN_UNIT,MAINTAIN_CONTACER,
     SERVICE_SOURCE,SERVICE_DEPT, MANAGE_NAME,DATA_RANGE, OPEN_CNDTN, DATA_FIELD,
     SERVICE_SOURCE,SERVICE_DEPT, MANAGE_NAME,DATA_RANGE, OPEN_CNDTN, DATA_FIELD,
@@ -99,8 +100,8 @@
     SERVICE_DEPT, MANAGE_NAME,RELEASE_TIME,DEVELOP_UNIT,DEVELOP_CONTACTER,MAINTAIN_UNIT,MAINTAIN_CONTACER,VIEW_NUM
     SERVICE_DEPT, MANAGE_NAME,RELEASE_TIME,DEVELOP_UNIT,DEVELOP_CONTACTER,MAINTAIN_UNIT,MAINTAIN_CONTACER,VIEW_NUM
     </sql>
     </sql>
     <sql id="table_columns">
     <sql id="table_columns">
-        UP_CYCL
-        ,
+        MDID,
+        UP_CYCL,
             OPEN_CNDTN,
             OPEN_CNDTN,
             AD_NAME,
             AD_NAME,
             DATA_FIELD,
             DATA_FIELD,
@@ -137,8 +138,8 @@
             VIEW_NUM
             VIEW_NUM
     </sql>
     </sql>
     <sql id="entity_properties">
     <sql id="entity_properties">
-        #{upCycl,jdbcType=VARCHAR}
-        ,
+        #{mdid,jdbcType=VARCHAR},
+        #{upCycl,jdbcType=VARCHAR},
         #{openCndtn,jdbcType=VARCHAR},
         #{openCndtn,jdbcType=VARCHAR},
         #{adName,jdbcType=VARCHAR},
         #{adName,jdbcType=VARCHAR},
         #{dataField,jdbcType=VARCHAR},
         #{dataField,jdbcType=VARCHAR},
@@ -176,6 +177,9 @@
     </sql>
     </sql>
     <sql id="page_where">
     <sql id="page_where">
         <trim prefix="where" prefixOverrides="and | or ">
         <trim prefix="where" prefixOverrides="and | or ">
+            <if test="mdid != null and mdid != ''">
+                and MDID = #{mdid,jdbcType=VARCHAR}
+            </if>
             <if test="upCycl != null and upCycl != ''">
             <if test="upCycl != null and upCycl != ''">
                 and UP_CYCL = #{upCycl,jdbcType=VARCHAR}
                 and UP_CYCL = #{upCycl,jdbcType=VARCHAR}
             </if>
             </if>
@@ -460,4 +464,148 @@
         WHERE A.USER_ID = #{userId}
         WHERE A.USER_ID = #{userId}
         ORDER BY RLSTM DESC
         ORDER BY RLSTM DESC
     </select>
     </select>
+    <resultMap id="MdModelInfoVoMap" type="com.ruoyi.interfaces.domain.vo.MdModelInfoVo">
+        <id property="mdid" column="mdid"/>
+        <result property="name" column="m_name"/>
+        <result property="enname" column="enname"/>
+        <result property="cateid" column="cateid"/>
+        <result property="devlang" column="devlang"/>
+        <result property="version" column="version"/>
+        <result property="intro" column="m_intro"/>
+        <result property="type" column="m_type"/>
+        <result property="tags" column="tags"/>
+        <result property="author" column="author"/>
+        <result property="isPublic" column="isPublic"/>
+        <result property="isApproved" column="isApproved"/>
+        <result property="status" column="status"/>
+        <result property="className" column="className"/>
+        <result property="mdUnit" column="mdUnit"/>
+        <result property="mdContact" column="mdContact"/>
+        <result property="developer" column="developer"/>
+        <result property="msgFlag" column="msgFlag"/>
+        <result property="msgWebHook" column="msgWebHook"/>
+        <result property="mdCPU" column="mdCPU"/>
+        <result property="mdGpu" column="mdGpu"/>
+        <result property="mdRunEnv" column="mdRunEnv"/>
+        <result property="mdRunCmd" column="mdRunCmd"/>
+        <result property="mdInOutName" column="mdInOutName"/>
+        <result property="mdInOutNameEn" column="mdInOutNameEn"/>
+        <result property="mirrorImageEg" column="mirrorImageEg"/>
+        <result property="mirrorImageUrl" column="mirrorImageUrl"/>
+        <result property="mirrorImageDesc" column="mirrorImageDesc"/>
+        <result property="createBy" column="createBy"/>
+        <result property="modifyBy" column="modifyBy"/>
+        <result property="registrant" column="registrant"/>
+        <collection property="serviceList" ofType="com.ruoyi.interfaces.domain.PtService" resultMap="PtServiceVoMap"/>
+    </resultMap>
+    <resultMap id="PtServiceVoMap" type="com.ruoyi.interfaces.domain.PtService">
+        <id column="SRV_ID" jdbcType="VARCHAR" property="srvId"/>
+        <result column="CATE_CODE" jdbcType="VARCHAR" property="cateCode"/>
+        <result column="s_name" jdbcType="VARCHAR" property="name"/>
+        <result column="s_type" jdbcType="VARCHAR" property="type"/>
+        <result column="s_intro" jdbcType="VARCHAR" property="intro"/>
+        <result column="URL" jdbcType="VARCHAR" property="url"/>
+        <result column="RQTYPE" jdbcType="VARCHAR" property="rqtype"/>
+        <result column="RPTYPE" jdbcType="VARCHAR" property="rptype"/>
+        <result column="STATUS" jdbcType="VARCHAR" property="status"/>
+        <result column="CNT" jdbcType="DECIMAL" property="cnt"/>
+        <result column="USER_ID" jdbcType="VARCHAR" property="userId"/>
+        <result column="RPCONTENT" jdbcType="CLOB" property="rpcontent"/>
+        <result column="NOTE" jdbcType="CLOB" property="note"/>
+        <result column="EXAMPLE" jdbcType="CLOB" property="example"/>
+        <result column="PROXY_ADDRESS" jdbcType="VARCHAR" property="proxyAddress"/>
+        <result column="PROXY_PATH" jdbcType="VARCHAR" property="proxyPath"/>
+        <result column="SERVICE_SOURCE" jdbcType="VARCHAR" property="serviceSource"/>
+        <result property="serviceDept" column="SERVICE_DEPT" jdbcType="VARCHAR"/>
+        <result property="manageName" column="MANAGE_NAME" jdbcType="VARCHAR"/>
+        <result property="releaseTime" column="RELEASE_TIME" jdbcType="TIMESTAMP"/>
+        <result property="developUnit" column="DEVELOP_UNIT" jdbcType="VARCHAR"/>
+        <result property="developContacter" column="DEVELOP_CONTACTER" jdbcType="VARCHAR"/>
+        <result property="maintainUnit" column="MAINTAIN_UNIT" jdbcType="VARCHAR"/>
+        <result property="maintainContacer" column="MAINTAIN_CONTACER" jdbcType="VARCHAR"/>
+        <result column="VIEW_NUM" jdbcType="DECIMAL" property="viewNum"/>
+        <result column="UP_CYCL" property="upCycl" jdbcType="VARCHAR"/>
+        <result column="OPEN_CNDTN" property="openCndtn" jdbcType="VARCHAR"/>
+        <result column="AD_NAME" property="adName" jdbcType="VARCHAR"/>
+        <result column="DATA_FIELD" property="dataField" jdbcType="VARCHAR"/>
+        <result column="TM" jdbcType="DATE" property="tm"/>
+        <result column="UPTM" property="uptm" jdbcType="DATE"/>
+        <result column="RLSTM" property="rlstm" jdbcType="DATE"/>
+        <result column="DATA_RANGE" property="dataRange" jdbcType="VARCHAR"/>
+        <result column="APPLY_NUM" property="applyNum" jdbcType="INTEGER"/>
+        <result column="DATA_NUM" property="dataNum" jdbcType="INTEGER"/>
+    </resultMap>
+
+
+    <select id="selectModelService" resultMap="MdModelInfoVoMap">
+        select m.mdid,
+        m.name as m_name,
+        m.enname,
+        m.cateid,
+        m.devlang,
+        m.version,
+        m.intro m_intro,
+        m.type m_type,
+        m.tags,
+        m.author,
+        m.isPublic,
+        m.isApproved,
+        m.status,
+        m.className,
+        m.mdUnit,
+        m.mdContact,
+        m.developer,
+        m.msgFlag,
+        m.msgWebHook,
+        m.mdCPU,
+        m.mdGpu,
+        m.mdRunEnv,
+        m.mdRunCmd,
+        m.mdInOutName,
+        m.mdInOutNameEn,
+        m.mirrorImageEg,
+        m.mirrorImageUrl,
+        m.mirrorImageDesc,
+        m.createBy,
+        m.modifyBy,
+        m.registrant,
+        s.UP_CYCL,
+        s.OPEN_CNDTN,
+        s.AD_NAME,
+        s.DATA_FIELD,
+        s.UPTM,
+        s.RLSTM,
+        s.DATA_RANGE,
+        s.APPLY_NUM,
+        s.DATA_NUM,
+        s.SRV_ID,
+        s.CATE_CODE,
+        s.NAME as s_name,
+        s.TYPE s_type,
+        s.INTRO s_intro,
+        s.URL,
+        s.RQTYPE,
+        s.RPTYPE,
+        s.RPCONTENT,
+        s.NOTE,
+        s.EXAMPLE,
+        s.STATUS,
+        s.CNT,
+        s.USER_ID,
+        s.TM,
+        s.PROXY_ADDRESS,
+        s.PROXY_PATH,
+        s.SERVICE_SOURCE,
+        s.SERVICE_DEPT,
+        s.MANAGE_NAME,
+        s.RELEASE_TIME,
+        s.DEVELOP_UNIT,
+        s.DEVELOP_CONTACTER,
+        s.MAINTAIN_UNIT,
+        s.MAINTAIN_CONTACER,
+        s.VIEW_NUM
+        from md_model_info m left join pt_service s on m.mdid = s.MDID
+        <where>
+        </where>
+    </select>
 </mapper>
 </mapper>