hst调用修改，大坝安全监测接口

guoshilong

2023-08-10 acf4a8171ae814e0d7fb061d163f95640dc39abc

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java

@@ -7,10 +7,7 @@
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.service.IPatrolTaskService;
import cn.gistack.sm.patrol.vo.BladeFlowPage;
import cn.gistack.sm.patrol.vo.BladeFlowTask;
import cn.gistack.sm.patrol.vo.PatrolTaskReport;
import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import cn.gistack.sm.patrol.vo.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -164,7 +161,7 @@
   @ApiOperation(value = "巡查任务-自定义通过id查询", notes = "巡查任务-自定义通过id查询")
   @GetMapping(value = "/getPatrolTaskById")
   public R getPatrolTaskById(@RequestParam(name = "id", required = true) String id) {
      PatrolTask PatrolTask = patrolTaskService.getPatrolTaskById(id);
      PatrolTask PatrolTask = patrolTaskService.customizeGetById(id);
      return R.data(PatrolTask);
   }

@@ -229,7 +226,7 @@
         List<Object> data = res.getData().getData();
         data.forEach(obj -> {
            BladeFlow bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlow.class);
            PatrolTask byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
            PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
            if (byId != null) {
               byId.setFlow(bladeFlow);
               patrolTaskList.add(byId);
@@ -254,7 +251,7 @@
    * @param patrolTask 任务
    */
   @PostMapping("patrol-done-list")
   @ApiOperation(value = "查询待办")
   @ApiOperation(value = "查询已办")
   public R patrolDoneList(PatrolTaskVO patrolTask, Query query) {
      BladeFlowVO bladeFlow2 = new BladeFlowVO();
      //设置流程类型
@@ -267,7 +264,7 @@
         List<Object> data = res.getData().getData();
         data.forEach(obj -> {
            BladeFlowVO<PatrolTask> bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlowVO.class);
            PatrolTask byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
            PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());

            bladeFlow.setDetail(byId);
            bladeFlowVOList.add(bladeFlow);
@@ -286,12 +283,44 @@
   }

   /**
    * 巡查任务报表
    * 巡查任务报表 分页
    */
   @PostMapping("getTaskReport")
   @GetMapping("getTaskReportPage")
   @ApiOperation(value = "巡查任务报表")
   public R getTaskReport(@RequestBody PatrolTaskReport patrolTaskReport) {
      List<PatrolTaskReport> list = patrolTaskService.getTaskReport(patrolTaskReport);
   public R getTaskReportPage( PatrolTaskReport patrolTaskReport , Query query) {
      IPage<PatrolTaskReport> pageList = patrolTaskService.getTaskReportPage(Condition.getPage(query),patrolTaskReport);
      return R.data(pageList);
   }

   /**
    * 巡查任务报表列表
    */
   @GetMapping("getTaskReportList")
   @ApiOperation(value = "巡查任务报表")
   public R getTaskReportList( PatrolTaskReport patrolTaskReport ) {
      List<PatrolTaskReport> list = patrolTaskService.getTaskReportList(patrolTaskReport);
      return R.data(list);
   }

   /**
    * 巡查任务报表详情
    */
   @GetMapping("getTaskReportDetail")
   @ApiOperation(value = "巡查任务详情")
   public R getTaskReportDetail( PatrolTaskReport patrolTaskReport , Query query) {
      IPage<PatrolTaskReport> pageList = patrolTaskService.getTaskReportDetail(Condition.getPage(query),patrolTaskReport);
      return R.data(pageList);
   }

   @GetMapping("getTaskStatusCount")
   public R getTaskStatusCount(PatrolTaskVO patrolTaskVO){
      List<TaskStatusCount> list = patrolTaskService.getTaskStatusCount(patrolTaskVO);
      return R.data(list);
   }

   @GetMapping("getTaskTypeCount")
   public R getTaskTypeCount(PatrolTaskVO patrolTaskVO){
      List<TaskStatusCount> list = patrolTaskService.getTaskTypeCount(patrolTaskVO);
      return R.data(list);
   }