boyue2025/xiongan-meeting
3
0
Fork 0
mirror of https://gitee.com/elegant_wings/xiongan-meeting.git synced 2025-06-21 04:59:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改了对应 用户信息接口，修改了展厅预约的接口，修改了微信用户登录接口

Browse Source
This commit is contained in:
chendaze 2024-03-13 15:15:35 +08:00
parent 1a22b6de6c
commit de96a45eda
28 changed files with 369 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ics-admin/src/main/java/com/ics/admin/controller/CustomerController.java
View File

@ -4,11 +4,11 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Maps;
import com.ics.admin.domain.Customer;
import com.ics.admin.domain.IcsCustomerStaff;
import com.ics.admin.service.ICustomerService;
import com.ics.admin.service.IIcsCustomerStaffService;
import com.ics.common.constant.Constants;
import com.ics.common.core.controller.BaseController;
import com.ics.common.core.domain.IcsCustomerStaff;
import com.ics.common.core.domain.R;
import com.ics.common.utils.ValidatorUtils;
import com.ics.common.utils.http.HttpUtils;

5
ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java
View File

@ -1,20 +1,17 @@
package com.ics.admin.controller;
import com.alibaba.fastjson.JSONObject;
import com.ics.admin.domain.IcsCustomerStaff;
import com.ics.admin.service.IIcsCustomerStaffService;
import com.ics.common.constant.Constants;
import com.ics.common.core.controller.BaseController;
import com.ics.common.core.domain.IcsCustomerStaff;
import com.ics.common.core.domain.R;
import com.ics.system.domain.User;
import com.ics.system.service.IUserService;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.wf.jwtp.annotation.RequiresPermissions;
import java.util.Date;
import java.util.List;
/**
* 企业员工 提供者

31
ics-admin/src/main/java/com/ics/admin/domain/meeting/ShowroomRecord.java
View File

@ -1,5 +1,6 @@
package com.ics.admin.domain.meeting;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ics.common.core.domain.BaseEntity;
import lombok.Data;
@ -22,11 +23,17 @@ public class ShowroomRecord extends BaseEntity<ShowroomRecord> {
/** 用户id */
private Long userId;
@TableField(exist = false)
private String userName;
@TableField(exist = false)
private String userPhone;
/** 主题（会议主题、展厅主题） */
private String title;
/** 预约状态 */
private Integer stauts;
private Integer status;
/** 预约编号 */
private String reservationNumber;
@ -44,10 +51,32 @@ public class ShowroomRecord extends BaseEntity<ShowroomRecord> {
private Integer meetingNeedType;
private Integer photographType;
private String persons;
private Integer visitType;
@TableField(exist = false)
private String visitTypeName;
/** 预约-结束时间 */
private Date endDate;
/** 备注 */
private String remake;
@TableField(exist = false)
private String roomName;
@TableField(exist = false)
private String buildingName;
@TableField(exist = false)
private String indoorPicUrl;
@TableField(exist = false)
private Integer capacityNum;
@TableField(exist = false)
private String statusName;
}

6
ics-admin/src/main/java/com/ics/admin/mapper/IcsCustomerStaffMapper.java
View File

@ -1,8 +1,9 @@
package com.ics.admin.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ics.admin.domain.IcsCustomerStaff;
import com.ics.common.core.domain.IcsCustomerStaff;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -64,10 +65,9 @@ public interface IcsCustomerStaffMapper extends BaseMapper<IcsCustomerStaff> {
/**
* 检查是否唯一手机号码
* @param icsCustomerStaff
* @return
*/
String checkMobileUnique(IcsCustomerStaff icsCustomerStaff);
String checkMobileUnique(@Param("mobile") String mobile);
IcsCustomerStaff selectUserByOpenid(String openid);
}

45
ics-admin/src/main/java/com/ics/admin/resolver/LoginStaffHandlerResolver.java Normal file
View File

@ -0,0 +1,45 @@
package com.ics.admin.resolver;
import com.ics.admin.service.IIcsCustomerStaffService;
import com.ics.common.annotation.LoginStaff;
import com.ics.common.core.domain.IcsCustomerStaff;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.MethodParameter;
import org.springframework.web.bind.support.WebDataBinderFactory;
import org.springframework.web.context.request.NativeWebRequest;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.method.support.ModelAndViewContainer;
import org.wf.jwtp.provider.Token;
import org.wf.jwtp.util.SubjectUtil;
import javax.servlet.http.HttpServletRequest;
/**
* 有@LoginStaff注解的方法参数，注入当前登录用户
*
*/
@Configuration
public class LoginStaffHandlerResolver implements HandlerMethodArgumentResolver {
@Autowired
private IIcsCustomerStaffService customerStaffService;
@Override
public boolean supportsParameter(MethodParameter parameter) {
return parameter.getParameterType().isAssignableFrom(IcsCustomerStaff.class) && parameter.hasParameterAnnotation(LoginStaff.class);
}
@Override
public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer container, NativeWebRequest nativeWebRequest, WebDataBinderFactory factory) throws Exception {
// 获取用户
HttpServletRequest request = nativeWebRequest.getNativeRequest(HttpServletRequest.class);
Token token = SubjectUtil.getToken(request);
Long userId = Long.valueOf(token.getUserId());
if (userId == null) {
return null;
}
return customerStaffService.selectIcsCustomerStaffById(userId);
}
}

6
ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java
View File

