From bb6bb3e166385332f00e55d0d0e2daafc5dbc717 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期五, 11 七月 2025 10:15:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml                              |   23 +-
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/RepairOrderWxMessageSendJob.java                 |  123 +++++++++++++++++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/WeekMaintenanceOrderWxMessageSendJob.java        |  123 +++++++++++++++++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java |    6 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderWxMessageSendJob.java             |  123 +++++++++++++++++
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java          |    6 
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java      |    6 
 7 files changed, 397 insertions(+), 13 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderWxMessageSendJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderWxMessageSendJob.java
new file mode 100644
index 0000000..66b4f5e
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderWxMessageSendJob.java
@@ -0,0 +1,123 @@
+package org.jeecg.modules.eam.job;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.InspectionStatus;
+import org.jeecg.modules.eam.entity.EamInspectionOrder;
+import org.jeecg.modules.eam.service.IEamInspectionOrderService;
+import org.jeecg.modules.mdc.util.ThrowableUtil;
+import org.jeecg.modules.quartz.entity.QuartzJob;
+import org.jeecg.modules.quartz.entity.SysQuartzLog;
+import org.jeecg.modules.quartz.service.IQuartzJobService;
+import org.jeecg.modules.quartz.service.ISysQuartzLogService;
+import org.jeecg.modules.qywx.message.vo.TemplateCard;
+import org.jeecg.modules.qywx.message.vo.TemplateCardEntity;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 寰呴鍙栫偣妫�宸ュ崟浼佷笟寰俊娑堟伅鎺ㄩ�佸畾鏃朵换鍔�
+ */
+@Slf4j
+@Component
+public class InspectionOrderWxMessageSendJob implements Job {
+
+    @Autowired
+    private IEamInspectionOrderService eamInspectionOrderService;
+    @Autowired
+    private ISysUserService sysUserService;
+    @Autowired
+    private ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService;
+    @Autowired
+    private ISysQuartzLogService sysQuartzLogService;
+    @Autowired
+    private IQuartzJobService quartzJobService;
+
+    @Value("${wechatEnterprise.cardActionUrl}")
+    private String cardActionUrl;
+
+    @Override
+    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        log.info("寰呯偣妫�宸ュ崟浼佷笟寰俊娑堟伅鎺ㄩ�佷换鍔″紑濮嬫墽琛岋紝鏃堕棿锛歿}", DateUtils.now());
+        //浠诲姟鏃ュ織
+        SysQuartzLog quartzLog = new SysQuartzLog();
+        quartzLog.setCreateTime(new Date());
+        List<QuartzJob> byJobClassName = quartzJobService.findByJobClassName(this.getClass().getName());
+        if (byJobClassName != null && !byJobClassName.isEmpty()) {
+            quartzLog.setJobId(byJobClassName.get(0).getId());
+        }
+        long startTime = System.currentTimeMillis();
+        try {
+            //鏌ヨ鎵�鏈夊緟鐐规鐨勫伐鍗�
+            List<EamInspectionOrder> waitOrderList = eamInspectionOrderService.list(new LambdaQueryWrapper<EamInspectionOrder>()
+                    .eq(EamInspectionOrder::getInspectionStatus, InspectionStatus.WAIT_INSPECTION.name())
+                    .eq(EamInspectionOrder::getDelFlag, CommonConstant.DEL_FLAG_0));
+            if (!waitOrderList.isEmpty()) {
+                //鏈夊緟鐐规宸ュ崟锛屾帹閫佷紒涓氬井淇℃秷鎭�
+                //鏌ヨ鎵�鏈夋搷浣滃伐
+                List<SysUser> userList = sysUserService.list(new LambdaQueryWrapper<SysUser>()
+                        .eq(SysUser::getPost, BusinessCodeConst.PCR0001)
+                        .eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0)
+                        .eq(SysUser::getStatus, CommonConstant.USER_UNFREEZE));
+                if (userList.isEmpty()) {
+                    log.error("绯荤粺鏈缃搷浣滃伐鐢ㄦ埛锛屾棤娉曟帹閫佸伐鍗曢鍙栨彁閱掓秷鎭�");
+                    quartzLog.setIsSuccess(0);
+                    quartzLog.setParams("绯荤粺鏈缃搷浣滃伐鐢ㄦ埛锛屾棤娉曟帹閫佸伐鍗曢鍙栨彁閱掓秷鎭�");
+                } else {
+                    TemplateCard templateCard = new TemplateCard();
+                    String toUsers = userList.stream().map(SysUser::getUsername).collect(Collectors.joining(","));
+                    String touser = wechatEnterpriseService.getTouser(toUsers, false);
+                    templateCard.setTouser(touser);
+                    TemplateCardEntity templateCardEntity = new TemplateCardEntity();
+                    templateCard.setTemplate_card(templateCardEntity);
+                    templateCardEntity.setTask_id(waitOrderList.get(0).getId());
+                    TemplateCardEntity.MainTitle mainTitle = new TemplateCardEntity.MainTitle();
+                    mainTitle.setTitle("璁惧鐐规");
+                    templateCardEntity.setMain_title(mainTitle);
+                    templateCardEntity.setSub_title_text("鎮ㄦ湁寰呴鍙栫偣妫�宸ュ崟锛岃杩涘叆绯荤粺棰嗗彇");
+                    TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
+                    cardAction.setType(1);
+                    cardAction.setUrl(cardActionUrl);
+                    templateCardEntity.setCard_action(cardAction);
+                    JSONObject jsonObject = wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
+                    Integer errcode = (Integer) jsonObject.get("errcode");
+                    if (errcode == 0) {
+                        log.info("鎺ㄩ�佸緟棰嗗彇鐐规宸ュ崟浼佷笟寰俊娑堟伅鎴愬姛锛寋}", jsonObject.toJSONString());
+                        quartzLog.setIsSuccess(0);
+                        quartzLog.setParams(jsonObject.toJSONString());
+                    } else {
+                        log.error("鎺ㄩ�佸緟棰嗗彇鐐规宸ュ崟浼佷笟寰俊娑堟伅澶辫触锛寋}", jsonObject.toJSONString());
+                        quartzLog.setIsSuccess(-1);
+                        quartzLog.setExceptionDetail(jsonObject.toJSONString());
+                    }
+                }
+            } else {
+                log.info("鏃犲緟棰嗗彇鐐规宸ュ崟锛屾棤闇�鎺ㄩ�佸伐鍗曢鍙栨彁閱掓秷鎭�");
+                quartzLog.setIsSuccess(0);
+                quartzLog.setParams("鏃犲緟棰嗗彇鐐规宸ュ崟锛屾棤闇�鎺ㄩ�佸伐鍗曢鍙栨彁閱掓秷鎭�");
+            }
+        } catch (Exception e) {
+            log.error("寰呯偣妫�宸ュ崟浼佷笟寰俊娑堟伅鎺ㄩ�佷换鍔℃墽琛屽け璐ワ紝{}", e.getMessage(), e);
+            quartzLog.setIsSuccess(-1);
+            quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e));
+        }
+        long endTime = System.currentTimeMillis();
+        quartzLog.setExecutionTime(Integer.parseInt(String.valueOf(endTime - startTime)));
+        sysQuartzLogService.save(quartzLog);
+    }
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/RepairOrderWxMessageSendJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/RepairOrderWxMessageSendJob.java
new file mode 100644
index 0000000..314c90f
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/RepairOrderWxMessageSendJob.java
@@ -0,0 +1,123 @@
+package org.jeecg.modules.eam.job;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.ReportRepairEnum;
+import org.jeecg.modules.eam.entity.EamReportRepair;
+import org.jeecg.modules.eam.service.IEamReportRepairService;
+import org.jeecg.modules.mdc.util.ThrowableUtil;
+import org.jeecg.modules.quartz.entity.QuartzJob;
+import org.jeecg.modules.quartz.entity.SysQuartzLog;
+import org.jeecg.modules.quartz.service.IQuartzJobService;
+import org.jeecg.modules.quartz.service.ISysQuartzLogService;
+import org.jeecg.modules.qywx.message.vo.TemplateCard;
+import org.jeecg.modules.qywx.message.vo.TemplateCardEntity;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 寰呴鍙栫淮淇伐鍗曚紒涓氬井淇℃秷鎭帹閫佸畾鏃朵换鍔�
+ */
+@Slf4j
+@Component
+public class RepairOrderWxMessageSendJob implements Job {
+
+    @Autowired
+    private IEamReportRepairService eamReportRepairService;
+    @Autowired
+    private ISysUserService sysUserService;
+    @Autowired
+    private ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService;
+    @Autowired
+    private ISysQuartzLogService sysQuartzLogService;
+    @Autowired
+    private IQuartzJobService quartzJobService;
+
+    @Value("${wechatEnterprise.cardActionUrl}")
+    private String cardActionUrl;
+
+    @Override
+    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        log.info("寰呯淮淇伐鍗曚紒涓氬井淇℃秷鎭帹閫佷换鍔″紑濮嬫墽琛岋紝鏃堕棿锛歿}", DateUtils.now());
+        //浠诲姟鏃ュ織
+        SysQuartzLog quartzLog = new SysQuartzLog();
+        quartzLog.setCreateTime(new Date());
+        List<QuartzJob> byJobClassName = quartzJobService.findByJobClassName(this.getClass().getName());
+        if (byJobClassName != null && !byJobClassName.isEmpty()) {
+            quartzLog.setJobId(byJobClassName.get(0).getId());
+        }
+        long startTime = System.currentTimeMillis();
+        try {
+            //鏌ヨ鎵�鏈夊緟缁翠慨鐨勬姤淇伐鍗�
+            List<EamReportRepair> waitOrderList = eamReportRepairService.list(new LambdaQueryWrapper<EamReportRepair>()
+                    .eq(EamReportRepair::getReportStatus, ReportRepairEnum.WAIT_REPAIR.name())
+                    .eq(EamReportRepair::getDelFlag, CommonConstant.DEL_FLAG_0));
+            if (!waitOrderList.isEmpty()) {
+                //鏈夊緟缁翠慨宸ュ崟锛屾帹閫佷紒涓氬井淇℃秷鎭�
+                //鏌ヨ鎵�鏈夌淮淇伐
+                List<SysUser> userList = sysUserService.list(new LambdaQueryWrapper<SysUser>()
+                        .eq(SysUser::getPost, BusinessCodeConst.PCR0002)
+                        .eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0)
+                        .eq(SysUser::getStatus, CommonConstant.USER_UNFREEZE));
+                if (userList.isEmpty()) {
+                    log.error("绯荤粺鏈缃淮淇伐鐢ㄦ埛锛屾棤娉曟帹閫佸伐鍗曢鍙栨彁閱掓秷鎭�");
+                    quartzLog.setIsSuccess(0);
+                    quartzLog.setParams("绯荤粺鏈缃淮淇伐鐢ㄦ埛锛屾棤娉曟帹閫佸伐鍗曢鍙栨彁閱掓秷鎭�");
+                } else {
+                    TemplateCard templateCard = new TemplateCard();
+                    String toUsers = userList.stream().map(SysUser::getUsername).collect(Collectors.joining(","));
+                    String touser = wechatEnterpriseService.getTouser(toUsers, false);
+                    templateCard.setTouser(touser);
+                    TemplateCardEntity templateCardEntity = new TemplateCardEntity();
+                    templateCard.setTemplate_card(templateCardEntity);
+                    templateCardEntity.setTask_id(waitOrderList.get(0).getId());
+                    TemplateCardEntity.MainTitle mainTitle = new TemplateCardEntity.MainTitle();
+                    mainTitle.setTitle("璁惧缁翠慨");
+                    templateCardEntity.setMain_title(mainTitle);
+                    templateCardEntity.setSub_title_text("鎮ㄦ湁寰呴鍙栫淮淇伐鍗曪紝璇疯繘鍏ョ郴缁熼鍙�");
+                    TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
+                    cardAction.setType(1);
+                    cardAction.setUrl(cardActionUrl);
+                    templateCardEntity.setCard_action(cardAction);
+                    JSONObject jsonObject = wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
+                    Integer errcode = (Integer) jsonObject.get("errcode");
+                    if (errcode == 0) {
+                        log.info("鎺ㄩ�佸緟棰嗗彇缁翠慨宸ュ崟浼佷笟寰俊娑堟伅鎴愬姛锛寋}", jsonObject.toJSONString());
+                        quartzLog.setIsSuccess(0);
+                        quartzLog.setParams(jsonObject.toJSONString());
+                    } else {
+                        log.error("鎺ㄩ�佸緟棰嗗彇缁翠慨宸ュ崟浼佷笟寰俊娑堟伅澶辫触锛寋}", jsonObject.toJSONString());
+                        quartzLog.setIsSuccess(-1);
+                        quartzLog.setExceptionDetail(jsonObject.toJSONString());
+                    }
+                }
+            } else {
+                log.info("鏃犲緟棰嗗彇缁翠慨宸ュ崟锛屾棤闇�鎺ㄩ�佸伐鍗曢鍙栨彁閱掓秷鎭�");
+                quartzLog.setIsSuccess(0);
+                quartzLog.setParams("鏃犲緟棰嗗彇缁翠慨宸ュ崟锛屾棤闇�鎺ㄩ�佸伐鍗曢鍙栨彁閱掓秷鎭�");
+            }
+        } catch (Exception e) {
+            log.error("寰呯淮淇伐鍗曚紒涓氬井淇℃秷鎭帹閫佷换鍔℃墽琛屽け璐ワ紝{}", e.getMessage(), e);
+            quartzLog.setIsSuccess(-1);
+            quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e));
+        }
+        long endTime = System.currentTimeMillis();
+        quartzLog.setExecutionTime(Integer.parseInt(String.valueOf(endTime - startTime)));
+        sysQuartzLogService.save(quartzLog);
+    }
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/WeekMaintenanceOrderWxMessageSendJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/WeekMaintenanceOrderWxMessageSendJob.java
new file mode 100644
index 0000000..c654ffc
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/WeekMaintenanceOrderWxMessageSendJob.java
@@ -0,0 +1,123 @@
+package org.jeecg.modules.eam.job;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.WeekMaintenanceStatusEnum;
+import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
+import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderService;
+import org.jeecg.modules.mdc.util.ThrowableUtil;
+import org.jeecg.modules.quartz.entity.QuartzJob;
+import org.jeecg.modules.quartz.entity.SysQuartzLog;
+import org.jeecg.modules.quartz.service.IQuartzJobService;
+import org.jeecg.modules.quartz.service.ISysQuartzLogService;
+import org.jeecg.modules.qywx.message.vo.TemplateCard;
+import org.jeecg.modules.qywx.message.vo.TemplateCardEntity;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 寰呴鍙栧懆淇濆伐鍗曚紒涓氬井淇℃秷鎭帹閫佸畾鏃朵换鍔�
+ */
+@Slf4j
+@Component
+public class WeekMaintenanceOrderWxMessageSendJob implements Job {
+
+    @Autowired
+    private IEamWeekMaintenanceOrderService eamWeekMaintenanceOrderService;
+    @Autowired
+    private ISysUserService sysUserService;
+    @Autowired
+    private ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService;
+    @Autowired
+    private ISysQuartzLogService sysQuartzLogService;
+    @Autowired
+    private IQuartzJobService quartzJobService;
+
+    @Value("${wechatEnterprise.cardActionUrl}")
+    private String cardActionUrl;
+
+    @Override
+    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        log.info("寰呭懆淇濆伐鍗曚紒涓氬井淇℃秷鎭帹閫佷换鍔″紑濮嬫墽琛岋紝鏃堕棿锛歿}", DateUtils.now());
+        //浠诲姟鏃ュ織
+        SysQuartzLog quartzLog = new SysQuartzLog();
+        quartzLog.setCreateTime(new Date());
+        List<QuartzJob> byJobClassName = quartzJobService.findByJobClassName(this.getClass().getName());
+        if (byJobClassName != null && !byJobClassName.isEmpty()) {
+            quartzLog.setJobId(byJobClassName.get(0).getId());
+        }
+        long startTime = System.currentTimeMillis();
+        try {
+            //鏌ヨ鎵�鏈夊緟淇濆吇鐨勫懆淇濆伐鍗�
+            List<EamWeekMaintenanceOrder> waitOrderList = eamWeekMaintenanceOrderService.list(new LambdaQueryWrapper<EamWeekMaintenanceOrder>()
+                    .eq(EamWeekMaintenanceOrder::getMaintenanceStatus, WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name())
+                    .eq(EamWeekMaintenanceOrder::getDelFlag, CommonConstant.DEL_FLAG_0));
+            if (!waitOrderList.isEmpty()) {
+                //鏈夊緟淇濆吇鐨勫伐鍗曪紝鎺ㄩ�佷紒涓氬井淇℃秷鎭�
+                //鏌ヨ鎵�鏈夋搷浣滃伐
+                List<SysUser> userList = sysUserService.list(new LambdaQueryWrapper<SysUser>()
+                        .eq(SysUser::getPost, BusinessCodeConst.PCR0001)
+                        .eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0)
+                        .eq(SysUser::getStatus, CommonConstant.USER_UNFREEZE));
+                if (userList.isEmpty()) {
+                    log.error("绯荤粺鏈缃搷浣滃伐鐢ㄦ埛锛屾棤娉曟帹閫佸伐鍗曢鍙栨彁閱掓秷鎭�");
+                    quartzLog.setIsSuccess(0);
+                    quartzLog.setParams("绯荤粺鏈缃搷浣滃伐鐢ㄦ埛锛屾棤娉曟帹閫佸伐鍗曢鍙栨彁閱掓秷鎭�");
+                } else {
+                    TemplateCard templateCard = new TemplateCard();
+                    String toUsers = userList.stream().map(SysUser::getUsername).collect(Collectors.joining(","));
+                    String touser = wechatEnterpriseService.getTouser(toUsers, false);
+                    templateCard.setTouser(touser);
+                    TemplateCardEntity templateCardEntity = new TemplateCardEntity();
+                    templateCard.setTemplate_card(templateCardEntity);
+                    templateCardEntity.setTask_id(waitOrderList.get(0).getId());
+                    TemplateCardEntity.MainTitle mainTitle = new TemplateCardEntity.MainTitle();
+                    mainTitle.setTitle("璁惧鍛ㄤ繚");
+                    templateCardEntity.setMain_title(mainTitle);
+                    templateCardEntity.setSub_title_text("鎮ㄦ湁寰呴鍙栧懆淇濆伐鍗曪紝璇疯繘鍏ョ郴缁熼鍙�");
+                    TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
+                    cardAction.setType(1);
+                    cardAction.setUrl(cardActionUrl);
+                    templateCardEntity.setCard_action(cardAction);
+                    JSONObject jsonObject = wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
+                    Integer errcode = (Integer) jsonObject.get("errcode");
+                    if (errcode == 0) {
+                        log.info("鎺ㄩ�佸緟棰嗗彇鍛ㄤ繚宸ュ崟浼佷笟寰俊娑堟伅鎴愬姛锛寋}", jsonObject.toJSONString());
+                        quartzLog.setIsSuccess(0);
+                        quartzLog.setParams(jsonObject.toJSONString());
+                    } else {
+                        log.error("鎺ㄩ�佸緟棰嗗彇鍛ㄤ繚宸ュ崟浼佷笟寰俊娑堟伅澶辫触锛寋}", jsonObject.toJSONString());
+                        quartzLog.setIsSuccess(-1);
+                        quartzLog.setExceptionDetail(jsonObject.toJSONString());
+                    }
+                }
+            } else {
+                log.info("鏃犲緟棰嗗彇鍛ㄤ繚宸ュ崟锛屾棤闇�鎺ㄩ�佸伐鍗曢鍙栨彁閱掓秷鎭�");
+                quartzLog.setIsSuccess(0);
+                quartzLog.setParams("鏃犲緟棰嗗彇鍛ㄤ繚宸ュ崟锛屾棤闇�鎺ㄩ�佸伐鍗曢鍙栨彁閱掓秷鎭�");
+            }
+        } catch (Exception e) {
+            log.error("寰呭懆淇濆伐鍗曚紒涓氬井淇℃秷鎭帹閫佷换鍔℃墽琛屽け璐ワ紝{}", e.getMessage(), e);
+            quartzLog.setIsSuccess(-1);
+            quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e));
+        }
+        long endTime = System.currentTimeMillis();
+        quartzLog.setExecutionTime(Integer.parseInt(String.valueOf(endTime - startTime)));
+        sysQuartzLogService.save(quartzLog);
+    }
+}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 440cf17..ef5d3ea 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -56,6 +56,7 @@
 import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
 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 org.springframework.transaction.annotation.Transactional;
 
