fix: 导航列表调整

xinkeaboard-server/b2b2c-entity/src/main/java/com/slodon/b2b2c/system/pojo/Navigation.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * PC导航栏
@@ -28,4 +29,7 @@ public class Navigation implements Serializable {
 
     @ApiModelProperty("链接数据，json类型，包含链接类型、链接地址等")
     private String data;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
 }

xinkeaboard-server/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/system/admin/AdminNavigationController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 import java.util.List;
 
 @Api(tags = "admin-导航设置")
@@ -37,12 +38,14 @@ public class AdminNavigationController extends BaseController {
             @ApiImplicitParam(name = "webSite", value = "站点", paramType = "query"),
             @ApiImplicitParam(name = "navName", value = "导航名称", paramType = "query"),
             @ApiImplicitParam(name = "pageSize", value = "分页大小", defaultValue = "20", paramType = "query"),
-            @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query")
+            @ApiImplicitParam(name = "current", value = "当前页面位置", defaultValue = "1", paramType = "query"),
+            @ApiImplicitParam(name = "isShow", value = "是否展示", paramType = "query")
     })
     @GetMapping("list")
-    public JsonResult<PageVO<Navigation>> list(HttpServletRequest request, String webSite, String navName) {
+    public JsonResult<PageVO<Navigation>> list(HttpServletRequest request, String webSite, String navName, Integer isShow) {
         PagerInfo pager = WebUtil.handlerPagerInfo(request);
         NavigationExample example = new NavigationExample();
+        example.setIsShow(isShow);
         example.setWebSite(webSite);
         if (!StringUtil.isEmpty(navName)) {
             if (navName.contains("&amp;")) {
@@ -74,6 +77,7 @@ public class AdminNavigationController extends BaseController {
         navigation.setSort(sort);
         navigation.setIsShow(isShow);
         navigation.setData(data);
+        navigation.setCreateTime(new Date());
         navigationModel.saveNavigation(navigation);
         return SldResponse.success("添加成功", "导航名称:" + navigation.getNavName());
     }

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/read/system/NavigationReadMapper.xml

@@ -8,6 +8,7 @@
     <result column="sort" property="sort" />
     <result column="is_show" property="isShow" />
     <result column="data" property="data" />
+    <result column="create_time" property="createTime" />
   </resultMap>
   <!--按照主键值进行操作-->
   <sql id="pkWhere">
@@ -46,7 +47,7 @@
   </sql>
   <!--排序条件-->
   <sql id="orderBy">
-    ORDER BY `nav_id` DESC
+    ORDER BY `sort` DESC,`create_time` DESC
   </sql>
   <sql id="orderByOther">
     order by ${example.orderBy}

xinkeaboard-server/b2b2c-web/src/main/resources/mapper/write/system/NavigationWriteMapper.xml

@@ -8,6 +8,7 @@
     <result column="sort" property="sort" />
     <result column="is_show" property="isShow" />
     <result column="data" property="data" />
+    <result column="create_time" property="createTime" />
   </resultMap>
   <!--除主键外的所有字段，用于插入操作-->
   <sql id="columns">
@@ -27,6 +28,9 @@
       <if test="data != null">
         `data`,
       </if>
+      <if test="createTime != null">
+        `create_time`,
+      </if>
     </trim>
   </sql>
   <!--按照主键值进行操作-->
@@ -66,7 +70,7 @@
   </sql>
   <!--排序条件-->
   <sql id="orderBy">
-    ORDER BY `nav_id` DESC
+    ORDER BY `sort` DESC ,`create_time` DESC
   </sql>
   <sql id="orderByOther">
     order by ${example.orderBy}
@@ -201,6 +205,9 @@
       <if test="data != null">
         #{data},
       </if>
+      <if test="createTime != null">
+        #{createTime},
+      </if>
     </trim>
     )
   </insert>

xinkeaboard-server/doc/DDL/update.sql

@@ -357,6 +357,8 @@ update sys_setting set description='建议上传宽1920*高104的图片 ' where
 
 update sys_setting set `value`='1' where name = 'verification_code_check_is_enable';
 
+ALTER TABLE sys_pc_navigation ADD COLUMN create_time DATETIME NOT NULL DEFAULT NOW() COMMENT '创建时间' AFTER data;
+