Merge branch 'fu-dev' of uskycloud/usky-cloud into master

base-modules/service-system/service-system-api/src/main/java/com/usky/system/domain/MceRequestVO.java

@@ -37,7 +37,7 @@ public class MceRequestVO  extends BaseEntity {
     @NotBlank(message = "消息内容 infoContent 不能为空！")
     private String infoContent;
 
-    /** 消息发布人
+    /** 用户名称
      * 登录账号 loginAccount
      * */
     @NotBlank(message = "消息发布人 userName 不能为空！")
@@ -54,23 +54,37 @@ public class MceRequestVO  extends BaseEntity {
     /**
      * ip地址
      */
-    String ipAddress;
+    private String ipAddress;
 
     /**
      * 登录地址
      */
-    String loginAddress;
+    private String loginAddress;
 
     /**
      * 登录方式
      */
-    String loginType;
+    private String loginType;
 
     /**
      * 审批结果
      */
-    String approvalResult;
+    private String approvalResult;
 
+    /**
+     * 流程名称
+     */
+    private String processName;
+
+    /**
+     * 审批节点
+     */
+    private String approvalNode;
+
+    /**
+     * 真实姓名
+     */
+    private String realName;
 
     @Override
     public String toString() {

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceContentServiceImpl.java

@@ -36,6 +36,7 @@ public class MceContentServiceImpl extends AbstractCrudService<MceContentMapper,
     private String appUrl;
 
     // 异步多线程调用
+    @Override
     @Async
     public void sendApp(JSONObject mceReceiveVO, String cids, Integer mceReceiveId, Integer sendType) {
         if (sendType.equals(0)) {
@@ -62,6 +63,7 @@ public class MceContentServiceImpl extends AbstractCrudService<MceContentMapper,
         }
     }
 
+    @Override
     @Async
     public void sendAppNew(MceRequestVO mceReceiveVO, String cids, Integer mceReceiveId, Integer sendType) {
         if (sendType.equals(0)) {
@@ -99,6 +101,15 @@ public class MceContentServiceImpl extends AbstractCrudService<MceContentMapper,
             if (StringUtils.isNotEmpty(mceReceiveVO.getApprovalResult())) {
                 sendWeChatMessageRequestVO.setApprovalResult(mceReceiveVO.getApprovalResult());
             }
+            if (StringUtils.isNotEmpty(mceReceiveVO.getProcessName())) {
+                sendWeChatMessageRequestVO.setProcessName(mceReceiveVO.getProcessName());
+            }
+            if (StringUtils.isNotEmpty(mceReceiveVO.getApprovalNode())) {
+                sendWeChatMessageRequestVO.setApprovalNode(mceReceiveVO.getApprovalNode());
+            }
+            if (StringUtils.isNotEmpty(mceReceiveVO.getRealName())) {
+                sendWeChatMessageRequestVO.setRealName(mceReceiveVO.getRealName());
+            }
             mceMbuserService.sendWeChatMessage(sendWeChatMessageRequestVO);
         }
     }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceMbuserServiceImpl.java

@@ -117,7 +117,7 @@ public class MceMbuserServiceImpl extends AbstractCrudService<MceMbuserMapper, M
                 // 登录账号 userName
                 data.put("thing6", new TemplateData(requestVO.getUserName(), "#173177"));
                 // 登录IP
-                data.put("character_string8", new TemplateData(requestVO.getLoginAddress(), "#173177"));
+                data.put("character_string8", new TemplateData(requestVO.getIpAddress(), "#173177"));
                 // 登录地点
                 data.put("thing9", new TemplateData(requestVO.getLoginAddress(), "#173177"));
                 // 登录方式
@@ -126,14 +126,19 @@ public class MceMbuserServiceImpl extends AbstractCrudService<MceMbuserMapper, M
                 templateId = constant.WE_CHAT_LOGIN_TEMPLATE_ID;
                 break;
 
+            /* 通知公告&工作报告通知（工单已完成通知）
+             * 工单标题{{thing9.DATA}}
+             * 发起人{{thing8.DATA}}
+             * 完成时间{{time12.DATA}}
+             **/
             case "1":
+                data.put("thing9", new TemplateData("通知公告-" + requestVO.getInfoContent(), "#173177"));
+                data.put("thing8", new TemplateData(requestVO.getUserName(), "#173177"));
+                data.put("time12", new TemplateData(nowTime, "#173177"));
+                templateId = constant.WE_CHAT_WORK_TEMPLATE_ID;
+                break;
             case "5":
-                /* 通知公告&工作报告通知（工单已完成通知）
-                 * 工单标题{{thing9.DATA}}
-                 * 发起人{{thing8.DATA}}
-                 * 完成时间{{time12.DATA}}
-                 **/
-                data.put("thing9", new TemplateData(requestVO.getInfoContent(), "#173177"));
+                data.put("thing9", new TemplateData("报告提醒-" + requestVO.getInfoContent(), "#173177"));
                 data.put("thing8", new TemplateData(requestVO.getUserName(), "#173177"));
                 data.put("time12", new TemplateData(nowTime, "#173177"));
                 // 设置公众号模板消息ID
@@ -148,9 +153,9 @@ public class MceMbuserServiceImpl extends AbstractCrudService<MceMbuserMapper, M
                  * 发起时间{{time10.DATA}}
                  * 审批结果{{const21.DATA}}
                  **/
-                data.put("thing7", new TemplateData(requestVO.getInfoTitle(), "#173177"));
-                data.put("thing8", new TemplateData(requestVO.getInfoContent(), "#173177"));
-                data.put("thing13", new TemplateData(requestVO.getUserName(), "#173177"));
+                data.put("thing7", new TemplateData(requestVO.getProcessName(), "#173177"));
+                data.put("thing8", new TemplateData(requestVO.getApprovalNode(), "#173177"));
+                data.put("thing13", new TemplateData(requestVO.getRealName(), "#173177"));
                 data.put("time10", new TemplateData(nowTime, "#173177"));
                 data.put("const21", new TemplateData(requestVO.getApprovalResult(), "#173177"));
 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceReceiveServiceImpl.java

@@ -253,11 +253,14 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
     @Override
     public void addMceReceive(MceRequestVO mceRequestVO) {
 
+        System.out.println(mceRequestVO.toString());
+
         // 登录成功 infoType 为 0，只给登录用户发送公众号消息
-        if ("0".equals(mceRequestVO.getInfoType())){
+        if ("0".equals(mceRequestVO.getInfoType())) {
             List<MceMbuser> mbuserList = mceMbuserService.list(Wrappers.lambdaQuery(MceMbuser.class).in(MceMbuser::getUserId, mceRequestVO.getUserIds()));
             String openid = mbuserList.get(0).getOpenid();
             mceContentService.sendAppNew(mceRequestVO, openid, 0, 1);
+            return;
         }
 
         // 如果 infoTypeName 为空，则从字典数据中获取
@@ -688,6 +691,9 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
         mceRequestVO.setId((Integer) json.get("id"));
         mceRequestVO.setUserName(json.get("userName").toString());
         mceRequestVO.setApprovalResult(json.get("approvalResult").toString());
+        mceRequestVO.setProcessName(json.get("processName").toString());
+        mceRequestVO.setApprovalNode(json.get("approvalNode").toString());
+        mceRequestVO.setRealName(json.get("realName").toString());
         addMceReceive(mceRequestVO);
     }
 }

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysNoticeServiceImpl.java

@@ -108,7 +108,7 @@ public class SysNoticeServiceImpl extends AbstractCrudService<SysNoticeMapper, S
         mceRequestVO.setUserName(userName);
         mceRequestVO.setUserIds(userIds);
         try {
-            //mceReceiveService.add(jsonObject.toString());
+            // mceReceiveService.add(jsonObject.toString());
             mceReceiveService.addMceReceive(mceRequestVO);
         } catch (Exception e) {
             log.error(String.format("公告:%d，消息发送失败:%s", id, e.getMessage()));

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/util/AsyncFactory.java

@@ -79,15 +79,16 @@ public class AsyncFactory
         // 日志状态
         if (StringUtils.equalsAny(status, Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) {
             logininfor.setStatus(String.valueOf(Constants.LOGIN_SUCCESS_STATUS)); // 使用String.valueOf进行转换
-
-            // 微信公众号推送登录消息
-            sendWeChatMessage(logininfor);
         } else if (Constants.LOGIN_FAIL.equals(status)) {
             logininfor.setStatus(String.valueOf(Constants.LOGIN_FAIL_STATUS)); // 使用String.valueOf进行转换
         }
         sys_user_logger.info("log is {}", JSON.toJSONString(logininfor));
         // 插入数据
         SpringContextUtils.getBean(ISysLogininforService.class).insertLogininfor(logininfor);
+        if (Constants.LOGIN_SUCCESS.equals(logininfor.getStatus())){
+            // 微信公众号推送登录消息
+            sendWeChatMessage(logininfor);
+        }
     }
 
     public static String getBlock(Object msg)

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/vo/SendWeChatMessageRequestVO.java

@@ -50,7 +50,7 @@ public class SendWeChatMessageRequestVO {
     String loginType;
 
     /**
-     * 发送人
+     * 用户名
      * 登录账号
      */
     String userName;
@@ -59,4 +59,19 @@ public class SendWeChatMessageRequestVO {
      * 审批结果
      */
     String approvalResult;
+
+    /**
+     * 流程名称
+     */
+    String processName;
+
+    /**
+     * 审批节点
+     */
+    String approvalNode;
+
+    /**
+     * 登录人真实姓名
+     */
+    String realName;
 }