fix: 1、添加日志记录； 2、修改请求网格系统待办接口的传参objId值为本系统caseId； 3、添加办理中时联合处置申请的网格待办。

wangwh

2024-10-28 236f80305991d3517c84e70b2645a80a52ad1294

fix:
1、添加日志记录；
2、修改请求网格系统待办接口的传参objId值为本系统caseId；
3、添加办理中时联合处置申请的网格待办。

 dyh-service/dyh-base/src/main/java/cn/huge/module/sys/constant/SyTimeEnum.java

@@ -6,8 +6,8 @@
    SY_TIME_3("24_00011-3", "受理时限"),
    SY_TIME_4("24_00011-4", "办理时限"),
    SY_TIME_5("24_00011-5", "督办回复时限"),
    SY_TIME_6("24_00011-6", "当事人评价时限");

    SY_TIME_6("24_00011-6", "当事人评价时限"),
    SY_TIME_7("24_00011-7", "联合处置审核时限");
    /**
     * 代码编号
     */

 dyh-service/dyh-base/src/main/java/cn/huge/module/sys/vo/GridToDoBacthVo.java

@@ -56,5 +56,5 @@
    /**
     * 事件编号
     */
    private String caseId;
    private String caseTaskId;
}

 dyh-service/dyh-base/src/main/java/cn/huge/module/sys/vo/GridToDoVo.java

@@ -55,5 +55,5 @@
    /**
     * 事件编号
     */
    private String caseId;
    private String caseTaskId;
}

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java

