巡检记录

src/main/java/com/sooka/sponest/mobile/emergency/controller/AppDangerController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.mobile.event.domain.CenterdataTAttach;
 import com.sooka.sponest.mobile.remoteapi.RemoteCenterBaseService;
+import com.sooka.sponest.mobile.remoteapi.RemoteDataBaseService;
 import com.sooka.sponest.mobile.remoteapi.RemoteSystemBaseService;
 import com.sooka.sponest.mobile.remoteapi.domain.CentereventTEmergencyDanger;
 import com.sooka.sponest.mobile.remoteapi.domain.CentereventTEmergencyDangerprocess;
@@ -31,10 +32,13 @@ public class AppDangerController {
     @Autowired
     private RemoteSystemBaseService remoteSystemBaseService;
 
+    @Autowired
+    private RemoteDataBaseService remoteDataBaseService;
+
     // 应急-查询安全隐患列表
     @PostMapping("/dangerList")
     public R dangerList(@RequestBody CentereventTEmergencyDanger centereventTEmergencyDanger) {
-        return remoteCenterBaseService.selectDanger(centereventTEmergencyDanger.getDangerTitle(),centereventTEmergencyDanger.getEnterpriseId(), centereventTEmergencyDanger.getEnterpriseName());
+        return remoteDataBaseService.selectDanger(centereventTEmergencyDanger.getDangerTitle(),centereventTEmergencyDanger.getEnterpriseId(), centereventTEmergencyDanger.getEnterpriseName());
     }
 
     // 查询全部部门
@@ -46,13 +50,13 @@ public class AppDangerController {
     // 应急-上报安全隐患
     @PostMapping("/addDanger")
     public R addDanger(@RequestBody CentereventTEmergencyDanger centereventTEmergencyDanger) {
-        return remoteCenterBaseService.insertDanger(centereventTEmergencyDanger);
+        return remoteDataBaseService.insertDanger(centereventTEmergencyDanger);
     }
 
     // 应急-隐患信息
     @PostMapping("/queryDangerDetail")
     public AjaxResult queryDangerDetail(@RequestBody CentereventTEmergencyDanger centereventTEmergencyDanger) {
-        CentereventTEmergencyDanger cted = remoteCenterBaseService.selectDangerById(centereventTEmergencyDanger.getId()).getData();
+        CentereventTEmergencyDanger cted = remoteDataBaseService.selectDangerById(centereventTEmergencyDanger.getId()).getData();
         List<CenterdataTAttach> list = cted.getAttachs();
         for (CenterdataTAttach cta:list) {
             cta.setAttachPath(cta.getAttachPath().replaceAll("172.18.1.32:8081","218.27.3.115:9301"));
@@ -64,13 +68,13 @@ public class AppDangerController {
     // 应急-更改流程
     @PostMapping("/editDanger")
     public R editDanger(@RequestBody CentereventTEmergencyDanger centereventTEmergencyDanger) {
-        return remoteCenterBaseService.updateDanger(centereventTEmergencyDanger);
+        return remoteDataBaseService.updateDanger(centereventTEmergencyDanger);
     }
 
     // 应急-反馈列表
     @PostMapping("/queryDangerProcess")
     public R GetDangerProcess(@RequestBody CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess) {
-        return remoteCenterBaseService.selectDangerprocess(centereventTEmergencyDangerprocess.getDangerId());
+        return remoteDataBaseService.selectDangerprocess(centereventTEmergencyDangerprocess.getDangerId());
     }
 
     // 应急-反馈
@@ -78,6 +82,6 @@ public class AppDangerController {
     public R addDangerprocess(@RequestBody CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess) {
         centereventTEmergencyDangerprocess.setUserId(SecurityUtils.getUserId());
         centereventTEmergencyDangerprocess.setUserName(SecurityUtils.getLoginUser().getSysUser().getNickName());
-        return remoteCenterBaseService.insertDangerprocess(centereventTEmergencyDangerprocess);
+        return remoteDataBaseService.insertDangerprocess(centereventTEmergencyDangerprocess);
     }
 }

src/main/java/com/sooka/sponest/mobile/emergency/domain/CentereventTEmergencyInspectionrecordBdody.java

@@ -59,4 +59,6 @@ public class CentereventTEmergencyInspectionrecordBdody  {
 
     private  boolean inspectionitemCheck;
 
+    private String content;
+
 }

src/main/java/com/sooka/sponest/mobile/emergency/service/impl/AppEmergencyServiceImpl.java

@@ -53,7 +53,7 @@ public class AppEmergencyServiceImpl implements AppEmergencyService {
 
     @Override
     public AjaxResult appSelectRecord(CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord) {
-        return AjaxResult.success(remoteEventBaseService.appSelectRecord(centereventTEmergencyInspectionrecord).getData());
+        return AjaxResult.success(remoteDataBaseService.appSelectRecord(centereventTEmergencyInspectionrecord).getData());
     }
 
     @Override
@@ -63,11 +63,11 @@ public class AppEmergencyServiceImpl implements AppEmergencyService {
 
     @Override
     public AjaxResult insertCentereventTEmergencyInspectionrecordMessage(CentereventTEmergencyInspectionrecordBody centereventTEmergencyInspectionrecordBody) {
-        return AjaxResult.success(remoteEventBaseService.insertCentereventTEmergencyInspectionrecordMessage(centereventTEmergencyInspectionrecordBody).getData());
+        return AjaxResult.success(remoteDataBaseService.insertCentereventTEmergencyInspectionrecordMessage(centereventTEmergencyInspectionrecordBody).getData());
     }
 
     @Override
     public AjaxResult selectCentereventTEmergencyInspectionrecordMessageList(CentereventTEmergencyInspectionrecordBdody centereventTEmergencyInspectionrecordBdody) {
-        return AjaxResult.success(remoteEventBaseService.selectCentereventTEmergencyInspectionrecordMessageList(centereventTEmergencyInspectionrecordBdody).getData());
+        return AjaxResult.success(remoteDataBaseService.selectCentereventTEmergencyInspectionrecordMessageList(centereventTEmergencyInspectionrecordBdody).getData());
     }
 }

src/main/java/com/sooka/sponest/mobile/remoteapi/RemoteCenterBaseService.java

@@ -19,31 +19,6 @@ import java.util.List;
         fallbackFactory = RemoteBaseServiceCenterFactory.class, url = "${sooka.service.event}")
 public interface RemoteCenterBaseService {
 
-    //查询安全隐患列表
-    @GetMapping("/danger/getAllDanger")
-    R<List<CentereventTEmergencyDanger>> selectDanger(@RequestParam("dangerTitle") String dangerTitle,@RequestParam("enterpriseId") String enterpriseId, @RequestParam("enterpriseName") String enterpriseName);
-
-    //新增安全隐患
-    @PostMapping("/danger")
-    @LogFeignCall
-    R insertDanger(@RequestBody CentereventTEmergencyDanger centereventTEmergencyDanger);
-
-    //根据id查询安全隐患
-    @GetMapping("/danger/{id}")
-    R<CentereventTEmergencyDanger> selectDangerById(@PathVariable("id") String id);
-
-    //更改安全隐患流程
-    @PutMapping("/danger")
-    R updateDanger(@RequestBody CentereventTEmergencyDanger centereventTEmergencyDanger);
-
-    //查询隐患处理过程列表
-    @GetMapping("/danger/getInfoView/{id}")
-    R selectDangerprocess(@PathVariable("id") String id);
-
-    //新增隐患处理过程
-    @PostMapping("/dangerprocess")
-    R insertDangerprocess(@RequestBody CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess);
-
     //查询大类二类
     @GetMapping("/eventtype/getCentereventTEventtypeByParentId")
     public AjaxResult listSJfl(@RequestParam("parentId") String parentId);

src/main/java/com/sooka/sponest/mobile/remoteapi/RemoteDataBaseService.java

@@ -14,14 +14,11 @@ import com.sooka.sponest.mobile.base.domain.CenterdataTHydraulicTrack;
 import com.sooka.sponest.mobile.base.domain.ModulesServiceNameContants;
 import com.sooka.sponest.mobile.data.generalbusiness.domain.AppDailyBO;
 import com.sooka.sponest.mobile.data.generalbusiness.domain.AppDailyVO;
-import com.sooka.sponest.mobile.emergency.domain.CenterdataTEmergencyEnterindesmap;
-import com.sooka.sponest.mobile.emergency.domain.CenterdataTEmergencyEnterprise;
-import com.sooka.sponest.mobile.emergency.domain.CenterdataTEmergencyInspectionitemBody;
-import com.sooka.sponest.mobile.emergency.domain.CenterdataTEmergencyPatrolpoint;
+import com.sooka.sponest.mobile.emergency.domain.*;
 import com.sooka.sponest.mobile.event.domain.AppDataTAttach;
+import com.sooka.sponest.mobile.log.LogFeignCall;
+import com.sooka.sponest.mobile.remoteapi.domain.*;
 import com.sooka.sponest.mobile.remoteapi.factory.RemoteBaseServiceFallbackFactory;
-import com.sooka.sponest.mobile.remoteapi.domain.CenterdataTForestFireteam;
-import com.sooka.sponest.mobile.remoteapi.domain.CenterdataTForestWaterintake;
 import com.sooka.sponest.mobile.zhsq.danyuan.domain.AppDanyuanVO;
 import com.sooka.sponest.mobile.zhsq.dbrw.domain.AppDbrwVO;
 import com.sooka.sponest.mobile.zhsq.fangjian.domain.AppFangjianVO;
@@ -691,7 +688,30 @@ public interface RemoteDataBaseService {
     @PostMapping("/emergency/enterindesmap/selectTBasicEnterpriseByentErpriseMessage")
     public R<List<CenterdataTEmergencyInspectionitemBody>> selectTBasicEnterpriseByentErpriseMessage(@RequestBody CenterdataTEmergencyEnterindesmap centerdataTEmergencyEnterindesmap);
 
+    /**
+     * 应急-查询巡检记录
+     *
+     * @return
+     * @Version 1.0
+     * @author wang_xy
+     * @since 2023/3/22 14:08
+     */
+    @PostMapping("/inspectionrecord/appSelectRecord")
+    public R<List<CentereventTEmergencyInspectionrecord>> appSelectRecord(@RequestBody CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord);
+
+    /**
+     * 应急-保存巡检记录
+     *
+     * @return
+     * @Version 1.0
+     * @author wang_xy
+     * @since 2023/3/22 14:08
+     */
+    @PostMapping("/inspectionrecord/insertCentereventTEmergencyInspectionrecordMessage")
+    public R insertCentereventTEmergencyInspectionrecordMessage(@RequestBody CentereventTEmergencyInspectionrecordBody centereventTEmergencyInspectionrecordBody);
 
+    @PostMapping("/inspectionrecord/selectCentereventTEmergencyInspectionrecordMessageList")
+    public R selectCentereventTEmergencyInspectionrecordMessageList(@RequestBody CentereventTEmergencyInspectionrecordBdody centereventTEmergencyInspectionrecordBdody);
     /*********************************************应急接口end**********************************/
 
     //水利
@@ -793,5 +813,31 @@ public interface RemoteDataBaseService {
 
     @GetMapping("/commandCenter/getImportAreaListOne")
     TableDataInfo getImportAreaListByParams(@RequestParam("params%5BareaName%5D") String areaName, @RequestParam("params%5BprojectType%5D") String projectType, @RequestParam("params%5BprojectLevel%5D") String projectLevel,@RequestParam("pageNum")Integer pageNum, @RequestParam("pageSize")Integer pageSize);
+
+    //查询安全隐患列表
+    @GetMapping("/danger/getAllDanger")
+    R<List<CentereventTEmergencyDanger>> selectDanger(@RequestParam("dangerTitle") String dangerTitle, @RequestParam("enterpriseId") String enterpriseId, @RequestParam("enterpriseName") String enterpriseName);
+
+    //新增安全隐患
+    @PostMapping("/danger")
+    @LogFeignCall
+    R insertDanger(@RequestBody CentereventTEmergencyDanger centereventTEmergencyDanger);
+
+    //根据id查询安全隐患
+    @GetMapping("/danger/{id}")
+    R<CentereventTEmergencyDanger> selectDangerById(@PathVariable("id") String id);
+
+    //更改安全隐患流程
+    @PutMapping("/danger")
+    R updateDanger(@RequestBody CentereventTEmergencyDanger centereventTEmergencyDanger);
+
+    //查询隐患处理过程列表
+    @GetMapping("/danger/getInfoView/{id}")
+    R selectDangerprocess(@PathVariable("id") String id);
+
+    //新增隐患处理过程
+    @PostMapping("/dangerprocess")
+    R insertDangerprocess(@RequestBody CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess);
+
 }
 

src/main/java/com/sooka/sponest/mobile/remoteapi/RemoteEventBaseService.java

@@ -226,33 +226,6 @@ public interface RemoteEventBaseService {
     @PostMapping(value = "patrolrecord/listPatrolrecord")
     public TableDataInfo listPatrolrecord(@RequestParam(value = "pageNum") Integer pageNum, @RequestParam(value = "pageSize") Integer pageSize, @RequestBody CentereventTEmergencyPatrolrecord centereventTEmergencyPatrolrecord);
 
-
-    /**
-     * 应急-查询巡检记录
-     *
-     * @return
-     * @Version 1.0
-     * @author wang_xy
-     * @since 2023/3/22 14:08
-     */
-    @PostMapping("/inspectionrecord/appSelectRecord")
-    public R<List<CentereventTEmergencyInspectionrecord>> appSelectRecord(@RequestBody CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord);
-
-
-    /**
-     * 应急-保存巡检记录
-     *
-     * @return
-     * @Version 1.0
-     * @author wang_xy
-     * @since 2023/3/22 14:08
-     */
-    @PostMapping("/inspectionrecord/insertCentereventTEmergencyInspectionrecordMessage")
-    public R insertCentereventTEmergencyInspectionrecordMessage(@RequestBody CentereventTEmergencyInspectionrecordBody centereventTEmergencyInspectionrecordBody);
-
-    @PostMapping("/inspectionrecord/selectCentereventTEmergencyInspectionrecordMessageList")
-    public R selectCentereventTEmergencyInspectionrecordMessageList(@RequestBody CentereventTEmergencyInspectionrecordBdody centereventTEmergencyInspectionrecordBdody);
-
     @GetMapping("/commandCenter/getDeptEventCount")
     public AjaxResult getDeptEventCount(@RequestParam("deptId") Long deptId);
 

src/main/java/com/sooka/sponest/mobile/remoteapi/factory/RemoteBaseServiceCenterFactory.java

@@ -29,35 +29,6 @@ public class RemoteBaseServiceCenterFactory implements FallbackFactory<RemoteCen
         log.error("事件中心-服务调用失败:{}", cause.getMessage());
 
         return new RemoteCenterBaseService() {
-            @Override
-            public R<List<CentereventTEmergencyDanger>> selectDanger(String dangerTitle,String enterpriseId, String enterpriseName) {
-                return null;
-            }
-
-            @Override
-            public R insertDanger(CentereventTEmergencyDanger centereventTEmergencyDanger) {
-                return null;
-            }
-
-            @Override
-            public R<CentereventTEmergencyDanger> selectDangerById(@PathVariable("id") String id) {
-                return null;
-            }
-
-            @Override
-            public R updateDanger(CentereventTEmergencyDanger centereventTEmergencyDanger) {
-                return null;
-            }
-
-            @Override
-            public R selectDangerprocess(String dangerId) {
-                return null;
-            }
-
-            @Override
-            public R insertDangerprocess(CentereventTEmergencyDangerprocess centereventTEmergencyDangerprocess) {
-                return null;
-            }
 
             @Override
             public AjaxResult listSJfl(@RequestParam("parentId") String parentId) {