2024/04/28_模型接口修改

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/TModelDTO.java

@@ -17,7 +17,6 @@ import java.util.Date;
 @Data
 public class TModelDTO extends PageParam implements Serializable {
 
-    private Integer id;
 
     /**
      * 模型中文
@@ -29,49 +28,20 @@ public class TModelDTO extends PageParam implements Serializable {
      */
     private String modelEn;
 
-    private String modelUnitName;
-
-    /**
-     * 收藏量
-     */
-    private Long favorites;
-
-    /**
-     * 浏览量
-     */
-    private Long views;
-
-    /**
-     * 参数量
-     */
-    private Long parameters;
-
     /**
      * 发布单位
      */
     private String releasedBy;
 
-    private String modelPosition;
-
-    /**
-     * 发布时间
-     */
-    private Date releaseTime;
-
-    /**
-     * 是否在线体验
-     */
-    private String isOnlineExperience;
-
     /**
-     * API
+     * 模型分类id
      */
-    private String onlineExperienceApi;
+    private Integer modelTypeId;
 
     /**
-     * 详情富文本
+     * 排序
      */
-    private String details;
+    private Integer orderBy;
 
     /**
      * 版本号

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/TModel.java

@@ -33,6 +33,12 @@ public class TModel implements Serializable {
     @Column(name = "model_en")
     private String modelEn;
 
+    /**
+     * 简介
+     */
+    @Column(name = "intro")
+    private String intro;
+
     /**
      *
      */

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/TModelType.java

+package com.upyuns.platform.rs.website.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import lombok.Data;
+
+/**
+ * 模型类型
+ * @TableName t_model_type
+ */
+@Table(name="t_model_type")
+@Data
+public class TModelType implements Serializable {
+    /**
+     *
+     */
+    @Id
+    private Integer id;
+
+    /**
+     * 模型类型名称
+     */
+    private String name;
+
+    /**
+     * 父id
+     */
+    private Integer pid;
+
+    /**
+     * 状态：1.上架 2.下架
+     */
+    private Byte status;
+
+    /**
+     * 是否删除：0、否， 1、是
+     */
+    @Column(name = "is_del")
+    private Byte isDel;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    @Column(name = "create_user")
+    private Long createUser;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "last_update_time")
+    private Date lastUpdateTime;
+
+    /**
+     * 更新人
+     */
+    @Column(name = "last_update_user")
+    private Long lastUpdateUser;
+
+    private static final long serialVersionUID = 1L;
+}

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/vo/TModelTypeVo.java

+package com.upyuns.platform.rs.website.vo;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import java.util.List;
+
+@Data
+public class TModelTypeVo {
+
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     * 模型类型名称
+     */
+    private String name;
+
+    /**
+     * 父id
+     */
+    private Integer pid;
+
+    /**
+     * 状态：1.上架 2.下架
+     */
+    private Byte status;
+
+    private List<TModelTypeVo> children;
+
+
+}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/TModelTypeBiz.java

+package com.upyuns.platform.rs.website.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.upyuns.platform.rs.website.entity.TModel;
+import com.upyuns.platform.rs.website.entity.TModelType;
+import com.upyuns.platform.rs.website.mapper.TModelMapper;
+import com.upyuns.platform.rs.website.mapper.TModelTypeMapper;
+import com.upyuns.platform.rs.website.vo.TModelTypeVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class TModelTypeBiz extends BaseBiz<TModelTypeMapper, TModelType> {
+
+
+    public ObjectRestResponse getAll() {
+        List<TModelTypeVo> vos = new ArrayList<>();
+        List<TModelType> tModelTypes = mapper.selectAll();
+        for (TModelType tModelType : tModelTypes) {
+            TModelTypeVo vo = new TModelTypeVo();
+            BeanUtils.copyProperties(tModelType, vo);
+            vos.add(vo);
+        }
+        List<TModelTypeVo> result = new ArrayList<>();
+        for (TModelTypeVo vo : vos) {
+            if (vo.getPid().equals(0)) {
+                result.add(findChildren(vo, vos));
+            }
+        }
+
+        return ObjectRestResponse.succ(result);
+    }
+
+
+    public TModelTypeVo findChildren(TModelTypeVo vo, List<TModelTypeVo> treeNodes) {
+        vo.setChildren(new ArrayList<>());
+        for (TModelTypeVo it : treeNodes) {
+            if (vo.getId().equals(it.getPid())) {
+                vo.getChildren().add(it);
+                findChildren(it, treeNodes);
+            }
+        }
+        return vo;
+    }
+
+}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/TModelTypeController.java

