Selaa lähdekoodia

手机端增加水利工程资源CRUD接口,
手机端增加重点区域查询接口,带分页带筛选

Wang-Xiao-Ran 1 vuosi sitten
vanhempi
commit
df0cfdfb99

+ 28 - 0
src/main/java/com/sooka/sponest/mobile/appbigdata/controller/AppBigDataController.java

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.system.api.domain.SysMenuEventType;
 import com.sooka.sponest.mobile.aop.NoRepeatSubmit;
+import com.sooka.sponest.mobile.appbigdata.domain.bo.ImportBo;
 import com.sooka.sponest.mobile.appbigdata.domain.bo.KeyProjectsScheduleBO;
 import com.sooka.sponest.mobile.appbigdata.domain.bo.VisuForestResourceBO;
 import com.sooka.sponest.mobile.appbigdata.domain.vo.VisuFireSendingSMSVo;
@@ -419,6 +420,33 @@ public class AppBigDataController extends VisuBaseService {
     }
 
     /**
+     * 获取重点区域
+     * 带筛选,带分页
+     * @return
+     * @Version 1.0
+     * @author wang_xy
+     * @since 2023/4/24 15:09
+     */
+    @ApiOperation(value = "获取重点区域(分页,筛选)", notes = "获取重点区域(分页,筛选)")
+    @GetMapping("getImportAreaListByParams")
+    public AjaxResult getImportAreaListByParams(ImportBo bo) {
+        return remoteDataBaseService.getImportAreaListByParams(bo.getAreaName(), bo.getProjectType(), bo.getProjectLevel(), bo.getPageNum(), bo.getPageSize());
+//        for (int i = 0; i < ajax.size(); i++) {
+//            Map map = ajax.get(i);
+//            List<Map> areaList = (List) map.get("areaList");
+//            for (int j = 0; j < areaList.size(); j++) {
+//                Map area = areaList.get(j);
+//                String photoId = area.containsKey(PHOTO_ID) && null != area.get(PHOTO_ID) ? area.get(PHOTO_ID).toString().replaceAll("172.18.1.32:8081", "218.27.3.115:9301") : "";
+//                photoId = photoId.replaceAll("10.6.52.32:8081", "218.27.3.115:9301");
+//                area.put(PHOTO_ID, photoId);
+//                areaList.set(j, area);
+//            }
+//            ajax.set(i, map);
+//        }
+//         AjaxResult.success(ajax);
+    }
+
+    /**
      * 实时关注
      *
      * @return

+ 17 - 0
src/main/java/com/sooka/sponest/mobile/appbigdata/domain/bo/ImportBo.java

@@ -0,0 +1,17 @@
+package com.sooka.sponest.mobile.appbigdata.domain.bo;
+
+import lombok.Data;
+
+/**
+ * @Author LG
+ * @Date 2023/9/7 - 11:22
+ */
+@Data
+public class ImportBo {
+    private Long deptId;
+    private String areaName;
+    private String projectType;
+    private String projectLevel;
+    private Integer pageNum;
+    private Integer pageSize;
+}

+ 69 - 0
src/main/java/com/sooka/sponest/mobile/data/digitalwatercontroller/WaterProjectController.java

@@ -0,0 +1,69 @@
+package com.sooka.sponest.mobile.data.digitalwatercontroller;
+
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageDomain;
+import com.ruoyi.common.core.web.page.TableSupport;
+import com.sooka.sponest.data.api.digitalwater.domain.HydraulicWaterProject;
+import com.sooka.sponest.data.api.digitalwater.service.RemoteWaterProjectService;
+import com.sooka.sponest.mobile.system.camera.service.AppCameraService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author LG
+ * @Date 2023/9/7 - 10:12
+ */
+@RestController
+@RequestMapping("/AppWaterProjectController")
+public class WaterProjectController {
+    @Resource
+    private RemoteWaterProjectService waterProjectService;
+
+    /**
+     * 查询闸口资源列表
+     */
+    @GetMapping("/waterproject/list")
+    public AjaxResult list(HydraulicWaterProject waterProject) {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        return AjaxResult.success( waterProjectService.list(pageNum,pageSize).getRows());
+    }
+
+
+    /**
+     * 获取闸口资源详细信息
+     */
+    @GetMapping("/waterproject/edit")
+    public AjaxResult edit(String id) {
+        return waterProjectService.edit(id);
+    }
+
+    /**
+     * 新增闸口资源
+     */
+    @PostMapping( "/waterproject")
+    public AjaxResult add(@RequestBody String json) {
+        return waterProjectService.add(json);
+    }
+
+    /**
+     * 修改闸口资源
+     */
+    @PostMapping("/waterproject/put")
+    public AjaxResult put(@RequestBody String json) {
+        return waterProjectService.put(json);
+    }
+
+    /**
+     * 删除闸口资源
+     */
+    @GetMapping("/waterproject/del")
+    public AjaxResult del(@RequestParam("id") List<String> id) {
+        return waterProjectService.del(id.toArray(new String[0]));
+    }
+
+}

+ 3 - 0
src/main/java/com/sooka/sponest/mobile/remoteapi/RemoteDataBaseService.java

@@ -789,5 +789,8 @@ public interface RemoteDataBaseService {
 
     @GetMapping("/fireControlView/getRYList")
     R<Map<String,Object>> getRyListToFireControlView(@RequestParam("deptId")Long deptId);//查询消防人员类型
+
+    @GetMapping("/commandCenter/getImportAreaListByParams")
+    AjaxResult getImportAreaListByParams(@RequestParam("areaName") String areaName, @RequestParam("projectType")String projectType, @RequestParam("projectLevel")String projectLevel,@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize);
 }