XA/xa-master-prod
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

兴安访客小程序对接部分迁移

Browse Source
This commit is contained in:
zc
2025-06-05 17:04:25 +08:00
parent b3657fb024
commit 5761742c5a
39 changed files with 1480 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysNoticeController.java
View File

@@ -1,6 +1,8 @@
package com.dcsoft.system.controller;
import java.util.List;
import cn.hutool.core.util.ObjectUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -89,4 +91,17 @@ public class SysNoticeController extends BaseController
{
return toAjax(noticeService.deleteNoticeByIds(noticeIds));
}
/**
* 小程序获取园区须知
*/
@GetMapping(value = "/app/getNoticeInfo")
public AjaxResult getNoticeInfo(SysNotice notice)
{
SysNotice noticeInfo = noticeService.getNoticeInfo(notice);
if (ObjectUtil.isEmpty(noticeInfo)) {
return error("请联系管理员配置访客须知内容");
}
return success(noticeInfo);
}
}

29
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysPeopleController.java
View File

@@ -1256,5 +1256,34 @@ public class SysPeopleController extends BaseController
return success(sysPeople);
}
/**
* 小程序通过手机号查找姓名
*
* @param js
* @return
*/
@PostMapping("/app/queryPeopleName")
public AjaxResult queryAppPeopleName(@RequestBody JSONObject js) {
if (null == js) {
throw new ServiceException("请输入查询参数");
}
String phone = js.getString("phone");
String deptType = js.getString("deptType");
if (StringUtils.isBlank(phone)) {
throw new ServiceException("手机号不能为空");
}
if (StringUtils.isBlank(deptType)) {
throw new ServiceException("公司/部门不能为空");
}
List<SysBranch> branch = sysBranchService.queryJuniorBranch(deptType);
List<String> collect = branch.stream().map(SysBranch::getId).collect(Collectors.toList());
collect.add(deptType);
SysPeople people = sysPeopleService.queryPeopleName(phone, collect);
if (people == null) {
return success();
}
return success(people);
}
}

137
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/controller/SysUserController.java
View File

