浦江访客

2025-04-14 13:29:25 +08:00
1 parent 102ce6c9fb
commit 6a1935e8c6
@@ -88,7 +88,16 @@ public class VisitorsAppDTO {
    @Schema(description="是否驾驶车辆0 否 1是")
    private String isDrive;

+	/**
+	 * 是否驾驶车辆0 否 1是
+	 */
+	@Schema(description="是否有随行人员 0 否 1是")
+	private String isOtherPeople;
+
 	@Schema(description="车牌号集合")
 	private List<VisitorsCarAppDTO> visitorsCarAppDTOList;

+	@Schema(description="随行人员集合")
+	private List <VisitorsPeopleAppDTO> visitorsPeopleAppDTOList;
+
 }
@@ -0,0 +1,25 @@
+package com.bsd.pjcloud.integrated.dto.visitor.app;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 随行人员
+ *
+ * @author zjf
+ * @date 2025-04-09 15:10:54
+ */
+@Data
+@Schema(description = "随行人员信息DTO")
+public class VisitorsPeopleAppDTO {
+
+
+	@Schema(description="姓名")
+	private String name;
+
+
+    @Schema(description="手机号")
+    private String mobile;
+
+
+}
@@ -126,4 +126,8 @@ public class VisitorsAppVo{

 	@Schema(description="车牌号")
 	private List<VisitorsCarAppVo> visitorsCarAppVos;
+
+
+	@Schema(description="随行人员信息")
+	private List<VisitorsPeopleAppVo> visitorsPeopleAppVos;
 }
