Merge branch 'test' into dev

# Conflicts:
#	hx-oa/src/main/java/com/fjhx/oa/service/daily/impl/DailyReportDetailsServiceImpl.java
#	hx-oa/src/main/java/com/fjhx/oa/service/daily/impl/DailyReportServiceImpl.java
#	hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/abnormal/impl/AbnormalDetailsServiceImpl.java

hx-admin/src/main/resources/application.yml

@@ -18,7 +18,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 20001
+  port: 9898
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8

hx-oa/src/main/java/com/fjhx/oa/service/daily/impl/DailyReportDetailsServiceImpl.java

@@ -46,8 +46,7 @@ public class DailyReportDetailsServiceImpl extends ServiceImpl<DailyReportDetail
         msgMap.put("businessId", id);
         msgMap.put("msg", "您有未读的日报");
         for (DailyReportDetails dailyReportDetails : list) {
-            // WebSocketServer.sendInfo(dailyReportDetails.getRecipientId(), 1, msgMap);
-
+//            WebSocketServer.sendInfo(dailyReportDetails.getRecipientId(), 1, msgMap);
             WebSocketPush.byUser(
                     PushTypeEnum.MESSAGE,
                     dailyReportDetails.getRecipientId(),

hx-oa/src/main/java/com/fjhx/oa/service/daily/impl/DailyReportServiceImpl.java

@@ -122,8 +122,7 @@ public class DailyReportServiceImpl extends ServiceImpl<DailyReportMapper, Daily
         msgMap.put("businessId", dailyReportDto.getId());
         msgMap.put("msg", String.format("%s发布了新日志", userName));
         for (DailyReportDetails dailyReportDetails : dailyReportDetailsList) {
-            // WebSocketServer.sendInfo(dailyReportDetails.getRecipientId(), 1, msgMap);
-
+//            WebSocketServer.sendInfo(dailyReportDetails.getRecipientId(), 1, msgMap);
             WebSocketPush.byUser(
                     PushTypeEnum.MESSAGE,
                     dailyReportDetails.getRecipientId(),
@@ -183,8 +182,7 @@ public class DailyReportServiceImpl extends ServiceImpl<DailyReportMapper, Daily
         msgMap.put("businessId", id);
         msgMap.put("msg", String.format("%s给你分享了日报", username));
         for (Long toUserId : toUserIdList) {
-            // WebSocketServer.sendInfo(toUserId, 1, msgMap);
-
+//            WebSocketServer.sendInfo(toUserId, 1, msgMap);
             WebSocketPush.byUser(
                     PushTypeEnum.MESSAGE,
                     toUserId,

hx-oa/src/main/java/com/fjhx/oa/utils/Notice.java

@@ -87,10 +87,11 @@ public class Notice {
             List<Long> scheduleInfoIds = scheduleInfos.stream().map(ScheduleInfo::getId).collect(Collectors.toList());
             List<ScheduleDetails> scheduleDetailsList = scheduleDetailsService.list(q -> q.in(ScheduleDetails::getScheduleInfoId, scheduleInfoIds));
             for (ScheduleDetails scheduleDetails : scheduleDetailsList) {
-                //发送消息
+                // 发送消息
                 ScheduleInfo scheduleInfo = scheduleInfoMap1.get(scheduleDetails.getScheduleInfoId());
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 String msg = String.format("您的日程<%s>将于%s开始。", scheduleInfo.getTitle(), sdf.format(scheduleInfo.getStartDate()));
+
                 Map<String, Object> msgMap = new HashMap<>();
                 msgMap.put("businessId", scheduleInfo.getId());
                 msgMap.put("msg", msg);

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/abnormal/impl/AbnormalDetailsServiceImpl.java

@@ -77,10 +77,6 @@ public class AbnormalDetailsServiceImpl extends ServiceImpl<AbnormalDetailsMappe
 
         //如果下一跟进人不为空 就给下一跟进人发送消息
         if (ObjectUtil.isNotEmpty(abnormalDetailsDto.getNextHandleUser())) {
-            //给下一个跟进人发消息通知
-            JSONObject meassage = new JSONObject();
-            meassage.put("msg", "有异常需要您跟进");
-            meassage.put("abnormalInfoId", abnormalDetailsDto.getAbnormalInfoId().toString());
             // 给下一个跟进人发消息通知
             JSONObject message = new JSONObject();
             message.put("msg", "有异常需要您跟进");