fix:修改邀约

pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitor/app/VisitorsYYAppDTO.java

@@ -22,9 +22,9 @@ public class VisitorsYYAppDTO {
 	/**
 	* 姓名
 	*/
-    @Schema(description="姓名")
+//    @Schema(description="姓名")
-	@NotNull
+//	@NotNull
-    private String name;
+//    private String name;
 
 	/**
 	* 手机号
@@ -36,41 +36,41 @@ public class VisitorsYYAppDTO {
 	/**
 	* 身份证号
 	*/
-    @Schema(description="身份证号")
+//    @Schema(description="身份证号")
-    private String idCard;
+//    private String idCard;
 
 	/**
 	* 描述
 	*/
-    @Schema(description="描述")
+//    @Schema(description="描述")
-    private String reasonValue;
+//    private String reasonValue;
 
 
 	/**
 	* 到访单位
 	*/
-    @Schema(description="到访单位id")
+//    @Schema(description="到访单位id")
-    private Long deptId;
+//    private Long deptId;
 
 	/**
 	 * 到访单位
 	 */
-	@Schema(description="到访单位")
+//	@Schema(description="到访单位")
-	private String deptName;
+//	private String deptName;
 
 
 	/**
 	* 接待人
 	*/
-    @Schema(description="接待人")
+//    @Schema(description="接待人")
-    private String userName;
+//    private String userName;
 
 
 	/**
 	* 公司名称
 	*/
-    @Schema(description="公司名称")
+//    @Schema(description="公司名称")
-    private String companyName;
+//    private String companyName;
 
 
 	/**

pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java

@@ -297,8 +297,8 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
         if (visitUser == null){
             visitUser = new VisitorUserEntity();
             visitUser.setPhone(visitors.getMobile());
-            visitUser.setIdCard(visitors.getIdCard());
+//            visitUser.setIdCard(visitors.getIdCard());
-            visitUser.setRealName(visitors.getName());
+//            visitUser.setRealName(visitors.getName());
             visitUser.setRegisterTime(LocalDateTime.now());
             visitorUserService.save(visitUser);
         }
@@ -307,7 +307,7 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
         // 设置数据归属信息
         bean.setUserId(visitUser.getId());
         bean.setCreateBy(visitUser.getRealName());
-        bean.setCheckStatus(TaskCheckStatusEnum.PADDING.getCode());
+        bean.setCheckStatus(TaskCheckStatusEnum.RESULT.getCode());
         Long userId = SecurityUtils.getUser().getId();
         bean.setReceiveId(userId);
         Long deptId = SecurityUtils.getUser().getDeptId();
@@ -319,6 +319,8 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
         String token = uniqueToken.replace("-", "");
         bean.setToken(token);
         int insert = baseMapper.insert(bean);
+
+        sendVisitorApprovalSms(visitUser, bean);
         return insert;
     }
 
@@ -362,21 +364,31 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
         visitors.setId(id);
         visitors.setCheckStatus(checkStatus);
         if (checkStatus.equals(TaskCheckStatusEnum.RESULT.getCode())){
-            //审核通过
+            sendVisitorApprovalSms(visitorUserEntity, dataVisitors);
-            Map<String, String> stringStringHashMap = new HashMap<>();
-//            params: [ "createTime", "visitorName", "visitorPhone", "visitorTime", "visitorLocal","url" ]
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            stringStringHashMap.put("createTime", visitorUserEntity.getCreateTime().format(formatter));
-            stringStringHashMap.put("visitorName",visitorUserEntity.getRealName());
-            stringStringHashMap.put("visitorPhone",visitorUserEntity.getPhone());
-            stringStringHashMap.put("visitorTime",dataVisitors.getVStartDate()+"至"+dataVisitors.getVEndDate());
-            stringStringHashMap.put("visitorLocal",dataVisitors.getDeptName());
-            stringStringHashMap.put("url","http://127.0.0.1:9999/integrated/visitors/app/get/visitorDetail?token=7a3a059ebdf94d07a10f29ecc379094e");
-            reminderThirdPartySmsService.sendParamsMsg(visitorUserEntity.getPhone(),"20658",stringStringHashMap, WebUtils.getIP());
         }
         return baseMapper.updateById(visitors);
     }
 
+    /**
+     * 发送访客审核通过短信通知
+     * @param visitorUserEntity 访客用户信息
+     * @param dataVisitors 访客申请信息
+     */
+    private void sendVisitorApprovalSms(VisitorUserEntity visitorUserEntity, VisitorsEntity dataVisitors) {
+        Map<String, String> stringStringHashMap = new HashMap<>();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        stringStringHashMap.put("createTime", visitorUserEntity.getCreateTime().format(formatter));
+        stringStringHashMap.put("visitorName", visitorUserEntity.getRealName()==null?visitorUserEntity.getPhone():visitorUserEntity.getRealName());
+        stringStringHashMap.put("visitorPhone", visitorUserEntity.getPhone());
+        stringStringHashMap.put("visitorTime", dataVisitors.getVStartDate() + "至" + dataVisitors.getVEndDate());
+        stringStringHashMap.put("visitorLocal", dataVisitors.getDeptName());
+
+        // 构建动态URL
+        String url = "http://127.0.0.1:9999/integrated/visitors/app/get/visitorDetail?token=" + dataVisitors.getToken();
+        stringStringHashMap.put("url", url);
+
+        reminderThirdPartySmsService.sendParamsMsg(visitorUserEntity.getPhone(), "20658", stringStringHashMap, WebUtils.getIP());
+    }
     @Override
     public Object getPageSQ(Page page, VisitorsEntity visitors) {
         Long currentVisitorUserId = getCurrentVisitorUserId();