Merge remote-tracking branch 'origin/master'

src/main/java/com/sooka/sponest/mobile/comprehensive/RoadCasecontroller/AppRoadCaseController.java

@@ -1,4 +1,4 @@
-package com.sooka.sponest.mobile.comprehensive.roadCaseController;
+package com.sooka.sponest.mobile.comprehensive.RoadCaseController;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/sooka/sponest/mobile/comprehensive/RoadCasecontroller/AppRoadProtectionController.java

@@ -1,4 +1,4 @@
-package com.sooka.sponest.mobile.comprehensive.roadCaseController;
+package com.sooka.sponest.mobile.comprehensive.RoadCaseController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.web.controller.BaseController;
@@ -7,7 +7,6 @@ import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.core.web.page.TableSupport;
 import com.ruoyi.common.security.utils.DictUtils;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveRoom;
 import com.sooka.sponest.comprehensive.api.comprehensiveRoadCase.domain.ComprehensiveRoadProtection;
 import com.sooka.sponest.comprehensive.api.comprehensiveRoadCase.service.RemoteRoadProtectionService;
 import com.ruoyi.common.core.domain.DictKeys;

src/main/java/com/sooka/sponest/mobile/comprehensive/comprehensiveconflictdefuseController/AppGridLeaderController.java

@@ -0,0 +1,82 @@
+package com.sooka.sponest.mobile.comprehensive.comprehensiveconflictdefusecontroller;
+
+import com.ruoyi.common.core.constant.HttpStatus;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageDomain;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.core.web.page.TableSupport;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveRfhGridLeader;
+import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteRfhGridLeaderService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 网格长管理App
+ *
+ * @author hanfucheng
+ * @date 2023/9/6 14:57
+ */
+@RestController
+@RequestMapping("/AppOverseasPersonInfoController")
+public class AppGridLeaderController extends BaseController {
+
+    @Resource
+    RemoteRfhGridLeaderService remoteRfhGridLeaderService;
+
+    /**
+     * 查询网格长管理列表
+     */
+    @GetMapping("/leader/list")
+    public AjaxResult list(ComprehensiveRfhGridLeader comprehensiveRfhGridLeader) {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        TableDataInfo tableDataInfo = remoteRfhGridLeaderService.selectComprehensiveRfhGridLeaderList(pageNum, pageSize, comprehensiveRfhGridLeader.getUserName(), comprehensiveRfhGridLeader.getMemberName());
+        if(HttpStatus.SUCCESS == tableDataInfo.getCode()){
+            return AjaxResult.success(tableDataInfo.getRows());
+        }else{
+            return AjaxResult.error(tableDataInfo.getCode(),tableDataInfo.getMsg());
+        }
+    }
+
+    @GetMapping("/leader/listAll")
+    public AjaxResult listAll(ComprehensiveRfhGridLeader comprehensiveRfhGridLeader) {
+      return remoteRfhGridLeaderService.listAll();
+    }
+
+    /**
+     * 获取网格长管理详细信息
+     */
+    @GetMapping("/leader/edit")
+    public AjaxResult getInfo(String id) {
+        return remoteRfhGridLeaderService.selectComprehensiveRfhGridLeaderById(id);
+    }
+
+    /**
+     * 新增网格长管理
+     */
+    @PostMapping("/leader")
+    public AjaxResult add(@RequestBody String json) {
+        return remoteRfhGridLeaderService.insertComprehensiveRfhGridLeader(json);
+    }
+    /**
+     * 修改网格长管理
+     */
+    @PostMapping("/leader/put")
+    public AjaxResult edit(@RequestBody String json) {
+        return remoteRfhGridLeaderService.updateComprehensiveRfhGridLeader(json);
+    }
+
+    /**
+     * 删除网格长管理
+     */
+    @GetMapping("/leader/del")
+    public AjaxResult remove(@RequestParam("id") List<String> id) {
+        return remoteRfhGridLeaderService.deleteComprehensiveRfhGridLeaderByIds(id.toArray(new String[0]));
+    }
+
+
+}

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutioncontroller/AppPatrolPlanController.java

@@ -1,4 +1,4 @@
-package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutioncontroller;
+package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.domain.R;
@@ -10,7 +10,6 @@ import com.ruoyi.common.core.web.page.TableSupport;
 import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.comprehensive.api.comprehensivepatrol.domain.ComprehensivePatrolPlan;
 import com.sooka.sponest.comprehensive.api.comprehensivepatrol.service.RemotePatrolPlanService;
-import com.sooka.sponest.mobile.utils.DictUtil;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutioncontroller/AppPatrolTaskController.java

@@ -1,4 +1,4 @@
-package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutioncontroller;
+package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.domain.R;

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutioncontroller/AppPatrolTrackController.java

@@ -1,4 +1,4 @@
-package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutioncontroller;
+package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.domain.R;

src/main/java/com/sooka/sponest/mobile/comprehensive/organizationAndInstitutioncontroller/AppVideoNetworkingController.java

@@ -1,4 +1,4 @@
-package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutioncontroller;
+package com.sooka.sponest.mobile.comprehensive.organizationAndInstitutionController;
 
 import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.domain.R;
@@ -8,7 +8,6 @@ import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.core.web.page.TableSupport;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.domain.ComprehensiveVideoNetworking;
-import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteBuildingService;
 import com.sooka.sponest.comprehensive.api.comprehensiveOrganizationAndInstitution.service.RemoteVideoNetworkingService;
 import org.springframework.web.bind.annotation.*;