@@ -1,9 +1,13 @@
package com.dcsoft.system.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.dcsoft.common.core.constant.CacheConstants;
import com.dcsoft.common.core.domain.R;
import com.dcsoft.common.core.exception.ServiceException;
import com.dcsoft.common.core.utils.SpringUtils;
import com.dcsoft.common.core.utils.StringUtils;
import com.dcsoft.common.core.utils.poi.ExcelUtil;
import com.dcsoft.common.core.web.controller.BaseController;
@@ -11,9 +15,14 @@ import com.dcsoft.common.core.web.domain.AjaxResult;
import com.dcsoft.common.core.web.page.TableDataInfo;
import com.dcsoft.common.log.annotation.Log;
import com.dcsoft.common.log.enums.BusinessType;
import com.dcsoft.common.redis.service.RedisService;
import com.dcsoft.common.security.annotation.InnerAuth;
import com.dcsoft.common.security.annotation.RequiresPermissions;
import com.dcsoft.common.security.utils.SecurityUtils;
import com.dcsoft.common.sms.config.properties.SmsProperties;
import com.dcsoft.common.sms.entity.SmsResult;
import com.dcsoft.common.sms.service.SmsTemplate;
import com.dcsoft.system.api.domain.SmsDTO;
import com.dcsoft.system.api.domain.SysDept;
import com.dcsoft.system.api.domain.SysRole;
import com.dcsoft.system.api.domain.SysUser;
@@ -21,6 +30,8 @@ import com.dcsoft.system.api.model.LoginUser;
import com.dcsoft.system.domain.vo.AppletInfoVo;
import com.dcsoft.system.service.*;
import com.dcsoft.system.uniubi.service.ISysApiService;
import com.dcsoft.system.utils.WeChatUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -30,8 +41,11 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -39,6 +53,7 @@ import java.util.stream.Collectors;
*
* @author dcsoft
*/
@Slf4j
@RestController
@RequestMapping("/user")
public class SysUserController extends BaseController
@@ -62,13 +77,10 @@ public class SysUserController extends BaseController
private ISysConfigService configService;
@Autowired
private ISysBranchService sysBranchService;
private SmsProperties smsProperties;
@Autowired
private ISysPeopleService peopleService;
@Autowired
private ISysApiService sysApiService;
private RedisService redisService;
@Value("${applet.appid}")
public String appid;
@@ -76,6 +88,9 @@ public class SysUserController extends BaseController
@Value("${applet.secret}")
public String secret;
@Value("${weixin.token}")
public String weixinToken;
/**
* 获取用户列表
*/
@@ -141,6 +156,30 @@ public class SysUserController extends BaseController
return R.ok(sysUserVo);
}
/**
* 获取当前用户信息(不返回异常信息)
*/
@InnerAuth
@GetMapping("/infos/{username}")
public R<LoginUser> infos(@PathVariable("username") String username)
{
SysUser sysUser = userService.selectUserByUserName(username);
if (StringUtils.isNull(sysUser))
{
return R.ok();
}
// 角色集合
Set<String> roles = permissionService.getRolePermission(sysUser);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(sysUser);
LoginUser sysUserVo = new LoginUser();
sysUserVo.setUserid(sysUser.getUserId());
sysUserVo.setSysUser(sysUser);
sysUserVo.setRoles(roles);
sysUserVo.setPermissions(permissions);
return R.ok(sysUserVo);
}
/**
* 获取当前用户信息
*/
@@ -164,6 +203,21 @@ public class SysUserController extends BaseController
return R.ok(sysUserVo);
}
/**
* 获取当前用户信息
*/
@InnerAuth
@PostMapping("/updateByUserId")
public R<?> updateByUserId(@RequestBody SysUser user)
{
if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
{
throw new ServiceException(user.getUserName() + "手机号码已存在");
}
userService.updateUserProfile(user);
return R.ok();
}
/**
* 注册用户信息
*/
@@ -391,7 +445,7 @@ public class SysUserController extends BaseController
// @RequiresPermissions("system:user:list")
@GetMapping("/deptTree")
public AjaxResult deptTree(SysDept dept)
{
{
return success(deptService.selectDeptTreeList(dept));
}
@@ -411,6 +465,50 @@ public class SysUserController extends BaseController
return AjaxResult.success(jsonObject);
}
/**
* 根据code获取手机号
*
* @param json
* @return
*/
@PostMapping("/getuserphonenumber")
public AjaxResult getuserphonenumber(@RequestBody JSONObject json) {
if (ObjectUtil.isNull(json) || StringUtils.isBlank(json.getString("code"))) {
throw new ServiceException("参数code不能为空");
}
String code = json.getString("code");
Map<String, Object> map = new HashMap<>();
map.put("code", code);
log.info("getuserphonenumber入参：{}", code);
String wxToken = getWxToken();
log.info("getuserphonenumber_getWxToken：{}", wxToken);
String url = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token= " + wxToken;
String body = HttpUtil.createPost(url).body(JSON.toJSONString(map)).execute().body();
log.info("getuserphonenumber_result:{}", body);
JSONObject jsonObject = JSON.parseObject(body);
if (jsonObject.getInteger("errcode") != 0) {
return AjaxResult.error(body);
}
return AjaxResult.success(jsonObject);
}
/**
* 获取小程序token
* @return
*/
private String getWxToken() {
String cacheObject = redisService.getCacheObject(CacheConstants.WEIXIN_TOKEN);
if (org.apache.commons.lang3.StringUtils.isNotEmpty(cacheObject)) {
return cacheObject;
}
String body = HttpUtil.createGet(weixinToken).execute().body();
JSONObject object = JSONObject.parseObject(body);
String string = object.get("access_token").toString();
redisService.setCacheObject(CacheConstants.LOGIN_TOKEN, string, Long.valueOf(object.get("expires_in").toString()), TimeUnit.SECONDS);
return string;
}
/**
* 小程序获取token
* @param appletInfoVo
@@ -430,5 +528,32 @@ public class SysUserController extends BaseController
return success(userService.updateAppletAvatar(file, userName));
}
/**
* 发送消息
* @return
*/
@PostMapping("/sendMessage")
public AjaxResult sendMessage(@RequestBody SmsDTO sms) {
if (StringUtils.isEmpty(sms.getPhone())) {
return error("手机号不能为空!");
}
if (!smsProperties.getEnabled()) {
error("当前系统没有开启短信功能！");
}
Map<String, String> map = new HashMap<>();
if(StringUtils.isNotBlank(sms.getCode())) {
map.put("code", sms.getCode());
}
if(StringUtils.isNotBlank(sms.getCaptcha())) {
map.put("captcha", sms.getCaptcha());
}
SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class);
SmsResult result = smsTemplate.send(sms.getPhone(), sms.getTemplateId(), map);
if (!result.getIsSuccess()) {
return error(result.getMessage());
}
return AjaxResult.success();
}
}

