zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

访客接口，对指定用户下线功能-1

Browse Source
This commit is contained in:
zjf committed 2025-04-10 17:03:29 +08:00
1 parent fe87379564
commit 3ab0cbef40
13 files changed
+309 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/dto/visitors/app/VisitorsAppDTO.java
+11 -10
View File
@@ -55,13 +55,8 @@ public class VisitorsAppDTO {
* 接待人
*/
@Schema(description="接待人")
private Long userName;
private String userName;
/**
* 车牌号id
*/
@Schema(description="车牌号id")
private Long carId;
/**
* 公司名称
@@ -75,11 +70,17 @@ public class VisitorsAppDTO {
@Schema(description="随行人员数量")
private Integer peopleNumber;
/**
* 到访时间
*/
@Schema(description="到访时间")
private LocalDateTime vDate;
* 到访时间
*/
@Schema(description="到访时间")
private LocalDateTime vStartDate;
/**
* 到访时间
*/
@Schema(description="到访时间")
private LocalDateTime vEndDate;
/**
* 是否驾驶车辆0 否 1是
pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/app/visitor/VisitorsAppVo.java
+129
View File
@@ -0,0 +1,129 @@
package com.bsd.pjcloud.integrated.vo.app.visitor;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.bsd.pjcloud.common.core.util.TenantTable;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
import java.util.List;
/**
* 访客表
*
* @author zjf
* @date 2025-04-09 15:22:47
*/
@Data
@Schema(description = "访客表vo")
public class VisitorsAppVo{
/**
* id
*/
@Schema(description="id")
private Long id;
/**
* 姓名
*/
@Schema(description="姓名")
private String name;
/**
* 手机号
*/
@Schema(description="手机号")
private String mobile;
/**
* 身份证号
*/
@Schema(description="身份证号")
private String idCard;
/**
* 描述
*/
@Schema(description="描述")
private String description;
/**
* 审核状态
*/
@Schema(description="审核状态")
private String checkStatus;
/**
* 到访单位
*/
@Schema(description="到访单位")
private Long deptId;
/**
* 接待人
*/
@Schema(description="接待人")
private Long userName;
/**
* 车牌号id
*/
@Schema(description="车牌号id")
private Long carId;
/**
* 公司名称
*/
@Schema(description="公司名称")
private String companyName;
/**
* 随行人员数量
*/
@Schema(description="随行人员数量")
private Integer peopleNumber;
/**
* 到访时间
*/
@Schema(description="到访时间")
private LocalDateTime vStartDate;
/**
* 到访时间
*/
@Schema(description="到访时间")
private LocalDateTime vEndDate;
/**
* 是否驾驶车辆0 否 1是
*/
@Schema(description="是否驾驶车辆0 否 1是")
private String isDrive;
/**
* 审核原因
*/
@Schema(description="审核原因")
private String checkReason;
/**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
@Schema(description="创建时间")
private LocalDateTime createTime;
@Schema(description="token")
private String token;
@Schema(description="车牌号")
private List<VisitorsCarAppVo> visitorsCarAppVos;
}
pjcloud-integrated/pjcloud-integrated-api/src/main/java/com/bsd/pjcloud/integrated/vo/app/visitor/VisitorsCarAppVo.java
+27
View File
@@ -0,0 +1,27 @@
package com.bsd.pjcloud.integrated.vo.app.visitor;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
/**
* 车牌号
*
* @author zjf
* @date 2025-04-09 15:10:54
*/
@Data
@Schema(description = "车牌号")
public class VisitorsCarAppVo {
private Long id;
/**
* 车牌号
*/
@Schema(description="车牌号")
private String carNumber;
}
pjcloud-integrated/pjcloud-integrated-biz/pom.xml
+6
View File
@@ -13,6 +13,12 @@
<artifactId>pjcloud-integrated-biz</artifactId>
<dependencies>
<!-- 幂等插件使用 -->
<dependency>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-common-idempotent</artifactId>
</dependency>
<!--必备: undertow容器-->
<dependency>
<groupId>org.springframework.boot</groupId>
pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/IntegratedApp.java
+1 -1
View File
@@ -12,7 +12,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
* <p>
* 项目启动类
*/
@EnableOpenApi("supermarketerp")
@EnableOpenApi("integrated")
@EnablePjcloudFeignClients
@EnableDiscoveryClient
@EnablePjcloudResourceServer
pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/VisitorsController.java
+36 -1
View File
@@ -7,7 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.bsd.pjcloud.common.core.util.R;
import com.bsd.pjcloud.common.idempotent.annotation.Idempotent;
import com.bsd.pjcloud.common.log.annotation.SysLog;
import com.bsd.pjcloud.common.security.annotation.Inner;
import com.bsd.pjcloud.flow.task.constant.TaskCheckStatusEnum;
import com.bsd.pjcloud.integrated.dto.visitors.app.VisitorsAppDTO;
import com.bsd.pjcloud.integrated.entity.VisitorsEntity;
import com.bsd.pjcloud.integrated.service.VisitorsService;
@@ -21,6 +24,7 @@ import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
import java.util.List;
/**
@@ -129,9 +133,40 @@ public class VisitorsController {
*/
@Operation(summary = "app新增访客表" , description = "app新增访客表" )
@SysLog("新增访客表" )
@PostMapping
@PostMapping("/app/save")
@Idempotent(key = "#key", expireTime = 10, info = "请勿重复提交")
@Inner(value = false)
public R save(@RequestBody VisitorsAppDTO visitors) {
return R.ok(visitorsService.vistorsSave(visitors));
}
/**
* 扫码发送请求确认是否能通过
* 通过token查询访客表
* @param
* @return R
*/
@Operation(summary = "通过token查询" , description = "通过token查询" )
@GetMapping("/app/check/{token}" )
public R getByToken(@PathVariable("token" ) String token) {
LambdaQueryWrapper<VisitorsEntity> visitorsEntityLambdaQueryWrapper = new LambdaQueryWrapper<>();
visitorsEntityLambdaQueryWrapper.eq(VisitorsEntity::getToken,token);
visitorsEntityLambdaQueryWrapper.eq(VisitorsEntity::getCheckStatus, TaskCheckStatusEnum.RESULT);
VisitorsEntity visitors = visitorsService.getOne(visitorsEntityLambdaQueryWrapper);
if (visitors == null){
return R.failed("没有此预约信息");
}
LocalDateTime vStartDate = visitors.getVStartDate();
if (vStartDate.isBefore(LocalDateTime.now())){
return R.failed("预约时间未到");
}
LocalDateTime vEndDate = visitors.getVEndDate();
if (vEndDate.isBefore(LocalDateTime.now())){
return R.failed("预约已过期");
}
return R.ok(true);
}
}
pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/entity/VisitorsEntity.java
+10 -1
View File
@@ -93,7 +93,12 @@ public class VisitorsEntity extends Model<VisitorsEntity> {
* 到访时间
*/
@Schema(description="到访时间")
private LocalDateTime vDate;
private LocalDateTime vStartDate;
/**
* 到访时间
*/
@Schema(description="到访时间")
private LocalDateTime vEndDate;
/**
* 是否驾驶车辆0 否 1是
@@ -154,4 +159,8 @@ public class VisitorsEntity extends Model<VisitorsEntity> {
*/
@Schema(description="租户编号")
private Long tenantId;
@Schema(description="token")
private String token;
}
pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java
+16 -2
View File
@@ -17,12 +17,18 @@ import com.bsd.pjcloud.integrated.entity.VisitorsEntity;
import com.bsd.pjcloud.integrated.mapper.VisitorsCarMapper;
import com.bsd.pjcloud.integrated.mapper.VisitorsMapper;
import com.bsd.pjcloud.integrated.service.VisitorsService;
import com.bsd.pjcloud.integrated.vo.app.visitor.VisitorsAppVo;
import com.bsd.pjcloud.integrated.vo.app.visitor.VisitorsCarAppVo;
import lombok.AllArgsConstructor;
import org.springframework.security.oauth2.jwt.Jwt;
import org.springframework.security.oauth2.jwt.JwtClaimsSet;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
import java.util.List;
import java.util.UUID;
/**
* 访客表
@@ -61,7 +67,10 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
bean.setProcessInstanceId(processInstanceId);
bean.setCheckStatus(TaskCheckStatusEnum.PADDING.getCode());
int insert = baseMapper.insert(bean);
String uniqueToken = UUID.randomUUID().toString();
String token = uniqueToken.replace("-", "");
bean.setToken(token);
baseMapper.insert(bean);
List<VisitorsCarAppDTO> visitorsCarAppDTOList = visitors.getVisitorsCarAppDTOList();
if (!CollectionUtils.isEmpty(visitorsCarAppDTOList)){
List<VisitorsCarEntity> visitorsCarEntities = BeanUtils.toBean(visitorsCarAppDTOList, VisitorsCarEntity.class);
@@ -70,6 +79,11 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
});
visitorsCarMapper.insert(visitorsCarEntities);
}
return insert;
VisitorsAppVo visitorAppVo = BeanUtils.toBean(bean, VisitorsAppVo.class);
List<VisitorsCarAppVo> visitorsCarAppVos = BeanUtils.toBean(visitorsCarAppDTOList, VisitorsCarAppVo.class);
visitorAppVo.setVisitorsCarAppVos(visitorsCarAppVos);
return visitorAppVo;
}
}
pjcloud-integrated/pjcloud-integrated-biz/src/main/resources/mapper/VisitorsMapper.xml
+3 -1
View File
@@ -15,7 +15,8 @@
<result property="carId" column="car_id"/>
<result property="companyName" column="company_name"/>
<result property="peopleNumber" column="people_number"/>
<result property="vDate" column="v_date"/>
<result property="vStartDate" column="v_start_date"/>
<result property="vEndDate" column="v_end_data"/>
<result property="isDrive" column="is_drive"/>
<result property="processInstanceId" column="process_instance_id"/>
<result property="checkReason" column="check_reason"/>
@@ -25,5 +26,6 @@
<result property="updateTime" column="update_time"/>
<result property="delFlag" column="del_flag"/>
<result property="tenantId" column="tenant_id"/>
<result property="token" column="token"/>
</resultMap>
</mapper>