应急手机端代码提交

src/main/java/com/sooka/sponest/mobile/data/emergency/controller/AppMaterialController.java

@@ -0,0 +1,30 @@
+package com.sooka.sponest.mobile.data.emergency.controller;
+
+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.mobile.data.emergency.domain.AppMaterialVO;
+import com.sooka.sponest.mobile.data.emergency.feign.service.RemoteMaterialService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Collections;
+import java.util.List;
+
+@RestController
+@RequestMapping("/AppMaterialController")
+public class AppMaterialController {
+    @Autowired
+    private RemoteMaterialService materialService;
+
+    @GetMapping("/geMaterialList")
+    public AjaxResult geMaterialList(AppMaterialVO vo) {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        return materialService.geMaterialList(pageNum, pageSize);
+    }
+}

src/main/java/com/sooka/sponest/mobile/data/emergency/controller/AppNoticeController.java

@@ -10,17 +10,20 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 @RestController
 @RequestMapping("/AppNoticeController")
 public class AppNoticeController {
     @Autowired
-    private RemoteNoticeService noticlist;
+    private RemoteNoticeService noticeService;
 
-    @GetMapping("getNotice")
+    @GetMapping("/getNotice")
     public AjaxResult getNotice(AppNoticeVO vo){
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
-        return noticlist.noticlist(pageNum, pageSize);
+        Map<String, Object> data = (Map<String, Object>) noticeService.noticlist(pageNum, pageSize).get("data");
+        return AjaxResult.success(data.get("rows"));
     }
 }

src/main/java/com/sooka/sponest/mobile/data/emergency/controller/AppWarehouseController.java

@@ -0,0 +1,34 @@
+package com.sooka.sponest.mobile.data.emergency.controller;
+
+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.mobile.data.emergency.domain.AppWarehouseVO;
+import com.sooka.sponest.mobile.data.emergency.feign.service.RemoteWarehouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Collections;
+import java.util.List;
+
+@RestController
+@RequestMapping("/AppWarehouseController")
+public class AppWarehouseController {
+    @Autowired
+    private RemoteWarehouseService warehouseService;
+
+
+    @GetMapping("/getWarehouseList")
+    public AjaxResult getWarehouseList(AppWarehouseVO vo){
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        String longitude = vo.getLongitude();
+        String latitude = vo.getLatitude();
+        return warehouseService.getWarehouseList(pageNum,pageSize,longitude,latitude);
+
+    }
+}

src/main/java/com/sooka/sponest/mobile/data/emergency/controller/AppXunjianController.java

@@ -50,4 +50,9 @@ public class AppXunjianController {
     public AjaxResult changeInspection(@RequestBody AppXunjianInspectionVO vo) {
         return xunjianService.changeInspection(vo);
     }
+
+    @PostMapping("/deleteXunjianItem")
+    public AjaxResult deleteXunjianItem(@RequestBody AppXunjianVO vo) {
+        return xunjianService.deleteXunjianItem(vo);
+    }
 }

src/main/java/com/sooka/sponest/mobile/data/emergency/domain/AppMaterialVO.java

@@ -0,0 +1,11 @@
+package com.sooka.sponest.mobile.data.emergency.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class AppMaterialVO extends BaseEntity {
+
+    String materialName;
+
+}

src/main/java/com/sooka/sponest/mobile/data/emergency/domain/AppWarehouseVO.java

@@ -0,0 +1,14 @@
+package com.sooka.sponest.mobile.data.emergency.domain;
+
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class AppWarehouseVO extends BaseEntity {
+
+    String warehouseName;
+    String longitude;
+    String latitude;
+}

src/main/java/com/sooka/sponest/mobile/data/emergency/feign/factory/RemoteMaterialServiceFallbackFactory.java

@@ -0,0 +1,11 @@
+package com.sooka.sponest.mobile.data.emergency.feign.factory;
+
+import com.sooka.sponest.mobile.data.emergency.feign.service.RemoteMaterialService;
+import org.springframework.cloud.openfeign.FallbackFactory;
+
+public class RemoteMaterialServiceFallbackFactory implements FallbackFactory<RemoteMaterialService> {
+    @Override
+    public RemoteMaterialService create(Throwable cause) {
+        return null;
+    }
+}

src/main/java/com/sooka/sponest/mobile/data/emergency/feign/factory/RemoteWarehouseServiceFallbackFactory.java

@@ -0,0 +1,12 @@
+package com.sooka.sponest.mobile.data.emergency.feign.factory;
+
+import com.sooka.sponest.mobile.data.emergency.feign.service.RemoteWarehouseService;
+import com.sooka.sponest.mobile.data.emergency.feign.service.RemoteXunchaService;
+import org.springframework.cloud.openfeign.FallbackFactory;
+
+public class RemoteWarehouseServiceFallbackFactory implements FallbackFactory<RemoteWarehouseService> {
+    @Override
+    public RemoteWarehouseService create(Throwable cause) {
+        return null;
+    }
+}

src/main/java/com/sooka/sponest/mobile/data/emergency/feign/service/RemoteMaterialService.java

@@ -0,0 +1,20 @@
+package com.sooka.sponest.mobile.data.emergency.feign.service;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.mobile.data.emergency.feign.factory.RemoteIndexServiceFallbackFactory;
+import com.sooka.sponest.mobile.data.emergency.feign.factory.RemoteMaterialServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(
+        contextId = "AppRemoteMaterialService",
+        value = ServiceNameConstants.DATA_SERVICE,
+        fallbackFactory = RemoteMaterialServiceFallbackFactory.class
+        , url = "${sooka.service.data}"
+)
+public interface RemoteMaterialService {
+    @GetMapping("/AppMaterialController/geMaterialList")
+    AjaxResult geMaterialList(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize);
+}

src/main/java/com/sooka/sponest/mobile/data/emergency/feign/service/RemoteWarehouseService.java

@@ -0,0 +1,20 @@
+package com.sooka.sponest.mobile.data.emergency.feign.service;
+
+import com.ruoyi.common.core.constant.ServiceNameConstants;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.mobile.data.emergency.feign.factory.RemoteIndexServiceFallbackFactory;
+import com.sooka.sponest.mobile.data.emergency.feign.factory.RemoteWarehouseServiceFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(
+        contextId = "AppRemoteWarehouseService",
+        value = ServiceNameConstants.DATA_SERVICE,
+        fallbackFactory = RemoteWarehouseServiceFallbackFactory.class
+        , url = "${sooka.service.data}"
+)
+public interface RemoteWarehouseService {
+    @GetMapping("/AppWarehouseController/getWarehouseList")
+    AjaxResult getWarehouseList(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize, @RequestParam("longitude") String longitude, @RequestParam("latitude") String latitude);
+}

src/main/java/com/sooka/sponest/mobile/data/emergency/feign/service/RemoteXunjianService.java

@@ -36,4 +36,7 @@ public interface RemoteXunjianService {
 
     @PostMapping("/AppXunjianController/changeInspection")
     AjaxResult changeInspection(@RequestBody AppXunjianInspectionVO vo);
+
+    @PostMapping("/AppXunjianController/deleteXunjianItem")
+    AjaxResult deleteXunjianItem(@RequestBody AppXunjianVO vo);
 }