模型服务树列表

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

@@ -91,9 +91,8 @@ public class PtServiceController extends BaseController {
      * @return
      */
     @GetMapping("/modelService")
-    public TableDataInfo modelService(MdModelInfo par){
-        startPage();
-        return getDataTable(ptServiceService.modelService(par));
+    public AjaxResult modelService(MdModelInfoVo par){
+        return AjaxResult.success(ptServiceService.modelService(par));
     }
 
 

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/controller/PtTreeCateController.java

@@ -4,7 +4,9 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.interfaces.domain.MdModelInfo;
+import com.ruoyi.interfaces.domain.vo.MdModelInfoVo;
 import com.ruoyi.interfaces.service.IMdModelInfoService;
+import com.ruoyi.interfaces.service.PtServiceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -37,7 +39,7 @@ public class PtTreeCateController extends BaseController
     private IPtTreeCateService ptTreeCateService;
 
     @Autowired
-    private IMdModelInfoService mdModelInfoService;
+    private PtServiceService ptServiceService;
 
 
     /**
@@ -126,9 +128,9 @@ public class PtTreeCateController extends BaseController
         ptTreeCate.setTreeType("MODEL");
         List<PtTreeCate> ptTreeCates = ptTreeCateService.selectPtTreeCateList(ptTreeCate);
         for (PtTreeCate treeCate : ptTreeCates) {
-            MdModelInfo mdModelInfo = new MdModelInfo();
+            MdModelInfoVo mdModelInfo = new MdModelInfoVo();
             mdModelInfo.setCateid(treeCate.getTreeId());
-            treeCate.setModels(mdModelInfoService.selectMdModelInfoList(mdModelInfo));
+            treeCate.setModels(ptServiceService.modelService(mdModelInfo));
         }
         return success(ptTreeCateService.buildDataTreeSelect(ptTreeCates));
     }

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/PtTreeCate.java

@@ -1,6 +1,7 @@
 package com.ruoyi.interfaces.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.interfaces.domain.vo.MdModelInfoVo;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -51,16 +52,16 @@ public class PtTreeCate extends BaseEntity
     @Excel(name = "创建时间")
     private Date createby;
 
-    private List<MdModelInfo> models;
+    private List<MdModelInfoVo> models;
 
 
     private List<PtTreeCate> children = new ArrayList<PtTreeCate>();
 
-    public List<MdModelInfo> getModels() {
+    public List<MdModelInfoVo> getModels() {
         return models;
     }
 
-    public void setModels(List<MdModelInfo> models) {
+    public void setModels(List<MdModelInfoVo> models) {
         this.models = models;
     }
 

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/domain/TreeSelectString.java

@@ -2,6 +2,7 @@ package com.ruoyi.interfaces.domain;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.ruoyi.common.core.domain.TreeSelect;
+import com.ruoyi.interfaces.domain.vo.MdModelInfoVo;
 
 import java.io.Serializable;
 import java.util.List;
@@ -19,7 +20,7 @@ public class TreeSelectString  implements Serializable{
     /**
      * 模型信息列表
      */
-    private List<MdModelInfo> models;
+    private List<MdModelInfoVo> models;
 
     /** 子节点 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
@@ -41,11 +42,11 @@ public class TreeSelectString  implements Serializable{
     }
 
 
-    public List<MdModelInfo> getModels() {
+    public List<MdModelInfoVo> getModels() {
         return models;
     }
 
-    public void setModels(List<MdModelInfo> models) {
+    public void setModels(List<MdModelInfoVo> models) {
         this.models = models;
     }
 

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-//@DataSource(DataSourceType.SLAVE)
+@DataSource(DataSourceType.SLAVE)
 public interface PtServiceMapper extends BaseMapper<PtService> {
 
     /**

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

@@ -47,5 +47,5 @@ public interface PtServiceService extends IService<PtService> {
 
     PtService get(String srvId);
 
-    List<MdModelInfoVo> modelService(MdModelInfo par);
+    List<MdModelInfoVo> modelService(MdModelInfoVo par);
 }

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

@@ -120,15 +120,9 @@ public class PtServiceServiceImpl extends ServiceImpl<PtServiceMapper, PtService
      * @return
      */
     @Override
-    public List<MdModelInfoVo> modelService(MdModelInfo par) {
-        List<MdModelInfo> mdModelInfos = mdModelInfoService.selectMdModelInfoList(par);
-        ArrayList<MdModelInfoVo> dataList = new ArrayList<>();
-        for (MdModelInfo mdModelInfo : mdModelInfos) {
-            MdModelInfoVo mdModelInfoVo = new MdModelInfoVo(mdModelInfo);
-            mdModelInfoVo.setServiceList(ptServiceMapper.selectAllColumns(new PtService(mdModelInfo.getMdid())));
-            dataList.add(mdModelInfoVo);
-        }
-        return dataList;
+    public List<MdModelInfoVo> modelService(MdModelInfoVo par) {
+
+        return ptServiceMapper.selectModelService(par);
     }
 
 }

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

@@ -477,7 +477,7 @@
         <result property="author" column="author"/>
         <result property="isPublic" column="isPublic"/>
         <result property="isApproved" column="isApproved"/>
-        <result property="status" column="status"/>
+        <result property="status" column="m_status"/>
         <result property="className" column="className"/>
         <result property="mdUnit" column="mdUnit"/>
         <result property="mdContact" column="mdContact"/>
@@ -507,7 +507,7 @@
         <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="S_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"/>
@@ -550,7 +550,7 @@
         m.author,
         m.isPublic,
         m.isApproved,
-        m.status,
+        m.status m_status,
         m.className,
         m.mdUnit,
         m.mdContact,
@@ -589,7 +589,7 @@
         s.RPCONTENT,
         s.NOTE,
         s.EXAMPLE,
-        s.STATUS,
+        s.STATUS S_STATUS,
         s.CNT,
         s.USER_ID,
         s.TM,
@@ -606,6 +606,7 @@
         s.VIEW_NUM
         from md_model_info m left join pt_service s on m.mdid = s.MDID
         <where>
+            <if test="cateid != null ">and m.cateid = #{cateid}</if>
         </where>
     </select>
 </mapper>