勋章排序

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/view.html

@@ -90,6 +90,7 @@
                     formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-primary btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="selected(\'' + row.guid + '\')"><i class="fa fa-eye"></i>成就</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="sort(\'' + row.guid + '\')"><i class="fa fa-eject"></i>上移</a>');
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.guid + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-primary btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.guid + '\')"><i class="fa fa-eye"></i>查看</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.guid + '\')"><i class="fa fa-remove"></i>删除</a>');
@@ -110,17 +111,9 @@
         $.modal.open("新增", ctx + "small/project/medal/add/" + type, 800, 450);
     }
 
-    function selected(id) {
-        var selectedUrl =  prefix + "/selected/{guid}";
-        var url = "/404.html";
-        if ($.common.isNotEmpty(id)) {
-            url = selectedUrl.replace("{guid}", id);
-        }
-        $.modal.open("编辑", url);
-    }
-
     function sort(id) {
-        $.get(ctx + "small/project/medal/sort/" + id, null, function (res) {
+        var type = [[${type}]];
+        $.get(ctx + "small/project/medal/sort/" + id +"/"+type, null, function (res) {
             if (res.success) {
                 //
                 $.table.refresh();
@@ -131,6 +124,16 @@
         });
     }
 
+    function selected(id) {
+        var selectedUrl =  prefix + "/selected/{guid}";
+        var url = "/404.html";
+        if ($.common.isNotEmpty(id)) {
+            url = selectedUrl.replace("{guid}", id);
+        }
+        $.modal.open("编辑", url);
+    }
+
+
     function reset() {
         $("[name='name']").val("");
         $.table.search()

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMedalController.java

@@ -200,6 +200,15 @@ public class SceneMedalController extends BaseController {
                 ? ZDResponse.success() : ZDResponse.error("删除失败");
     }
 
+    /**
+     * 排序上移
+     */
+    @GetMapping("/sort/{guid}/{type}")
+    @ResponseBody
+    public ZDResponse sort(@PathVariable("guid") String guid, @PathVariable("type") String type) {
+        return sceneMedalService.sort(guid, type);
+    }
+
     /**
      * 查询附件信息
      *

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneMedal.java

@@ -1,5 +1,6 @@
 package com.zdxt.knowledge.domain;
 
+import com.zdxt.common.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -51,6 +52,11 @@ public class SceneMedal implements Serializable {
      */
     private Integer hide;
 
+    /**
+     * 排序
+     */
+    private Integer sort;
+
     /**
      * 创建人
      */
@@ -183,4 +189,12 @@ public class SceneMedal implements Serializable {
     public void setGain(boolean gain) {
         this.gain = gain;
     }
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
 }

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneMedalMapper.java

@@ -1,6 +1,7 @@
 package com.zdxt.knowledge.mapper;
 
 import com.zdxt.knowledge.domain.SceneMedal;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -59,4 +60,18 @@ public interface SceneMedalMapper {
      */
     public List<SceneMedal> selectSceneMedalByIds(String[] guids);
 
+    /**
+     * 获取排序【请填写功能名称】
+     *
+     * @return 结果
+     */
+    public Integer selectMinSort();
+
+    /**
+     * 获取排序【请填写功能名称】
+     *
+     * @return 结果
+     */
+    public SceneMedal selectLastSort(@Param("sort") Integer sort, @Param("type")String type);
+
 }

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneMedalService.java

@@ -55,6 +55,14 @@ public interface ISceneMedalService {
      */
     public int deleteSceneMedalByIds(String guids);
 
+    /**
+     * 排序上移【请填写功能名称】
+     *
+     * @param guid 需要删除的数据ID
+     * @return 结果
+     */
+    public ZDResponse sort(String guid, String type);
+
     /**
      * 批量查询
      *

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java

@@ -293,7 +293,7 @@ public class SceneManageServiceImpl implements ISceneManageService {
     public ZDResponse sort(String guid) {
         SceneManage sceneManage = sceneManageMapper.selectSceneManageById(guid);
         if (Objects.isNull(sceneManage)) {
-            return ZDResponse.error("未找到改场景相关数据");
+            return ZDResponse.error("未找到该场景相关数据");
         }
         SceneManage lastSceneManage = sceneManageMapper.selectLastSort(sceneManage.getSort());
         if (Objects.isNull(lastSceneManage)) {

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneMedalServiceImpl.java

@@ -81,6 +81,8 @@ public class SceneMedalServiceImpl implements ISceneMedalService {
             sceneMedal.setCreateTime(DateUtils.getNowDate());
         }
         // 上传文件，并在附件表中添加记录
+        Integer i = sceneMedalMapper.selectMinSort();
+        sceneMedal.setSort(Objects.isNull(i) ? 1 : i + 1);
         sceneMedal.setGuid(StringUtils.getUUID());
         String uploadFilePath = fileUploadApi.upload(files[0]);
         zdxtFileCommonApi.insertZdxtFile(files[0], sceneMedal.getGuid() + "", uploadFilePath);
@@ -168,4 +170,23 @@ public class SceneMedalServiceImpl implements ISceneMedalService {
         return ZDResponse.error("编辑成就勋章图片失败");
     }
 
+
+    @Override
+    public ZDResponse sort(String guid,String type) {
+        SceneMedal sceneMedal = sceneMedalMapper.selectSceneMedalById(guid);
+        if (Objects.isNull(sceneMedal)) {
+            return ZDResponse.error("未找到该勋章相关数据");
+        }
+        SceneMedal lastSceneMedal = sceneMedalMapper.selectLastSort(sceneMedal.getSort(),type);
+        if (Objects.isNull(lastSceneMedal)) {
+            return ZDResponse.error("上移达到最大限制");
+        }
+
+        Integer lastSceneManageSort = lastSceneMedal.getSort();
+        lastSceneMedal.setSort(sceneMedal.getSort());
+        sceneMedalMapper.updateSceneMedal(lastSceneMedal);
+        sceneMedal.setSort(lastSceneManageSort);
+        sceneMedalMapper.updateSceneMedal(sceneMedal);
+        return ZDResponse.success("上移成功");
+    }
 }

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMedalMapper.xml

@@ -12,6 +12,7 @@
         <result property="type" column="type"/>
         <result property="hide" column="hide"/>
         <result property="level" column="level"/>
+        <result property="sort" column="sort"/>
         <result property="creator" column="creator"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -21,6 +22,7 @@
     <sql id="selectSceneMedalVo">
         select guid,
                name,
+               sort,
                icon_path,
                achieve_icon_path,
                scene_id,
@@ -43,6 +45,7 @@
             <if test="creator != null  and creator != ''">and creator = #{creator}</if>
             <if test="sceneId != null  and sceneId != ''">and scene_id = #{sceneId}</if>
         </where>
+        order by sort ASC
     </select>
 
     <select id="selectSceneMedalById" parameterType="String" resultMap="SceneMedalResult">
@@ -61,6 +64,7 @@
             <if test="type != null  and type != ''">type,</if>
             <if test="hide != null">hide,</if>
             <if test="level != null">level,</if>
+            <if test="sort != null">sort,</if>
             <if test="creator != null  and creator != ''">creator,</if>
             <if test="createTime != null ">create_time,</if>
             <if test="updateBy != null  and updateBy != ''">update_by,</if>
@@ -75,6 +79,7 @@
             <if test="type != null  and type != ''">#{type},</if>
             <if test="hide != null">#{hide},</if>
             <if test="level != null">#{level},</if>
+            <if test="sort != null">#{sort},</if>
             <if test="creator != null  and creator != ''">#{creator},</if>
             <if test="createTime != null ">#{createTime},</if>
             <if test="updateBy != null  and updateBy != ''">#{updateBy},</if>
@@ -92,6 +97,7 @@
             <if test="type != null  and type != ''">type = #{type},</if>
             <if test="hide != null ">hide = #{hide},</if>
             <if test="level != null">level = #{level},</if>
+            <if test="sort != null">sort = #{sort},</if>
             <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
             <if test="updateTime != null ">update_time = #{updateTime},</if>
         </trim>
@@ -118,6 +124,14 @@
         </foreach>
     </select>
 
+    <select id="selectMinSort" resultType="INTEGER">
+        select MAX(sort) as sort from scene_medal where type =  #{type}
+    </select>
+
+    <select id="selectLastSort" resultMap="SceneMedalResult">
+        SELECT guid, sort FROM scene_medal WHERE sort = (SELECT MAX(sort) FROM scene_medal where sort &lt; #{sort} and type = #{type});
+    </select>
+
 <!--    <select id="selectSceneMedalListAll" parameterType="SceneMedal" resultMap="SceneMedalResult">-->
 <!--        select cu.guid, cu.name, zd.upload_path-->
 <!--        from scene_medal as cu-->