Merge branch 'master' into docker_package

config/db/V4.7__resource_add_col.sql

@@ -0,0 +1,7 @@
+ALTER TABLE `tb_data_resource`
+ADD COLUMN `pin_top` int NULL COMMENT '是否置顶' ,
+ADD COLUMN `pin_top_time` datetime NULL COMMENT '置顶操作时间';
+
+UPDATE tb_data_resource
+SET pin_top = 0,
+pin_top_time = NOW();

renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java

@@ -153,6 +153,16 @@ public class ResourceController {
         return new Result<>().ok(resourceService.pageWithAttrs(jsonObject, resourceService.selectDTOPageSpecilTotal(resourceDTO)));
     }
 
+    @PutMapping("/pin_top/{id}")
+    @LogOperation(value = "置顶该能力资源")
+    public Result pinTop(@PathVariable("id") Long id) {
+        ResourceDTO data = resourceService.get(id);
+        data.setPinTop(1);
+        data.setPinTopTime(new Date());
+        resourceService.update(data);
+        return new Result<>().ok(id);
+    }
+
     @GetMapping("/{id}")
     @ApiOperation("查询能力资源详细信息")
     @LogOperation("查询能力资源详细信息")

renren-admin/src/main/java/io/renren/modules/resource/dto/ResourceDTO.java

