diff --git a/src/main/java/com/zhgd/exception/ExceptionHandlerAdvice.java b/src/main/java/com/zhgd/exception/ExceptionHandlerAdvice.java index f57dd6f81..db9d9b92c 100644 --- a/src/main/java/com/zhgd/exception/ExceptionHandlerAdvice.java +++ b/src/main/java/com/zhgd/exception/ExceptionHandlerAdvice.java @@ -1,12 +1,17 @@ package com.zhgd.exception; import cn.hutool.core.util.StrUtil; +import com.wflow.exception.BusinessException; +import com.wflow.service.OrgRepositoryService; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.constant.CommonConstant; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.execption.OpenPromptException; +import com.zhgd.xmgl.modules.basicdata.service.INoticeService; +import com.zhgd.xmgl.util.EmailUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; import org.springframework.validation.FieldError; import org.springframework.web.bind.MethodArgumentNotValidException; @@ -32,6 +37,9 @@ import java.util.stream.Collectors; @ControllerAdvice public class ExceptionHandlerAdvice { + @Autowired + private INoticeService noticeService; + @ExceptionHandler(Exception.class) @ResponseBody public Result restError(HttpServletRequest request, HttpServletResponse response, Exception ex) { @@ -51,8 +59,13 @@ public class ExceptionHandlerAdvice { result.setCode(200); result.setMessage(appException.getMessage()); result.setResult(appException.getResult()); + } else if (ex instanceof BusinessException) { + BusinessException appException = (BusinessException) ex; + noticeService.addNoticeToManager("【" + appException.getMessage() + "流程】出现异常", "", "30", null); + result.error500("操作异常,请联系管理员或查看异常日志"); } else { - result.error500(ex.getMessage() == null ? "操作中出现空指针!" : ex.getMessage()); +// result.error500(ex.getMessage() == null ? "操作中出现空指针!" : ex.getMessage()); + result.error500("操作异常,请联系管理员或查看异常日志"); } log.error("异常请求路径:" + request.getRequestURI() + "--" + result.getMessage()); log.error("", ex); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserDestroyController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserDestroyController.java index 2d28bc3e0..8caba9910 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserDestroyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserDestroyController.java @@ -120,14 +120,13 @@ public class SystemUserDestroyController { if (systemUserDestroyEntity == null) { result.error500("未找到对应实体"); } else { - boolean ok = systemUserDestroyService.updateById(systemUserDestroy); + boolean ok = systemUserDestroyService.updateInfo(systemUserDestroy); if (ok) { result.success("修改成功!"); } else { result.success("操作失败!"); } } - return result; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserDestroyService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserDestroyService.java index 7baae2946..648b390af 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserDestroyService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/ISystemUserDestroyService.java @@ -12,4 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService; public interface ISystemUserDestroyService extends IService { void saveInfo(); + + boolean updateInfo(SystemUserDestroy systemUserDestroy); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java index 0cc17596d..579b5c982 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/NoticeServiceImpl.java @@ -132,7 +132,7 @@ public class NoticeServiceImpl extends ServiceImpl impleme public void addNoticeToManager(String title, String msg, String type, String projectSn) { List systemUserList = systemUserService.list(Wrappers.lambdaQuery() .eq(SystemUser::getAccountType, SystemUserAccountTypeEnum.NEW_USER.getValue()) - .eq(SystemUser::getSn, projectSn)); + .eq(projectSn != null, SystemUser::getSn, projectSn)); List accountIds = systemUserList.stream().map(u -> u.getUserId()).collect(Collectors.toList()); ArrayList notices = new ArrayList<>(); for (Long accountId : accountIds) { diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserDestroyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserDestroyServiceImpl.java index d09ecc130..a74bfc788 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserDestroyServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserDestroyServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.basicdata.service.impl; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.entity.SystemUserDestroy; @@ -12,7 +13,10 @@ import com.zhgd.xmgl.modules.worker.service.IEnterpriseInfoService; import com.zhgd.xmgl.modules.worker.service.IWorkerInfoService; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; +import com.zhgd.xmgl.util.EmailUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -37,6 +41,10 @@ public class SystemUserDestroyServiceImpl extends ServiceImpl> queryPageList(@ApiIgnore @RequestBody Map map) { - QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(CarDelRecord.class, map); - Page page = PageUtil.getPage(map); - IPage pageList = carDelRecordService.page(page, queryWrapper); + IPage pageList = carDelRecordService.selectPage(map); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java index 9465f450b..ad2019d71 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java @@ -261,7 +261,7 @@ public class CarInfoController { } catch (Exception e) { log.error("添加车辆黑白名单管理信息", e); emailUtils.saveExceptionAndSendFlowEmail(paramStr, e, "添加车辆", "/xmgl/carInfo/save", MapUtils.getString(map, "instanceId")); - noticeService.addNoticeToManager("【车辆申请】出现异常", "", "30", String.valueOf(map.get("projectSn"))); + noticeService.addNoticeToManager("【车辆申请】出现异常", "车牌号【" + map.get("carNumber") + "】", "30", String.valueOf(map.get("projectSn"))); } return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarDelRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarDelRecordMapper.java index 7b17139e9..6a9da92ca 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarDelRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/CarDelRecordMapper.java @@ -22,5 +22,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @DataScope(includeTable = "car_del_record") public interface CarDelRecordMapper extends BaseMapper { - IPage selectPage(Page page, @Param("param") Map map); + Page selectPage(Page page, @Param("param") Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarDelRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarDelRecordMapper.xml index 26f1e07ff..b4b1373a7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarDelRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarDelRecordMapper.xml @@ -27,15 +27,15 @@ t.xsz, t.jqx, t.other_prove, - t.send_success_status, t.create_by, + t.create_time, b.car_type_name, ei.enterprise_name, p.project_name, u.real_name createByName FROM car_del_record t join project p on p.project_sn = t.project_sn - LEFT JOIN system_user_info u ON t.create_by = u.user_id + LEFT JOIN system_user u ON t.create_by = u.user_id LEFT JOIN car_type b ON (t.car_type = b.id and t.project_sn = b.project_sn) left join enterprise_info ei on ei.id = t.enterprise_id left join worker_info wi @@ -44,7 +44,7 @@ on wi1.id_card = t.outside_driver_id_card and t.car_module_type = 3 - + WHERE t.project_sn = #{param.projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java index 30e2e7881..ef9e421b5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java @@ -210,7 +210,7 @@ public class DangerousEngineeringRecordController { } catch (Exception e) { log.error("添加现场危大工程信息", e); emailUtils.saveExceptionAndSendFlowEmail(paramStr, e, "添加现场危大工程信息", "/xmgl/dangerousEngineeringRecord/save", MapUtils.getString(map, "instanceId")); - noticeService.addNoticeToManager("【危大工程申请】出现异常", "", "30", String.valueOf(map.get("projectSn"))); + noticeService.addNoticeToManager("【危大工程申请】出现异常", "危大工程【" + MapUtils.getString(map, "engineeringName") +"】", "30", String.valueOf(map.get("projectSn"))); } return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java index e852758f7..7e28f2a18 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java @@ -227,7 +227,7 @@ public class XzMaterialController { } catch (Exception e) { log.error(interfaceName + e); emailUtils.saveExceptionAndSendFlowEmail(paramStr, e, interfaceName, "/xmgl/xzMaterial/save", MapUtils.getString(obj, "instanceId")); - noticeService.addNoticeToManager("【材料进出场申请】出现异常", "", "30", obj.getString("projectSn")); + noticeService.addNoticeToManager("【材料进出场申请】出现异常", "车牌号为【" + obj.getString("carNumber") + "】", "30", obj.getString("projectSn")); } return Result.success("添加成功!"); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzVisitorManageRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzVisitorManageRecordController.java index 93c50ee81..3e6013841 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzVisitorManageRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzVisitorManageRecordController.java @@ -147,7 +147,7 @@ public class XzVisitorManageRecordController { } catch (Exception e) { log.error("添加访客信息", e); emailUtils.saveExceptionAndSendFlowEmail(paramStr, e, "添加访客信息", "/xmgl/xzVisitorManageRecord/save", MapUtils.getString(map, "instanceId")); - noticeService.addNoticeToManager("【访客申请】出现异常", "", "30", String.valueOf(map.get("projectSn"))); + noticeService.addNoticeToManager("【访客申请】出现异常", "访客姓名【" + MapUtils.getString(map, "visitName") + "】", "30", String.valueOf(map.get("projectSn"))); } return Result.success("添加成功!"); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionCompareDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionCompareDataServiceImpl.java index bb67fc5cf..4a53f92ed 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionCompareDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionCompareDataServiceImpl.java @@ -128,6 +128,12 @@ public class XzHikvisionCompareDataServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initPageQueryWrapper(XzHikvisionCompareData.class, param, alias); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzHikvisionCompareData::getId)); + if (MapUtils.getInteger(param, "syncResultComplete") == 3) { + queryWrapper.lambda().lt(XzHikvisionCompareData::getSyncResult, 3); + } + if (MapUtils.getInteger(param, "syncResultComplete") == 0) { + queryWrapper.lambda().gt(XzHikvisionCompareData::getSyncResult, 0); + } return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java index 18b23c945..1701423e1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java @@ -254,7 +254,7 @@ public class XzBlindPlatePlugSafeController { } catch (Exception e) { log.error(interfaceName + e); emailUtils.saveExceptionAndSendFlowEmail(paramStr, e, interfaceName, "/xmgl/xzBlindPlatePlugSafe/save", MapUtils.getString(paramMap, "instanceId")); - noticeService.addNoticeToManager("【盲板抽堵申请】出现异常", "", "30", String.valueOf(paramMap.get("projectSn"))); + noticeService.addNoticeToManager("【盲板抽堵申请】出现异常", "作业票编号【" + paramMap.getString("safetyWorkTicketCode") + "】", "30", String.valueOf(paramMap.get("projectSn"))); } return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzGroundSafetController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzGroundSafetController.java index f4ea7fb79..d7f862486 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzGroundSafetController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzGroundSafetController.java @@ -186,7 +186,7 @@ public class XzGroundSafetController { } catch (Exception e) { log.error(interfaceName + e); emailUtils.saveExceptionAndSendFlowEmail(paramStr, e, interfaceName, "/xmgl/xzGroundSafet/save", MapUtils.getString(paramMap, "instanceId")); - noticeService.addNoticeToManager("【动土安全申请】出现异常", "", "30", String.valueOf(paramMap.get("projectSn"))); + noticeService.addNoticeToManager("【动土安全申请】出现异常", "作业票编号【" + paramMap.getString("safetyWorkTicketCode") + "】", "30", String.valueOf(paramMap.get("projectSn"))); } return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java index 9d0403885..fedb15da6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java @@ -209,7 +209,7 @@ public class XzHighJobSafeController { } catch (Exception e) { log.error(interfaceName + e); emailUtils.saveExceptionAndSendFlowEmail(paramStr, e, interfaceName, "/xmgl/xzHighJobSafe/save", MapUtils.getString(paramMap, "instanceId")); - noticeService.addNoticeToManager("【高处作业安全票申请】出现异常", "", "30", String.valueOf(paramMap.get("projectSn"))); + noticeService.addNoticeToManager("【高处作业安全票申请】出现异常", "作业票编号【" + paramMap.getString("safetyWorkTicketCode") + "】", "30", String.valueOf(paramMap.get("projectSn"))); } return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java index e62089a57..45370da74 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java @@ -201,7 +201,7 @@ public class XzHoistSafetyWorkController { } catch (Exception e) { log.error(interfaceName + e); emailUtils.saveExceptionAndSendFlowEmail(paramStr, e, interfaceName, "/xmgl/xzHoistSafetyWork/save", MapUtils.getString(paramMap, "instanceId")); - noticeService.addNoticeToManager("【吊装安全作业票申请】出现异常", "", "30", String.valueOf(paramMap.get("projectSn"))); + noticeService.addNoticeToManager("【吊装安全作业票申请】出现异常", "作业票编号【" + paramMap.getString("safetyWorkTicketCode") + "】", "30", String.valueOf(paramMap.get("projectSn"))); } return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java index a4430fa70..911ccd662 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java @@ -259,7 +259,7 @@ public class XzLimitSpaceSafeController { } catch (Exception e) { log.error(interfaceName + e); emailUtils.saveExceptionAndSendFlowEmail(paramStr, e, interfaceName, "xmgl/xzLimitSpaceSafe/save", MapUtils.getString(paramMap, "instanceId")); - noticeService.addNoticeToManager("【受限空间安全作业票申请】出现异常", "", "30", String.valueOf(paramMap.get("projectSn"))); + noticeService.addNoticeToManager("【受限空间安全作业票申请】出现异常", "作业票编号【" + paramMap.getString("safetyWorkTicketCode") + "】", "30", String.valueOf(paramMap.get("projectSn"))); } return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyController.java index 383689b29..9a0f49a70 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyController.java @@ -219,7 +219,7 @@ public class XzSpecialOperationFireSafetyController { } catch (Exception e) { log.error(interfaceName + e); emailUtils.saveExceptionAndSendFlowEmail(paramStr, e, interfaceName, "/xmgl/xzSpecialOperationFireSafety/save", MapUtils.getString(paramMap, "instanceId")); - noticeService.addNoticeToManager("【动火安全作业票申请】出现异常", "", "30", String.valueOf(paramMap.get("projectSn"))); + noticeService.addNoticeToManager("【动火安全作业票申请】出现异常", "作业票编号【" + paramMap.getString("safetyWorkTicketCode") + "】", "30", String.valueOf(paramMap.get("projectSn"))); } return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyNewController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyNewController.java index 7b0eb5fde..071acc987 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyNewController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyNewController.java @@ -188,7 +188,7 @@ public class XzSpecialOperationFireSafetyNewController { } catch (Exception e) { log.error(interfaceName + e); emailUtils.saveExceptionAndSendFlowEmail(paramStr, e, interfaceName, "/xmgl/xzSpecialOperationFireSafetyNew/save", MapUtils.getString(paramMap, "instanceId")); - noticeService.addNoticeToManager("【动火安全作业票申请】出现异常", "", "30", String.valueOf(paramMap.get("projectSn"))); + noticeService.addNoticeToManager("【动火安全作业票申请】出现异常", "作业票编号【" + paramMap.getString("safetyWorkTicketCode") + "】", "30", String.valueOf(paramMap.get("projectSn"))); } return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java index d037cf8e5..0cf7dd31f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java @@ -214,7 +214,7 @@ public class XzTemporaryElectricitySafeController { } catch (Exception e) { log.error(interfaceName + e); emailUtils.saveExceptionAndSendFlowEmail(paramStr, e, interfaceName, "/xmgl/xzTemporaryElectricitySafe/save", MapUtils.getString(paramMap, "instanceId")); - noticeService.addNoticeToManager("【临时用电安全作业票申请】出现异常", "", "30", String.valueOf(paramMap.get("projectSn"))); + noticeService.addNoticeToManager("【临时用电安全作业票申请】出现异常", "作业票编号【" + paramMap.getString("safetyWorkTicketCode") + "】", "30", String.valueOf(paramMap.get("projectSn"))); } return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/util/EmailUtils.java b/src/main/java/com/zhgd/xmgl/util/EmailUtils.java index 6eb7d2d40..66f11aaa0 100644 --- a/src/main/java/com/zhgd/xmgl/util/EmailUtils.java +++ b/src/main/java/com/zhgd/xmgl/util/EmailUtils.java @@ -176,39 +176,39 @@ public class EmailUtils implements EmailService { * @param instanceId */ public void saveExceptionAndSendFlowEmail(String paramStr, Exception e, String subject, String url, String instanceId) { -// String envName; -// if (EnvironmentUtil.isXingZongProd()) { -// envName = "星纵生产环境"; -// } else if (EnvironmentUtil.isXingZongTest()) { -// envName = "星纵测试环境"; -// } else { -// envName = "本地环境"; -// } -// String detail = StrUtil.format("调用接口:" + url + ",参数:{},审批单编号:{},异常详情:{}", paramStr, instanceId, ExceptionUtil.stacktraceToString(e)); -// String sub = envName + "工作流【" + subject + "】出现异常"; -// if (instanceId != null) { -// ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(instanceId).singleResult(); -// Date startTime = processInstance.getStartTime(); -// String processDefinitionName = processInstance.getProcessDefinitionName(); -// String startUserId = processInstance.getStartUserId(); -// String projectSn = processInstance.getTenantId(); -// FlowExceptionLog log = new FlowExceptionLog(); -// log.setApprovalNumber(instanceId); -// log.setApprovalType(processDefinitionName); -// log.setProjectSn(projectSn); -// log.setLaunchTime(startTime); -// HashMap map = new HashMap<>(16); -// map.put("userId", startUserId); -// map.put("projectSn", projectSn); -// List userList = systemUserService.getProjectChildernSystemUserList(map); -// log.setLauncherName(CollUtil.isNotEmpty(userList) ? userList.get(0).getRealName() : null); -// log.setLaunchEnterpriseName(CollUtil.isNotEmpty(userList) ? userList.get(0).getEnterpriseName() : null); -// log.setExceptionDetail(detail); -// flowExceptionLogService.add(log); -// } -// this.sendSimpleMail("ak47_vce@163.com", sub, detail); -// this.sendSimpleMail("du.haipeng@szjxj.com", sub, detail); -// this.sendSimpleMail("2634687239@qq.com", sub, detail); -// this.sendSimpleMail("1923636941@qq.com", sub, detail); + String envName; + if (EnvironmentUtil.isXingZongProd()) { + envName = "星纵生产环境"; + } else if (EnvironmentUtil.isXingZongTest()) { + envName = "星纵测试环境"; + } else { + envName = "本地环境"; + } + String detail = StrUtil.format("调用接口:" + url + ",参数:{},审批单编号:{},异常详情:{}", paramStr, instanceId, ExceptionUtil.stacktraceToString(e)); + String sub = envName + "工作流【" + subject + "】出现异常"; + if (instanceId != null) { + ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(instanceId).singleResult(); + Date startTime = processInstance.getStartTime(); + String processDefinitionName = processInstance.getProcessDefinitionName(); + String startUserId = processInstance.getStartUserId(); + String projectSn = processInstance.getTenantId(); + FlowExceptionLog log = new FlowExceptionLog(); + log.setApprovalNumber(instanceId); + log.setApprovalType(processDefinitionName); + log.setProjectSn(projectSn); + log.setLaunchTime(startTime); + HashMap map = new HashMap<>(16); + map.put("userId", startUserId); + map.put("projectSn", projectSn); + List userList = systemUserService.getProjectChildernSystemUserList(map); + log.setLauncherName(CollUtil.isNotEmpty(userList) ? userList.get(0).getRealName() : null); + log.setLaunchEnterpriseName(CollUtil.isNotEmpty(userList) ? userList.get(0).getEnterpriseName() : null); + log.setExceptionDetail(detail); + flowExceptionLogService.add(log); + } + this.sendSimpleMail("ak47_vce@163.com", sub, detail); + this.sendSimpleMail("du.haipeng@szjxj.com", sub, detail); + this.sendSimpleMail("2634687239@qq.com", sub, detail); + this.sendSimpleMail("1923636941@qq.com", sub, detail); } } diff --git a/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar b/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar index 9ec0f4996..c55aa0f91 100644 Binary files a/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar and b/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar differ