From 8b379c762a24ca1a6744cd594266ab598180d62e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 10 五月 2024 16:35:25 +0800
Subject: [PATCH] 最新版本
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 14 +-
server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartmentUser.java | 3
server/system_service/src/main/java/com/doumee/dao/system/model/SystemPositionUser.java | 3
server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java | 7
server/system_service/src/main/java/com/doumee/dao/system/model/SystemDataPermission.java | 3
server/system_service/src/main/java/com/doumee/dao/system/model/SystemDictData.java | 3
server/system_service/src/main/java/com/doumee/dao/system/model/SystemRolePermission.java | 3
server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 3
server/system_service/src/main/java/com/doumee/dao/system/model/SystemDict.java | 3
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java | 2
server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartment.java | 3
server/system_service/src/main/java/com/doumee/dao/system/model/SystemTraceLog.java | 3
server/system_service/src/main/java/com/doumee/dao/system/model/SystemRole.java | 3
server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java | 3
server/system_service/src/main/java/com/doumee/dao/system/model/SystemPosition.java | 3
server/system_service/src/main/java/com/doumee/dao/system/model/SystemLoginLog.java | 3
server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java | 3
server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java | 3
server/system_service/src/main/java/com/doumee/dao/system/model/SystemRoleMenu.java | 3
server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java | 3
server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java | 3
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java | 214 ++++++++++++++++++++++++++++++++++++++++++
server/system_service/src/main/java/com/doumee/dao/system/model/SystemUserRole.java | 3
23 files changed, 264 insertions(+), 30 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
new file mode 100644
index 0000000..5d03593
--- /dev/null
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
@@ -0,0 +1,214 @@
+package com.doumee.cloud.admin;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.doumee.api.BaseController;
+import com.doumee.core.annotation.excel.ExcelExporter;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
+import com.doumee.dao.business.model.Bookings;
+import com.doumee.dao.business.vo.RoomStatisticsVo;
+import com.doumee.dao.system.dto.UserStatisticsDTO;
+import com.doumee.dao.system.vo.UserStatisticsVo;
+import com.doumee.dao.web.response.DateTimeResourceDate;
+import com.doumee.dao.web.response.MeetingDetailResponse;
+import com.doumee.service.business.BookingsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/05/04 18:18
+ */
+@Api(tags = "浼氳瀹ら瀹氫俊鎭〃")
+@RestController
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/bookings")
+public class BookingsCloudController extends BaseController {
+
+ @Autowired
+ private BookingsService bookingsService;
+
+ @PreventRepeat
+ @ApiOperation("鏂板缓")
+ @PostMapping("/create")
+ @RequiresPermissions("business:bookings:create")
+ public ApiResponse create(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ LoginUserInfo user = getLoginUser(token);
+ bookings.setLoginUserInfo(user);
+ bookings.setCreator(user.getId());
+ return ApiResponse.success(bookingsService.create(bookings));
+ }
+
+ @ApiOperation("鏍规嵁ID鍒犻櫎")
+ @GetMapping("/delete/{id}")
+ @RequiresPermissions("business:bookings:delete")
+ public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ bookingsService.deleteById(id,this.getLoginUser(token));
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎")
+ @GetMapping("/delete/batch")
+ @RequiresPermissions("business:bookings:delete")
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ String [] idArray = ids.split(",");
+ List<Integer> idList = new ArrayList<>();
+ for (String id : idArray ){
+ idList.add(Integer.valueOf(id));
+ }
+ bookingsService.deleteByIdInBatch(idList,this.getLoginUser(token));
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鏍规嵁ID淇敼")
+ @PostMapping("/updateById")
+ @RequiresPermissions("business:bookings:update")
+ public ApiResponse updateById(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ LoginUserInfo user = getLoginUser(token);
+ bookings.setLoginUserInfo(user);
+ bookings.setEditor(user.getId());
+ bookingsService.updateById(bookings);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ @RequiresPermissions("business:bookings:query")
+ public ApiResponse<PageData<Bookings>> findPage (@RequestBody PageWrap<Bookings> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(bookingsService.findPage(pageWrap));
+ }
+
+ @ApiOperation("瀵煎嚭Excel")
+ @PostMapping("/exportExcel")
+ @RequiresPermissions("business:bookings:exportExcel")
+ public void exportExcel (@RequestBody PageWrap<Bookings> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ ExcelExporter.build(Bookings.class).export(bookingsService.findPage(pageWrap).getRecords(), "浼氳瀹ら瀹氫俊鎭〃", response);
+ }
+
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @GetMapping("/{id}")
+ @RequiresPermissions("business:bookings:query")
+ public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(bookingsService.getMeetingDetail(id));
+ }
+
+
+ @ApiOperation("鍙栨秷")
+ @PostMapping("/cancelById")
+ @RequiresPermissions("business:bookings:update")
+ public ApiResponse cancelById(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ bookings.setLoginUserInfo(this.getLoginUser(token));
+ bookingsService.cancelById(bookings);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("浼氳瀹や娇鐢ㄦ椂闀跨粺璁�")
+ @GetMapping("/getRoomStatistics")
+ @RequiresPermissions("business:bookings:update")
+ public ApiResponse<List<RoomStatisticsVo>> getRoomStatistics(@RequestParam Integer yearNum, @RequestParam Integer roomId){
+ return ApiResponse.success(bookingsService.getRoomStatistics(yearNum));
+ }
+
+ @ApiOperation("浜哄憳鍙傚姞浼氳鏃跺父")
+ @PostMapping("/getUserStatistics")
+ @RequiresPermissions("business:bookings:update")
+ public ApiResponse<PageData<UserStatisticsVo>> getUserStatistics(@RequestBody PageWrap<UserStatisticsDTO> pageWrap ){
+ return ApiResponse.success(bookingsService.getUserStatistics(pageWrap));
+ }
+
+ @ApiOperation("浜哄憳鍙備細鏃堕暱缁熻瀵煎嚭Excel")
+ @PostMapping("/exportUserStatistics")
+ @RequiresPermissions("business:bookings:exportExcel")
+ public void exportUserStatistics (@RequestBody PageWrap<UserStatisticsDTO> pageWrap,HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+
+ List<UserStatisticsVo> records = bookingsService.getUserStatistics(pageWrap).getRecords();
+ if (!CollectionUtils.isEmpty(records)){
+ JSONArray o = (JSONArray) JSON.toJSON(records);
+ o.forEach(s->{
+ JSONObject jsonObject = (JSONObject) s;
+ Set<Map.Entry<String, Object>> entries = jsonObject.entrySet();
+ for (Map.Entry<String, Object> entry:entries){
+
+ if (entry.getValue() instanceof BigDecimal){
+ BigDecimal value = (BigDecimal) entry.getValue();
+ entry.setValue(value.compareTo(value.setScale(0, RoundingMode.DOWN)) > 0 ? value : value.setScale(0, RoundingMode.DOWN));
+ }
+ }
+ });
+ records = o.toJavaList(UserStatisticsVo.class);
+ }
+ ExcelExporter.build(UserStatisticsVo.class).export(records, "浜哄憳鍙備細鏃堕暱缁熻", response);
+ }
+
+ @ApiOperation("浼氳瀹や娇鐢ㄦ椂闀跨粺璁″鍑篍xcel")
+ @PostMapping("/exportRoomStatistics")
+ @RequiresPermissions("business:bookings:exportExcel")
+ public void exportRoomStatistics (@RequestBody PageWrap<UserStatisticsDTO> pageWrap,HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ List<RoomStatisticsVo> roomStatistics = bookingsService.getRoomStatistics(pageWrap.getModel().getYearNum());
+ if (!CollectionUtils.isEmpty(roomStatistics)){
+ JSONArray o = (JSONArray) JSON.toJSON(roomStatistics);
+ o.forEach(s->{
+ JSONObject jsonObject = (JSONObject) s;
+ Set<Map.Entry<String, Object>> entries = jsonObject.entrySet();
+ for (Map.Entry<String, Object> entry:entries){
+
+ if (entry.getValue() instanceof BigDecimal){
+ BigDecimal value = (BigDecimal) entry.getValue();
+ entry.setValue(value.compareTo(value.setScale(0, RoundingMode.DOWN)) > 0 ? value : value.setScale(0, RoundingMode.DOWN));
+ }
+ }
+ });
+ roomStatistics = o.toJavaList(RoomStatisticsVo.class);
+ }
+ ExcelExporter.build(RoomStatisticsVo.class).export(roomStatistics, "浼氳瀹や娇鐢ㄦ椂闀跨粺璁�", response);
+ }
+
+ @ApiOperation("鍙備笌鐨勯绾︿細璁�")
+ @GetMapping("/reservationCancel")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "1 浠婂ぉ 2 鏈懆", required = true),
+ })
+ public ApiResponse<List<Bookings>> getMyJoinBookingMeet(@RequestParam Integer type){
+
+ LocalDateTime startTime = LocalDateTime.of(LocalDate.now(), LocalTime.of(00,00,00));
+ LocalDateTime endTime = LocalDateTime.of(LocalDate.now(), LocalTime.of(23,59,59));
+ if(Constants.equalsInteger(type,Constants.TWO)){
+ startTime = DateUtil.getMonday();
+ endTime = DateUtil.getSunday();
+ }
+ return ApiResponse.success(bookingsService.getMyJoinBookingMeet(getLoginUser(null).getId(), null,startTime,endTime));
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛褰撳綋鏈堥绾︿細璁儏鍐�
+ * @return
+ */
+ @ApiOperation("鑾峰彇鐢ㄦ埛褰撳綋鏈堥绾︿細璁儏鍐�")
+ @PostMapping("/findMothBookingMeet")
+ public ApiResponse<List<DateTimeResourceDate>> findMothBookingMeet( @RequestParam(required = false) Integer roomId,String dateMonth){
+ return ApiResponse.success(bookingsService.findMothBookingMeet(getLoginUser(null).getId(),roomId,dateMonth));
+ }
+}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
index 847ee4c..412059b 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
@@ -124,9 +124,9 @@
})
public ApiResponse<Integer> reservationMeeting(@RequestBody BookingsRequest bookingsRequest,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
LoginUserInfo user = getLoginUser(token);
-// LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
bookingsRequest.setCreator(user.getId());
bookingsRequest.setEditor(user.getId());
+ bookingsRequest.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success("鎿嶄綔鎴愬姛",bookingsService.reservationMeeting(bookingsRequest));
}
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java
index ad11b15..59df5ed 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/web/request/BookingsRequest.java
@@ -1,5 +1,6 @@
package com.doumee.dao.web.request;
+import com.doumee.core.model.LoginUserModel;
import com.doumee.dao.business.model.BookingTime;
import com.doumee.dao.system.model.Multifile;
import com.doumee.dao.business.model.ProjectRel;
@@ -19,7 +20,7 @@
*/
@Data
@ApiModel("浼氳瀹ら瀹氳姹傜被")
-public class BookingsRequest {
+public class BookingsRequest extends LoginUserModel {
@ApiModelProperty(value = "涓婚敭", example = "1")
private Integer id;
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
index f22d92f..fec87ee 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
@@ -1,6 +1,7 @@
package com.doumee.service.business;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.admin.response.DevWgResponseParam;
@@ -39,21 +40,21 @@
*
* @param id 涓婚敭
*/
- void deleteById(Integer id);
+ void deleteById(Integer id,LoginUserInfo user);
/**
* 鍒犻櫎
*
* @param bookings 瀹炰綋瀵硅薄
*/
- void delete(Bookings bookings);
+ void delete(Bookings bookings,LoginUserInfo user);
/**
* 鎵归噺涓婚敭鍒犻櫎
*
* @param ids 涓婚敭闆�
*/
- void deleteByIdInBatch(List<Integer> ids);
+ void deleteByIdInBatch(List<Integer> ids, LoginUserInfo user);
/**
* 涓婚敭鏇存柊
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index 7e56c59..abdbaeb 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -299,8 +299,7 @@
}
@Override
- public void deleteById(Integer id) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public void deleteById(Integer id,LoginUserInfo user) {
Bookings bookings = new Bookings();
bookings.setId(id);
bookings.setIsdeleted(MeetConstants.ONE);
@@ -310,14 +309,13 @@
}
@Override
- public void delete(Bookings bookings) {
+ public void delete(Bookings bookings,LoginUserInfo user) {
UpdateWrapper<Bookings> deleteWrapper = new UpdateWrapper<>(bookings);
bookingsMapper.delete(deleteWrapper);
}
@Override
- public void deleteByIdInBatch(List<Integer> ids) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
@@ -349,8 +347,7 @@
if(dbBookings.getStatus().equals(MeetConstants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鏈鎿嶄綔澶辫触,棰勭害鐘舵�佸凡娴佽浆");
}
- LoginUserInfo user = new LoginUserInfo();
- user.setId(bookings.getCreator());
+ LoginUserInfo user = bookings.getLoginUserInfo();
isCreateParamValid(bookings, user);
bookings.setEditDate(new Date());
bookings.setEditor(user.getId());
@@ -385,6 +382,9 @@
@Override
public void cancelById(Bookings bs) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(user == null){
+ user = bs.getLoginUserInfo();
+ }
/*
if(Objects.isNull(bookings)||bookings.getId()==null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), ResponseStatus.BAD_REQUEST.getMessage());
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java b/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
index 7986a80..2c274ae 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/Multifile.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +20,7 @@
@Data
@ApiModel("闄勪欢涓婁紶淇℃伅琛�")
@TableName("`multifile`")
-public class Multifile {
+public class Multifile extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
index 85e9332..b0be2e5 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/Notices.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.model.LoginUserModel;
import com.doumee.core.utils.Constants;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,7 +22,7 @@
@Data
@ApiModel("绯荤粺娑堟伅淇℃伅琛�")
@TableName("`notices`")
-public class Notices {
+public class Notices extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDataPermission.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDataPermission.java
index 66505c7..7f82b15 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDataPermission.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDataPermission.java
@@ -1,6 +1,7 @@
package com.doumee.dao.system.model;
import com.doumee.core.constants.OperaType;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -22,7 +23,7 @@
@Data
@ApiModel("鏁版嵁鏉冮檺閰嶇疆")
@TableName("SYSTEM_DATA_PERMISSION")
-public class SystemDataPermission implements Serializable {
+public class SystemDataPermission extends LoginUserModel implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartment.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartment.java
index 1e960c3..6887f64 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartment.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartment.java
@@ -1,6 +1,7 @@
package com.doumee.dao.system.model;
import com.doumee.core.constants.OperaType;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -21,7 +22,7 @@
*/
@Data
@ApiModel("閮ㄩ棬")
-public class SystemDepartment implements Serializable {
+public class SystemDepartment extends LoginUserModel implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartmentUser.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartmentUser.java
index 292901a..28343ea 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartmentUser.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartmentUser.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,7 +17,7 @@
*/
@Data
@ApiModel("閮ㄩ棬鐢ㄦ埛")
-public class SystemDepartmentUser implements Serializable {
+public class SystemDepartmentUser extends LoginUserModel implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDict.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDict.java
index 3b7729a..c0a111a 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDict.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDict.java
@@ -1,6 +1,7 @@
package com.doumee.dao.system.model;
import com.doumee.core.constants.OperaType;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +20,7 @@
*/
@Data
@ApiModel("瀛楀吀")
-public class SystemDict implements Serializable {
+public class SystemDict extends LoginUserModel implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDictData.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDictData.java
index 73f46f4..6f3174e 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDictData.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDictData.java
@@ -1,6 +1,7 @@
package com.doumee.dao.system.model;
import com.doumee.core.constants.OperaType;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +20,7 @@
*/
@Data
@ApiModel("瀛楀吀鏁版嵁")
-public class SystemDictData implements Serializable {
+public class SystemDictData extends LoginUserModel implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemLoginLog.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemLoginLog.java
index 41ea8dd..4d536fe 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemLoginLog.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemLoginLog.java
@@ -1,6 +1,7 @@
package com.doumee.dao.system.model;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -18,7 +19,7 @@
*/
@Data
@ApiModel("鐧诲綍鏃ュ織")
-public class SystemLoginLog {
+public class SystemLoginLog extends LoginUserModel {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java
index be604dc..44edb71 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemMenu.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.constants.OperaType;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -21,7 +22,7 @@
*/
@Data
@ApiModel("绯荤粺鑿滃崟")
-public class SystemMenu implements Serializable {
+public class SystemMenu extends LoginUserModel implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java
index 313536b..d972eda 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPermission.java
@@ -1,6 +1,7 @@
package com.doumee.dao.system.model;
import com.doumee.core.constants.OperaType;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +20,7 @@
*/
@Data
@ApiModel("绯荤粺鏉冮檺")
-public class SystemPermission implements Serializable {
+public class SystemPermission extends LoginUserModel implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPosition.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPosition.java
index 9999c3e..0d45205 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPosition.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPosition.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.constants.OperaType;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -21,7 +22,7 @@
*/
@Data
@ApiModel("宀椾綅")
-public class SystemPosition implements Serializable {
+public class SystemPosition extends LoginUserModel implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPositionUser.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPositionUser.java
index 80407e9..b75c99c 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPositionUser.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemPositionUser.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,7 +17,7 @@
*/
@Data
@ApiModel("宀椾綅鐢ㄦ埛")
-public class SystemPositionUser implements Serializable {
+public class SystemPositionUser extends LoginUserModel implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRole.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRole.java
index 38a7b9e..7970e05 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRole.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRole.java
@@ -1,6 +1,7 @@
package com.doumee.dao.system.model;
import com.doumee.core.constants.OperaType;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +20,7 @@
*/
@Data
@ApiModel("绯荤粺瑙掕壊")
-public class SystemRole implements Serializable {
+public class SystemRole extends LoginUserModel implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRoleMenu.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRoleMenu.java
index 37b0608..84ba3a4 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRoleMenu.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRoleMenu.java
@@ -1,5 +1,6 @@
package com.doumee.dao.system.model;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -16,7 +17,7 @@
*/
@Data
@ApiModel("瑙掕壊鑿滃崟鍏宠仈")
-public class SystemRoleMenu implements Serializable {
+public class SystemRoleMenu extends LoginUserModel implements Serializable {
@ApiModelProperty(value = "涓婚敭", example = "1")
@TableId(type = IdType.AUTO)
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRolePermission.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRolePermission.java
index 5caea59..718099d 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRolePermission.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemRolePermission.java
@@ -1,5 +1,6 @@
package com.doumee.dao.system.model;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -16,7 +17,7 @@
*/
@Data
@ApiModel("瑙掕壊鏉冮檺鍏宠仈")
-public class SystemRolePermission implements Serializable {
+public class SystemRolePermission extends LoginUserModel implements Serializable {
@ApiModelProperty(value = "涓婚敭", example = "1")
@TableId(type = IdType.AUTO)
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemTraceLog.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemTraceLog.java
index 7f9ddab..8ed6e74 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemTraceLog.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemTraceLog.java
@@ -1,6 +1,7 @@
package com.doumee.dao.system.model;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -17,7 +18,7 @@
*/
@Data
@ApiModel("璺熻釜鏃ュ織")
-public class SystemTraceLog implements Serializable {
+public class SystemTraceLog extends LoginUserModel implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
index 4fa3fff..c81fad3 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.constants.OperaType;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -25,7 +26,7 @@
@Data
@ApiModel("绯荤粺鐢ㄦ埛")
@TableName("`SYSTEM_USER`")
-public class SystemUser implements Serializable {
+public class SystemUser extends LoginUserModel implements Serializable {
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUserRole.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUserRole.java
index 5ce3e2e..31cbaf4 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUserRole.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemUserRole.java
@@ -1,5 +1,6 @@
package com.doumee.dao.system.model;
+import com.doumee.core.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -16,7 +17,7 @@
*/
@Data
@ApiModel("鐢ㄦ埛瑙掕壊鍏宠仈")
-public class SystemUserRole implements Serializable {
+public class SystemUserRole extends LoginUserModel implements Serializable {
@ApiModelProperty(value = "涓婚敭", example = "1")
@TableId(type = IdType.AUTO)
--
Gitblit v1.9.3