From de96a45edab340810da876da64806c87bec2fd72 Mon Sep 17 00:00:00 2001 From: chendaze <1824191732@qq.com> Date: Wed, 13 Mar 2024 15:15:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=20=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86=E5=B1=95=E5=8E=85=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E5=BE=AE=E4=BF=A1=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/CustomerController.java | 2 +- .../controller/CustomerStaffController.java | 5 +- .../admin/domain/meeting/ShowroomRecord.java | 31 ++++- .../admin/mapper/IcsCustomerStaffMapper.java | 6 +- .../resolver/LoginStaffHandlerResolver.java | 45 +++++++ .../service/IIcsCustomerStaffService.java | 6 +- .../impl/IcsCustomerStaffServiceImpl.java | 12 +- .../meeting/CustomerTicketServiceImpl.java | 3 - .../meeting/ShowroomRecordServiceImpl.java | 15 +++ .../meeting/IShowroomRecordService.java | 2 + .../mapper/admin/IcsCustomerStaffMapper.xml | 16 ++- .../admin/meeting/ShowroomRecordMapper.xml | 10 +- .../com/ics/common/annotation/LoginStaff.java | 15 +++ .../common/core}/domain/IcsCustomerStaff.java | 3 +- .../system/service/IAccessTokenService.java | 3 + .../service/impl/AccessTokenServiceImpl.java | 42 +++++++ .../mobile/ActivityAPIController.java | 3 +- .../controller/mobile/LoginAPIController.java | 3 +- .../controller/mobile/ParkAPIController.java | 4 +- .../mobile/ServiceManagerAPIController.java | 4 +- .../mobile/VisitorApiController.java | 2 +- .../mobile/WxLoginAPIController.java | 30 ++--- .../meeting/ApiEquipmentController.java | 7 +- .../meeting/ApiRoomContentController.java | 28 +++-- .../mobile/meeting/ApiShowroomController.java | 118 +++++++++++++++++- .../mobile/meeting/ApiVisitorController.java | 23 ++-- .../mobile/member/ProfileAPIController.java | 40 +++--- ics-web/src/main/resources/application.yml | 2 +- 28 files changed, 369 insertions(+), 111 deletions(-) create mode 100644 ics-admin/src/main/java/com/ics/admin/resolver/LoginStaffHandlerResolver.java create mode 100644 ics-common/ics-common-core/src/main/java/com/ics/common/annotation/LoginStaff.java rename {ics-admin/src/main/java/com/ics/admin => ics-common/ics-common-core/src/main/java/com/ics/common/core}/domain/IcsCustomerStaff.java (95%) diff --git a/ics-admin/src/main/java/com/ics/admin/controller/CustomerController.java b/ics-admin/src/main/java/com/ics/admin/controller/CustomerController.java index cc26a9e..8d84b6f 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/CustomerController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/CustomerController.java @@ -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; diff --git a/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java b/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java index b0c4e3c..300fb7a 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/CustomerStaffController.java @@ -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; /** * 企业员工 提供者 diff --git a/ics-admin/src/main/java/com/ics/admin/domain/meeting/ShowroomRecord.java b/ics-admin/src/main/java/com/ics/admin/domain/meeting/ShowroomRecord.java index 8488d1f..1b4d0dd 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/meeting/ShowroomRecord.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/meeting/ShowroomRecord.java @@ -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 { /** 用户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 { 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; + } diff --git a/ics-admin/src/main/java/com/ics/admin/mapper/IcsCustomerStaffMapper.java b/ics-admin/src/main/java/com/ics/admin/mapper/IcsCustomerStaffMapper.java index d35cebe..98fa35e 100644 --- a/ics-admin/src/main/java/com/ics/admin/mapper/IcsCustomerStaffMapper.java +++ b/ics-admin/src/main/java/com/ics/admin/mapper/IcsCustomerStaffMapper.java @@ -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 { /** * 检查是否唯一手机号码 - * @param icsCustomerStaff * @return */ - String checkMobileUnique(IcsCustomerStaff icsCustomerStaff); + String checkMobileUnique(@Param("mobile") String mobile); IcsCustomerStaff selectUserByOpenid(String openid); } diff --git a/ics-admin/src/main/java/com/ics/admin/resolver/LoginStaffHandlerResolver.java b/ics-admin/src/main/java/com/ics/admin/resolver/LoginStaffHandlerResolver.java new file mode 100644 index 0000000..b5282e8 --- /dev/null +++ b/ics-admin/src/main/java/com/ics/admin/resolver/LoginStaffHandlerResolver.java @@ -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); + } +} \ No newline at end of file diff --git a/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java b/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java index c9ffebd..e481612 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java +++ b/ics-admin/src/main/java/com/ics/admin/service/IIcsCustomerStaffService.java @@ -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 { /** * 检查手机号码是否唯一 - * @param icsCustomerStaff * @return */ - String checkMobileUnique(IcsCustomerStaff icsCustomerStaff); + String checkMobileUnique(String mobile); IcsCustomerStaff selectUserByOpenid(String openid); diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java index c3faead..6111eea 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/IcsCustomerStaffServiceImpl.java @@ -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 selectUserByCustomer(Long customerId) { + public List selectUserByCustomer(Long id) { IcsCustomerStaff icsCustomerStaff = new IcsCustomerStaff(); - icsCustomerStaff.setIcsCustomerId(customerId); + icsCustomerStaff.setIcsCustomerId(id); return icsCustomerStaffMapper.selectIcsCustomerStaffList(icsCustomerStaff); } } diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/CustomerTicketServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/CustomerTicketServiceImpl.java index e5b5908..14f790c 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/CustomerTicketServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/CustomerTicketServiceImpl.java @@ -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; diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomRecordServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomRecordServiceImpl.java index bd9d303..893a491 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomRecordServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomRecordServiceImpl.java @@ -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 selectShowroomRecord(ShowroomRecord showroomRecord, Integer pageNum, Integer pageSize) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + + queryWrapper.eq("user_id",showroomRecord.getUserId()); + IPage pages = new Page<>(pageNum,pageSize); + + IPage showroomRecordIPage = baseMapper.selectPage(pages, queryWrapper); + + return showroomRecordIPage; + + } } diff --git a/ics-admin/src/main/java/com/ics/admin/service/meeting/IShowroomRecordService.java b/ics-admin/src/main/java/com/ics/admin/service/meeting/IShowroomRecordService.java index 4dc403a..a131c20 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/meeting/IShowroomRecordService.java +++ b/ics-admin/src/main/java/com/ics/admin/service/meeting/IShowroomRecordService.java @@ -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 { boolean selectFreeMeetingRoom(ShowroomRecord showroomRecord); + IPage selectShowroomRecord(ShowroomRecord showroomRecord,Integer pageNum,Integer pageSize); } diff --git a/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml b/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml index 6630cc2..fc898f5 100644 --- a/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/IcsCustomerStaffMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM ics_customer_staff - AND username LIKE CONCAT('%', #{username}, '%') @@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE id = #{id} - + INSERT INTO ics_customer_staff id, @@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + UPDATE ics_customer_staff username = #{username}, @@ -146,13 +146,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - WHERE mobile=#{mobile} - WHERE openid=#{openId} + + diff --git a/ics-admin/src/main/resources/mapper/admin/meeting/ShowroomRecordMapper.xml b/ics-admin/src/main/resources/mapper/admin/meeting/ShowroomRecordMapper.xml index 66b60e1..548c55f 100644 --- a/ics-admin/src/main/resources/mapper/admin/meeting/ShowroomRecordMapper.xml +++ b/ics-admin/src/main/resources/mapper/admin/meeting/ShowroomRecordMapper.xml @@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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