Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/modules/resourceScore/dto/ResourceScoreDTO.java

@@ -30,6 +30,12 @@ public class ResourceScoreDTO implements Serializable {
     private Long resourceId;
     @ApiModelProperty(value = "评分，1-5分，1分差评，5分好评")
     private Integer score;
+    @ApiModelProperty(value = "质量评分，1-5分，1分差评，5分好评")
+    private Integer qualityScore;
+    @ApiModelProperty(value = "算法准确，1-5分，1分差评，5分好评")
+    private Integer algorithmExactScore;
+    @ApiModelProperty(value = "组件服务质量，1-5分，1分差评，5分好评")
+    private Integer assemblyQualityScore;
     @ApiModelProperty(value = "评论内容")
     private String comment;
     @ApiModelProperty(value = "删除标志；0:正常；1:已删除")

renren-admin/src/main/java/io/renren/modules/resourceScore/entity/ResourceScoreEntity.java

@@ -38,6 +38,18 @@ public class ResourceScoreEntity {
      * 评分，1-5分，1分差评，5分好评
      */
     private Integer score;
+    /**
+     * 质量评分
+     */
+    private Integer qualityScore;
+    /**
+     * 算法准确
+     */
+    private Integer algorithmExactScore;
+    /**
+     * 组件服务质量
+     */
+    private Integer assemblyQualityScore;
     /**
      * 评论内容
      */

renren-admin/src/main/resources/db/V9.0__resource_score.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `tb_resource_score`
+ADD COLUMN `quality_score` int NULL COMMENT '质量评分',
+ADD COLUMN `algorithm_exact_score` int NULL COMMENT '算法准确',
+ADD COLUMN `assembly_quality_score` int NULL COMMENT '组件服务质量';

renren-admin/src/main/resources/mapper/resourceScore/ResourceScoreDao.xml

@@ -8,6 +8,9 @@
         <result property="userId" column="user_id"/>
         <result property="resourceId" column="resource_id"/>
         <result property="score" column="score"/>
+        <result property="qualityScore" column="quality_score"/>
+        <result property="algorithmExactScore" column="algorithm_exact_score"/>
+        <result property="assemblyQualityScore" column="assembly_quality_score"/>
         <result property="comment" column="comment"/>
         <result property="delFlag" column="del_flag"/>
         <result property="creator" column="creator"/>