@@ -116,6 +116,12 @@ public class ResourceDTO extends AuditingBaseDTO implements Serializable {
     @ApiModelProperty(value = "申请单号")
     private String applyNumber;
 
+    @ApiModelProperty(value = "置顶标识")
+    private Integer pinTop;
+
+    @ApiModelProperty(value = "置顶时间")
+    private Date pinTopTime;
+
     public String getDelFlagTip() {
         if (this.delFlag != null) {
             Optional<ResourceEntityDelFlag> resourceEntityDelFlagOptional = Optional.ofNullable(ResourceEntityDelFlag.getByFlag(this.delFlag));

renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java

@@ -140,6 +140,17 @@ public class ResourceEntity extends BaseEntity {
      */
     private String undercarriageEnclosure;
 
+
+    /**
+     * 置顶标识
+     */
+    private Integer pinTop;
+
+    /**
+     * 置顶时间
+     */
+    private Date pinTopTime;
+
     @TableField(value = "info_list", typeHandler = FastjsonTypeHandler.class)
     private List<AttrEntity> infoList;
 

renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java

@@ -389,7 +389,18 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
         Integer pageNum = jsonObject.getInteger("pageNum");
         Integer pageSize = jsonObject.getInteger("pageSize");
         //默认按上架时间降序排列
-        String orderField = StringUtils.isBlank(jsonObject.getString("orderField")) ? "total" : jsonObject.getString("orderField");
+        String orderField;
+        if (StringUtils.isBlank(jsonObject.getString("orderField"))) {
+            if ("应用资源".equals(jsonObject.getString("type"))) {
+                orderField = "deptSort";
+            } else if ("组件服务".equals(jsonObject.getString("type"))) {
+                orderField = "pin_top";
+            } else {
+                orderField = "total";
+            }
+        } else {
+            orderField = jsonObject.getString("orderField");
+        }
         String orderType = StringUtils.isBlank(jsonObject.getString("orderType")) ? "DESC" : jsonObject.getString("orderType");
         Page<ResourceDTO> resultPage = new Page<>(pageNum, pageSize);
         switch (Constant.ProjectPlace.getByFlag(projectPlace)) {

renren-admin/src/main/resources/application-dev.yml

@@ -6,9 +6,9 @@ spring:
       #MySQL
 
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://192.168.124.236:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
+      url: jdbc:mysql://192.168.124.243:3306/share_platform?useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&useSSL=false
       username: root
-      password: Hisense2019
+      password: Liwen073898!
       #Hisense2019
       #      #Oracle
       #      driver-class-name: oracle.jdbc.OracleDriver

renren-admin/src/main/resources/mapper/resource/ResourceDao.xml

@@ -37,6 +37,8 @@
         <result property="infoList" column="info_list"
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
         <result property="applyNumber" column="apply_number"/>
+        <result property="pinTop" column="pin_top"/>
+        <result property="pinTopTime" column="pin_top_time"/>
     </resultMap>
 
     <resultMap id="resourceDTO" type="io.renren.modules.resource.dto.ResourceDTO">
@@ -81,6 +83,8 @@
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
         <result property="total" column="total"/>
         <result property="applyNumber" column="apply_number"/>
+        <result property="pinTop" column="pin_top"/>
+        <result property="pinTopTime" column="pin_top_time"/>
     </resultMap>
 
     <update id="deleteByIds">
@@ -128,8 +132,7 @@
         AND user_id = #{dto.creator}
         GROUP BY id) taa2 ON tdr.id = taa2.resource_id
         LEFT JOIN ( SELECT resource_id, COUNT( approve_status ) approve_status FROM t_ability_application WHERE 1 = 1
-        AND del_flag = 0 AND user_id = #{dto.creator} AND approve_status = '通过' GROUP BY resource_id ) taa3 ON tdr.id
+        AND del_flag = 0 AND user_id = #{dto.creator} AND approve_status = '通过' GROUP BY resource_id ) taa3 ON tdr.id =
-        =
         taa3.resource_id
         LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
         WHERE 1 = 1
@@ -184,10 +187,13 @@
             )
         </if>
         <if test="orderField != null and orderField !=''">
-            ORDER BY ${orderField} ${orderType}
             <if test="orderField == 'pin_top'">
-                , pin_top_time DESC
+                ORDER BY ${orderField} ${orderType}, pin_top_time DESC
             </if>
+            <if test="orderField == 'deptSort'">
+                ORDER BY sd.type, sd.sort
+            </if>
+            ORDER BY ${orderField} ${orderType}
         </if>
     </select>
 
@@ -401,8 +407,7 @@
         AND user_id = #{dto.creator}
         GROUP BY id) taa2 ON tdr.id = taa2.resource_id
         LEFT JOIN ( SELECT resource_id, COUNT( approve_status ) approve_status FROM t_ability_application WHERE 1 = 1
-        AND del_flag = 0 AND user_id = #{dto.creator} AND approve_status = '通过' GROUP BY resource_id ) taa3 ON tdr.id
+        AND del_flag = 0 AND user_id = #{dto.creator} AND approve_status = '通过' GROUP BY resource_id ) taa3 ON tdr.id =
-        =
         taa3.resource_id
         LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
         WHERE 1 = 1
@@ -447,10 +452,13 @@
             </foreach>
         </if>
         <if test="orderField != null and orderField !=''">
-            ORDER BY ${orderField} ${orderType}
             <if test="orderField == 'pin_top'">
-                , pin_top_time DESC
+                ORDER BY ${orderField} ${orderType}, pin_top_time DESC
             </if>
+            <if test="orderField == 'deptSort'">
+                ORDER BY sd.type, sd.sort
+            </if>
+            ORDER BY ${orderField} ${orderType}
             LIMIT ${pageNum}, ${pageSize}
         </if>
     </select>
@@ -578,8 +586,7 @@
         FROM
         (
         SELECT
-        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS
+        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type",
-        "type",
         sd.NAME AS "deptName",
         IFNULL( tdr.deptCount, 0 ) AS "deptCount",
         sd.id AS "deptId",
@@ -610,8 +617,7 @@
         FROM
         (
         SELECT
-        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS
+        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type",
-        "type",
         IFNULL( tdr.deptCount, 0 ) AS "deptCount"
         FROM
         sys_dept sd
@@ -649,8 +655,7 @@
         FROM
         (
         SELECT
-        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS
+        ( CASE sd.type WHEN 1 THEN '省级' WHEN 2 THEN '市级' WHEN 3 THEN '区级' WHEN 4 THEN '企业' ELSE '其他' END ) AS "type",
-        "type",
         IFNULL( tdr.deptCount, 0) AS "deptCount",
         IFNULL(sr.name, '暂无该地区') AS "districtName"
         FROM