guoshilong
2023-05-15 ab0b146114153d90d7940fbafd18023de3db4595
报汛待办已办接口
6 files modified
99 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java 74 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.java 3 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml 5 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/service/IReportFloodRecordService.java 2 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/service/impl/ReportFloodRecordServiceImpl.java 5 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/vo/ReportFloodRecordVO.java 10 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/controller/ReportFloodRecordController.java
@@ -1,11 +1,18 @@
package cn.gistack.sm.reportFlood.controller;
import cn.gistack.flow.core.feign.IFlowClient;
import cn.gistack.flow.core.vo.BladeFlowVO;
import cn.gistack.sm.patrol.entity.PatrolConfig;
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.service.IPatrolConfigService;
import cn.gistack.sm.patrol.vo.BladeFlowPage;
import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import cn.gistack.sm.reportFlood.entity.ReportFloodRecord;
import cn.gistack.sm.reportFlood.service.IReportFloodRecordService;
import cn.gistack.sm.reportFlood.vo.ReportFloodRecordVO;
import com.alibaba.fastjson.JSON;
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 lombok.AllArgsConstructor;
@@ -16,7 +23,9 @@
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* @Description: 报汛记录
@@ -29,6 +38,7 @@
public class ReportFloodRecordController extends BladeController {
   private IReportFloodRecordService reportFloodRecordService;
    private IFlowClient flowClient;
   /**
    * 分页列表查询
@@ -126,4 +136,68 @@
        return R.status(reportFloodRecordService.completeTask(reportFloodRecord,taskUser,currentUser));
    }
    /**
     * 查询待办
     */
    @PostMapping("reportFlood-todo-list")
    @ApiOperation(value = "查询待办")
    public R reportFloodToDoList(ReportFloodRecordVO reportFloodRecordVO, Query query){
        BladeFlowVO bladeFlow2 = new BladeFlowVO();
        //获取待办
        R<BladeFlowPage> res = flowClient.getTodoBladeFlowList(query.getSize(),query.getCurrent(),reportFloodRecordVO.getCurrentUserId(), bladeFlow2);
        IPage<BladeFlowVO> bladeFlowVOIPage = new Page<>();
        List<BladeFlowVO> bladeFlowVOList = new ArrayList<>();
        if (res.isSuccess()){
            List<Object> data = res.getData().getData();
            data.forEach(obj -> {
                BladeFlowVO<ReportFloodRecord> bladeFlow = JSON.parseObject(JSON.toJSONString(obj),BladeFlowVO.class);
                ReportFloodRecordVO byId = reportFloodRecordService.customizeGetDetail(bladeFlow.getBusinessId());
                bladeFlow.setDetail(byId);
                bladeFlowVOList.add(bladeFlow);
            });
        }
        //设置数据集
        bladeFlowVOIPage.setRecords(bladeFlowVOList);
        //设置当前页
        bladeFlowVOIPage.setCurrent(res.getData().getCurrent());
        //设置页数
        bladeFlowVOIPage.setSize(res.getData().getSize());
        //设置总数
        bladeFlowVOIPage.setTotal(res.getData().getTotal());
        return R.data(bladeFlowVOIPage);
    }
    /**
     * 查询已办
     */
    @PostMapping("reportFlood-done-list")
    @ApiOperation(value = "查询待办")
    public R reportFloodDoneList(ReportFloodRecordVO reportFloodRecordVO, Query query){
        BladeFlowVO bladeFlow2 = new BladeFlowVO();
        //获取待办
        R<BladeFlowPage> res = flowClient.getDoneBladeFlowList(query.getSize(),query.getCurrent(),reportFloodRecordVO.getCurrentUserId(), bladeFlow2);
        IPage<BladeFlowVO> bladeFlowVOIPage = new Page<>();
        List<BladeFlowVO> bladeFlowVOList = new ArrayList<>();
        if (res.isSuccess()){
            List<Object> data = res.getData().getData();
            data.forEach(obj -> {
                BladeFlowVO<ReportFloodRecord> bladeFlow = JSON.parseObject(JSON.toJSONString(obj),BladeFlowVO.class);
                ReportFloodRecordVO byId = reportFloodRecordService.customizeGetDetail(bladeFlow.getBusinessId());
                bladeFlow.setDetail(byId);
                bladeFlowVOList.add(bladeFlow);
            });
        }
        //设置数据集
        bladeFlowVOIPage.setRecords(bladeFlowVOList);
        //设置当前页
        bladeFlowVOIPage.setCurrent(res.getData().getCurrent());
        //设置页数
        bladeFlowVOIPage.setSize(res.getData().getSize());
        //设置总数
        bladeFlowVOIPage.setTotal(res.getData().getTotal());
        return R.data(bladeFlowVOIPage);
    }
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.patrol.entity.PatrolConfig;
import cn.gistack.sm.reportFlood.entity.ReportFloodRecord;
import cn.gistack.sm.reportFlood.vo.ReportFloodRecordVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;
@@ -14,4 +15,6 @@
public interface ReportFloodRecordMapper extends BaseMapper<ReportFloodRecord> {
    List<ReportFloodRecord> selectReportFloodRecordPages(IPage<ReportFloodRecord> page, ReportFloodRecord reportFloodRecord);
    ReportFloodRecordVO customizeGetDetail(@Param("id") String id);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
@@ -6,4 +6,9 @@
    <select id="selectReportFloodRecordPages" resultType="cn.gistack.sm.reportFlood.entity.ReportFloodRecord">
    </select>
    <select id="customizeGetDetail" resultType="cn.gistack.sm.reportFlood.vo.ReportFloodRecordVO">
        SELECT R.*,atb."name" reservoirName FROM SM_REPORT_FLOOD_RECORD R
        LEFT JOIN "SJZT_MD"."att_res_base" atb ON atb."guid" = R.reservoir_id
        WHERE IS_DELETED = 0 AND  R.ID = #{id}
    </select>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/service/IReportFloodRecordService.java
@@ -16,4 +16,6 @@
    boolean startProcess(ReportFloodRecord reportFloodRecord);
    boolean completeTask(ReportFloodRecordVO reportFloodRecord, String taskUser, String currentUser);
    ReportFloodRecordVO customizeGetDetail(String businessId);
}
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/service/impl/ReportFloodRecordServiceImpl.java
@@ -127,6 +127,11 @@
            return true;
    }
    @Override
    public ReportFloodRecordVO customizeGetDetail(String businessId) {
        return baseMapper.customizeGetDetail(businessId);
    }
    /**
     * 根据水库id和责任人类型获取用户
     * @param type 责任人类型
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/vo/ReportFloodRecordVO.java
@@ -8,4 +8,14 @@
    private boolean report;
    private boolean toDept;
    /**
     * 当前用户
     */
    private String currentUserId;
    /**
     * 水库名
     */
    private String reservoirName;
}