记录通知到历史消息中

src/main/java/com/care/bms/controller/EventHandleController.java

@@ -232,7 +232,8 @@ public class EventHandleController {
     @PostMapping("/complete/{orderId}")
     @ApiOperation(tags = {"事件处理"},value = "完成工单")
     public Result<Object> complete(HttpServletRequest request,@RequestHeader("token") String token,@PathVariable("orderId") Long orderId){
-        this.bmsEventOrderService.updateOrderStatus(orderId,OrderStatusEnum.COMPLETE);
+        UserLogindConvertVO loginUser = WebPageUtils.getCurrentLoginedUser(request);
+        this.bmsEventOrderService.complete(orderId,loginUser);
         this.bmsEventOrderService.sendSmsToMemberAndLianxiren(orderId,"工单完成");
         return  Result.success("操作成功！");
     }

src/main/java/com/care/bms/service/BmsEventOrderService.java

@@ -488,15 +488,26 @@ public class BmsEventOrderService {
      * 更新工单状态
      *
      * @param orderId
-     * @param orderStatusEnum
+     * @param loginUser
      */
-    public void updateOrderStatus(Long orderId, OrderStatusEnum orderStatusEnum) {
+    public void complete(Long orderId, UserLogindConvertVO loginUser) {
         CareEventOrder order = this.careEventOrderService.getById(orderId);
         UpdateWrapper<CareEventOrder> updateWrapper = new UpdateWrapper<>();
         updateWrapper.lambda().eq(CareEventOrder::getId, orderId)
-                .set(CareEventOrder::getStatus, orderStatusEnum.getValue())
+                .set(CareEventOrder::getStatus, OrderStatusEnum.COMPLETE.getValue())
                 .set(CareEventOrder::getModifyTime, DateUtil.date());
         this.careEventOrderService.update(updateWrapper);
+        CareEventOrderHandleHis log = new CareEventOrderHandleHis();
+        log.setOrgId(order.getOrgId());
+        log.setStationId(order.getStationId());
+        log.setOrderId(order.getId());
+        log.setLogType(LogTypeEnum.CLOSE.getValue());
+        log.setLogObjectId(loginUser.getId());
+        log.setLogObjectName(loginUser.getName());
+        log.setLogResult("完成工单");
+        log.setOpUserRole(UserRoleEnum.SEAT.getValue());
+        log.setCreateTime(DateUtil.date());
+        this.careEventOrderHandleHisService.save(log);
         this.bigScreenService.pushRtEventFlag(order.getOrgId(), order.getStationId(), orderId.toString(), "bigscreenRefresh");
     }
 
@@ -661,19 +672,18 @@ public class BmsEventOrderService {
 
         boolean smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.ORDER_COMPLETE, careMemberInfo.getPhone(), house.getName());
         if (smsResult) {
-            CareHandleLog log = new CareHandleLog();
+            CareEventOrderHandleHis log = new CareEventOrderHandleHis();
             log.setOrgId(order.getOrgId());
             log.setStationId(order.getStationId());
             log.setOrderId(order.getId());
             log.setLogType(LogTypeEnum.SMS.getValue());
             log.setLogObjectId(order.getMemberId());
             log.setLogObjectName(careMemberInfo.getName());
-            log.setLogResult("短信通知");
-            log.setLogContent(content);
+            log.setLogResult(content+"短信通知");
             log.setOpUserRole(UserRoleEnum.SEAT.getValue());
             log.setCreateTime(DateUtil.date());
             log.setRelationTypeDesc("用户");
-            this.careHandleLogService.save(log);
+            this.careEventOrderHandleHisService.save(log);
         }
     }
     /**
@@ -701,19 +711,18 @@ public class BmsEventOrderService {
             boolean smsResult = this.wxNoticSendService.sendWhenHappen(careMemberInfo.getOpenId(),data);
             log.info("发送WX消息模板: openId: " + careMemberInfo.getOpenId() + ", ORDER: " + order.getId() + " 状态: " + smsResult);
             if (smsResult) {
-                CareHandleLog log = new CareHandleLog();
+                CareEventOrderHandleHis log = new CareEventOrderHandleHis();
                 log.setOrgId(order.getOrgId());
                 log.setStationId(order.getStationId());
                 log.setOrderId(order.getId());
-                log.setLogType(LogTypeEnum.SMS.getValue());
+                log.setLogType(LogTypeEnum.WX.getValue());
                 log.setLogObjectId(order.getMemberId());
                 log.setLogObjectName(careMemberInfo.getName());
-                log.setLogResult("微信通知");
-                log.setLogContent(content);
+                log.setLogResult(content+"微信通知");
                 log.setOpUserRole(UserRoleEnum.SYSTEM.getValue());
                 log.setCreateTime(DateUtil.date());
                 log.setRelationTypeDesc("用户");
-                this.careHandleLogService.save(log);
+                this.careEventOrderHandleHisService.save(log);
             }
         }
     }
@@ -738,19 +747,18 @@ public class BmsEventOrderService {
             boolean smsResult = smsSendService.sendSmsToLianxirenOrMember(SmsTemplateTypeEnum.ORDER_COMPLETE, orderContactorVO.getContactPhone(), house.getName());
 
             if (smsResult) {
-                CareHandleLog log = new CareHandleLog();
+                CareEventOrderHandleHis log = new CareEventOrderHandleHis();
                 log.setOrgId(order.getOrgId());
                 log.setStationId(order.getStationId());
                 log.setOrderId(order.getId());
                 log.setLogType(LogTypeEnum.SMS.getValue());
                 log.setLogObjectId(order.getMemberId());
                 log.setLogObjectName(orderContactorVO.getContactName());
-                log.setLogResult("短信通知");
-                log.setLogContent(content);
+                log.setLogResult(content+"短信通知");
                 log.setOpUserRole(UserRoleEnum.SEAT.getValue());
                 log.setCreateTime(DateUtil.date());
                 log.setRelationTypeDesc("联系人");
-                this.careHandleLogService.save(log);
+                this.careEventOrderHandleHisService.save(log);
             }
         }
 

src/main/java/com/care/common/enums/LogTypeEnum.java

@@ -20,7 +20,10 @@ public enum LogTypeEnum {
     OUT_CALL(3,"呼叫"),
     KEY(4,"钥匙"),
     CHAMB(5,"管家"),
-    SMS(6,"短信");
+    SMS(6,"短信"),
+    VOTICE(6,"语音"),
+    WX(6,"微信"),
+    CLOSE(6,"完成工单");
     private Integer value;
     private String name;
     LogTypeEnum(Integer value, String name) {
@@ -47,6 +50,12 @@ public enum LogTypeEnum {
             return CHAMB.name;
         }else if (SMS.getValue().intValue() == code.intValue()){
             return SMS.name;
+        }else if (VOTICE.getValue().intValue() == code.intValue()){
+            return VOTICE.name;
+        }else if (WX.getValue().intValue() == code.intValue()){
+            return WX.name;
+        }else if (CLOSE.getValue().intValue() == code.intValue()){
+            return CLOSE.name;
         }
 
         return null;

src/main/java/com/care/common/service/impl/CareEventOrderServiceImpl.java

@@ -185,9 +185,9 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                     log.setOrgId(order.getOrgId());
                     log.setStationId(order.getStationId());
                     log.setOrderId(order.getId());
-                    log.setLogType(LogTypeEnum.SMS.getValue());
+                    log.setLogType(LogTypeEnum.WX.getValue());
                     log.setLogObjectId(order.getMemberId());
-                    log.setLogObjectName(careMemberInfo.getName());
+                    log.setLogObjectName(careMemberInfo.getNickname());
                     log.setLogResult("微信通知");
                     log.setOpUserRole(UserRoleEnum.SYSTEM.getValue());
                     log.setCreateTime(DateUtil.date());
@@ -492,9 +492,9 @@ public class CareEventOrderServiceImpl extends ServiceImpl<CareEventOrderMapper,
                     log.setOrgId(order.getOrgId());
                     log.setStationId(order.getStationId());
                     log.setOrderId(order.getId());
-                    log.setLogType(LogTypeEnum.SMS.getValue());
+                    log.setLogType(LogTypeEnum.WX.getValue());
                     log.setLogObjectId(order.getMemberId());
-                    log.setLogObjectName(careMemberInfo.getName());
+                    log.setLogObjectName(careMemberInfo.getNickname());
                     log.setLogResult("事件取消微信通知");
                     log.setOpUserRole(UserRoleEnum.SYSTEM.getValue());
                     log.setCreateTime(DateUtil.date());