@ -1,8 +1,7 @@
package com.ics.admin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ics.admin.domain.IcsCustomerStaff;
import com.ics.system.domain.User;
import com.ics.common.core.domain.IcsCustomerStaff;
import java.util.List;
@ -64,10 +63,9 @@ public interface IIcsCustomerStaffService extends IService<IcsCustomerStaff> {
/**
* 检查手机号码是否唯一
* @param icsCustomerStaff
* @return
*/
String checkMobileUnique(IcsCustomerStaff icsCustomerStaff);
String checkMobileUnique(String mobile);
IcsCustomerStaff selectUserByOpenid(String openid);

12
ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java
View File

@ -1,13 +1,11 @@
package com.ics.admin.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ics.admin.domain.IcsCustomerStaff;
import com.ics.admin.mapper.IcsCustomerStaffMapper;
import com.ics.admin.service.IIcsCustomerStaffService;
import com.ics.common.core.domain.IcsCustomerStaff;
import com.ics.common.utils.StringUtils;
import com.ics.system.domain.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -91,8 +89,8 @@ public class IcsCustomerStaffServiceImpl extends ServiceImpl<IcsCustomerStaffMap
return icsCustomerStaffMapper.deleteIcsCustomerStaffById(id);
}
public String checkMobileUnique(IcsCustomerStaff icsCustomerStaff){
return icsCustomerStaffMapper.checkMobileUnique(icsCustomerStaff);
public String checkMobileUnique(String mobile){
return icsCustomerStaffMapper.checkMobileUnique(mobile);
}
@Override
@ -102,10 +100,10 @@ public class IcsCustomerStaffServiceImpl extends ServiceImpl<IcsCustomerStaffMap
}
@Override
public List<IcsCustomerStaff> selectUserByCustomer(Long customerId) {
public List<IcsCustomerStaff> selectUserByCustomer(Long id) {
IcsCustomerStaff icsCustomerStaff = new IcsCustomerStaff();
icsCustomerStaff.setIcsCustomerId(customerId);
icsCustomerStaff.setIcsCustomerId(id);
return icsCustomerStaffMapper.selectIcsCustomerStaffList(icsCustomerStaff);
}
}

3
ics-admin/src/main/java/com/ics/admin/service/impl/meeting/CustomerTicketServiceImpl.java
View File

@ -2,16 +2,13 @@ package com.ics.admin.service.impl.meeting;
import java.util.List;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ics.admin.domain.IcsCustomerStaff;
import com.ics.admin.domain.meeting.Ticket;
import com.ics.admin.domain.meeting.vo.UserCustomerVo;
import com.ics.admin.mapper.IcsCustomerStaffMapper;
import com.ics.admin.mapper.meeting.TicketMapper;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ics.admin.mapper.meeting.CustomerTicketMapper;

15
ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomRecordServiceImpl.java
View File

@ -7,6 +7,8 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ics.admin.domain.meeting.Reservation;
import com.ics.admin.domain.meeting.ReservationDTO;
@ -144,4 +146,17 @@ public class ShowroomRecordServiceImpl extends ServiceImpl<ShowroomRecordMapper,
}
return false;
}
@Override
public IPage<ShowroomRecord> selectShowroomRecord(ShowroomRecord showroomRecord, Integer pageNum, Integer pageSize) {
QueryWrapper<ShowroomRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_id",showroomRecord.getUserId());
IPage<ShowroomRecord> pages = new Page<>(pageNum,pageSize);
IPage<ShowroomRecord> showroomRecordIPage = baseMapper.selectPage(pages, queryWrapper);
return showroomRecordIPage;
}
}

2
ics-admin/src/main/java/com/ics/admin/service/meeting/IShowroomRecordService.java
View File

@ -1,5 +1,6 @@
package com.ics.admin.service.meeting;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ics.admin.domain.meeting.ShowroomRecord;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ics.admin.domain.meeting.ShowroomRecordDTO;
@ -65,4 +66,5 @@ public interface IShowroomRecordService extends IService<ShowroomRecord> {
boolean selectFreeMeetingRoom(ShowroomRecord showroomRecord);
IPage<ShowroomRecord> selectShowroomRecord(ShowroomRecord showroomRecord,Integer pageNum,Integer pageSize);
}