+package com.upyuns.platform.rs.website.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.upyuns.platform.rs.website.biz.TModelBiz;
+import com.upyuns.platform.rs.website.biz.TModelTypeBiz;
+import com.upyuns.platform.rs.website.entity.TModel;
+import com.upyuns.platform.rs.website.entity.TModelType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Arrays;
+
+@RestController
+@RequestMapping("tModelType")
+public class TModelTypeController extends BaseController<TModelTypeBiz, TModelType> {
+
+
+
+    @GetMapping(value = "/app/unauth/getAll")
+    @IgnoreUserToken
+    public ObjectRestResponse getAll() {
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("softwareFramework", Arrays.asList("TensorFlow","pytorch","paddle","oneflow"));
+        jsonObject.put("modelTypes",baseBiz.getAll());
+        return ObjectRestResponse.succ(jsonObject);
+    }
+
+
+}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/mapper/TModelTypeMapper.java

+package com.upyuns.platform.rs.website.mapper;
+
+import com.upyuns.platform.rs.website.entity.TModel;
+import com.upyuns.platform.rs.website.entity.TModelType;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface TModelTypeMapper extends Mapper<TModelType> {
+}

rs-website/rs-website-server/src/main/resources/mapper/TModelMapper.xml

@@ -31,7 +31,8 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,model_cn,model_en,
+        id
+        ,model_cn,model_en,
         model_unit_name,favorites,views,
         parameters,released_by,model_position,
         release_time,is_online_experience,online_experience_api,
@@ -42,54 +43,74 @@
     </sql>
     <select id="selectList" resultType="com.upyuns.platform.rs.website.entity.TModel">
         SELECT
-            id,
-            model_cn,
-            model_en,
-            model_unit_name,
-            favorites,
-            views,
-            parameters,
-            released_by,
-            model_position,
-            release_time,
-            is_online_experience,
-            online_experience_api,
-            details,
-            model_version,
-            software_framework,
-            hardware_type,
-            examine_status,
-            `status`,
-            create_time,
-            create_user,
-            last_update_time,
-            last_update_user
+        t.id,
+        t.model_cn,
+        t.model_en,
+        t.model_unit_name,
+        t.favorites,
+        t.views,
+        t.parameters,
+        t.released_by,
+        t.model_position,
+        t.release_time,
+        t.is_online_experience,
+        t.online_experience_api,
+        t.details,
+        t.model_version,
+        t.software_framework,
+        t.hardware_type,
+        t.examine_status,
+        t.`status`,
+        t.create_time,
+        t.create_user,
+        t.last_update_time,
+        t.last_update_user
         FROM
-            t_model
+        t_model t
+        left join t_model_type_relevance ttr on t.id=ttr.model_id
         WHERE
-            is_del = 0
+        t.is_del = 0
         <if test="modelCn != null and modelCn != ''">
-            model_cn like concat('%',#{modelCn},'%')
+            AND t.model_cn like concat('%',#{modelCn},'%')
         </if>
         <if test="modelEn != null and modelEn != ''">
-            model_en like concat('%',#{modelEn},'%')
+            AND t.model_en like concat('%',#{modelEn},'%')
+        </if>
+        <if test="releasedBy != null and releasedBy != ''">
+            AND t.released_by like concat('%',#{releasedBy},'%')
         </if>
         <if test="softwareFramework != null and softwareFramework != ''">
-            software_framework like concat('%',#{softwareFramework},'%')
+            AND t.software_framework like concat('%',#{softwareFramework},'%')
         </if>
         <if test="status != null">
-            `status` = status
+            AND t.`status` = #{status}
         </if>
-        <if test="examineStatus != examineStatus">
-            `examine_status` = examineStatus
+        <if test="examineStatus != null">
+            AND t.`examine_status` = #{examineStatus}
         </if>
-        <if test="modelVersion != modelVersion">
-            `model_version` = modelVersion
+        <if test="modelVersion != null">
+            AND t.`model_version` = #{modelVersion}
         </if>
-        <if test="hardwareType != hardwareType">
-            `hardware_type` = hardwareType
+        <if test="hardwareType != null">
+            AND t.`hardware_type` = #{hardwareType}
         </if>
-        ORDER BY create_time,id desc
-
+        <if test="modelTypeId != null">
+            AND ttr.`model_type_id` = #{modelTypeId}
+        </if>
+        GROUP BY t.`id`
+        <choose>
+            <when test="orderBy == 1">
+                ORDER BY t.`views`,t.`id` desc
+            </when>
+            <when test="orderBy == 2">
+                ORDER BY t.create_time,t.id desc
+            </when>
+            <when test="orderBy == 3">
+                ORDER BY ttr.`model_type_id`,t.id desc
+            </when>
+            <when test="orderBy == 4">
+                ORDER BY t.released_by,t.id desc
+            </when>
+        </choose>
     </select>
 </mapper>

rs-website/rs-website-server/src/main/resources/mapper/TModelTypeMapper.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.upyuns.platform.rs.website.mapper.TModelTypeMapper">
+
+</mapper>