@@ -0,0 +1,25 @@
+package com.bsd.pjcloud.integrated.vo.visitor.app;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 随行人员
+ *
+ * @author zjf
+ * @date 2025-04-09 15:10:54
+ */
+@Data
+@Schema(description = "随行人员信息vo")
+public class VisitorsPeopleAppVo {
+
+
+	@Schema(description="姓名")
+	private String name;
+
+
+    @Schema(description="手机号")
+    private String mobile;
+
+
+}
@@ -188,8 +188,8 @@ public class VisitorsController {
     * @param visitors 访客表
     * @return R
     */
-    @Operation(summary = "app新增拜访" , description = "app新增拜访" )
-    @SysLog("新增拜访" )
+    @Operation(summary = "app新增邀约" , description = "app新增拜访" )
+    @SysLog("新增邀约" )
    @PostMapping("/app/saveBF")
    @Idempotent(key = "#mobile", expireTime = 10, info = "请勿重复提交")
    public R saveBF(@RequestBody VisitorsAppDTO visitors) {
@@ -0,0 +1,119 @@
+package com.bsd.pjcloud.integrated.controller;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.collection.CollUtil;
+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.log.annotation.SysLog;
+import com.bsd.pjcloud.integrated.entity.VisitorsPeopleEntity;
+import com.bsd.pjcloud.integrated.service.VisitorsPeopleService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 随行人员表
+ *
+ * @author zjf
+ * @date 2025-04-14 12:13:21
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/visitorsPeople" )
+@Tag(description = "visitorsPeople" , name = "随行人员表管理" )
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class VisitorsPeopleController {
+
+    private final  VisitorsPeopleService visitorsPeopleService;
+
+    /**
+     * 分页查询
+     * @param page 分页对象
+     * @param visitorsPeople 随行人员表
+     * @return
+     */
+    @Operation(summary = "分页查询" , description = "分页查询" )
+    @GetMapping("/page" )
+    @PreAuthorize("@pms.hasPermission('integrated_visitorsPeople_view')" )
+    public R getVisitorsPeoplePage(@ParameterObject Page page, @ParameterObject VisitorsPeopleEntity visitorsPeople) {
+        LambdaQueryWrapper<VisitorsPeopleEntity> wrapper = Wrappers.lambdaQuery();
+        return R.ok(visitorsPeopleService.page(page, wrapper));
+    }
+
+
+    /**
+     * 通过id查询随行人员表
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id查询" , description = "通过id查询" )
+    @GetMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('integrated_visitorsPeople_view')" )
+    public R getById(@PathVariable("id" ) Long id) {
+        return R.ok(visitorsPeopleService.getById(id));
+    }
+
+    /**
+     * 新增随行人员表
+     * @param visitorsPeople 随行人员表
+     * @return R
+     */
+    @Operation(summary = "新增随行人员表" , description = "新增随行人员表" )
+    @SysLog("新增随行人员表" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('integrated_visitorsPeople_add')" )
+    public R save(@RequestBody VisitorsPeopleEntity visitorsPeople) {
+        return R.ok(visitorsPeopleService.save(visitorsPeople));
+    }
+
+    /**
+     * 修改随行人员表
+     * @param visitorsPeople 随行人员表
+     * @return R
+     */
+    @Operation(summary = "修改随行人员表" , description = "修改随行人员表" )
+    @SysLog("修改随行人员表" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('integrated_visitorsPeople_edit')" )
+    public R updateById(@RequestBody VisitorsPeopleEntity visitorsPeople) {
+        return R.ok(visitorsPeopleService.updateById(visitorsPeople));
+    }
+
+    /**
+     * 通过id删除随行人员表
+     * @param ids id列表
+     * @return R
+     */
+    @Operation(summary = "通过id删除随行人员表" , description = "通过id删除随行人员表" )
+    @SysLog("通过id删除随行人员表" )
+    @DeleteMapping
+    @PreAuthorize("@pms.hasPermission('integrated_visitorsPeople_del')" )
+    public R removeById(@RequestBody Long[] ids) {
+        return R.ok(visitorsPeopleService.removeBatchByIds(CollUtil.toList(ids)));
+    }
+
+
+    /**
+     * 导出excel 表格
+     * @param visitorsPeople 查询条件
+   	 * @param ids 导出指定ID
+     * @return excel 文件流
+     */
+    @ResponseExcel
+    @GetMapping("/export")
+    @PreAuthorize("@pms.hasPermission('integrated_visitorsPeople_export')" )
+    public List<VisitorsPeopleEntity> export(VisitorsPeopleEntity visitorsPeople,Long[] ids) {
+        return visitorsPeopleService.list(Wrappers.lambdaQuery(visitorsPeople).in(ArrayUtil.isNotEmpty(ids), VisitorsPeopleEntity::getId, ids));
+    }
+}
@@ -0,0 +1,62 @@
+package com.bsd.pjcloud.integrated.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.time.LocalDateTime;
+
+/**
+ * 随行人员表
+ *
+ * @author zjf
+ * @date 2025-04-14 12:13:21
+ */
+@Data
+@TableName("visitors_people")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "随行人员表")
+public class VisitorsPeopleEntity extends Model<VisitorsPeopleEntity> {
+
+
+	/**
+	* id
+	*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description="id")
+    private Long id;
+
+	/**
+	* 随行人员姓名
+	*/
+    @Schema(description="随行人员姓名")
+    private String name;
+
+	/**
+	* 访客id
+	*/
+    @Schema(description="访客id")
+    private Long visitorsId;
+
+	/**
+	* 随行人员手机号
+	*/
+    @Schema(description="随行人员手机号")
+    private String mobile;
+
+	/**
+	* 创建时间
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建时间")
+    private LocalDateTime createTime;
+
+	/**
+	* 是否删除
+	*/
+    @TableLogic
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="是否删除")
+    private String delFlag;
+}
@@ -0,0 +1,11 @@
+package com.bsd.pjcloud.integrated.mapper;
+
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import com.bsd.pjcloud.integrated.entity.VisitorsPeopleEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface VisitorsPeopleMapper extends PjcloudBaseMapper<VisitorsPeopleEntity> {
+
+
+}
@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.integrated.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.integrated.entity.VisitorsPeopleEntity;
+
+public interface VisitorsPeopleService extends IService<VisitorsPeopleEntity> {
+
+}
@@ -0,0 +1,16 @@
+package com.bsd.pjcloud.integrated.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.integrated.entity.VisitorsPeopleEntity;
+import com.bsd.pjcloud.integrated.mapper.VisitorsPeopleMapper;
+import com.bsd.pjcloud.integrated.service.VisitorsPeopleService;
+import org.springframework.stereotype.Service;
+/**
+ * 随行人员表
+ *
+ * @author zjf
+ * @date 2025-04-14 12:13:21
+ */
+@Service
+public class VisitorsPeopleServiceImpl extends ServiceImpl<VisitorsPeopleMapper, VisitorsPeopleEntity> implements VisitorsPeopleService {
+}
@@ -17,14 +17,18 @@ import com.bsd.pjcloud.integrated.constant.IntegratedFlowConstant;
 import com.bsd.pjcloud.integrated.constant.VisitorTypeEnum;
 import com.bsd.pjcloud.integrated.dto.visitor.app.VisitorsAppDTO;
 import com.bsd.pjcloud.integrated.dto.visitor.app.VisitorsCarAppDTO;
+import com.bsd.pjcloud.integrated.dto.visitor.app.VisitorsPeopleAppDTO;
 import com.bsd.pjcloud.integrated.entity.VisitorsCarEntity;
 import com.bsd.pjcloud.integrated.entity.VisitorsEntity;
+import com.bsd.pjcloud.integrated.entity.VisitorsPeopleEntity;
 import com.bsd.pjcloud.integrated.mapper.VisitorsCarMapper;
 import com.bsd.pjcloud.integrated.mapper.VisitorsMapper;
+import com.bsd.pjcloud.integrated.mapper.VisitorsPeopleMapper;
 import com.bsd.pjcloud.integrated.service.VisitorsService;
 import com.bsd.pjcloud.integrated.vo.visitor.app.VisitorsAppPageVo;
 import com.bsd.pjcloud.integrated.vo.visitor.app.VisitorsAppVo;
 import com.bsd.pjcloud.integrated.vo.visitor.app.VisitorsCarAppVo;
+import com.bsd.pjcloud.integrated.vo.visitor.app.VisitorsPeopleAppVo;
 import lombok.AllArgsConstructor;
 import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.security.oauth2.jwt.JwtClaimsSet;
@@ -51,6 +55,8 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
    private final RemoteUserService remoteUserService;

    private final RemoteFlowApiFlowService remoteFlowApiFlowService;
+
+    private final VisitorsPeopleMapper visitorsPeopleMapper;
    @Override
    @Transactional
    public Object vistorsSave(VisitorsAppDTO visitors) {
@@ -85,9 +91,6 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
            });
            visitorsCarMapper.insert(visitorsCarEntities);
        }
