Merge pull request 'dev' (#85) from dev into test

Reviewed-on: http://39.105.23.186:3000/develop/digimeta-MultiSaas/pulls/85

xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/controller/DmIntentController.java

@@ -478,7 +478,7 @@ public class DmIntentController extends BaseController<DmIntentQuery, DmIntentDt
                 if (dateFormat.format(new Date(Long.valueOf(String.valueOf(jo.get("timestamp"))))).equals(dateFormat.format(new Date()))) {
                     joResult.put("msg", jo.get("content"));
                     joResult.put("target", 1);
-                    redisTemplate.opsForHash().delete("group:nlp" + ":" + personId, "birthday");
+                    redisTemplate.opsForHash().delete("group:nlp" + ":" + personId, key);
                     redisTemplate.opsForValue().increment("dashboard:conversation-duration", jo.get("content").toString().length() / 4);
                     return joResult;
                 }

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/DmStaffController.java

@@ -161,6 +161,33 @@ public class DmStaffController extends BaseController<DmStaffQuery, DmStaffDto,
     @RequiresPermissions(Auth.DM_STAFF_EDIT)
     @Log(title = "人员管理", businessType = BusinessType.UPDATE)
     public AjaxResult edit(@Validated({V_E.class}) @RequestBody DmStaffDto dmStaff) {
+        Long tenantId = Long.parseLong(String.valueOf(SecurityContextHolder.getLocalMap().get("enterprise_id")));
+        SysEnterpriseDto enterpriseDto = enterpriseService.selectById(tenantId);
+        Source source = SourceUtil.getSourceCache(enterpriseDto.getStrategyId());
+        if (dmStaff.getBirthDate() != null) {
+            DmWebSocketMessageVo vo = new DmWebSocketMessageVo();
+            JSONObject birthJson = new JSONObject();
+            birthJson.put("name",dmStaff.getUserName());
+            birthJson.put("orderId",dmStaff.getId());
+            birthJson.put("years",new Date().getYear() - dmStaff.getBirthDate().getYear());
+            birthJson.put("timestamp",dmStaff.getBirthDate().getTime());
+            vo.setTemplate("birthday");
+            vo.setFormat(birthJson);
+            System.out.println(birthJson.toJSONString());
+            remoteIntentService.sendMessage(vo,tenantId,source.getMaster(), SecurityConstants.INNER);
+        }
+        if (dmStaff.getHireDate() != null) {
+            DmWebSocketMessageVo vo2 = new DmWebSocketMessageVo();
+            JSONObject hireJson = new JSONObject();
+            hireJson.put("name",dmStaff.getUserName());
+            hireJson.put("orderId",dmStaff.getId());
+            hireJson.put("years",new Date().getYear() - dmStaff.getHireDate().getYear());
+            hireJson.put("timestamp",dmStaff.getHireDate().getTime());
+            vo2.setTemplate("hireDate");
+            vo2.setFormat(hireJson);
+            System.out.println(hireJson.toJSONString());
+            remoteIntentService.sendMessage(vo2,tenantId,source.getMaster(), SecurityConstants.INNER);
+        }
         return super.edit(dmStaff);
     }