16
ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml
View File

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ics.admin.mapper.IcsCustomerStaffMapper">
<resultMap type="com.ics.admin.domain.IcsCustomerStaff" id="IcsCustomerStaffResult">
<resultMap type="com.ics.common.core.domain.IcsCustomerStaff" id="IcsCustomerStaffResult">
<result property="id" column="id" />
<result property="username" column="username" />
<result property="mobile" column="mobile" />
@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM ics_customer_staff
</sql>
<select id="selectIcsCustomerStaffList" parameterType="IcsCustomerStaff" resultMap="IcsCustomerStaffResult">
<select id="selectIcsCustomerStaffList" parameterType="com.ics.common.core.domain.IcsCustomerStaff" resultMap="IcsCustomerStaffResult">
<include refid="selectIcsCustomerStaffVo"/>
<where>
<if test="username != null and username != ''"> AND username LIKE CONCAT('%', #{username}, '%') </if>
@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE id = #{id}
</select>
<insert id="insertIcsCustomerStaff" parameterType="IcsCustomerStaff">
<insert id="insertIcsCustomerStaff" parameterType="com.ics.common.core.domain.IcsCustomerStaff">
INSERT INTO ics_customer_staff
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null ">id,</if>
@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</insert>
<update id="updateIcsCustomerStaff" parameterType="IcsCustomerStaff">
<update id="updateIcsCustomerStaff" parameterType="com.ics.common.core.domain.IcsCustomerStaff">
UPDATE ics_customer_staff
<trim prefix="SET" suffixOverrides=",">
<if test="username != null and username != ''">username = #{username},</if>
@ -146,13 +146,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<select id="checkPhoneUnique" parameterType="String" resultType="IcsCustomerStaff">
<select id="checkPhoneUnique" parameterType="String" resultType="com.ics.common.core.domain.IcsCustomerStaff">
<include refid="selectIcsCustomerStaffVo"/>
WHERE mobile=#{mobile}
</select>
<select id="selectUserByOpenid" resultType="com.ics.admin.domain.IcsCustomerStaff">
<select id="selectUserByOpenid" resultType="com.ics.common.core.domain.IcsCustomerStaff">
<include refid="selectIcsCustomerStaffVo"/>
WHERE openid=#{openId}
</select>
<select id="checkMobileUnique" resultType="java.lang.String">
SELECT count(1) FROM ics_customer_staff WHERE mobile=#{mobile}
</select>
</mapper>

10
ics-admin/src/main/resources/mapper/admin/meeting/ShowroomRecordMapper.xml
View File

@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="showroomId" column="showroom_id" />
<result property="userId" column="user_id" />
<result property="title" column="title" />
<result property="stauts" column="stauts" />
<result property="status" column="status" />
<result property="reservationNumber" column="reservation_number" />
<result property="cancelTime" column="cancel_time" />
<result property="cancelResaon" column="cancel_resaon" />
@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectShowroomRecordVo">
SELECT id, showroom_id, user_id, title, stauts, reservation_number,, explain_need_type, meeting_need_type, photograph_type, cancel_time, cancel_resaon, start_time, end_date, delete_flag, create_by, create_time, update_by, update_time, remake FROM tb_showroom_record
SELECT id, showroom_id, user_id, title, status, reservation_number,, explain_need_type, meeting_need_type, photograph_type, cancel_time, cancel_resaon, start_time, end_date, delete_flag, create_by, create_time, update_by, update_time, remake FROM tb_showroom_record
</sql>
<select id="selectShowroomRecordList" parameterType="ShowroomRecord" resultMap="ShowroomRecordResult">
@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="showroomId != null ">showroom_id,</if>
<if test="userId != null ">user_id,</if>
<if test="title != null and title != ''">title,</if>
<if test="stauts != null ">stauts,</if>
<if test="status != null ">status,</if>
<if test="reservationNumber != null and reservationNumber != ''">reservation_number,</if>
<if test="cancelTime != null ">cancel_time,</if>
<if test="cancelResaon != null and cancelResaon != ''">cancel_resaon,</if>
@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="showroomId != null ">#{showroomId},</if>
<if test="userId != null ">#{userId},</if>
<if test="title != null and title != ''">#{title},</if>
<if test="stauts != null ">#{stauts},</if>
<if test="status != null ">#{status},</if>
<if test="reservationNumber != null and reservationNumber != ''">#{reservationNumber},</if>
<if test="cancelTime != null ">#{cancelTime},</if>
<if test="cancelResaon != null and cancelResaon != ''">#{cancelResaon},</if>
@ -101,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="showroomId != null ">showroom_id = #{showroomId},</if>
<if test="userId != null ">user_id = #{userId},</if>
<if test="title != null and title != ''">title = #{title},</if>
<if test="stauts != null ">stauts = #{stauts},</if>
<if test="status != null ">status = #{status},</if>
<if test="reservationNumber != null and reservationNumber != ''">reservation_number = #{reservationNumber},</if>
<if test="cancelTime != null ">cancel_time = #{cancelTime},</if>
<if test="cancelResaon != null and cancelResaon != ''">cancel_resaon = #{cancelResaon},</if>

15
ics-common/ics-common-core/src/main/java/com/ics/common/annotation/LoginStaff.java Normal file
View File

@ -0,0 +1,15 @@
package com.ics.common.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* 登录用户信息
*
*/
@Target(ElementType.PARAMETER)
@Retention(RetentionPolicy.RUNTIME)
public @interface LoginStaff {
}

3
ics-admin/src/main/java/com/ics/admin/domain/IcsCustomerStaff.java → ics-common/ics-common-core/src/main/java/com/ics/common/core/domain/IcsCustomerStaff.java
View File

@ -1,8 +1,7 @@
package com.ics.admin.domain;
package com.ics.common.core.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ics.common.core.domain.BaseEntity;
import lombok.Data;
import java.util.Date;

3
ics-system/src/main/java/com/ics/system/service/IAccessTokenService.java
View File

@ -1,6 +1,7 @@
package com.ics.system.service;
import com.ics.common.core.domain.IcsCustomerStaff;
import com.ics.system.domain.User;
import java.util.Map;
@ -28,6 +29,8 @@ public interface IAccessTokenService {
*/
Map<String, Object> createToken(User user);
Map<String, Object> createStaffToken(IcsCustomerStaff icsCustomerStaff);
/**
* 删除token
*

42
ics-system/src/main/java/com/ics/system/service/impl/AccessTokenServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.ics.system.service.impl;
import com.google.common.collect.Maps;
import com.ics.common.constant.Constants;
import com.ics.common.core.domain.IcsCustomerStaff;
import com.ics.common.redis.annotation.RedisEvict;
import com.ics.common.redis.util.RedisUtils;
import com.ics.common.utils.AddressUtils;
@ -74,6 +75,24 @@ public class AccessTokenServiceImpl implements IAccessTokenService {
return map;
}
@Override
public Map<String, Object> createStaffToken(IcsCustomerStaff icsCustomerStaff) {
// 签发token
Long userId = icsCustomerStaff.getId();
Token token = tokenStore.createNewToken(userId.toString(), new String[]{"member:center:view"}, new String[]{"appUser"}, TokenUtil.DEFAULT_EXPIRE_REFRESH_TOKEN);
Map<String, Object> map = Maps.newHashMap();
map.put("userId", userId);
map.put("token", token.getAccessToken());
map.put("expire", RedisUtils.DEFAULT_EXPIRE);
// 记录在线用户
icsCustomerStaff = recordCustomerOnlineInfo(icsCustomerStaff, token.toString());
redis.set(ACCESS_TOKEN + token, icsCustomerStaff, RedisUtils.DEFAULT_EXPIRE);
redis.set(ACCESS_USERID + icsCustomerStaff.getId(), token, RedisUtils.DEFAULT_EXPIRE);
return map;
}
@Override
public void expireToken(long userId) {
String token = redis.get(ACCESS_USERID + userId);
@ -112,4 +131,27 @@ public class AccessTokenServiceImpl implements IAccessTokenService {
return user;
}
private IcsCustomerStaff recordCustomerOnlineInfo(final IcsCustomerStaff user, final String token) {
HttpServletRequest request = ServletUtils.getRequest();
final UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent"));
final String ip = IpUtils.getIpAddr(request);
// 获取客户端操作系统
String os = userAgent.getOperatingSystem().getName();
// 获取客户端浏览器
String browser = userAgent.getBrowser().getName();
// 封装对象
CurrentUserVO userOnline = new CurrentUserVO();
userOnline.setUserId(user.getId());
userOnline.setTokenId(token);
userOnline.setLoginName(user.getUsername());
userOnline.setLoginTime(DateUtils.getNowDate());
userOnline.setOs(os);
userOnline.setIpaddr(ip);
userOnline.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
userOnline.setBrowser(browser);
SpringContextHolder.publishEvent(new UserOnlineEvent(userOnline));
return user;
}
}

3
ics-web/src/main/java/com/ics/controller/mobile/ActivityAPIController.java
View File

@ -5,16 +5,15 @@ import com.google.common.collect.Maps;
import com.ics.admin.domain.Activity;
import com.ics.admin.domain.ActivityDetail;
import com.ics.admin.domain.IcsCustomerStaff;
import com.ics.admin.domain.Park;
import com.ics.admin.service.IIcsCustomerStaffService;
import com.ics.admin.service.IParkService;
import com.ics.common.core.domain.IcsCustomerStaff;
import com.ics.service.IActivityDetailService;
import com.ics.service.IActivityService;
import com.ics.common.core.controller.BaseController;
import com.ics.common.core.domain.R;
import com.ics.common.utils.DateUtils;
import com.ics.system.domain.User;
import com.ics.system.service.IUserService;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.factory.annotation.Autowired;

3
ics-web/src/main/java/com/ics/controller/mobile/LoginAPIController.java
View File

@ -1,9 +1,8 @@
package com.ics.controller.mobile;
import com.ics.admin.domain.IcsCustomerStaff;
import com.ics.admin.mapper.IcsCustomerStaffMapper;
import com.ics.admin.service.IIcsCustomerStaffService;
import com.ics.common.core.domain.IcsCustomerStaff;
import com.ics.common.core.domain.R;
import com.ics.common.utils.bean.BeanUtils;
import com.ics.system.domain.User;

4
ics-web/src/main/java/com/ics/controller/mobile/ParkAPIController.java
View File

@ -2,17 +2,15 @@ package com.ics.controller.mobile;
import com.google.common.collect.Maps;
import com.ics.admin.domain.IcsCustomerStaff;
import com.ics.admin.domain.Park;
import com.ics.admin.service.IIcsCustomerStaffService;
import com.ics.admin.service.IParkService;
import com.ics.common.annotation.LoginUser;
import com.ics.common.core.controller.BaseController;
import com.ics.common.core.domain.IcsCustomerStaff;
import com.ics.common.core.domain.R;
import com.ics.system.domain.Tenant;
import com.ics.system.domain.User;
import com.ics.system.service.ITenantService;
import com.ics.system.service.IUserService;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;

4
ics-web/src/main/java/com/ics/controller/mobile/ServiceManagerAPIController.java
View File

@ -3,12 +3,12 @@ package com.ics.controller.mobile;
import cn.hutool.core.collection.CollectionUtil;
import com.google.common.collect.Maps;
import com.ics.admin.domain.IcsCustomerStaff;
import com.ics.admin.domain.Park;
import com.ics.admin.domain.ServiceManage;
import com.ics.admin.domain.ServiceOrder;
import com.ics.admin.service.IIcsCustomerStaffService;
import com.ics.admin.service.IParkService;
import com.ics.common.core.domain.IcsCustomerStaff;
import com.ics.service.IServiceManageService;
import com.ics.service.IServiceOrderService;
import com.ics.common.core.controller.BaseController;
@ -16,9 +16,7 @@ import com.ics.common.core.domain.R;
import com.ics.common.enums.SmsType;
import com.ics.common.utils.RandomUtil;
import com.ics.common.utils.StringUtils;
import com.ics.system.domain.User;
import com.ics.system.service.ISmsService;
import com.ics.system.service.IUserService;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;

2
ics-web/src/main/java/com/ics/controller/mobile/VisitorApiController.java
View File

@ -1,9 +1,9 @@
package com.ics.controller.mobile;
import com.ics.admin.domain.IcsCustomerStaff;
import com.ics.admin.service.IIcsCustomerStaffService;
import com.ics.common.constant.Constants;
import com.ics.common.core.controller.BaseController;
import com.ics.common.core.domain.IcsCustomerStaff;
import com.ics.common.core.domain.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

30
ics-web/src/main/java/com/ics/controller/mobile/WxLoginAPIController.java
View File

@ -2,45 +2,27 @@ package com.ics.controller.mobile;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
import cn.binarywang.wx.miniapp.util.WxMaConfigHolder;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.aliyun.oss.ServiceException;
import com.ics.admin.domain.IcsCustomerStaff;
import com.ics.admin.service.IIcsCustomerStaffService;
import com.ics.common.annotation.LoginUser;
import com.ics.common.constant.Constants;
import com.ics.common.core.controller.BaseController;
import com.ics.common.core.domain.IcsCustomerStaff;
import com.ics.common.core.domain.R;
import com.ics.common.exception.user.UserPasswordNotMatchException;
import com.ics.common.utils.DateUtils;
import com.ics.common.utils.MessageUtils;
import com.ics.common.utils.RandomUtil;
import com.ics.common.utils.StringUtils;
import com.ics.common.utils.bean.BeanUtils;
import com.ics.service.IWxAppLoginService;
import com.ics.system.domain.User;
import com.ics.system.domain.form.LoginRequest;
import com.ics.system.log.publish.PublishFactory;
import com.ics.system.service.IAccessTokenService;
import com.ics.system.service.IUserService;
import com.ics.system.util.PasswordUtils;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit;
@ -73,6 +55,8 @@ public class WxLoginAPIController extends BaseController {
// todo 微信小程序登录后，新建一个token ，然后在新增LoginUser 这个注解，然后在拦截器中获取token，然后获取用户信息
@PostMapping("/weixin/login")
public R login(@RequestBody Map<String, String> paramMap) {
// 参数
@ -151,7 +135,13 @@ public class WxLoginAPIController extends BaseController {
icsCustomerStaff.setGender("0");
icsCustomerStaff.setStatus("0");
int i = icsCustomerStaffService.insertIcsCustomerStaff(icsCustomerStaff);
return toAjax(i);
Map<String, Object> token = tokenService.createStaffToken(icsCustomerStaff);
R ajax = R.ok();
ajax.put(Constants.TOKEN, token);
// ajax.put(Constants.TOKEN, token);
ajax.put("user", icsCustomerStaff);
ajax.put("openid", openid);
return ajax;
}
} catch (Exception e) {
log.error(e.getMessage(), e);

7
ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java
View File

@ -21,6 +21,7 @@ import com.ics.common.utils.DeviceUtils;
import com.ics.common.utils.IpUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.wf.jwtp.annotation.RequiresPermissions;
import java.util.List;
@ -39,6 +40,7 @@ public class ApiEquipmentController extends BaseController {
private IRoomRecordService roomRecordService;
//根据用户id查询对应的设备， 楼层分割，房间，设备信息，
@RequiresPermissions("member:center:view")
@GetMapping("/getEquipmentByUserId/{userId}")
public R getEquipmentByUserId(@PathVariable("userId") Long userId){
List<UserEquipment> equipments = userEquipmentService.getEquipmentByUserId(userId);
@ -49,7 +51,7 @@ public class ApiEquipmentController extends BaseController {
/**
* 开门
*/
@RequiresPermissions("member:center:view")
@PostMapping("/openDoor")
public R openDoor(@RequestBody RoomRecord roomRecord){
//判断用户是否有权限开门
@ -69,7 +71,7 @@ public class ApiEquipmentController extends BaseController {
/**
* 开门记录
*/
@RequiresPermissions("member:center:view")
@PostMapping("/getOpenDoorRecord")
public R getOpenDoorRecord(@RequestBody RoomRecord roomRecord) {
PageDomain pageDomain = TableSupport.buildPageRequest();
@ -89,6 +91,7 @@ public class ApiEquipmentController extends BaseController {
* 获取对比记录 todo 没写完 是否需要人脸对比的数据
* @return
*/
@RequiresPermissions("member:center:view")
@PostMapping("/getEquipmentByUserIdAndEquipmentId")
public R getEquipmentByUserIdAndEquipmentId(@RequestBody DeviceData data){

28
ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java
View File

@ -1,12 +1,10 @@
package com.ics.controller.mobile.meeting;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ics.admin.domain.BuildingDetail;
import com.ics.admin.domain.IcsCustomerStaff;
import com.ics.admin.domain.Park;
import com.ics.admin.domain.Room;
import com.ics.admin.domain.meeting.*;
@ -17,15 +15,14 @@ import com.ics.admin.mapper.meeting.RoomEquipmentMapper;
import com.ics.admin.service.*;
import com.ics.admin.service.meeting.*;
import com.ics.common.core.controller.BaseController;
import com.ics.common.core.domain.IcsCustomerStaff;
import com.ics.common.core.domain.R;
import com.ics.common.core.page.PageDomain;
import com.ics.common.core.page.TableSupport;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.wf.jwtp.annotation.RequiresPermissions;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -75,6 +72,7 @@ public class ApiRoomContentController extends BaseController {
/**
* 查询条件筛选
*/
@RequiresPermissions("member:center:view")
@GetMapping("searchInfo/{type}")
public R searchInfo(@PathVariable("type") Integer type) {
// 1.会议室类型，2.人数，3.会议室设备，4.形式
@ -86,6 +84,7 @@ public class ApiRoomContentController extends BaseController {
/**
* 获取房间内容
*/
@RequiresPermissions("member:center:view")
@PostMapping("list")
public R list(@RequestBody RoomContent roomContent) {
List<RoomContent> roomContents = roomContentService.selectApiRoomList(roomContent);
@ -97,6 +96,7 @@ public class ApiRoomContentController extends BaseController {
/**
* 获取房间详情信息
*/
@RequiresPermissions("member:center:view")
@GetMapping("/info/{id}")
public R infoById(@PathVariable("id") Long id) {
RoomContent roomContents = roomContentService.selectInfoById(id);
@ -106,6 +106,7 @@ public class ApiRoomContentController extends BaseController {
/**
* 优惠卷列表
*/
@RequiresPermissions("member:center:view")
@PostMapping("/getCustomerTicket")
public R getCustomerTicket(@RequestBody UserCustomerVo userCustomerVo) {
//根据用户获取对应的企业id，查询该企业下对应的优惠卷
@ -118,7 +119,7 @@ public class ApiRoomContentController extends BaseController {
/**
* 展示会议列表，当天会议室的预约时间
*/
@RequiresPermissions("member:center:view")
@GetMapping("/getMeetingRoomRecord/{meetingRoomId}")
public R getMeetingRoomRecord(@PathVariable("meetingRoomId") Long meetingRoomId) {
//根据用户获取对应的企业id，查询该企业下对应的优惠卷
@ -133,6 +134,7 @@ public class ApiRoomContentController extends BaseController {
* @param reservation
* @return
*/
@RequiresPermissions("member:center:view")
@PostMapping("/selectFreeMeetingRoom")
public R selectFreeMeetingRoom(@RequestBody Reservation reservation) {
boolean count =reservationService.selectFreeMeetingRoom(reservation);
@ -144,6 +146,7 @@ public class ApiRoomContentController extends BaseController {
/**
* 会议预约记录
*/
@RequiresPermissions("member:center:view")
@PostMapping("/saveMeetingRecord")
public R getMeetingRoomRecord(@RequestBody Reservation reservation) {
//根据用户获取对应的企业id，查询该企业下对应的优惠卷
@ -168,6 +171,7 @@ public class ApiRoomContentController extends BaseController {
/**
* 根据会议室id查询所有的会议室服务与设备
*/
@RequiresPermissions("member:center:view")
@GetMapping("/getMeetingRoomServiceAndEquipment/{meetingRoomId}")
public R getMeetingRoomServiceAndEquipment(@PathVariable("meetingRoomId") Long meetingRoomId) {
//根据用户获取对应的企业id，查询该企业下对应的优惠卷
@ -178,6 +182,7 @@ public class ApiRoomContentController extends BaseController {
/**
* 计算会议室金额
*/
@RequiresPermissions("member:center:view")
@PostMapping("/calculateMeetingRoomAmount")
public R calculateMeetingRoomAmount(@RequestBody Reservation reservation) {
//根据用户获取对应的企业id，查询该企业下对应的优惠卷
@ -188,6 +193,7 @@ public class ApiRoomContentController extends BaseController {
/**
* 预约列表
*/
@RequiresPermissions("member:center:view")
@PostMapping("selectReservationListByUserId")
public R selectReservationListByUserId(@RequestBody Reservation reservation){
@ -200,6 +206,7 @@ public class ApiRoomContentController extends BaseController {
}
// 根据id查询预约信息
@RequiresPermissions("member:center:view")
@GetMapping("selectReservationById/{id}")
public R selectReservationById(@PathVariable("id") Long id){
Reservation reservation = reservationService.selectReservationById(id);
@ -249,6 +256,7 @@ public class ApiRoomContentController extends BaseController {
/*
获取坐标信息
*/
@RequiresPermissions("member:center:view")
@GetMapping("/selectCoordinate")
public R selectCoordinate() {
//根据用户获取对应的企业id，查询该企业下对应的优惠卷
@ -261,6 +269,7 @@ public class ApiRoomContentController extends BaseController {
/**
* 判断预约参观人员
*/
@RequiresPermissions("member:center:view")
@PostMapping("/isVisitor")
public R isVisitor(@RequestBody ReservationPerson reservationPerson) {
@ -274,6 +283,7 @@ public class ApiRoomContentController extends BaseController {
/**
* 添加 预约参观人员
*/
@RequiresPermissions("member:center:view")
@PostMapping("/addVisitor")
public R addVisitor(@RequestBody ReservationPerson reservationPerson) {
@ -287,6 +297,7 @@ public class ApiRoomContentController extends BaseController {
}
//取消订单
@RequiresPermissions("member:center:view")
@PostMapping("/cancelOrder")
public R cancelOrder(@RequestBody Reservation reservation) {
@ -298,6 +309,7 @@ public class ApiRoomContentController extends BaseController {
}
//支付订单
@RequiresPermissions("member:center:view")
@PostMapping("/payOrder")
public R payOrder(@RequestBody Reservation reservation) {
Reservation reservation1 = reservationService.selectReservationById(reservation.getId());
@ -312,10 +324,6 @@ public class ApiRoomContentController extends BaseController {
return toAjax(i);
}
}

118
ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiShowroomController.java
View File

@ -2,21 +2,30 @@ package com.ics.controller.mobile.meeting;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ics.admin.domain.BuildingDetail;
import com.ics.admin.domain.Room;
import com.ics.admin.domain.meeting.*;
import com.ics.admin.service.IBuildingDetailService;
import com.ics.admin.service.IIcsCustomerStaffService;
import com.ics.admin.service.IRoomService;
import com.ics.admin.service.meeting.IShowroomRecordService;
import com.ics.admin.service.meeting.IShowroomService;
import com.ics.common.annotation.LoginStaff;
import com.ics.common.annotation.LoginUser;
import com.ics.common.core.controller.BaseController;
import com.ics.common.core.domain.IcsCustomerStaff;
import com.ics.common.core.domain.R;
import org.checkerframework.checker.units.qual.A;
import com.ics.common.core.page.PageDomain;
import com.ics.common.core.page.TableSupport;
import com.ics.system.domain.DictData;
import com.ics.system.service.IDictDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import org.wf.jwtp.annotation.Ignore;
import org.wf.jwtp.annotation.RequiresPermissions;
import java.util.Date;
import java.util.List;
/**
@ -41,9 +50,16 @@ public class ApiShowroomController extends BaseController {
@Autowired
private IShowroomRecordService recordService;
@Autowired
private IDictDataService dictDataService;
@Autowired
private IIcsCustomerStaffService staffService;
/**
* 查询展厅管理
*/
@RequiresPermissions("member:center:view")
@GetMapping("get/{id}")
public Showroom get(@PathVariable("id") Long id) {
Showroom showroom = showroomService.selectShowroomById(id);
@ -66,8 +82,9 @@ public class ApiShowroomController extends BaseController {
/**
* 查询展厅管理列表
*/
@RequiresPermissions("member:center:view")
@PostMapping("list")
public R list(@RequestBody Showroom showroom) {
public R list(@LoginUser @RequestBody Showroom showroom) {
List<Showroom> showrooms = showroomService.selectShowroomList(showroom);
for (Showroom showroom1 : showrooms) {
Room room = roomService.selectRoomById(showroom1.getRoomId());
@ -112,7 +129,7 @@ public class ApiShowroomController extends BaseController {
/**
* 查询展厅已经预约的记录
*/
@RequiresPermissions("member:center:view")
@PostMapping("/appointmentRecord")
public R appointmentRecord(@RequestBody ShowroomRecord showroomRecord)
{
@ -124,6 +141,7 @@ public class ApiShowroomController extends BaseController {
* 查询空闲的会议室
* @return
*/
@RequiresPermissions("member:center:view")
@PostMapping("/selectFreeShowRoom")
public R selectFreeMeetingRoom(@RequestBody ShowroomRecord ShowroomRecord) {
boolean count =recordService.selectFreeMeetingRoom(ShowroomRecord);
@ -134,16 +152,108 @@ public class ApiShowroomController extends BaseController {
/**
* 会议预约记录
*/
@RequiresPermissions("member:center:view")
@PostMapping("/saveShowRoomRecord")
public R saveShowRoomRecord(@RequestBody ShowroomRecord showroomRecord) {
//根据用户获取对应的企业id，查询该企业下对应的优惠卷
showroomRecord.setReservationNumber(RandomUtil.randomNumbers(8));
boolean b = recordService.selectFreeMeetingRoom(showroomRecord);
Assert.isFalse(b, "会议室不可用");
showroomRecord.setStatus(0);
showroomRecord.setCreateTime(new Date());
boolean save = recordService.save(showroomRecord);
Long id = showroomRecord.getId();
return toAjax(save).put("showroomRecord",id);
}
/**
* 查询字典
*/
@RequiresPermissions("member:center:view")
@PostMapping("/listByType")
public R list(@RequestBody DictData dictData) {
return R.ok().put("data",dictDataService.selectDictDataList(dictData));
}
/**
* 查询预约记录
*/
@RequiresPermissions("member:center:view")
@PostMapping("/selectShowroomRecord")
public R selectShowroomRecord(@RequestBody ShowroomRecord showroomRecord) {
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
IPage<ShowroomRecord> showroomRecords = recordService.selectShowroomRecord(showroomRecord,pageNum,pageSize);
for (ShowroomRecord showroomRecord1 : showroomRecords.getRecords()) {
if (showroomRecord1.getStatus() == 0){
showroomRecord1.setStatusName("待审核");
}else if (showroomRecord1.getStatus() == 1){
showroomRecord1.setStatusName("审核通过");
}else if (showroomRecord1.getStatus() == 2){
showroomRecord1.setStatusName("审核驳回");
}
Showroom showroom = showroomService.selectShowroomById(showroomRecord1.getShowroomId());
if (null != showroom){
showroomRecord1.setIndoorPicUrl(showroom.getIndoorPicUrl());
showroomRecord1.setCapacityNum(showroom.getCapacityNum());
Room room = roomService.selectRoomById(showroom.getRoomId());
if (room != null) {
showroomRecord1.setRoomName(room.getName());
//查询楼层号
BuildingDetail buildingDetail = buildingDetailService.selectBuildingDetailById(room.getBuildingDetailId());
if (buildingDetail != null) {
showroomRecord1.setBuildingName(buildingDetail.getFloorName() +"F");
}
}
}
}
return R.ok().put("data",showroomRecords);
}
/**
* 展厅详情
*/
@RequiresPermissions("member:center:view")
@GetMapping("/selectShowroomRecordById/{id}")
public R selectShowroomRecordById(@PathVariable("id") Long id) {
ShowroomRecord showroomRecord = recordService.selectShowroomRecordById(id);
if (null != showroomRecord) {
if (showroomRecord.getStatus() == 0) {
showroomRecord.setStatusName("待审核");
} else if (showroomRecord.getStatus() == 1) {
showroomRecord.setStatusName("审核通过");
} else if (showroomRecord.getStatus() == 2) {
showroomRecord.setStatusName("审核驳回");
}
IcsCustomerStaff icsCustomerStaff = staffService.selectIcsCustomerStaffById(showroomRecord.getUserId());
if (null != icsCustomerStaff){
showroomRecord.setUserName(icsCustomerStaff.getUsername());
showroomRecord.setUserPhone(icsCustomerStaff.getMobile());
}
String typeName = dictDataService.selectDictLabel("visit_type", showroomRecord.getVisitType() + "");
showroomRecord.setVisitTypeName(typeName);
Showroom showroom = showroomService.selectShowroomById(showroomRecord.getShowroomId());
if (null != showroom) {
showroomRecord.setIndoorPicUrl(showroom.getIndoorPicUrl());
showroomRecord.setCapacityNum(showroom.getCapacityNum());
Room room = roomService.selectRoomById(showroom.getRoomId());
if (room != null) {
showroomRecord.setRoomName(room.getName());
//查询楼层号
BuildingDetail buildingDetail = buildingDetailService.selectBuildingDetailById(room.getBuildingDetailId());
if (buildingDetail != null) {
showroomRecord.setBuildingName(buildingDetail.getFloorName() + "F");
}
}
}
}
return R.ok().put("data",showroomRecord);
}
}

23
ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiVisitorController.java
View File

@ -3,18 +3,11 @@ package com.ics.controller.mobile.meeting;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.IdcardUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ics.admin.domain.BuildingDetail;
import com.ics.admin.domain.Customer;
import com.ics.admin.domain.IcsCustomerStaff;
import com.ics.admin.domain.Room;
import com.ics.admin.domain.meeting.Reservation;
import com.ics.admin.domain.meeting.ReservationPerson;
import com.ics.admin.domain.meeting.RoomContent;
import com.ics.admin.domain.meeting.VisitorPerson;
import com.ics.admin.domain.meeting.vo.VisitorPersonVo;
import com.ics.admin.mapper.meeting.RoomContentMapper;
@ -23,9 +16,9 @@ import com.ics.admin.service.ICustomerService;
import com.ics.admin.service.IIcsCustomerStaffService;
import com.ics.admin.service.IRoomService;
import com.ics.admin.service.meeting.IReservationPersonService;
import com.ics.admin.service.meeting.IRoomContentService;
import com.ics.admin.service.meeting.IVisitorPersonService;
import com.ics.common.core.controller.BaseController;
import com.ics.common.core.domain.IcsCustomerStaff;
import com.ics.common.core.domain.R;
import com.ics.common.core.domain.dto.DevicePersonDto;
import com.ics.common.core.domain.dto.FacesDto;
@ -33,16 +26,13 @@ import com.ics.common.core.page.PageDomain;
import com.ics.common.core.page.TableSupport;
import com.ics.common.utils.DeviceUtils;
import com.ics.common.utils.UrlToBase64Util;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
import org.wf.jwtp.annotation.RequiresPermissions;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
@ -81,7 +71,7 @@ public class ApiVisitorController extends BaseController {
/**
* 获取所有的企业
*/
@RequiresPermissions("member:center:view")
@GetMapping("list")
public R list(Customer customer) {
List<Customer> customers = customerService.selectCustomerList(customer);
@ -91,6 +81,7 @@ public class ApiVisitorController extends BaseController {
/**
* 获取企业下的所有用户
*/
@RequiresPermissions("member:center:view")
@GetMapping("selectUserByCustomer/{customerId}")
public R selectUserByCustomer(@PathVariable("customerId") Long customerId) {
List<IcsCustomerStaff> customers = customerStaffService.selectUserByCustomer(customerId);
@ -102,6 +93,7 @@ public class ApiVisitorController extends BaseController {
/**
* 被访客记录
*/
@RequiresPermissions("member:center:view")
@PostMapping("/selectVisitorRecordByUserId")
public R selectVisitorPerson(@RequestBody VisitorPerson visitorPerson1) {
PageDomain pageDomain = TableSupport.buildPageRequest();
@ -132,6 +124,7 @@ public class ApiVisitorController extends BaseController {
* 访客记录
* @return
*/
@RequiresPermissions("member:center:view")
@PostMapping("selectVisitorRecordByIntervieweeId")
public R selectVisitorRecordByIntervieweeId(@RequestBody VisitorPerson visitorPerson1) {
PageDomain pageDomain = TableSupport.buildPageRequest();
@ -161,6 +154,7 @@ public class ApiVisitorController extends BaseController {
/**
* 获取访客记录的详情
*/
@RequiresPermissions("member:center:view")
@GetMapping("selectVisitorRecordById/{id}")
public R selectVisitorRecordById(@PathVariable("id") Long id) {
VisitorPerson visitorPerson = visitorPersonService.selectReservationPersonById(id);
@ -193,6 +187,7 @@ public class ApiVisitorController extends BaseController {
/**
* 被访人审核功能
*/
@RequiresPermissions("member:center:view")
@PostMapping("updateVisitorPersonStatus")
public R updateVisitorPersonStatus(@RequestBody VisitorPerson person) {
VisitorPerson visitorPerson = visitorPersonService.selectReservationPersonById(person.getId());
@ -205,6 +200,7 @@ public class ApiVisitorController extends BaseController {
/**
* 访客邀请记录
*/
@RequiresPermissions("member:center:view")
@GetMapping("selectVisitorInvitationRecord/{userId}")
public R selectVisitorInvitationRecord(@PathVariable("userId") Long userId) {
PageDomain pageDomain = TableSupport.buildPageRequest();
@ -220,6 +216,7 @@ public class ApiVisitorController extends BaseController {
*
* 添加访客预约
*/
@RequiresPermissions("member:center:view")
@PostMapping("visitorPerson")
public R visitorPerson(@RequestBody VisitorPerson person) {
person.setStatus(0);

40
ics-web/src/main/java/com/ics/controller/mobile/member/ProfileAPIController.java
View File

@ -4,21 +4,24 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Maps;
import com.ics.admin.domain.IcsCustomerStaff;
import com.ics.admin.service.IIcsCustomerStaffService;
import com.ics.common.annotation.LoginStaff;
import com.ics.common.annotation.LoginUser;
import com.ics.common.constant.Constants;
import com.ics.common.constant.UserConstants;
import com.ics.common.core.controller.BaseController;
import com.ics.common.core.domain.IcsCustomerStaff;
import com.ics.common.core.domain.R;
import com.ics.common.utils.bean.BeanUtils;
import com.ics.system.domain.User;
import com.ics.system.service.IConfigService;
import com.ics.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.wf.jwtp.annotation.Ignore;
import org.wf.jwtp.annotation.RequiresPermissions;
import org.wf.jwtp.util.SubjectUtil;
import javax.security.auth.Subject;
import java.util.Map;
/**
@ -40,21 +43,24 @@ public class ProfileAPIController extends BaseController {
/**
* 当前用户信息
*/
@Ignore
@GetMapping
public R index(@LoginUser IcsCustomerStaff icsCustomerStaff) {
public R index( IcsCustomerStaff icsCustomerStaff) {
String jsonConfig = configService.selectConfigByKey("sys.setting.siteUrl");
JSONObject jsonObject = JSON.parseObject(jsonConfig);
String siteUrl = jsonObject.getString("siteUrl");
Map<String, Object> map = Maps.newHashMap();
icsCustomerStaff = icsCustomerStaffService.selectIcsCustomerStaffById(icsCustomerStaff.getId());
if (icsCustomerStaff.getAvatar().contains(Constants.RESOURCE_PREFIX)) {
icsCustomerStaff.setAvatar(siteUrl + icsCustomerStaff.getAvatar());
} else {
icsCustomerStaff.setAvatar(icsCustomerStaff.getAvatar());
}
// if (icsCustomerStaff.getAvatar().contains(Constants.RESOURCE_PREFIX)) {
// icsCustomerStaff.setAvatar(icsCustomerStaff.getAvatar());
// } else {
// icsCustomerStaff.setAvatar(icsCustomerStaff.getAvatar());
// }
/* map.put("userId", icsCustomerStaff.getId());
map.put("mobile", icsCustomerStaff.getMobile());
if (icsCustomerStaff.getAvatar().contains(Constants.RESOURCE_PREFIX)) {
@ -74,12 +80,18 @@ public class ProfileAPIController extends BaseController {
/**
* 更新当前用户
*/
@RequiresPermissions("member:center:view")
@PostMapping("/update")
public R update(@RequestBody IcsCustomerStaff icsCustomerStaff, @LoginUser IcsCustomerStaff currentUser) {
BeanUtils.copyBeanProp(currentUser, icsCustomerStaff);
if (UserConstants.USER_PHONE_NOT_UNIQUE.equals(icsCustomerStaffService.checkMobileUnique(currentUser))) {
return R.error("修改用户'" + currentUser.getUsername()+ "'失败，手机号码已存在");
}
return toAjax(icsCustomerStaffService.updateIcsCustomerStaff(currentUser));
public R update(@RequestBody IcsCustomerStaff icsCustomerStaff) {
long userId = this.getCurrentUserId();
// System.out.println(currentUserId);
// IcsCustomerStaff customerStaff = icsCustomerStaffService.selectIcsCustomerStaffById(currentUserId);
// BeanUtils.copyBeanProp(customerStaff, icsCustomerStaff);
// if (UserConstants.USER_PHONE_NOT_UNIQUE.equals(icsCustomerStaffService.checkMobileUnique(customerStaff.getMobile()))) {
// return R.error("修改用户'" + currentUser.getUsername()+ "'失败，手机号码已存在");
// }
icsCustomerStaff.setId(userId);
return toAjax(icsCustomerStaffService.updateIcsCustomerStaff(icsCustomerStaff));
}
}

2
ics-web/src/main/resources/application.yml
View File

@ -76,7 +76,7 @@ jwtp:
## 拦截路径，默认是/**
path: /**
## 排除拦截路径，默认无
exclude-path: /admin/login/slide, /business/login/slide, /login/slide,/user/check_code,/captcha/check,/captcha/get,/system/sms/send,/user/register/submit,/api/**,/weixin/login,/meeting/roomItemByRoom/**,/social_user_login/login,/wx/**,/wx/login,/user/check_mobile,/user/send_mobile,/user/search_customer,/user/check_code,/user/register,/password/send_mobile,/password/forgot,/auth/login,/social_user_login/login
exclude-path: /admin/login/slide, /business/login/slide, /login/slide,/user/check_code,/captcha/check,/captcha/get,/system/sms/send,/user/register/submit,/weixin/login,/meeting/roomItemByRoom/**,/social_user_login/login,/wx/**,/wx/login,/user/check_mobile,/user/send_mobile,/user/search_customer,/user/check_code,/user/register,/password/send_mobile,/password/forgot,/auth/login,/social_user_login/login
## 单个用户最大token数，默认-1不限制
max-token: 1
## url自动对应权限方式，0 简易模式，1 RESTful模式