Merge branch 'dev' into 'main'

Dev

See merge request !178

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

@@ -940,4 +940,16 @@ public class RegionController extends BaseController {
         return AjaxResult.success(res);
     }
 
+    @RequestMapping(value = "/getRegionDetail", method = RequestMethod.GET)
+    @ResponseBody
+    public AjaxResult getRegionDetail(@RequestParam("id") String id) {
+        return AjaxResult.success(gridRegionMapper.getRegionDetail(id));
+    }
+
+    @RequestMapping(value = "/updateRegionDetail", method = RequestMethod.POST)
+    @ResponseBody
+    public AjaxResult updateRegionDetail(@RequestParam("id") String id,@RequestParam("detail") String detail) {
+        return AjaxResult.success(gridRegionMapper.updateRegionDetail(id,detail));
+    }
+
 }

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

+package com.ruoyi.system.domain.grid;
+
+import lombok.Data;
+
+@Data
+public class GridRegionDetail {
+    private String id;
+    private String detail;
+}

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

@@ -65,4 +65,8 @@ public interface GridRegionMapper {
     List<GridRegion> selectAllByIdAndWgType(@Param("wgType")String wgType, @Param("wgCode")String wgCode);
 
     int changeTreeNodeNameByCode(@Param("code") String code, @Param("name") String name);
+
+    String getRegionDetail(@Param("id")String id);
+
+    int updateRegionDetail(@Param("id")String id,@Param("detail")String detail);
 }
\ No newline at end of file

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

@@ -708,6 +708,10 @@
     and wg_type = #{wgType}
     and wg_code = #{wgCode}
   </select>
+  <select id="getRegionDetail" resultType="java.lang.String">
+    select detail from grid_region
+    where id = #{id}
+  </select>
 
   <update id="changeTreeNodeName">
     update grid_region set wg_name=#{name} where id = #{id}
@@ -715,5 +719,8 @@
     <update id="changeTreeNodeNameByCode">
       update grid_region set wg_name=#{name} where wg_code = #{code}
     </update>
+  <update id="updateRegionDetail">
+    update grid_region set detail=#{detail} where id = #{id}
+  </update>
 
 </mapper>
\ No newline at end of file