59
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysNotice.java
View File

@@ -9,7 +9,7 @@ import com.dcsoft.common.core.xss.Xss;
/**
* 通知公告表 sys_notice
*
*
* @author dcsoft
*/
public class SysNotice extends BaseEntity
@@ -22,7 +22,7 @@ public class SysNotice extends BaseEntity
/** 公告标题 */
private String noticeTitle;
/** 公告类型（1通知 2公告） */
/** 公告类型（1通知 2公告 3须知） */
private String noticeType;
/** 公告内容 */
@@ -31,6 +31,39 @@ public class SysNotice extends BaseEntity
/** 公告状态（0正常 1关闭） */
private String status;
/** 字典类型 */
private String dictType;
/** 字典值 */
private String dictValue;
/** 字典名称 */
private String dictName;
public String getDictName() {
return dictName;
}
public void setDictName(String dictName) {
this.dictName = dictName;
}
public String getDictType() {
return dictType;
}
public void setDictType(String dictType) {
this.dictType = dictType;
}
public String getDictValue() {
return dictValue;
}
public void setDictValue(String dictValue) {
this.dictValue = dictValue;
}
public Long getNoticeId()
{
return noticeId;
@@ -87,16 +120,16 @@ public class SysNotice extends BaseEntity
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("noticeId", getNoticeId())
.append("noticeTitle", getNoticeTitle())
.append("noticeType", getNoticeType())
.append("noticeContent", getNoticeContent())
.append("status", getStatus())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
.append("noticeId", getNoticeId())
.append("noticeTitle", getNoticeTitle())
.append("noticeType", getNoticeType())
.append("noticeContent", getNoticeContent())
.append("status", getStatus())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}

51
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/vo/KeyLabelVo.java Normal file
View File

@@ -0,0 +1,51 @@
package com.dcsoft.system.domain.vo;
import java.io.Serializable;
/**
* Treeselect树结构实体类
*
* @author dcsoft
*/
public class KeyLabelVo implements Serializable
{
private static final long serialVersionUID = 1L;
private String key;
private String label;
private String color;
public KeyLabelVo() {
}
public String getColor() {
return color;
}
public void setColor(String color) {
this.color = color;
}
public String getKey()
{
return key;
}
public void setKey(String key)
{
this.key = key;
}
public String getLabel()
{
return label;
}
public void setLabel(String label)
{
this.label = label;
}
}

2
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/mapper/SysBranchMapper.java
View File

@@ -97,4 +97,6 @@ public interface SysBranchMapper
* @return
*/
List<SysBranch> queryPropertyDept(String parentId);
List<SysBranch> queryJuniorBranch(String branchId);
}

7
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/mapper/SysNoticeMapper.java
View File

@@ -57,4 +57,11 @@ public interface SysNoticeMapper
* @return 结果
*/
public int deleteNoticeByIds(Long[] noticeIds);
/**
* 小程序获取访客须知
* @param notice
* @return
*/
SysNotice selectNotice(SysNotice notice);
}

7
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/service/ISysBranchService.java
View File

@@ -125,4 +125,11 @@ public interface ISysBranchService
* @return
*/
List<SysBranch> queryPropertyDept(String parentId);
/**
* 查询
* @param branchId
* @return
*/
List<SysBranch> queryJuniorBranch(String branchId);
}

7
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/service/ISysNoticeService.java
View File

@@ -57,4 +57,11 @@ public interface ISysNoticeService
* @return 结果
*/
public int deleteNoticeByIds(Long[] noticeIds);
/**
* 小程序获取访客须知
* @param notice
* @return
*/
SysNotice getNoticeInfo(SysNotice notice);
}

5
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/service/impl/SysBranchServiceImpl.java
View File

