Merge remote-tracking branch 'origin/dev' into dev

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/ServiceCapabilityDTO.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.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 服务能力
+ * @TableName service_capability
+ */
+@Data
+public class ServiceCapabilityDTO extends PageParam implements Serializable {
+
+
+    /**
+     * 状态：1.上架 2.下架
+     */
+    private Byte status;
+
+
+}

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

@@ -86,9 +86,9 @@ public class IndustryApplicationInfo implements Serializable {
 	/**
 	 * 下载地址
 	 */
-	@Column(name = "download_url")
-	@ApiModelProperty(value = "下载地址")
-	private String downloadUrl;
+	@Column(name = "online_url")
+	@ApiModelProperty(value = "系统在线地址")
+	private String onlineUrl;
 
 	/**
 	 * 是否删除：0、否， 1、是

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

+package com.upyuns.platform.rs.website.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import lombok.Data;
+
+/**
+ * 服务能力
+ * @TableName service_capability
+ */
+@Table(name="service_capability")
+@Data
+public class ServiceCapability implements Serializable {
+    /**
+     *
+     */
+    @Id
+    private Integer id;
+
+    /**
+     * 计算能力(单位：GHz)
+     */
+    @Column(name = "computing_power")
+    private BigDecimal computingPower;
+
+    /**
+     * 数据总量(单位：TB)
+     */
+    @Column(name = "data_volume")
+    private BigDecimal dataVolume;
+
+    /**
+     * 数据集(单位：个)
+     */
+    @Column(name = "data_set")
+    private Integer dataSet;
+
+    /**
+     * 在库数据量(单位：TB)
+     */
+    @Column(name = "Library_data")
+    private BigDecimal libraryData;
+
+    /**
+     * 存储能力(单位：TB)
+     */
+    @Column(name = "storage_capacity")
+    private BigDecimal storageCapacity;
+
+    /**
+     * 数据(单位：条)
+     */
+    @Column(name = "data_count")
+    private Integer dataCount;
+
+    /**
+     * 状态：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/ServiceCapabilityBiz.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.Query;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.upyuns.platform.rs.website.dto.ServiceCapabilityDTO;
+import com.upyuns.platform.rs.website.entity.ServiceCapability;
+
+import com.upyuns.platform.rs.website.entity.TModel;
+import com.upyuns.platform.rs.website.mapper.ServiceCapabilityMapper;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ServiceCapabilityBiz extends BaseBiz<ServiceCapabilityMapper, ServiceCapability> {
+
+    public ObjectRestResponse addObj(ServiceCapability serviceCapability) {
+        if (serviceCapability == null) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        if (serviceCapability.getId() != null) {
+            ServiceCapability old = selectById(serviceCapability.getId());
+            if (old == null || old.getIsDel() == 1) {
+                return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
+            }
+            BeanUtil.copyProperties(serviceCapability, old, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
+            updateSelectiveByIdRe(old);
+        } else {
+            insertSelectiveRe(serviceCapability);
+        }
+        return ObjectRestResponse.succ();
+    }
+
+    public ObjectRestResponse getList(ServiceCapabilityDTO serviceCapabilityDTO) {
+        Query query = new Query(serviceCapabilityDTO);
+        PageDataVO<ServiceCapability> 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/IndustryApplicationInfoController.java

@@ -12,12 +12,14 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("industryApplicationInfo")
 public class IndustryApplicationInfoController extends BaseController<IndustryApplicationInfoBiz, IndustryApplicationInfo> {
 
-	@PostMapping(value = "addUpdate")
+	@PostMapping(value = "/app/unauth/addUpdate")
+	@IgnoreUserToken
 	public ObjectRestResponse addUpdate(@RequestBody IndustryApplicationInfo industryApplicationInfo) {
 		return baseBiz.addObj(industryApplicationInfo);
 	}
 
-	@GetMapping(value = "getList")
+	@GetMapping(value = "/app/unauth/getList")
+	@IgnoreUserToken
 	public ObjectRestResponse getList(IndustryApplicationInfoDto industryApplicationInfoDto) {
 		return baseBiz.selectList(industryApplicationInfoDto);
 	}
@@ -34,4 +36,4 @@ public class IndustryApplicationInfoController extends BaseController<IndustryAp
 		return ObjectRestResponse.succ(baseBiz.selectById(id));
 	}
 
-}
\ No newline at end of file
+}

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/ServiceCapabilityController.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.OrderItemBiz;
+import com.upyuns.platform.rs.website.biz.ServiceCapabilityBiz;
+import com.upyuns.platform.rs.website.dto.ServiceCapabilityDTO;
+import com.upyuns.platform.rs.website.dto.TModelDTO;
+import com.upyuns.platform.rs.website.entity.OrderItem;
+import com.upyuns.platform.rs.website.entity.ServiceCapability;
+import com.upyuns.platform.rs.website.entity.TModel;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("serviceCapability")
+public class ServiceCapabilityController extends BaseController<ServiceCapabilityBiz, OrderItem> {
+
+
+    @PostMapping(value = "/app/unauth/addUpdate")
+    @IgnoreUserToken
+    public ObjectRestResponse addUpdate(@RequestBody ServiceCapability serviceCapability) {
+        return baseBiz.addObj(serviceCapability);
+    }
+
+
+    @PostMapping(value = "/app/unauth/getList")
+    @IgnoreUserToken
+    public ObjectRestResponse getList(@RequestBody ServiceCapabilityDTO serviceCapabilityDTO) {
+        return baseBiz.getList(serviceCapabilityDTO);
+    }
+
+
+    @GetMapping(value = "/app/unauth/detail")
+    @IgnoreUserToken
+    public ObjectRestResponse detail(Integer id) {
+        return ObjectRestResponse.succ(baseBiz.selectById(id));
+    }
+
+
+}

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

@@ -17,19 +17,22 @@ public class TModelController extends BaseController<TModelBiz, TModel> {
 
 
 
-    @PostMapping(value = "addUpdate")
+    @PostMapping(value = "/app/unauth/addUpdate")
+    @IgnoreUserToken
     public ObjectRestResponse addUpdate(@RequestBody TModel tModel) {
         return baseBiz.addObj(tModel);
     }
 
 
-    @PostMapping(value = "getList")
+    @PostMapping(value = "/app/unauth/getList")
+    @IgnoreUserToken
     public ObjectRestResponse getList(@RequestBody TModelDTO tModelDTO) {
         return baseBiz.getList(tModelDTO);
     }
 
 
-    @GetMapping(value = "/detail")
+    @GetMapping(value = "/app/unauth/detail")
+    @IgnoreUserToken
     public ObjectRestResponse detail(Integer id) {
         return ObjectRestResponse.succ(baseBiz.selectById(id));
     }

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

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

rs-website/rs-website-server/src/main/resources/mapper/ServiceCapabilityMapper.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.ServiceCapabilityMapper">
+
+    <resultMap id="BaseResultMap" type="com.upyuns.platform.rs.website.entity.ServiceCapability">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="computingPower" column="computing_power" jdbcType="DECIMAL"/>
+            <result property="dataVolume" column="data_volume" jdbcType="DECIMAL"/>
+            <result property="dataSet" column="data_set" jdbcType="INTEGER"/>
+            <result property="libraryData" column="Library_data" jdbcType="DECIMAL"/>
+            <result property="storageCapacity" column="storage_capacity" jdbcType="DECIMAL"/>
+            <result property="dataCount" column="data_count" jdbcType="INTEGER"/>
+            <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,computing_power,data_volume,
+        data_set,Library_data,storage_capacity,
+        data_count,status,is_del,
+        create_time,create_user,last_update_time,
+        last_update_user
+    </sql>
+    <select id="selectList" resultType="com.upyuns.platform.rs.website.entity.ServiceCapability">
+        SELECT
+            *
+        FROM
+            service_capability
+        WHERE
+            is_del = 0
+        <if test="status != null">
+            AND `status` = #{status}
+        </if>
+        ORDER BY create_time,id desc
+    </select>
+</mapper>