完善

platform-dao/src/main/java/com/platform/dao/vo/SysUserVO.java

@@ -45,7 +45,7 @@ public class SysUserVO implements Serializable {
     /**
      * 微信openid
      */
-    private String wxOpenid;
+    private String wxOpenId;
 
     /**
      * 身份类型：11.表示设备主管

platform-service/src/main/java/com/platform/service/event/EventListenerBean.java

@@ -45,7 +45,7 @@ public class EventListenerBean {
     @Order
     @EventListener(WorkplaceBacklogEvent.class)
     public void sendOneBacklog(WorkplaceBacklogEvent event) {
-        log.info("消息事件执行");
+        log.info("邮件消息事件执行");
         WorkplaceBacklogDTO model = (WorkplaceBacklogDTO) event.getSource();
         WorkplaceBacklog backlog = BeanConverterUtil.copyObjectProperties(model, new WorkplaceBacklog());
         backlog.setId(IdGeneratorUtils.getObjectId());
@@ -73,7 +73,7 @@ public class EventListenerBean {
     @Order
     @EventListener(WorkplaceBacklogListEvent.class)
     public void sendOneBacklogList(WorkplaceBacklogListEvent event) {
-        log.info("消息事件执行");
+        log.info("站内信消息事件执行");
         LocalDateTime now = LocalDateTime.now();
         List<WorkplaceBacklogDTO> list = (List<WorkplaceBacklogDTO>) event.getSource();
         List<WorkplaceBacklog> logList = ListUtils.newArrayList(list.size());

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -435,9 +435,9 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             for (SysUserVO sysUserVO : sysUserVOList) {
                 // 站内信需要用户id
                 userIds.add(sysUserVO.getUserId());
-                if (StringUtils.isNotBlank(sysUserVO.getWxOpenid())) {
+                if (StringUtils.isNotBlank(sysUserVO.getWxOpenId())) {
                     // 微信id
-                    openIds.add(sysUserVO.getWxOpenid());
+                    openIds.add(sysUserVO.getWxOpenId());
                 }
                 if (StringUtils.isNotBlank(sysUserVO.getPhone())) {
                     // 手机

platform-service/src/main/java/com/platform/service/repair/strategy/AbstractRepairBaseStrategy.java

@@ -302,8 +302,10 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
      * @param sb
      */
     public void sendWechat(List<String> openIds,RepairApplicationFormDTO model,SbInfo sb){
-        // 发送微信通知给所有维修人角色
-        if (CollectionUtil.isNotEmpty(openIds) && BeanUtils.isProd()) {
+        // 发送微信通知
+        log.info("发送微信通知,维修单id: " + model.getId() );
+        if (CollectionUtil.isNotEmpty(openIds)) {
+
             String mobileDomain = ConfigCache.getLabelByValueAllowNull(SysConfigEnum.SYSTEM_DOMAIN_MOBILE.name());
             if (StringUtils.isBlank(mobileDomain)) {
                 throw new BusinessException("请先设置系统域名地址,系统管理-》系统参数配置-》SYSTEM_DOMAIN_MOBILE");
@@ -313,6 +315,7 @@ public abstract class AbstractRepairBaseStrategy implements RepairBaseStrategy{
             }
             String mobileRepairUrl = mobileDomain + "pages/repair-detail/repair-detail?detailId=" + model.getId();
             for (String openId : openIds) {
+                log.info("开始发送微信通知，用户openId: " + openId);
                 WeChatMessageUtil.repairMessage(openId, mobileRepairUrl, model, sb);
             }
         }

platform-service/src/main/java/com/platform/service/repair/strategy/impl/AllocateRepairBaseStrategy.java

@@ -71,15 +71,15 @@ public class AllocateRepairBaseStrategy extends AbstractRepairBaseStrategy {
 
         // 发送短信通知给所有维修，且必须是正式环境
         SysUserDTO sysUserDTO = new SysUserDTO();
-        sysUserDTO.setRoleCode(SysRoleCodeEnum.Maintenance.name());
+        sysUserDTO.setRoleCode(SysRoleCodeEnum.REPAIR_DISPATCH.name());
         List<SysUserVO> sysUserVOList = sysUserService.getDeptChildrenRoleUser(sysUserDTO);
         if (CollectionUtil.isNotEmpty(sysUserVOList)) {
             for (SysUserVO sysUserVO : sysUserVOList) {
                 // 站内信需要用户id
                 userIds.add(sysUserVO.getUserId());
-                if (StringUtils.isNotBlank(sysUserVO.getWxOpenid())) {
+                if (StringUtils.isNotBlank(sysUserVO.getWxOpenId())) {
                     // 微信id
-                    openIds.add(sysUserVO.getWxOpenid());
+                    openIds.add(sysUserVO.getWxOpenId());
                 }
                 if (StringUtils.isNotBlank(sysUserVO.getPhone())) {
                     // 手机
@@ -185,6 +185,11 @@ public class AllocateRepairBaseStrategy extends AbstractRepairBaseStrategy {
         return applicationForm;
     }
 
+    /**
+     * 拒绝
+     * @param model
+     * @return
+     */
     @Override
     public RepairApplicationFormDTO verifyRefused(RepairApplicationFormDTO model) {
         RepairApplicationFormDTO dto = super.verifyRefused(model);
@@ -231,13 +236,31 @@ public class AllocateRepairBaseStrategy extends AbstractRepairBaseStrategy {
         applicationForm.setStatus(RepairApplicationFormStatusEnum.PROCESSING.getValue());
         applicationForm.setRepairStartTime(LocalDateTime.now());
         applicationForm.setUpdateTime(LocalDateTime.now());
-        // 转派其他人要将维修结束时间置空'
+        // 转派其他人要将维修结束时间置空
         repairApplicationFormMapper.updateForRepairDispatch(applicationForm);
 
         SysUser repairUser = sysUserService.getModelById(model.getRepairUserId());
-        SpringContextHolder.publishEvent(new WorkplaceBacklogEvent(WorkplaceBacklogTypeEnum.REPAIR.getValue(), WorkplaceBacklogDetailTypeEnum.REPAIR_DISPATCH.getValue(),
+        /*SpringContextHolder.publishEvent(new WorkplaceBacklogEvent(WorkplaceBacklogTypeEnum.REPAIR.getValue(), WorkplaceBacklogDetailTypeEnum.REPAIR_DISPATCH.getValue(),
                 applicationForm.getId(), MessageTemplateUtil.getRepairDispatch(applicationForm.getNo()),
-                applicationForm.getId(), ListUtils.newArrayList(model.getRepairUserId()), ListUtils.newArrayList(repairUser.getEmail())));
+                applicationForm.getId(), ListUtils.newArrayList(model.getRepairUserId()), ListUtils.newArrayList(repairUser.getEmail())));*/
+        List<String> openIds = new ArrayList<>();
+        List<String> userIds = new ArrayList<>();
+        List<String> mails = new ArrayList<>();
+        List<String> receiverList = new ArrayList<>();
+
+        // 发送短信通知给所有维修，且必须是正式环境
+        userIds.add(repairUser.getUserId());
+        openIds.add(repairUser.getWxOpenId());
+        receiverList.add(repairUser.getPhone());
+        mails.add(repairUser.getEmail());
+
+        // 推送站内信和邮箱，根据业务需要
+        SbInfo sb = sbInfoService.getModelById(model.getSbId());
+        sendWorkplaceAndEmail(mails,userIds,model,sb);
+        // 推送微信
+        sendWechat(openIds,model,sb);
+        // 短信
+        sendSms(receiverList,model,sb);
         return model;
     }
 }

platform-service/src/main/java/com/platform/service/repair/strategy/impl/BaseRepairBaseStrategy.java

@@ -52,9 +52,9 @@ public class BaseRepairBaseStrategy extends AbstractRepairBaseStrategy {
             for (SysUserVO sysUserVO : sysUserVOList) {
                 // 站内信需要用户id
                 userIds.add(sysUserVO.getUserId());
-                if (StringUtils.isNotBlank(sysUserVO.getWxOpenid())) {
+                if (StringUtils.isNotBlank(sysUserVO.getWxOpenId())) {
                     // 微信id
-                    openIds.add(sysUserVO.getWxOpenid());
+                    openIds.add(sysUserVO.getWxOpenId());
                 }
                 if (StringUtils.isNotBlank(sysUserVO.getPhone())) {
                     // 手机

platform-service/src/main/java/com/platform/service/wechat/service/WeChatConnectService.java

@@ -188,7 +188,7 @@ public class WeChatConnectService {
         log.info("获取微信token");
         String token = getToken();
         if(StringUtils.isBlank(token)){
-            log.info("发送模板消息时，获取tokern失败");
+            log.info("发送模板消息时，获取token失败");
         }
         String url = String.format("%s?access_token=%s", TEMPLATE_URL.trim(), token.trim());
         try {