@@ -105,6 +106,9 @@
     private ISysUserService sysUserService;
     @Autowired
     private HistoryService historyService;
+
+    @Value("${wechatEnterprise.cardActionUrl}")
+    private String cardActionUrl;
 
     @Override
     public IPage<EamInspectionOrder> queryPageList(Page<EamInspectionOrder> page, EamInspectionOrderQuery query) {
@@ -385,7 +389,7 @@
 
         TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
         cardAction.setType(1);
-        cardAction.setUrl("http://houjie.xalxzn.com:8866/h5");
+        cardAction.setUrl(cardActionUrl);
         templateCardEntity.setCard_action(cardAction);
 
         wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
index 40028d3..fb5c7b9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -47,6 +47,7 @@
 import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
 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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -96,6 +97,9 @@
 
     @Resource
     private ISysUserService sysUserService;
+
+    @Value("${wechatEnterprise.cardActionUrl}")
+    private String cardActionUrl;
 
     /**
      * 鍒嗛〉鍒楄〃
@@ -376,7 +380,7 @@
 
         TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
         cardAction.setType(1);
-        cardAction.setUrl("http://houjie.xalxzn.com:8866/h5");
+        cardAction.setUrl(cardActionUrl);
         templateCardEntity.setCard_action(cardAction);
 
         wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
index bb05add..c846542 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
@@ -47,6 +47,7 @@
 import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl;
 import org.jeecg.modules.system.vo.UserSelector;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -93,6 +94,9 @@
     private IMdcProductionService mdcProductionService;
     @Autowired
     private ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService;
+
+    @Value("${wechatEnterprise.cardActionUrl}")
+    private String cardActionUrl;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -491,7 +495,7 @@
 
         TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
         cardAction.setType(1);
-        cardAction.setUrl("http://houjie.xalxzn.com:8866/h5");
+        cardAction.setUrl(cardActionUrl);
         templateCardEntity.setCard_action(cardAction);
 
         wechatEnterpriseService.sendTemplateCardMsg(templateCard, true);
diff --git a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
index 78d8a5d..bf453ac 100644
--- a/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
+++ b/lxzn-module-system/lxzn-system-start/src/main/resources/application-dev.yml
@@ -253,10 +253,10 @@
       client-secret: ??
       redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
     WECHAT_ENTERPRISE:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
-      agent-id: ??
+      client-id: ww5999b2643c95fa75
+      client-secret: 86jN7TtWMxjiFoWPgMQYBCu46bOoEkpfscvuyvsS31Y
+      redirect-uri: http://houjie.xalxzn.com:8866/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
+      agent-id: 1000002
     DINGTALK:
       client-id: ??
       client-secret: ??
@@ -271,19 +271,19 @@
     timeout: 1h
 #绗笁鏂笰PP瀵规帴
 third-app:
-  enabled: false
+  enabled: true
   type:
     #浼佷笟寰俊
     WECHAT_ENTERPRISE:
-      enabled: false
+      enabled: true
       #CORP_ID
-      client-id: ??
+      client-id: ww5999b2643c95fa75
       #SECRET
-      client-secret: ??
+      client-secret: 86jN7TtWMxjiFoWPgMQYBCu46bOoEkpfscvuyvsS31Y
       #鑷缓搴旂敤id
-      agent-id: ??
+      agent-id: 1000002
       #鑷缓搴旂敤绉橀挜锛堟柊鐗堜紒寰渶瑕侀厤缃級
-      # agent-app-secret: ??
+      agent-app-secret: 86jN7TtWMxjiFoWPgMQYBCu46bOoEkpfscvuyvsS31Y
     #閽夐拤
     DINGTALK:
       enabled: false
@@ -335,3 +335,6 @@
 ncSend:
   addOrDelete: false  #//鏄惁鍒犻櫎seed 涓殑涔嬪墠鏂囦欢
 #staticAccessPath: /api/ffile/** # 褰撳墠椤圭洰鐨勯潤鎬佽祫婧愯闂厤缃湪nginx涓�
+# 浼佷笟寰俊妯℃澘鍗＄墖娑堟伅鐐瑰嚮鍚庤烦杞殑 url
+wechatEnterprise:
+  cardActionUrl: https://houjie.xalxzn.com:8866/h5

--
Gitblit v1.9.3