@@ -18,6 +18,9 @@
import cn.huge.module.flow.domain.po.FlowNode;
import cn.huge.module.flow.service.FlowInfoService;
import cn.huge.module.mediate.constant.*;
import cn.huge.module.sys.constant.GridBaseConsts;
import cn.huge.module.sys.constant.GridEnum;
import cn.huge.module.sys.constant.SyTimeEnum;
import cn.huge.module.sys.dto.FileIdInfoBaseDTO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -65,6 +68,8 @@
    private CaseInfoUnfoldService caseInfoUnfoldService;
    @Autowired
    private CaseAssistInfoService caseAssistInfoService;
    @Autowired
    private CaseInfoService caseInfoService;

    /**
    * 更新对象
@@ -180,6 +185,12 @@
            caseAssistApply.setAuditUnitId(ctUnitDTO.getId());
            caseAssistApply.setAuditUnitName(ctUnitDTO.getUnitName());
            mapper.insert(caseAssistApply);
            CaseInfo caseInfo = caseInfoService.getById(caseAssistApply.getCaseId());
            CaseTask caseTask = new CaseTask();
            caseTask.setId(caseInfo.getId());
            caseTask.setCandeUnitId(caseAssistApply.getAuditUnitId());
            caseTask.setExpireTime(sysClient.getExpireTime(caseAssistApply.getApplyTime(), SyTimeEnum.SY_TIME_2.getIndex()));
            caseTaskService.createGridToDo(caseInfo, caseTask, GridEnum.GRID_OBJECT_TYPE_4.getIndex(), GridBaseConsts.GRID_TYPE_4);
        }catch (Exception e){
            log.error("[CaseAssistApplyService.addCaseAssistApply]调用失败，异常信息："+e, e);
            throw new ServiceException("CaseAssistApplyService.addCaseAssistApply", e);
@@ -295,6 +306,9 @@
                    caseAssistInfoPO.setCreateTime(now);
                    caseAssistInfoPO.setUpdateTime(now);
                    caseAssistInfoService.save(caseAssistInfoPO);
                    //网格待办流转
                    CaseInfo caseInfo = caseInfoService.getById(caseAssistApplyPO.getCaseId());
                    caseTaskService.taskFlowGridToDo(caseInfo, dslCaseTask, caseInfo.getId(), GridEnum.GRID_OBJECT_TYPE_2.getIndex(), GridBaseConsts.GRID_TYPE_2);
                }
                // 更新纠纷扩展信息
                CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
@@ -302,6 +316,11 @@
                caseInfoUnfoldPO.setAssistUnitId(caseAssistApplyPO.getApplyAssistUnitId());
                caseInfoUnfoldPO.setAssistUnitName(caseAssistApplyPO.getApplyAssistUnitName());
                caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
            }else{
                CaseTask caseTask = new CaseTask();
                caseTask.setCaseId(caseAssistApplyPO.getCaseId());
                caseTask.setId(caseAssistApplyPO.getCaseId());
                caseTaskService.deleteGridTodo(caseTask);
            }
        }catch (Exception e){
            log.error("[CaseAssistApplyService.reviewCaseAssistApply]调用失败，异常信息："+e, e);

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java

@@ -3349,7 +3349,7 @@
            SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            //添加网格待办
            GridToDoBacthVo gridToDoBacthVo = new GridToDoBacthVo();
            gridToDoBacthVo.setObjId(caseTask.getId());
            gridToDoBacthVo.setObjId(caseInfo.getId());
            gridToDoBacthVo.setObjType(gridObjType);
            gridToDoBacthVo.setSysContent("");
            gridToDoBacthVo.setYzyContent("");
@@ -3358,7 +3358,7 @@
            gridToDoBacthVo.setTodoType(GridEnum.GRID_TODO_TYPE_5.getIndex());
            gridToDoBacthVo.setTitle(noticeTypeName + caseInfo.getPlaintiffs() + "和" + caseInfo.getDefendants()+"的"+caseInfo.getCaseTypeName()+"事件");
            gridToDoBacthVo.setLimitTime(outputFormat.format(caseTask.getExpireTime()));
            gridToDoBacthVo.setCaseId(caseInfo.getId());
            gridToDoBacthVo.setCaseTaskId(caseTask.getId());
            sysClient.createTaskToDo(gridToDoBacthVo, caseTask.getCandeUnitId());
        } catch (Exception e) {
            log.error("添加网格待办失败");
@@ -3370,7 +3370,7 @@
        try {
            //添加网格待办
            GridToDoVo gridToDoVo = new GridToDoVo();
            gridToDoVo.setObjId(caseTask.getId());
            gridToDoVo.setObjId(caseInfo.getId());
            gridToDoVo.setObjType(gridObjType);
            gridToDoVo.setSysContent("");
            gridToDoVo.setYzyContent("");
@@ -3379,7 +3379,7 @@
            gridToDoVo.setTodoType(GridEnum.GRID_TODO_TYPE_5.getIndex());
            gridToDoVo.setTitle(noticeTypeName + caseInfo.getPlaintiffs() + "和" + caseInfo.getDefendants() + "的" + caseInfo.getCaseTypeName() + "事件");
            gridToDoVo.setLimitTime(String.valueOf(caseTask.getExpireTime()));
            gridToDoVo.setCaseId(caseInfo.getId());
            gridToDoVo.setCaseTaskId(caseTask.getId());
            sysClient.updateTaskTodo(gridToDoVo, previousTaskId);
        } catch (Exception e) {
            log.error("修改网格待办失败");
@@ -3397,7 +3397,7 @@
            sysClient.deleteTaskTodo(gridTaskVo);
            //添加网格待办
            GridToDoBacthVo gridToDoBacthVo = new GridToDoBacthVo();
            gridToDoBacthVo.setObjId(caseTask.getId());
            gridToDoBacthVo.setObjId(caseInfo.getId());
            gridToDoBacthVo.setObjType(gridObjType);
            gridToDoBacthVo.setSysContent("");
            gridToDoBacthVo.setYzyContent("");
@@ -3410,7 +3410,7 @@
            }else{
                gridToDoBacthVo.setLimitTime(outputFormat.format(DateUtils.addHour(DateUtils.getNowDate(), 12)));
            }
            gridToDoBacthVo.setCaseId(caseInfo.getId());
            gridToDoBacthVo.setCaseTaskId(caseTask.getId());
            sysClient.createTaskToDo(gridToDoBacthVo, caseTask.getCandeUnitId());
        } catch (Exception e) {
            log.error("修改网格待办流程失败");

 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/dao/mapper/xml/GridCaseTaskMapper.xml

@@ -201,6 +201,6 @@

    <!--  根据组织编号查询网格组织编号  -->
    <select id="getGridUnitIdByUnitId" resultType="string">
        select third_unit_id from dyh_ct_unit_grid where dyh_unit_id = #{unitId}
        select third_unit_id from dyh_th_grid_unit where dyh_unit_id = #{unitId}
    </select>
</mapper> 

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

@@ -6,6 +6,7 @@
import cn.huge.module.grid.domain.po.GridCaseTask;
import cn.huge.module.sys.vo.*;
import cn.huge.module.grid.domain.vo.*;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -66,16 +67,16 @@
        GridToDoBatchRequestVo requestVo = new GridToDoBatchRequestVo();
        requestVo.setHeadVo(headVo);
        requestVo.setBodyVo(gridToDoVo);
        log.info("xsd:{}", JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty));
        log.info("xsd:{}", gridUrl + "/api/thrid/grid/todo/batch-create-todo" + JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty));

        String s = null;
        try {
            if (SpringContextUtil.checkDev()) {
                Map<String, String> header = new HashMap<>();
                String authorizationValue = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJIVUdFSU5GTyIsImV4cCI6MTcyOTcyOTI1MCwiaWF0IjoxNzI5Njg2MDUwLCJ1c2VySWQiOiJkNjY2ZTUzZGMwMjU0NjNkYTllZTkwOTUyNjk5MTljNCYyMl8wMDAyNC0zIn0.pPZsj-PpKD0m9SynBlL4KTiLVMx_r1rdDDX5wpEGwuY";
                header.put("Authorization", authorizationValue);
                s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/batch-create-todo", JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty), header, "utf-8");
                log.info("xsd:{}", JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty));
                log.info("xsd:{}", testUrl + "/api/thrid/grid/todo/batch-create-todo" + JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty));
                s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/batch-create-todo", JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty), new HashMap<>(), "utf-8");
            } else {
                log.info("xsd:{}", JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty));
                log.info("xsd:{}", gridUrl + "/sysUserTodo/saveBatch" + JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty));
                s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/saveBatch", JSON.toJSONString(requestVo, SerializerFeature.WriteNullStringAsEmpty), new HashMap<>(), "utf-8");
            }
        } catch (Exception e) {
@@ -153,16 +154,14 @@
        GridToDoDeleteRequestVo requestVo = new GridToDoDeleteRequestVo();
        requestVo.setHeadVo(headVo);
        requestVo.setBodyVo(gridIdsVo);
        log.info("xsd:{}", requestVo);
        log.info("xsd:{}", testUrl + "/sysUserTodo/batchDel" + JSON.toJSONString(gridIdsVo, SerializerFeature.WriteNullStringAsEmpty));
        String s = null;
        try {
            if (SpringContextUtil.checkDev()) {
                Map<String, String> header = new HashMap<>();
                String authorizationValue = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJIVUdFSU5GTyIsImV4cCI6MTcyOTcyOTI1MCwiaWF0IjoxNzI5Njg2MDUwLCJ1c2VySWQiOiJkNjY2ZTUzZGMwMjU0NjNkYTllZTkwOTUyNjk5MTljNCYyMl8wMDAyNC0zIn0.pPZsj-PpKD0m9SynBlL4KTiLVMx_r1rdDDX5wpEGwuY";
                header.put("Authorization", authorizationValue);
                s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/delete-todo", JSON.toJSONString(gridIdsVo, SerializerFeature.WriteNullStringAsEmpty), header, "utf-8");
                log.info("xsd:{}", requestVo);
                log.info("xsd:{}", testUrl + "/api/thrid/grid/todo/delete-todo" + JSON.toJSONString(gridIdsVo, SerializerFeature.WriteNullStringAsEmpty));
                s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/delete-todo", JSON.toJSONString(gridIdsVo, SerializerFeature.WriteNullStringAsEmpty), new HashMap<>(), "utf-8");
            } else {
                log.info("xsd:{}", gridUrl + "/sysUserTodo/batchDel" + JSON.toJSONString(requestVo, SerializerFeature.WriteNullStringAsEmpty));
                s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/batchDel", JSON.toJSONString(requestVo, SerializerFeature.WriteNullStringAsEmpty), new HashMap<>(), "utf-8");
            }
        } catch (Exception e) {
@@ -199,10 +198,7 @@
        String s = null;
        try {
            if (SpringContextUtil.checkDev()) {
                Map<String, String> header = new HashMap<>();
                String authorizationValue = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJIVUdFSU5GTyIsImV4cCI6MTcyOTcyOTI1MCwiaWF0IjoxNzI5Njg2MDUwLCJ1c2VySWQiOiJkNjY2ZTUzZGMwMjU0NjNkYTllZTkwOTUyNjk5MTljNCYyMl8wMDAyNC0zIn0.pPZsj-PpKD0m9SynBlL4KTiLVMx_r1rdDDX5wpEGwuY";
                header.put("Authorization", authorizationValue);
                s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/get-todo", JSON.toJSONString(gridGetToDoVo, SerializerFeature.WriteNullStringAsEmpty), header, "utf-8");
                s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/get-todo", JSON.toJSONString(gridGetToDoVo, SerializerFeature.WriteNullStringAsEmpty), new HashMap<>(), "utf-8");
            } else {
                s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/page", JSON.toJSONString(gridGetToDoVo, SerializerFeature.WriteNullStringAsEmpty), new HashMap<>(), "utf-8");
            }
@@ -225,7 +221,7 @@
    public R<List<GridToDoVo>> updateTaskToDo(GridToDoVo gridToDoVo, String previousTaskId) {
        //修改网格系统工单
        List<GridToDoVo> gridToDoVoList = new ArrayList<>();
        List<GridCaseTask> gridCaseTaskList = gridCaseTaskService.listGridCaseTask(gridToDoVo.getCaseId(), previousTaskId);
        List<GridCaseTask> gridCaseTaskList = gridCaseTaskService.listGridCaseTask(gridToDoVo.getObjId(), previousTaskId);
        for (GridCaseTask gridCaseTask : gridCaseTaskList) {
            gridToDoVo.setId(gridCaseTask.getId());
            gridToDoVo.setMobile(gridCaseTask.getMobile());
@@ -238,8 +234,8 @@
        for (GridToDoVo gridToDoVoResult : GridToDoVoResult) {
            GridCaseTask gridCaseTask = new GridCaseTask();
            BeanUtils.copyProperties(gridToDoVoResult, gridCaseTask);
            gridCaseTask.setCaseId(gridToDoVo.getCaseId());
            gridCaseTask.setCaseTaskId(gridToDoVo.getObjId());
            gridCaseTask.setCaseId(gridToDoVo.getObjId());
            gridCaseTask.setCaseTaskId(gridToDoVo.getCaseTaskId());
            gridCaseTaskListNew.add(gridCaseTask);
        }
        gridCaseTaskService.updateBatchById(gridCaseTaskListNew);
@@ -247,18 +243,22 @@
    }

    public R<List<GridToDoVo>> createTaskToDo(GridToDoBacthVo gridToDoBacthVo, String unitId) {
        Date now = DateUtils.getNowDate();
        //查询网格组织编号
        String gridUnitId = gridCaseTaskMapper.getGridUnitIdByUnitId(unitId);
        log.info("caseId:" + gridToDoBacthVo.getObjId() + "查询到网格组织编号为：" + gridUnitId);
        if(org.apache.commons.lang3.StringUtils.isNotBlank(gridUnitId)){
            //查询组织下用户
            GridOrgUsersVo gridOrgUsersVo = new GridOrgUsersVo();
            gridOrgUsersVo.setCurrOrgId(gridUnitId);
            List<GridUserVo> gridUserVoList = gridUserService.getUserListByOrg(gridOrgUsersVo).getData();
            log.info("caseId:" + gridToDoBacthVo.getObjId() + "查询到网格编号为："+gridUnitId+ "下的用户有："+ gridUserVoList.stream().map(GridUserVo:: getId).collect(Collectors.joining(",")));
            if(CollectionUtils.isNotEmpty(gridUserVoList)){
                //创建待办工单
                List<String> userIdList = gridUserVoList.stream().map(GridUserVo::getId).collect(Collectors.toList());
                gridToDoBacthVo.setUserIdList(userIdList);
                R<List<GridToDoVo>> resultData = this.batchCreateToDo(gridToDoBacthVo);
                log.info("caseId:" + gridToDoBacthVo.getObjId() + "批量添加网格任务成功");
                //保存待办工单
                List<GridToDoVo> GridToDoVoResult = resultData.getData();
                if(CollectionUtils.isNotEmpty(GridToDoVoResult)) {
@@ -266,12 +266,15 @@
                    for (GridToDoVo gridToDoVoResult : GridToDoVoResult) {
                        GridCaseTask gridCaseTask = new GridCaseTask();
                        BeanUtils.copyProperties(gridToDoVoResult, gridCaseTask);
                        gridCaseTask.setCaseId(gridToDoBacthVo.getCaseId());
                        gridCaseTask.setCaseTaskId(gridToDoBacthVo.getObjId());
                        gridCaseTask.setCaseId(gridToDoBacthVo.getObjId());
                        gridCaseTask.setCaseTaskId(gridToDoBacthVo.getCaseTaskId());
                        gridCaseTask.setCreateTime(now);
                        gridCaseTask.setUpdateTime(now);
                        gridCaseTaskListNew.add(gridCaseTask);
                    }
                    BeanUtils.copyProperties(GridToDoVoResult, gridCaseTaskListNew);
                    gridCaseTaskService.saveBatch(gridCaseTaskListNew);
                    log.info("caseId:" + gridToDoBacthVo.getObjId() + "成功在本系统添加网格待办信息");
                }
                return resultData;
            }
@@ -280,12 +283,23 @@
    }

    public R<String> deleteTaskToDo(GridTaskVo gridTaskVo) {
        try {
        List<GridCaseTask> gridCaseTaskList = gridCaseTaskService.listGridCaseTask(gridTaskVo.getCaseId(), gridTaskVo.getCaseTaskId());
        List<String> idList = gridCaseTaskList.stream().map(GridCaseTask::getId).collect(Collectors.toList());
            String ids = gridCaseTaskList.stream().map(GridCaseTask::getId).collect(Collectors.joining(","));
            log.info("caseId:" + gridTaskVo.getCaseId() + "查询到本系统保存的编号" + ids);

        GridIdsVo gridIdsVo = new GridIdsVo();
        gridIdsVo.setIds(idList);
        R<String> result = this.deleteToDo(gridIdsVo);
            log.info("caseId:" + gridTaskVo.getCaseId() + "成功删除网格系统的待办任务，编号为：" + ids);
        gridCaseTaskService.removeByIds(idList);
            log.info("caseId:" + gridTaskVo.getCaseId() + "成功删除本系统保存的网格任务，编号为：" + ids);
        return result;
        }catch (Exception e){
            log.info("xsderror:{}", e);
            throw new RuntimeException(e);
        }

    }
}

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

@@ -28,7 +28,7 @@
    private String userName;
    @Value("${grid.password:aek8CdcaM}")
    private String passWord;
    private String testUrl = "http://183.2.142.46:9007";
    private String testUrl = "http://183.2.142.21:9007";

    public R<GridUserVo> getUserInfo(GridTokenVo gridTokenVo) {
        String s = null;
@@ -37,7 +37,6 @@
        requestVo.setHeadVo(headVo);
        requestVo.setBodyVo(gridTokenVo);
        try {
//            log.info("xsdobject:{}",JSON.toJSONString(requestVo));
            // 开发环境
            if (SpringContextUtil.checkDev()) {
                 log.info("xsdurl:{}",testUrl + "/sys/getUserByToken");
@@ -163,9 +162,6 @@
            // 开发环境
            if (SpringContextUtil.checkDev()) {
                log.info("xsdurl:{}",testUrl + "/api/thrid/grid/user/get-org-users"+JSON.toJSONString(gridOrgUsersVo));
                Map<String, String> header = new HashMap<>();
                String authorizationValue = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJIVUdFSU5GTyIsImV4cCI6MTcyOTcwNzA3NywiaWF0IjoxNzI5NjYzODc3LCJ1c2VySWQiOiJkNjY2ZTUzZGMwMjU0NjNkYTllZTkwOTUyNjk5MTljNCYyMl8wMDAyNC0zIn0.a0TfTkKKDQpUJRyGUSVnfghIWvGy5hrTzxX26SpW7kA";
                header.put("Authorization", authorizationValue);
                s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/user/get-org-users", JSON.toJSONString(gridOrgUsersVo), new HashMap<>(), "utf-8");
            }else {
                log.info("xsdurl:{}",gridUrl + "/sys/user/getUserListByOrg");