Merge branch 'dev' into 'main'

Dev

See merge request !203

ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.zqt.ZQTImportExcelUtil;
 import com.ruoyi.system.domain.grid.*;
 import com.ruoyi.system.domain.grid.vo.GridDxbVO;
 import com.ruoyi.system.domain.grid.vo.GridTreeNode;
+import com.ruoyi.system.domain.video.ext.Position;
 import com.ruoyi.system.mapper.grid.GridRegionMapper;
 import com.ruoyi.system.service.grid.GridRegionFacadeService;
 import com.ruoyi.system.service.grid.GridRegionService;
@@ -967,4 +968,32 @@ public class RegionController extends BaseController {
         return AjaxResult.success(gridRegionMapper.getFourRegionList(wgCode));
     }
 
+    @PostMapping("/position")
+    public AjaxResult getVideoPosition(@RequestBody Position position) {
+        List<String> list = Arrays.asList(position.getIds());
+
+        //需要两个数组，index_now记录当前传入数组的channelId在数据库中的position
+        //此处为了考虑按照类型分类后产生的不完整排序
+        int[] index_now = new int[list.size()];
+
+        for(int i = 0; i < list.size(); i++){
+            String channelId = list.get(i);
+            int position_now = gridRegionMapper.positionById(channelId);
+            index_now[i] = position_now;
+        }
+        Arrays.sort(index_now);
+
+        for(int i = 0;i<list.size();i++){
+            gridRegionMapper.position(list.get(i),index_now[i]);
+        }
+
+        return AjaxResult.success();
+    }
+
+//    @RequestMapping(value = "/exchangePosition", method = RequestMethod.GET)
+//    @ResponseBody
+//    public AjaxResult exchangePosition(@RequestParam("first") String first,@RequestParam("second") String second) {
+//        return AjaxResult.success(gridRegionMapper.getFourRegionList(wgCode));
+//    }
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/grid/Position1.java

+package com.ruoyi.system.domain.grid;
+
+import lombok.Data;
+
+@Data
+public class Position1 {
+
+    private String[] ids;
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/grid/GridRegionMapper.java

@@ -78,4 +78,10 @@ public interface GridRegionMapper {
     String getJzAreaByCode(@Param("code")String code);
 
     List<GridRegion> getFourRegionList(@RequestParam("wgCode") String wgCode);
+
+    int positionById(@Param("id") String id);
+
+    int position(@Param("id") String id,@Param("position") int position);
+
+    void exchangePosition(@Param("first") String first, @Param("second") String second);
 }
\ No newline at end of file

ruoyi-system/src/main/resources/mapper/grid/GridRegionMapper.xml

@@ -598,7 +598,7 @@
           #{wgCode}
         </foreach>
       </if>
-      order by wg_code asc
+      order by position,wg_code asc
     </select>
   <select id="countByParams" resultType="java.lang.Integer">
     select
@@ -740,7 +740,23 @@
     <include refid="Base_Column_List" />
     from grid_region where is_valid = '1'
     and wg_parent_id = #{wgCode}
+    order by position asc
   </select>
 
+  <select id="positionById" parameterType="String" resultType="integer">
+    select position
+    from grid_region
+    where id = #{id}
+  </select>
+  <update id="position">
+    UPDATE grid_region
+    SET position = #{position} where id = #{id}
+  </update>
+
+  <update id="exchangePosition">
+    UPDATE grid_region
+    SET position = #{position} where id = #{id}
+  </update>
+
 
 </mapper>
\ No newline at end of file