Merge branch 'dev-lb' into 'dev'

Dev lb

See merge request !179

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

@@ -9,10 +9,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.zqt.ZQTImportExcelUtil;
-import com.ruoyi.system.domain.grid.GridRegion;
-import com.ruoyi.system.domain.grid.GridRegionExample;
-import com.ruoyi.system.domain.grid.GridRegionUser;
-import com.ruoyi.system.domain.grid.GridRegionUserExample;
+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.mapper.grid.GridRegionMapper;
@@ -948,8 +945,20 @@ public class RegionController extends BaseController {
 
     @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));
+    public AjaxResult updateRegionDetail(@RequestBody GridRegionDetail gridRegionDetail) {
+        return AjaxResult.success(gridRegionMapper.updateRegionDetail(gridRegionDetail.getId(),gridRegionDetail.getDetail()));
+    }
+
+    @RequestMapping(value = "/getRegionJzArea", method = RequestMethod.GET)
+    @ResponseBody
+    public AjaxResult getRegionJzArea(@RequestParam("id") String id) {
+        return AjaxResult.success(gridRegionMapper.getRegionJzArea(id));
+    }
+
+    @RequestMapping(value = "/updateRegionJzArea", method = RequestMethod.POST)
+    @ResponseBody
+    public AjaxResult updateRegionJzArea(@RequestBody GridRegionDetail gridRegionDetail) {
+        return AjaxResult.success(gridRegionMapper.updateRegionJzArea(gridRegionDetail.getId(),gridRegionDetail.getJzArea()));
     }
 
 }

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

@@ -6,4 +6,5 @@ import lombok.Data;
 public class GridRegionDetail {
     private String id;
     private String detail;
+    private String jzArea;
 }

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

@@ -69,4 +69,8 @@ public interface GridRegionMapper {
     String getRegionDetail(@Param("id")String id);
 
     int updateRegionDetail(@Param("id")String id,@Param("detail")String detail);
+
+    String getRegionJzArea(@Param("id")String id);
+
+    int updateRegionJzArea(@Param("id")String id,@Param("JzArea")String JzArea);
 }
\ No newline at end of file

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

@@ -712,6 +712,10 @@
     select detail from grid_region
     where id = #{id}
   </select>
+  <select id="getRegionJzArea" resultType="java.lang.String">
+    select jz_area from grid_region
+    where id = #{id}
+  </select>
 
   <update id="changeTreeNodeName">
     update grid_region set wg_name=#{name} where id = #{id}
@@ -722,5 +726,8 @@
   <update id="updateRegionDetail">
     update grid_region set detail=#{detail} where id = #{id}
   </update>
+  <update id="updateRegionJzArea">
+    update grid_region set jz_area=#{jzArea} where id = #{id}
+  </update>
 
 </mapper>
\ No newline at end of file