-//        VisitorsAppVo visitorAppVo =  BeanUtils.toBean(bean, VisitorsAppVo.class);
-//        List<VisitorsCarAppVo> visitorsCarAppVos = BeanUtils.toBean(visitorsCarAppDTOList, VisitorsCarAppVo.class);
-//        visitorAppVo.setVisitorsCarAppVos(visitorsCarAppVos);
        return insert;
    }

@@ -99,12 +102,22 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
        VisitorsAppVo bean = BeanUtils.toBean(visitors, VisitorsAppVo.class);
        List<VisitorsCarEntity> visitorsCarEntities =
                visitorsCarMapper.selectList(new LambdaQueryWrapper<VisitorsCarEntity>().eq(VisitorsCarEntity::getVisitorsId, visitors.getId()));
-        List<VisitorsCarAppVo> visitorsCarAppVos = BeanUtils.toBean(visitorsCarEntities, VisitorsCarAppVo.class);
-        bean.setVisitorsCarAppVos(visitorsCarAppVos);
+        if (!CollectionUtils.isEmpty(visitorsCarEntities)){
+            List<VisitorsCarAppVo> visitorsCarAppVos = BeanUtils.toBean(visitorsCarEntities, VisitorsCarAppVo.class);
+            bean.setVisitorsCarAppVos(visitorsCarAppVos);
+        }
+        List<VisitorsPeopleEntity> visitorsPeopleEntities =
+                visitorsPeopleMapper.selectList(new LambdaQueryWrapper<VisitorsPeopleEntity>().eq(VisitorsPeopleEntity::getVisitorsId, visitors.getId()));
+        if (!CollectionUtils.isEmpty(visitorsPeopleEntities)){
+            List<VisitorsPeopleAppVo> visitorsPeopleAppVos = BeanUtils.toBean(visitorsPeopleEntities, VisitorsPeopleAppVo.class);
+            bean.setVisitorsPeopleAppVos(visitorsPeopleAppVos);
+        }
+
        return bean;
    }

    @Override
+    @Transactional
    public Object vistorsBFSave(VisitorsAppDTO visitors) {
        //发起流程
        R<Process> processR = remoteFlowApiFlowService.getProcessByBusinessKey(IntegratedFlowConstant.INTEGRATED_VISITOR);
@@ -138,6 +151,14 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
            });
            visitorsCarMapper.insert(visitorsCarEntities);
        }
+        List<VisitorsPeopleAppDTO> visitorsPeopleAppDTOList = visitors.getVisitorsPeopleAppDTOList();
+        if (!CollectionUtils.isEmpty(visitorsPeopleAppDTOList)){
+            List<VisitorsPeopleEntity> visitorsPeopleEntities = BeanUtils.toBean(visitorsPeopleAppDTOList, VisitorsPeopleEntity.class);
+            visitorsPeopleEntities.forEach(i->{
+                i.setVisitorsId(bean.getId());
+            });
+            visitorsPeopleMapper.insert(visitorsPeopleEntities);
+        }
        return insert;
    }

@@ -29,5 +29,6 @@
        <result property="token" column="token"/>
        <result property="type" column="type"/>
        <result property="userId" column="user_id"/>
+        <result property="isOtherPeople" column="is_other_people"/>
  </resultMap>
 </mapper>
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.bsd.pjcloud.integrated.mapper.VisitorsPeopleMapper">
+
+  <resultMap id="visitorsPeopleMap" type="com.bsd.pjcloud.integrated.entity.VisitorsPeopleEntity">
+        <id property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="visitorsId" column="visitors_id"/>
+        <result property="mobile" column="mobile"/>
+        <result property="createTime" column="create_time"/>
+        <result property="delFlag" column="del_flag"/>
+  </resultMap>
+</mapper>