hanfucheng 4 月之前
父节点
当前提交
60f7dd58bc

+ 26 - 4
src/main/java/com/sooka/sponest/mobile/data/emergency/controller/AppXungengController.java

@@ -2,17 +2,16 @@ 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.AppXungengVO;
 import com.sooka.sponest.mobile.data.emergency.feign.service.RemoteXungengService;
+import com.sooka.sponest.mobile.emergency.domain.CentereventTEmergencyPatrolrecord;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Collections;
-import java.util.List;
-
 @RestController
 @RequestMapping("/AppXungengController")
 public class AppXungengController {
@@ -30,4 +29,27 @@ public class AppXungengController {
         String busPatrolstationId = vo.getBusPatrolstationId();
         return xungengService.getXungengInfo(pageNum, pageSize, busPatrolstationId);
     }
+
+
+    /*
+    * 添加巡更记录
+    *
+    * @author 韩福成
+    * @date 2025/2/25 下午2:27
+    */
+    @PostMapping("/doXungeng")
+    public AjaxResult doXungeng(@RequestBody AppXungengVO vo) {
+        return xungengService.doXungeng(vo);
+    }
+
+    /*
+     * 添加巡更点位
+     *
+     * @author 韩福成
+     * @date 2025/2/25 上午10:46
+     */
+    @PostMapping("addXungengPoint")
+    public AjaxResult addXungengPoint(@RequestBody CentereventTEmergencyPatrolrecord vo){
+        return xungengService.addXungengPoint(vo);
+    }
 }

+ 4 - 0
src/main/java/com/sooka/sponest/mobile/data/emergency/domain/AppXungengVO.java

@@ -8,4 +8,8 @@ import lombok.Setter;
 @Setter
 public class AppXungengVO extends BaseEntity {
     String busPatrolstationId;
+
+    private String busEnterpriseId;
+
+    private String busEnterpriseName;
 }

+ 11 - 1
src/main/java/com/sooka/sponest/mobile/data/emergency/feign/service/RemoteXungengService.java

@@ -2,10 +2,13 @@ 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.RemoteXunchaServiceFallbackFactory;
+import com.sooka.sponest.mobile.data.emergency.domain.AppXungengVO;
 import com.sooka.sponest.mobile.data.emergency.feign.factory.RemoteXungengServiceFallbackFactory;
+import com.sooka.sponest.mobile.emergency.domain.CentereventTEmergencyPatrolrecord;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(
@@ -17,4 +20,11 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface RemoteXungengService {
     @GetMapping("/AppXungengController/getXungengInfo")
     AjaxResult getXungengInfo(@RequestParam("pageNum") Integer pageNum, @RequestParam("pageSize") Integer pageSize,  @RequestParam("busPatrolstationId")String busPatrolstationId);
+
+
+    @PostMapping("/AppXungengController/doXungeng")
+    AjaxResult doXungeng(@RequestBody AppXungengVO vo);
+
+    @PostMapping("/patrolrecord")
+    AjaxResult addXungengPoint(@RequestBody CentereventTEmergencyPatrolrecord vo);
 }

+ 10 - 0
src/main/java/com/sooka/sponest/mobile/emergency/domain/CentereventTEmergencyPatrolrecord.java

@@ -87,6 +87,16 @@ public class CentereventTEmergencyPatrolrecord extends BaseEntity
     @Excel(name = "数据所属部门(政或党的id)")
     private Long deptId;
 
+    private String busLogId;
+
+    public String getBusLogId() {
+        return busLogId;
+    }
+
+    public void setBusLogId(String busLogId) {
+        this.busLogId = busLogId;
+    }
+
     public void setId(String id)
     {
         this.id = id;