巡查修改

guoshilong

2024-03-23 f04487fef5ac47380dfa9670156743c9d273966b

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

@@ -1,34 +1,25 @@
package cn.gistack.sm.patrol.controller;

import cn.gistack.flow.core.entity.BladeFlow;
import cn.gistack.flow.core.feign.IFlowClient;
import cn.gistack.flow.core.vo.BladeFlowVO;
import cn.gistack.sm.patrol.entity.PatrolReport;
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.params.PersonHandleParams;
import cn.gistack.sm.patrol.dto.PatrolTaskDTO;
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.service.IPatrolTaskService;
import cn.gistack.sm.patrol.vo.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.redisson.executor.TasksService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;

import javax.sound.midi.Soundbank;
import java.net.http.HttpRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -227,34 +218,35 @@
   @PostMapping("patrol-todo-list")
   @ApiOperation(value = "查询待办")
   public R patrolTodoList(PatrolTaskVO patrolTask, Query query) {
      BladeFlow bladeFlow2 = new BladeFlow();
      //设置流程类型
      bladeFlow2.setCategory("flow_3");
      R<BladeFlowPage> res = flowClient.getTodoBladeFlowList(query.getSize(), query.getCurrent(), patrolTask.getCurrentUserId(), bladeFlow2);
      IPage<PatrolTask> patrolTaskIPage = new Page<>();
      List<PatrolTask> patrolTaskList = new ArrayList<>();

      if (res.isSuccess()) {
         List<Object> data = res.getData().getData();
         data.forEach(obj -> {
            BladeFlow bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlow.class);
            PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
            if (byId != null) {
               byId.setFlow(bladeFlow);
               patrolTaskList.add(byId);
            }
         });
      }
      //设置数据集
      patrolTaskIPage.setRecords(patrolTaskList);
      //设置当前页
      patrolTaskIPage.setCurrent(res.getData().getCurrent());
      //设置页数
      patrolTaskIPage.setSize(res.getData().getSize());
      //设置总数
      patrolTaskIPage.setTotal(res.getData().getTotal());

      return R.data(patrolTaskIPage);
//      BladeFlow bladeFlow2 = new BladeFlow();
//      //设置流程类型
//      bladeFlow2.setCategory("flow_3");
//      R<BladeFlowPage> res = flowClient.getTodoBladeFlowList(query.getSize(), query.getCurrent(), patrolTask.getCurrentUserId(), bladeFlow2);
//      IPage<PatrolTask> patrolTaskIPage = new Page<>();
//      List<PatrolTask> patrolTaskList = new ArrayList<>();
//
//      if (res.isSuccess()) {
//         List<Object> data = res.getData().getData();
//         data.forEach(obj -> {
//            BladeFlow bladeFlow = JSON.parseObject(JSON.toJSONString(obj), BladeFlow.class);
//            PatrolTaskVO byId = patrolTaskService.customizeGetById(bladeFlow.getBusinessId());
//            if (byId != null) {
//               byId.setFlow(bladeFlow);
//               patrolTaskList.add(byId);
//            }
//         });
//      }
//      //设置数据集
//      patrolTaskIPage.setRecords(patrolTaskList);
//      //设置当前页
//      patrolTaskIPage.setCurrent(res.getData().getCurrent());
//      //设置页数
//      patrolTaskIPage.setSize(res.getData().getSize());
//      //设置总数
//      patrolTaskIPage.setTotal(res.getData().getTotal());
//
//      return R.data(patrolTaskIPage);
      return null;
   }

   /**
@@ -352,6 +344,58 @@
   }


   /**
    * 下发任务
    * @param patrolTask
    * @return
    */
   @PostMapping("deliverTask")
   public R deliverTask(@RequestBody PatrolTask patrolTask){
      List<PatrolTask> saveList = patrolTaskService.deliverTask(patrolTask);
      return R.data(saveList);
   }

   /**
    * 获取巡查项
    * @param taskId
    * @return
    */
   @GetMapping("getTaskDTO")
   public R getTaskDTO(String taskId){
      PatrolTaskDTO result =  patrolTaskService.getTaskDTO(taskId);
      return R.data(result);
   }

   /**
    * 获取我的巡查任务
    * @param patrolTask
    * @return
    */
   @GetMapping("getMyTask")
   public R getMyTask(PatrolTaskVO patrolTask,Query query){

      Object result = patrolTaskService.getMyTask(patrolTask,Condition.getPage(query));
      return R.data(result);
   }

   /**
    * 结束任务
    * @param patrolTaskVO
    * @return
    */
   @PostMapping("finishPatrolTask")
   public R finishPatrolTask(@RequestBody PatrolTaskVO patrolTaskVO){
      Boolean result = patrolTaskService.finishPatrolTask(patrolTaskVO);
      return R.data(result);
   }

   /**
    * 处理
    */
   @PostMapping("personHandle")
   public R personHandle(@RequestBody PersonHandleParams personHandleParams){
      Boolean res = patrolTaskService.personHandle(personHandleParams);
      return R.data(res);
   }

}