fix:本地环境能提交到亿迅环境兼容

xusd

2024-10-22 a0d8bc14edfc7a49f8fe050dadec22a173247504

 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java

@@ -2,17 +2,25 @@

import cn.huge.base.common.bo.R;
import cn.huge.base.common.utils.HttpClientUtils;
import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.base.common.utils.SpringContextUtil;
import cn.huge.module.grid.domain.po.GridCaseTask;
import cn.huge.module.sys.vo.*;
import cn.huge.module.grid.domain.vo.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;

@Slf4j
@Service
@@ -23,6 +31,11 @@
    private String userName;
    @Value("${grid.password}")
    private String passWord;
    private String testUrl = "http://183.2.142.21:9007";
    @Autowired
    private GridCaseTaskService gridCaseTaskService;
    @Autowired
    private GridUserService gridUserService;

    public R<GridToDoVo> createToDo(GridToDoVo gridToDoVo) {
        HeadVo headVo = initHeadVo();
@@ -40,6 +53,11 @@
        }
        log.info("xsd:{}", s);
        GridToDoVo gridToDoDto = JSONObject.parseObject(s).getObject("data", GridToDoVo.class);
        if (ObjectUtils.isNotEmpty(gridToDoDto)) {
            GridCaseTask gridCaseTask = new GridCaseTask();
            BeanUtils.copyProperties(gridToDoDto, gridCaseTask);
            gridCaseTaskService.save(gridCaseTask);
        }
        return R.ok(gridToDoDto);
    }

@@ -52,7 +70,12 @@
        log.info("xsd:{}", gridUrl + "/sysUserTodo/saveBatch");
        String s = null;
        try {
            s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/saveBatch", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
            if (SpringContextUtil.checkDev()) {
                log.info("xsdurl:{}", testUrl + "/api/thrid/grid/todo/batch-create-todo");
                s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/batch-create-todo", JSON.toJSONString(gridToDoVo), new HashMap<>(), "utf-8");
            } else {
                s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/saveBatch", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
            }
        } catch (Exception e) {
            log.info("xsderror:{}", e);
            throw new RuntimeException(e);
@@ -67,7 +90,6 @@
            return R.fail("获取失败");
        }
    }



    public R<GridToDoVo> updateToDo(GridToDoVo gridToDoVo) {
@@ -103,7 +125,12 @@
        log.info("xsd:{}", JSON.toJSONString(requestVo));
        log.info("xsd:{}", gridUrl + "/sysUserTodo/updateBatch");
        try {
            s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/updateBatch", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
            if (SpringContextUtil.checkDev()) {
                log.info("xsdurl:{}", testUrl + "/api/thrid/grid/todo/batch-update-todo");
                s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/batch-update-todo", JSON.toJSONString(gridToDoVos), new HashMap<>(), "utf-8");
            } else {
                s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/updateBatch", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
            }
        } catch (Exception e) {
            log.info("xsderror:{}", e);
            throw new RuntimeException(e);
@@ -128,7 +155,12 @@
        log.info("xsd:{}", gridUrl + "/sysUserTodo/batchDel");
        String s = null;
        try {
            s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/batchDel", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
            if (SpringContextUtil.checkDev()) {
                log.info("xsdurl:{}", testUrl + "/api/thrid/grid/todo/delete-todo");
                s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/delete-todo", JSON.toJSONString(gridIdsVo), new HashMap<>(), "utf-8");
            } else {
                s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/batchDel", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
            }
        } catch (Exception e) {
            log.info("xsderror:{}", e);
            throw new RuntimeException(e);
@@ -180,4 +212,56 @@
        }

    }

    public R<List<GridToDoVo>> updateTaskToDo(GridToDoVo gridToDoVo, String previousTaskId) {
        //修改网格系统工单
        List<GridToDoVo> gridToDoVoList = new ArrayList<>();
        List<GridCaseTask> gridCaseTaskList = gridCaseTaskService.listGridCaseTask(gridToDoVo.getCaseId(), previousTaskId);
        for (GridCaseTask gridCaseTask : gridCaseTaskList) {
            gridToDoVo.setId(gridCaseTask.getId());
            gridToDoVo.setMobile(gridCaseTask.getMobile());
            gridToDoVoList.add(gridToDoVo);
        }
        R<List<GridToDoVo>> resultData = this.batchUpdateToDo(gridToDoVoList);
        //修改保存的待办工单
        List<GridToDoVo> GridToDoVoResult = resultData.getData();
        List<GridCaseTask> gridCaseTaskListNew = new ArrayList<>();
        for (GridToDoVo gridToDoVoResult : GridToDoVoResult) {
            GridCaseTask gridCaseTask = new GridCaseTask();
            BeanUtils.copyProperties(gridToDoVoResult, gridCaseTask);
            gridCaseTaskListNew.add(gridCaseTask);
        }
        gridCaseTaskService.updateBatchById(gridCaseTaskListNew);
        return resultData;
    }

    public R<List<GridToDoVo>> createTaskToDo(GridToDoBacthVo gridToDoBacthVo, String unitId) {
        GridOrgUsersVo gridOrgUsersVo = new GridOrgUsersVo();
        gridOrgUsersVo.setCurrOrgId(unitId);
        List<GridUserVo> gridUserVoList = gridUserService.getUserListByOrg(gridOrgUsersVo).getData();
        List<String> userIdList = gridUserVoList.stream().map(GridUserVo::getId).collect(Collectors.toList());
        gridToDoBacthVo.setUserIdList(userIdList);
        R<List<GridToDoVo>> resultData = this.batchCreateToDo(gridToDoBacthVo);
        //保存待办工单
        List<GridToDoVo> GridToDoVoResult = resultData.getData();
        List<GridCaseTask> gridCaseTaskListNew = new ArrayList<>();
        for (GridToDoVo gridToDoVoResult : GridToDoVoResult) {
            GridCaseTask gridCaseTask = new GridCaseTask();
            BeanUtils.copyProperties(gridToDoVoResult, gridCaseTask);
            gridCaseTaskListNew.add(gridCaseTask);
        }
        BeanUtils.copyProperties(GridToDoVoResult, gridCaseTaskListNew);
        gridCaseTaskService.saveBatch(gridCaseTaskListNew);
        return resultData;
    }

    public R<String> deleteTaskToDo(GridTaskVo gridTaskVo) {
        List<GridCaseTask> gridCaseTaskList = gridCaseTaskService.listGridCaseTask(gridTaskVo.getCaseId(), gridTaskVo.getCaseTaskId());
        List<String> idList = gridCaseTaskList.stream().map(GridCaseTask::getId).collect(Collectors.toList());
        GridIdsVo gridIdsVo = new GridIdsVo();
        gridIdsVo.setIds(idList);
        R<String> result = this.deleteToDo(gridIdsVo);
        gridCaseTaskService.removeByIds(idList);
        return result;
    }
}