Merge branch 'dev' of http://git.upyuns.com/zhoujw/rs-cloud-platform into dev

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

+package com.upyuns.platform.rs.website.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 模型
+ * @TableName t_model
+ */
+
+@Data
+public class TModelDTO extends PageParam implements Serializable {
+
+    private Integer id;
+
+    /**
+     * 模型中文
+     */
+    private String modelCn;
+
+    /**
+     * 模型英文
+     */
+    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
+     */
+    private String onlineExperienceApi;
+
+    /**
+     * 详情富文本
+     */
+    private String details;
+
+    /**
+     * 版本号
+     */
+    private Integer modelVersion;
+
+    /**
+     * 软件框架
+     */
+    private String softwareFramework;
+
+    /**
+     * 硬件类型
+     */
+    private String hardwareType;
+
+    /**
+     * 审核状态：1.待审核 2.通过 3.拒绝
+     */
+    private Byte examineStatus;
+
+    /**
+     * 状态：1.上架 2.下架
+     */
+    private Byte status;
+
+}

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

+package com.upyuns.platform.rs.website.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 模型
+ * @TableName t_model
+ */
+@Table(name="t_model")
+@Data
+public class TModel implements Serializable {
+    /**
+     * 模型ID
+     */
+    @Id
+    private Integer id;
+
+    /**
+     * 模型中文
+     */
+    @Column(name = "model_cn")
+    private String modelCn;
+
+    /**
+     * 模型英文
+     */
+    @Column(name = "model_en")
+    private String modelEn;
+
+    /**
+     *
+     */
+    @Column(name = "model_unit_name")
+    private String modelUnitName;
+
+    /**
+     * 收藏量
+     */
+    private Long favorites;
+
+    /**
+     * 浏览量
+     */
+    private Long views;
+
+    /**
+     * 参数量
+     */
+    private Long parameters;
+
+    /**
+     * 发布单位
+     */
+    @Column(name = "released_by")
+    private String releasedBy;
+
+    /**
+     *
+     */
+    @Column(name = "model_position")
+    private String modelPosition;
+
+    /**
+     * 发布时间
+     */
+    @Column(name = "release_time")
+    private Date releaseTime;
+
+    /**
+     * 是否在线体验
+     */
+    @Column(name = "is_online_experience")
+    private String isOnlineExperience;
+
+    /**
+     * API
+     */
+    @Column(name = "online_experience_api")
+    private String onlineExperienceApi;
+
+    /**
+     * 详情富文本
+     */
+    private String details;
+
+    /**
+     * 版本号
+     */
+    @Column(name = "model_version")
+    private Integer modelVersion;
+
+    /**
+     * 软件框架
+     */
+    @Column(name = "software_framework")
+    private String softwareFramework;
+
+    /**
+     * 硬件类型
+     */
+    @Column(name = "hardware_type")
+    private String hardwareType;
+
+    /**
+     * 审核状态：1.待审核 2.通过 3.拒绝
+     */
+    @Column(name = "examine_status")
+    private Byte examineStatus;
+
+    /**
+     * 状态：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-server/src/main/java/com/upyuns/platform/rs/website/biz/TModelBiz.java

+package com.upyuns.platform.rs.website.biz;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.upyuns.platform.rs.website.dto.TModelDTO;
+import com.upyuns.platform.rs.website.entity.IndustryApplicationInfo;
+import com.upyuns.platform.rs.website.entity.TModel;
+import com.upyuns.platform.rs.website.mapper.TModelMapper;
+import org.springframework.stereotype.Service;
+import com.github.wxiaoqi.security.common.util.Query;
+
+/**
+ *
+ */
+@Service
+public class TModelBiz extends BaseBiz<TModelMapper, TModel>{
+
+    public ObjectRestResponse addObj(TModel tModel) {
+        if (tModel == null) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        if (tModel.getId() != null) {
+            TModel old = selectById(tModel.getId());
+            if (old == null || old.getIsDel() == 1) {
+                return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
+            }
+            BeanUtil.copyProperties(tModel, old, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+            updateSelectiveByIdRe(old);
+        } else {
+            insertSelectiveRe(tModel);
+        }
+        return ObjectRestResponse.succ();
+    }
+
+
+    public ObjectRestResponse getList(TModelDTO tModelDTO) {
+        Query query = new Query(tModelDTO);
+        PageDataVO<TModel> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectList(query.getSuper()));
+        return ObjectRestResponse.succ(pageDataVO);
+    }
+}
+
+
+
+

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

+package com.upyuns.platform.rs.website.controller;
+
+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.ShoppingCartInfoBiz;
+import com.upyuns.platform.rs.website.biz.TModelBiz;
+import com.upyuns.platform.rs.website.dto.TModelDTO;
+import com.upyuns.platform.rs.website.entity.IndustryApplicationInfo;
+import com.upyuns.platform.rs.website.entity.ShoppingCartInfo;
+import com.upyuns.platform.rs.website.entity.TModel;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("tModel")
+public class TModelController extends BaseController<TModelBiz, TModel> {
+
+
+
+    @PostMapping(value = "addUpdate")
+    public ObjectRestResponse addUpdate(@RequestBody TModel tModel) {
+        return baseBiz.addObj(tModel);
+    }
+
+
+    @PostMapping(value = "getList")
+    public ObjectRestResponse getList(@RequestBody TModelDTO tModelDTO) {
+        return baseBiz.getList(tModelDTO);
+    }
+
+
+    @GetMapping(value = "/detail")
+    public ObjectRestResponse detail(Integer id) {
+        return ObjectRestResponse.succ(baseBiz.selectById(id));
+    }
+
+
+//    @PostMapping(value = "delete/{id}")
+//    public ObjectRestResponse remove(@PathVariable Integer id) {
+//        return baseBiz.remove(id);
+//    }
+
+}

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

+package com.upyuns.platform.rs.website.mapper;
+
+
+import com.upyuns.platform.rs.website.entity.TModel;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/**
+ * @Entity generator.domain.TModel
+ */
+public interface TModelMapper extends Mapper<TModel> {
+
+
+    List<TModel> selectList(LinkedHashMap<String, Object> aSuper);
+}
+
+
+
+

rs-website/rs-website-server/src/main/resources/mapper/TModelMapper.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.TModelMapper">
+
+    <resultMap id="BaseResultMap" type="com.upyuns.platform.rs.website.entity.TModel">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="modelCn" column="model_cn" jdbcType="VARCHAR"/>
+            <result property="modelEn" column="model_en" jdbcType="VARCHAR"/>
+            <result property="modelUnitName" column="model_unit_name" jdbcType="VARCHAR"/>
+            <result property="favorites" column="favorites" jdbcType="BIGINT"/>
+            <result property="views" column="views" jdbcType="BIGINT"/>
+            <result property="parameters" column="parameters" jdbcType="BIGINT"/>
+            <result property="releasedBy" column="released_by" jdbcType="VARCHAR"/>
+            <result property="modelPosition" column="model_position" jdbcType="VARCHAR"/>
+            <result property="releaseTime" column="release_time" jdbcType="TIMESTAMP"/>
+            <result property="isOnlineExperience" column="is_online_experience" jdbcType="VARCHAR"/>
+            <result property="onlineExperienceApi" column="online_experience_api" jdbcType="VARCHAR"/>
+            <result property="details" column="details" jdbcType="VARCHAR"/>
+            <result property="modelCersion" column="model_cersion" jdbcType="INTEGER"/>
+            <result property="softwareFramework" column="software_framework" jdbcType="VARCHAR"/>
+            <result property="hardwareType" column="hardware_type" jdbcType="VARCHAR"/>
+            <result property="examineStatus" column="examine_status" jdbcType="TINYINT"/>
+            <result property="status" column="status" jdbcType="TINYINT"/>
+            <result property="isDel" column="is_del" jdbcType="TINYINT"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="createUser" column="create_user" jdbcType="BIGINT"/>
+            <result property="lastUpdateTime" column="last_update_time" jdbcType="TIMESTAMP"/>
+            <result property="lastUpdateUser" column="last_update_user" jdbcType="BIGINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        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,
+        is_del,create_time,create_user,
+        last_update_time,last_update_user
+    </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
+        FROM
+            t_model
+        WHERE
+            is_del = 0
+        <if test="modelCn != null and modelCn != ''">
+            model_cn like concat('%',#{modelCn},'%')
+        </if>
+        <if test="modelEn != null and modelEn != ''">
+            model_en like concat('%',#{modelEn},'%')
+        </if>
+        <if test="softwareFramework != null and softwareFramework != ''">
+            software_framework like concat('%',#{softwareFramework},'%')
+        </if>
+        <if test="status != null">
+            `status` = status
+        </if>
+        <if test="examineStatus != examineStatus">
+            `examine_status` = examineStatus
+        </if>
+        <if test="modelVersion != modelVersion">
+            `model_version` = modelVersion
+        </if>
+        <if test="hardwareType != hardwareType">
+            `hardware_type` = hardwareType
+        </if>
+        ORDER BY create_time,id desc
+
+    </select>
+</mapper>