@@ -245,6 +245,11 @@ public class SysBranchServiceImpl implements ISysBranchService
return sysBranchMapper.queryPropertyDept(parentId);
}
@Override
public List<SysBranch> queryJuniorBranch(String branchId) {
return sysBranchMapper.queryJuniorBranch(branchId);
}
/**
* 构建前端所需要树结构

5
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/service/impl/SysNoticeServiceImpl.java
View File

@@ -89,4 +89,9 @@ public class SysNoticeServiceImpl implements ISysNoticeService
{
return noticeMapper.deleteNoticeByIds(noticeIds);
}
@Override
public SysNotice getNoticeInfo(SysNotice notice) {
return noticeMapper.selectNotice(notice);
}
}

28
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisVisitorRegisterController.java
View File

@@ -3,6 +3,7 @@ package com.dcsoft.system.visitor.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.dcsoft.common.core.utils.StringUtils;
import com.dcsoft.system.visitor.domain.VisVisitorRegister;
import com.dcsoft.system.visitor.service.IVisVisitorRegisterService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +38,7 @@ public class VisVisitorRegisterController extends BaseController {
/**
* 查询访客注册列表
*/
@RequiresPermissions("system:register:list")
// @RequiresPermissions("system:register:list")
@GetMapping("/list")
public TableDataInfo list(VisVisitorRegister visVisitorRegister) {
startPage();
@@ -60,27 +61,40 @@ public class VisVisitorRegisterController extends BaseController {
/**
* 获取访客注册详细信息
*/
@RequiresPermissions("system:register:query")
// @RequiresPermissions("system:register:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
return success(visVisitorRegisterService.selectVisVisitorRegisterById(id));
}
/**
* 小程序获取访客注册详细信息
*/
// @RequiresPermissions("system:register:query")
@PostMapping(value = "/getVisitorInfo")
public AjaxResult getVisitorInfo() {
return success(visVisitorRegisterService.getVisitorInfo());
}
/**
* 新增访客注册
*/
@RequiresPermissions("system:register:add")
// @RequiresPermissions("system:register:add")
@Log(title = "访客注册", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody VisVisitorRegister visVisitorRegister) {
return toAjax(visVisitorRegisterService.insertVisVisitorRegister(visVisitorRegister));
public AjaxResult addOrUpdate(@RequestBody VisVisitorRegister visVisitorRegister) {
if (StringUtils.isBlank(visVisitorRegister.getId())) {
return toAjax(visVisitorRegisterService.insertVisVisitorRegister(visVisitorRegister));
} else {
return toAjax(visVisitorRegisterService.updateVisVisitorRegister(visVisitorRegister));
}
}
/**
* 修改访客注册
*/
@RequiresPermissions("system:register:edit")
@Log(title = "访客注册", businessType = BusinessType.UPDATE)
// @RequiresPermissions("system:register:edit")
@Log(title = "修改访客注册", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody VisVisitorRegister visVisitorRegister) {
return toAjax(visVisitorRegisterService.updateVisVisitorRegister(visVisitorRegister));

49
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/controller/VisitorController.java
View File

@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.dcsoft.common.core.constant.CacheConstants;
import com.dcsoft.common.core.constant.Constants;
import com.dcsoft.common.core.enums.ExamineEnum;
import com.dcsoft.common.core.enums.MatterEnum;
import com.dcsoft.common.core.enums.exception.CommonExceptionEnum;
import com.dcsoft.common.core.exception.ServiceException;
import com.dcsoft.common.core.utils.SpringUtils;
@@ -24,6 +26,7 @@ import com.dcsoft.common.sms.entity.SmsResult;
import com.dcsoft.common.sms.service.SmsTemplate;
import com.dcsoft.system.api.model.LoginUser;
import com.dcsoft.system.domain.*;
import com.dcsoft.system.domain.vo.KeyLabelVo;
import com.dcsoft.system.domain.vo.OfficialAccountVo;
import com.dcsoft.system.domain.vo.SysFileVo;
import com.dcsoft.system.service.*;
@@ -215,6 +218,52 @@ public class VisitorController extends BaseController {
return getDataTable(list);
}
/**
* 小程序查询我的访客信息列表
*/
@GetMapping("/app/list")
public TableDataInfo appList(Visitor visitor) {
LoginUser user = SecurityUtils.getLoginUser();
visitor.setCreateBy(user.getUsername());
log.info("访客信息列表入参:{}", JSON.toJSONString(visitor));
startPage();
List<Visitor> list = visitorService.selectAppVisitorList(visitor);
Map<String, String> map = dictDataService.queryDictData("sys_company_type");
// Map<String, String> parkMap = dictDataService.queryDictData("sys_park_group");
List<SysBranch> sysBranches = sysBranchService.queryPropertyDept(null);
Map<String, String> collect = sysBranches.stream().collect(Collectors.toMap(SysBranch::getId, SysBranch::getName));
for (Visitor visitor1 : list) {
String s = map.get(visitor1.getDeptId());
if (StringUtils.isNotEmpty(s)) {
visitor1.setDeptName(s);
} else {
visitor1.setDeptName(collect.get(visitor1.getDeptId()));
}
visitor1.setMatterName(MatterEnum.getByCode(visitor1.getMatter()));
// visitor1.setParkName(parkMap.get(visitor1.getPark()));
}
log.info("访客信息列表:{}", JSON.toJSONString(list));
return getDataTable(list);
}
/**
* 查询审批状态枚举类型
* @return
*/
@GetMapping("/app/getExamineEnum")
public AjaxResult getExamineEnum() {
List<KeyLabelVo> list = new ArrayList();
for (ExamineEnum examine : ExamineEnum.values()) {
KeyLabelVo keyLabelVo = new KeyLabelVo();
keyLabelVo.setKey(examine.getCode());
keyLabelVo.setLabel(examine.getValue());
keyLabelVo.setColor(examine.getColor());
list.add(keyLabelVo);
}
return AjaxResult.success(list);
}
/**
* 导出访客信息列表
*/

56
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/VisVisitorRegister.java
View File

@@ -40,6 +40,26 @@ public class VisVisitorRegister extends BaseEntity {
@Excel(name = "用户手机号")
private String phone;
/**
* 用户主键id
*/
private Long userId;
/**
* 身份证
*/
private String idcard;
/**
* 访客用人单位
*/
private String visitingUnit;
/**
* 人脸图片地址
*/
private String avatar;
/**
* 微信公众号用户id
*/
@@ -158,6 +178,38 @@ public class VisVisitorRegister extends BaseEntity {
return updatedTime;
}
public Long getUserId() {
return userId;
}
public void setUserId(Long userId) {
this.userId = userId;
}
public String getIdcard() {
return idcard;
}
public void setIdcard(String idcard) {
this.idcard = idcard;
}
public String getAvatar() {
return avatar;
}
public void setAvatar(String avatar) {
this.avatar = avatar;
}
public String getVisitingUnit() {
return visitingUnit;
}
public void setVisitingUnit(String visitingUnit) {
this.visitingUnit = visitingUnit;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -166,6 +218,10 @@ public class VisVisitorRegister extends BaseEntity {
.append("nickName", getNickName())
.append("phone", getPhone())
.append("openid", getOpenid())
.append("userId", getUserId())
.append("idcard", getIdcard())
.append("visitingUnit", getVisitingUnit())
.append("avatar", getAvatar())
.append("deleteState", getDeleteState())
.append("createdBy", getCreatedBy())
.append("createdTime", getCreatedTime())

13
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/domain/Visitor.java
View File

@@ -242,4 +242,17 @@ public class Visitor extends BaseEntity {
private List<SysFileVo> fileList;
private List<VisitorReviewProcessVo> reviewProcessList;
/**
* 主键ids
*/
List<Long> ids;
/** 小程序二维码 */
private String qrCode;
/**
* 来访事由名称
*/
private String MatterName;
}

8
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/mapper/VisVisitorRegisterMapper.java
View File

@@ -65,4 +65,12 @@ public interface VisVisitorRegisterMapper {
void saveVisitorRegister(SysPeople people1);
void updateVisitorRegisterByOpenid(SysPeople sysPeople);
/**
* 查询访客注册
*
* @param userId 访客注册主键
* @return 访客注册
*/
public VisVisitorRegister selectVisVisitorRegisterByUserId(Long userId);
}

6
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/mapper/VisitorMapper.java
View File

@@ -232,4 +232,10 @@ public interface VisitorMapper
int queryVisitorReviewProcessCount(Long id);
List<VisitorReviewProcessVo> queryVisitorReviewProcessList(Long id);
List<Long> selectAppVisitorFollow(Visitor visitor);
List<Visitor> selectAppVisitorList(Visitor visitor);
List<CheckCodeVo> queryCode(List<Long> collect);
}

7
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/service/IVisVisitorRegisterService.java
View File

@@ -66,4 +66,11 @@ public interface IVisVisitorRegisterService
void saveVisitorRegister(SysPeople people1);
void updateVisitorRegisterByOpenid(SysPeople sysPeople);
/**
* 查询访客注册
*
* @return 访客注册
*/
public VisVisitorRegister getVisitorInfo();
}

2
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/service/IVisitorService.java
View File

@@ -247,4 +247,6 @@ public interface IVisitorService
String queryReviewProcess(Visitor visitor);
int queryVisitorReviewProcessCount(Long id);
List<Visitor> selectAppVisitorList(Visitor visitor);
}

27
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/service/impl/VisVisitorRegisterServiceImpl.java
View File

@@ -2,6 +2,11 @@ package com.dcsoft.system.visitor.service.impl;
import java.util.List;
import cn.hutool.core.util.ObjectUtil;
import com.dcsoft.common.core.exception.ServiceException;
import com.dcsoft.common.core.utils.StringUtils;
import com.dcsoft.common.security.utils.SecurityUtils;
import com.dcsoft.system.api.model.LoginUser;
import com.dcsoft.system.domain.SysPeople;
import com.dcsoft.system.visitor.domain.VisVisitorRegister;
import com.dcsoft.system.visitor.mapper.VisVisitorRegisterMapper;
@@ -50,6 +55,15 @@ public class VisVisitorRegisterServiceImpl implements IVisVisitorRegisterService
*/
@Override
public int insertVisVisitorRegister(VisVisitorRegister visVisitorRegister) {
if (null == visVisitorRegister.getUserId()) {
LoginUser loginUser = SecurityUtils.getLoginUser();
visVisitorRegister.setUserId(loginUser.getUserid());
}
VisVisitorRegister visVisitor = visVisitorRegisterMapper.selectVisVisitorRegisterByUserId(visVisitorRegister.getUserId());
if (ObjectUtil.isNotNull(visVisitor) && StringUtils.isNotBlank(visVisitor.getId())) {
throw new ServiceException("不可重复注册访客信息！");
}
return visVisitorRegisterMapper.insertVisVisitorRegister(visVisitorRegister);
}
@@ -100,4 +114,17 @@ public class VisVisitorRegisterServiceImpl implements IVisVisitorRegisterService
public void updateVisitorRegisterByOpenid(SysPeople sysPeople) {
visVisitorRegisterMapper.updateVisitorRegisterByOpenid(sysPeople);
}
/**
* 查询访客注册
*
* @return 访客注册
*/
@Override
public VisVisitorRegister getVisitorInfo() {
LoginUser loginUser = SecurityUtils.getLoginUser();
Long userId = loginUser.getUserid();
return visVisitorRegisterMapper.selectVisVisitorRegisterByUserId(userId);
}
}

33
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/visitor/service/impl/VisitorServiceImpl.java
View File

@@ -3,6 +3,7 @@ package com.dcsoft.system.visitor.service.impl;
import com.dcsoft.common.core.constant.Constants;
import com.dcsoft.common.core.domain.R;
import com.dcsoft.common.core.exception.ServiceException;
import com.dcsoft.common.core.utils.CollUtil;
import com.dcsoft.common.core.web.page.TableDataInfoPage;
import com.dcsoft.common.datascope.annotation.DataScope;
import com.dcsoft.system.api.RemoteFileService;
@@ -668,4 +669,36 @@ public class VisitorServiceImpl implements IVisitorService {
return visitorMapper.queryVisitorReviewProcessCount(id);
}
/**
* 查询访客信息列表
*
* @param visitor 访客信息
* @return 访客信息
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<Visitor> selectAppVisitorList(Visitor visitor) {
//查询我作为随访人员的申请信息主键ids
List<Long> ids = visitorMapper.selectAppVisitorFollow(visitor);
//查询我申请的访客信息
visitor.setIds(ids);
List<Visitor> visitors = visitorMapper.selectAppVisitorList(visitor);
List<Long> collect = visitors.stream().map(Visitor::getId).collect(Collectors.toList());
if(CollUtil.isNotEmpty(collect)) {
List<CheckCodeVo> checkCodeVos = visitorMapper.queryCode(collect);
visitors.forEach(visit -> {
checkCodeVos.forEach(code -> {
if (StringUtils.equals(String.valueOf(visit.getId()), code.getVisitorId())) {
visit.setQrCode(code.getCode());
}
});
});
}
return visitors;
}
}