jx访客

2025-04-15 17:09:53 +08:00
1 parent 2973feb37a
commit f59bad4dbe
@@ -1,5 +1,6 @@
 package com.bsd.pjcloud.integrated.dto.visitor.app;

+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -48,9 +49,16 @@ public class VisitorsAppDTO {
 	/**
 	* 到访单位
 	*/
-    @Schema(description="到访单位")
+    @Schema(description="到访单位id")
    private Long deptId;

+	/**
+	 * 到访单位
+	 */
+	@Schema(description="到访单位")
+	private String deptName;
+
+
 	/**
 	* 接待人
 	*/
@@ -75,11 +83,13 @@ public class VisitorsAppDTO {
 	 * 到访时间
 	 */
 	@Schema(description="到访时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private LocalDateTime vStartDate;
 	/**
 	 * 到访时间
 	 */
 	@Schema(description="到访时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private LocalDateTime vEndDate;

 	/**
@@ -94,10 +104,14 @@ public class VisitorsAppDTO {
 	@Schema(description="是否有随行人员 0 否 1是")
 	private String isOtherPeople;

+
+	@Schema(description="用户id")
+	private Long userId;
+
 	@Schema(description="车牌号集合")
-	private List<VisitorsCarAppDTO> visitorsCarAppDTOList;
+	private List<VisitorsCarAppDTO> carList;

 	@Schema(description="随行人员集合")
-	private List <VisitorsPeopleAppDTO> visitorsPeopleAppDTOList;
+	private List <VisitorsPeopleAppDTO> otherPeople;

 }
@@ -136,7 +136,7 @@ public class VisitorsController {
    @Operation(summary = "app新增访客" , description = "app新增访客" )
    @SysLog("新增访客" )
    @PostMapping("/app/save")
-    @Idempotent(key = "#mobile", expireTime = 10, info = "请勿重复提交")
+    @Idempotent(expireTime = 10, info = "请勿重复提交")
    public R saveFK(@RequestBody VisitorsAppDTO visitors) {
        return R.ok(visitorsService.vistorsSave(visitors));
    }
@@ -68,8 +68,8 @@ public class VisitorsEntity extends Model<VisitorsEntity> {
 	/**
 	* 接待人
 	*/
-    @Schema(description="接待人")
-    private Long userName;
+    @Schema(description="拜访人")
+    private String userName;

 	/**
 	* 车牌号id
@@ -83,7 +83,7 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
        String token = uniqueToken.replace("-", "");
        bean.setToken(token);
        int insert = baseMapper.insert(bean);
-        List<VisitorsCarAppDTO> visitorsCarAppDTOList = visitors.getVisitorsCarAppDTOList();
+        List<VisitorsCarAppDTO> visitorsCarAppDTOList = visitors.getCarList();
        if (!CollectionUtils.isEmpty(visitorsCarAppDTOList)){
            List<VisitorsCarEntity> visitorsCarEntities = BeanUtils.toBean(visitorsCarAppDTOList, VisitorsCarEntity.class);
            visitorsCarEntities.forEach(i->{
@@ -91,6 +91,14 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
            });
            visitorsCarMapper.insert(visitorsCarEntities);
        }
+        List<VisitorsPeopleAppDTO> visitorsPeopleAppDTOList = visitors.getOtherPeople();
+        if (!CollectionUtils.isEmpty(visitorsPeopleAppDTOList)){
+            List<VisitorsPeopleEntity> visitorsPeopleEntities = BeanUtils.toBean(visitorsPeopleAppDTOList, VisitorsPeopleEntity.class);
+            visitorsPeopleEntities.forEach(i->{
+                i.setVisitorsId(bean.getId());
+            });
+            visitorsPeopleMapper.insert(visitorsPeopleEntities);
+        }
        return insert;
    }

@@ -143,7 +151,7 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
        String token = uniqueToken.replace("-", "");
        bean.setToken(token);
        int insert = baseMapper.insert(bean);
-        List<VisitorsCarAppDTO> visitorsCarAppDTOList = visitors.getVisitorsCarAppDTOList();
+        List<VisitorsCarAppDTO> visitorsCarAppDTOList = visitors.getCarList();
        if (!CollectionUtils.isEmpty(visitorsCarAppDTOList)){
            List<VisitorsCarEntity> visitorsCarEntities = BeanUtils.toBean(visitorsCarAppDTOList, VisitorsCarEntity.class);
            visitorsCarEntities.forEach(i->{
@@ -151,7 +159,7 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
            });
            visitorsCarMapper.insert(visitorsCarEntities);
        }
-        List<VisitorsPeopleAppDTO> visitorsPeopleAppDTOList = visitors.getVisitorsPeopleAppDTOList();
+        List<VisitorsPeopleAppDTO> visitorsPeopleAppDTOList = visitors.getOtherPeople();
        if (!CollectionUtils.isEmpty(visitorsPeopleAppDTOList)){
            List<VisitorsPeopleEntity> visitorsPeopleEntities = BeanUtils.toBean(visitorsPeopleAppDTOList, VisitorsPeopleEntity.class);
            visitorsPeopleEntities.forEach(i->{
@@ -0,0 +1,15 @@
+package com.bsd.pjcloud.admin.api.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "简要用户信息,不包含手机号")
+public class SimpleUserListVO {
+
+    private Long userId;
+
+    @Schema(description = "姓名")
+    private String name;
+}
@@ -91,6 +91,19 @@ public class SysDeptController {
        return R.ok(sysDeptService.selectTree(deptName, parentId));
    }

+    /**
+     *
+     * 查询所有，无权限过滤
+     * simpleTree
+     * @param deptName
+     * @param parentId
+     * @return
+     */
+    @GetMapping(value = "/simpleTree")
+    public R getSimpleTree(String deptName, Long parentId) {
+        return R.ok(sysDeptService.selectSimpleTree(deptName, parentId));
+    }
+
    /**
     * 添加
     *
@@ -29,10 +29,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.admin.api.dto.UserDTO;
 import com.bsd.pjcloud.admin.api.dto.UserInfo;
 import com.bsd.pjcloud.admin.api.entity.SysUser;
-import com.bsd.pjcloud.admin.api.vo.SimpleUserAllListVO;
-import com.bsd.pjcloud.admin.api.vo.UserExcelFaceVo;
-import com.bsd.pjcloud.admin.api.vo.UserExcelVO;
-import com.bsd.pjcloud.admin.api.vo.UserVO;
+import com.bsd.pjcloud.admin.api.vo.*;
 import com.bsd.pjcloud.admin.service.SysUserService;
 import com.bsd.pjcloud.common.core.constant.CommonConstants;
 import com.bsd.pjcloud.common.core.exception.ErrorCodes;
@@ -360,6 +357,19 @@ public class SysUserController {
        return R.ok(userService.listUserIdByDeptIds(CollUtil.toList(deptIdList)));
    }

+
+    /**
+     * 根据部门id查询用户列表
+     * @param deptId
+     * @return
+     */
+//    @Inner
+    @GetMapping("/getUserIdListByDeptId")
+    public R<List<SimpleUserListVO>> getUserIdListByDeptId(@RequestParam("deptId")Long deptId,
+                                                               @RequestParam(value = "name",required = false) String name) {
+        return R.ok(userService.listUserIdByDeptId(deptId,name));
+    }
+
    /**
     * 根据用户名获取用户列表
     *
@@ -130,4 +130,8 @@ public interface SysDeptService extends IService<SysDept> {


    List<SysDept> getInnerDept(DeptAllListDto dto);
+
+
+
+    List<Tree<Long>> selectSimpleTree(String deptName, Long parentId);
 }
@@ -26,10 +26,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.admin.api.dto.UserDTO;
 import com.bsd.pjcloud.admin.api.dto.UserInfo;
 import com.bsd.pjcloud.admin.api.entity.SysUser;
-import com.bsd.pjcloud.admin.api.vo.SimpleUserAllListVO;
-import com.bsd.pjcloud.admin.api.vo.UserExcelFaceVo;
-import com.bsd.pjcloud.admin.api.vo.UserExcelVO;
-import com.bsd.pjcloud.admin.api.vo.UserVO;
+import com.bsd.pjcloud.admin.api.vo.*;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordAssignUserParamDto;

@@ -221,4 +218,13 @@ public interface SysUserService extends IService<SysUser> {
     * @return
     */
    List<SysUser> listScopeByLikeNameOrByMobileScope(LambdaQueryWrapper<SysUser> eq);
+
+
+    /**
+     * 根据部门id/姓名，获取用户信息
+     * @param deptId
+     * @param name
+     * @return
+     */
+    List<SimpleUserListVO> listUserIdByDeptId(Long deptId, String name);
 }
@@ -38,7 +38,6 @@ import com.bsd.pjcloud.admin.api.vo.DeptExcelVO;
 import com.bsd.pjcloud.admin.api.vo.OrgTreeVO;
 import com.bsd.pjcloud.admin.mapper.*;
 import com.bsd.pjcloud.admin.service.SysDeptService;
-import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.excel.vo.ErrorMessage;
@@ -423,6 +422,30 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
        );
    }

+    @Override
+    public List<Tree<Long>> selectSimpleTree(String deptName, Long parentId) {
+        // 查询全部部门
+        List<SysDept> deptAllList = deptMapper
+                .selectList(Wrappers.<SysDept>lambdaQuery().like(StrUtil.isNotBlank(deptName), SysDept::getName, deptName));
+
+        List<TreeNode<Long>> collect = deptAllList.stream()
+                .filter(dept -> dept.getDeptId().intValue() != dept.getParentId())
+                .sorted(Comparator.comparingInt(SysDept::getSortOrder))
+                .map(dept -> {
+                    TreeNode<Long> treeNode = new TreeNode<>();
+                    treeNode.setId(dept.getDeptId());
+                    treeNode.setParentId(dept.getParentId());
+                    treeNode.setName(dept.getName());
+                    return treeNode;
+                })
+                .collect(Collectors.toList());
+
+        List<Tree<Long>> build = TreeUtil.build(collect, parentId == null ? 0 : parentId);
+
+        return build;
+
+    }
+
    /**
     * 递归查询所有子节点。
     *
@@ -911,6 +911,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
        return baseMapper.selectListByScope(eq, DataScope.of());
    }

+    @Override
+    public List<SimpleUserListVO> listUserIdByDeptId(Long deptId, String name) {
+        List<SysUser> sysUsers = baseMapper.selectList(Wrappers.<SysUser>lambdaQuery()
+                .eq(SysUser::getDeptId, deptId)
+                .like(StrUtil.isNotBlank(name),SysUser::getName, name));
+        return com.bsd.pjcloud.common.core.util.BeanUtils.toBean(sysUsers, SimpleUserListVO.class);
+    }
+
    private SysUserServiceImpl getSelf() {
        return SpringUtil.getBean(getClass());
    }