lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamDashboardController.java

@@ -3,17 +3,22 @@
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus;
import org.jeecg.modules.eam.constant.EquipmentRepairStatus;
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.entity.EamRepairOrder;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.vo.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -247,4 +252,40 @@
            return Result.error("数据转译失败！");
        }
    }

    @ApiOperation(value = "H5首页-待执行工单数量统计", notes = "H5首页-待执行工单数量统计")
    @GetMapping(value = "/pendingExecOrderCountBySelf")
    public Result<?> pendingExecOrderCountBySelf() {
        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String post = user.getPost();
        Map<String, Integer> countMap = CollectionUtil.newHashMap();
        if (BusinessCodeConst.PCR0001.equals(post)) {
            //是操作工，查询待点检工单、待周保工单
            List<EamInspectionOrder> unExecInspectionOrderList = inspectionOrderService.list(new LambdaQueryWrapper<EamInspectionOrder>()
                    .eq(EamInspectionOrder::getOperator, user.getUsername())
                    .eq(EamInspectionOrder::getInspectionStatus, InspectionStatus.UNDER_INSPECTION.name())
                    .eq(EamInspectionOrder::getDelFlag, CommonConstant.DEL_FLAG_0));
            List<EamWeekMaintenanceOrder> unExecMaintenanceOrderList = weekMaintenanceOrderService.list(new LambdaQueryWrapper<EamWeekMaintenanceOrder>()
                    .eq(EamWeekMaintenanceOrder::getOperator, user.getUsername())
                    .eq(EamWeekMaintenanceOrder::getMaintenanceStatus, WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name())
                    .eq(EamWeekMaintenanceOrder::getDelFlag, CommonConstant.DEL_FLAG_0));
            countMap.put("unExecInspectionOrderCount", unExecInspectionOrderList.size());
            countMap.put("unExecMaintenanceOrderCount", unExecMaintenanceOrderList.size());
            countMap.put("unExecRepairOrderCount", 0);
        } else if (BusinessCodeConst.PCR0002.equals(post)) {
            //是维修工，查询待维修工单
            List<EamRepairOrder> unExecRepairOrderList = repairOrderService.list(new LambdaQueryWrapper<EamRepairOrder>()
                    .eq(EamRepairOrder::getRepairer, user.getUsername())
                    .eq(EamRepairOrder::getRepairStatus, EquipmentRepairStatus.UNDER_REPAIR.name())
                    .eq(EamRepairOrder::getDelFlag, CommonConstant.DEL_FLAG_0));
            countMap.put("unExecInspectionOrderCount", 0);
            countMap.put("unExecMaintenanceOrderCount", 0);
            countMap.put("unExecRepairOrderCount", unExecRepairOrderList.size());
        } else {
            countMap.put("unExecInspectionOrderCount", 0);
            countMap.put("unExecMaintenanceOrderCount", 0);
            countMap.put("unExecRepairOrderCount", 0);
        }
        return Result.OK(countMap);
    }
}

 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);
    }
}

 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);
    }
}

 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);
    }
}

 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);

 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);

 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);

 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
#第三方APP对接
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