From b771d62db31bb113aff6db1be958ca83d591212f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 11 五月 2024 11:58:44 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 6
server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java | 2
server/meeting/meeting_admin/src/main/java/com/doumee/MeetingAdminApplication.java | 2
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java | 2
server/system_service/src/main/java/com/doumee/core/model/LoginUserModel.java | 3
server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroConfig.java | 4
server/system_service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 2
admin/src/api/meeting/projects.js | 7 -
admin/src/views/meeting/rooms.vue | 3
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java | 8 +-
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java | 4
admin/src/utils/form.js | 56 ++++++++++++++
server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java | 65 ++++++++-------
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java | 4
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java | 26 +++---
admin/src/views/meeting/components/OperaRoomsWindow.vue | 15 ++-
admin/src/views/meeting/projects.vue | 7 -
server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java | 2
admin/src/views/meeting/components/OperaBookingsWindow.vue | 6
19 files changed, 146 insertions(+), 78 deletions(-)
diff --git a/admin/src/api/meeting/projects.js b/admin/src/api/meeting/projects.js
index 30bb958..03d4b53 100644
--- a/admin/src/api/meeting/projects.js
+++ b/admin/src/api/meeting/projects.js
@@ -24,14 +24,13 @@
return request.post('/meetingAdmin/cloudService/business/projects/updateById', data)
}
// 浼氳鍏宠仈鐨勯」鐩�
-export function findListByObjId ({objId, objType}) {
- // return request.post('/meetingAdmin/cloudService/business/projects/findListByObjId', { params })
- return request.post(`/meetingAdmin/cloudService/projects/findListByObjId?objId=${objId}&objType=${objType}`)
+export function findListByObjId (data) {
+ return request.post('/meetingAdmin/cloudService/business/projects/findListByObjId', data)
}
// 鍒犻櫎
export function deleteById (id) {
- return request.get(`/meetingAdmin/cloudService/projects/delete/${id}`)
+ return request.get(`/meetingAdmin/cloudService/business/projects/delete/${id}`)
}
// 鎵归噺鍒犻櫎
diff --git a/admin/src/utils/form.js b/admin/src/utils/form.js
index 90af3c2..52ef5cf 100644
--- a/admin/src/utils/form.js
+++ b/admin/src/utils/form.js
@@ -23,3 +23,59 @@
}
callback()
}
+
+
+export function numRule(rule, value, callback) {
+ // debugger
+ if (value == null || value < 0 || !value) {
+ callback(new Error())
+ } else {
+ callback()
+ }
+}
+export function arrayRule(rule, value, callback) {
+ // debugger
+ if (value == null || value.length <= 0 || !value) {
+ callback(new Error())
+ } else {
+ callback()
+ }
+}
+
+export function nameRule (rule, value, callback) {
+ if (value == null || value.trim() === '') {
+ if (rule.required) {
+ callback(new Error('璇疯緭鍏ュ悕瀛�'))
+ } else {
+ callback()
+ }
+ return
+ }
+ callback()
+ // let re = /^[\u4e00-\u9fa5]+$/g;
+ // var result = re.test(value)
+ // if(!result) {
+ // callback(new Error('璇疯緭鍏ユ纭殑鍚嶅瓧'))
+ // } else {
+ // callback()
+ // }
+}
+export function creditCode (rule, value, callback) {
+ if (value == null || value.trim() === '') {
+ if (rule.required) {
+ callback(new Error('璇疯緭鍏ョぞ浼氫俊鐢ㄤ唬鐮�'))
+ } else {
+ callback()
+ }
+ return
+ }
+ let re = /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/
+ var result = re.test(value)
+ if(!result) {
+ callback(new Error('璇疯緭鍏ユ纭殑绀句細淇＄敤浠ｇ爜'))
+ } else {
+ callback()
+ }
+}
+
+
diff --git a/admin/src/views/meeting/components/OperaBookingsWindow.vue b/admin/src/views/meeting/components/OperaBookingsWindow.vue
index 0af16af..b998662 100644
--- a/admin/src/views/meeting/components/OperaBookingsWindow.vue
+++ b/admin/src/views/meeting/components/OperaBookingsWindow.vue
@@ -101,7 +101,7 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalAlertWindow from '@/components/common/GlobalAlertWindow'
import FileLink from '@/views/meeting/components/common/FileLink'
-import { uploadFileLocal as upload } from '@/api/system/common'
+import { upload as upload } from '@/api/system/common'
import { fetchList as userList } from '@/api/system/user'
import { findListByObjId } from '@/api/meeting/projects'
import { findList } from '@/api/meeting/roomTime'
@@ -211,8 +211,8 @@
selectRoom(objId) {
this.getTimes()
findListByObjId({
- objId,
- objType: 0,
+ objId: objId,
+ objType: 0
})
.then(res => {
this.projectList = res
diff --git a/admin/src/views/meeting/components/OperaRoomsWindow.vue b/admin/src/views/meeting/components/OperaRoomsWindow.vue
index 853154d..cbb22d9 100644
--- a/admin/src/views/meeting/components/OperaRoomsWindow.vue
+++ b/admin/src/views/meeting/components/OperaRoomsWindow.vue
@@ -101,20 +101,20 @@
id: null,
sysList: [],
projectList: [],
- createDate: '',
+ createDate: null,
editor: '',
- editDate: '',
- isdeleted: '',
+ editDate: null,
+ isdeleted: 0,
name: '',
remark: '',
startTime: '',
endTime: '',
- limitNum: '',
+ limitNum: 0,
imgurl: '',
imgFullUrl: '',
tips: '',
- status: '',
- intervalTime: ''
+ status: 0,
+ intervalTime: 0
},
user: [],
projectList: [],
@@ -178,6 +178,9 @@
this.form.projectList = this.form.projectList ? target.projectList.map(item => item.projectId) : []
this.form.sysList = this.form.sysList ? this.form.sysList.map(item => item.userId) : []
// console.log(this.form.imgFullUrl);
+ console.log(this.form)
+ console.log(this.form.intervalTime)
+ console.log(target)
})
},
selectRange(v) {
diff --git a/admin/src/views/meeting/projects.vue b/admin/src/views/meeting/projects.vue
index 4ccd9e6..884eb7c 100644
--- a/admin/src/views/meeting/projects.vue
+++ b/admin/src/views/meeting/projects.vue
@@ -58,7 +58,7 @@
<!-- {{ row.imgurlfull }} -->
<el-image
v-if="!!row.imgurlfull"
- style="width: 80px; height: 40px;"
+ style="width: 40px; height: 40px;"
:src="row.imgurlfull"
:preview-src-list="[row.imgurlfull]"
></el-image>
@@ -67,12 +67,11 @@
<el-table-column prop="name" label="鍚嶇О" align="center" min-width="100px"></el-table-column>
<el-table-column prop="sortnum" label="鎺掑簭鐮�(鍗囧簭)" align="center" min-width="100px"></el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="100px"></el-table-column>
-
+ <el-table-column prop="editDate" label="鏇存柊鏃堕棿" align="center" min-width="100px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:projects:update', 'business:projects:delete'])"
label="鎿嶄綔"
min-width="120"
- fixed="right"
align="center"
>
<template slot-scope="{row}">
@@ -123,7 +122,7 @@
created () {
this.config({
module: '鏈嶅姟椤圭洰淇℃伅琛�',
- api: '@/views/meeting/api/projects',
+ api: '/meeting/projects',
'field.id': 'id',
'field.main': 'id'
})
diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index a8ef660..d75760a 100644
--- a/admin/src/views/meeting/rooms.vue
+++ b/admin/src/views/meeting/rooms.vue
@@ -11,6 +11,7 @@
filterable
clearable
multiple
+ style="width: 250px"
placeholder="閫夋嫨閮ㄩ棬鎴愬憳"
>
<el-option
@@ -84,8 +85,8 @@
</template>
</el-table-column>
<el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="140px"></el-table-column>
+ <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="140px"></el-table-column>
<!-- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
<el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
<el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
<el-table-column prop="imgurl" label="浼氳瀹ゅ浘鐗�" min-width="100px"></el-table-column>
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/MeetingAdminApplication.java b/server/meeting/meeting_admin/src/main/java/com/doumee/MeetingAdminApplication.java
index 0a50827..4802001 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/MeetingAdminApplication.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/MeetingAdminApplication.java
@@ -16,8 +16,8 @@
@Slf4j
@EnableAsync
@SpringBootApplication
+@MapperScan("com.doumee.dao.*")
@EnableDiscoveryClient
-@MapperScan("com.doumee.dao")
public class MeetingAdminApplication {
public static void main(String[] args) {
ApplicationContext context = SpringApplication.run(MeetingAdminApplication.class);
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
index b1243f2..bfeec82 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
@@ -66,7 +66,7 @@
@GetMapping("/delete/{id}")
@RequiresPermissions("business:bookings:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
- bookingsService.deleteById(id);
+ bookingsService.deleteById(id,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -79,7 +79,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- bookingsService.deleteByIdInBatch(idList);
+ bookingsService.deleteByIdInBatch(idList,this.getLoginUser(null));
return ApiResponse.success(null);
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java
index bbeabee..ce4d517 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/common/HomeController.java
@@ -83,7 +83,7 @@
bq2.eq(Bookings::getStatus, Constants.ZERO);
bq2.apply("DATE_FORMAT(t.START_TIME,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d') " );
// bq2.last("limit 1");
- bq2.select("(select count(u.id) from user_rel u where u.ISDELETED=0 and u.OBJ_ID=t.id)as bookingUser");
+ bq2.select("(select count(u.id) from meeting_user_rel u where u.ISDELETED=0 and u.OBJ_ID=t.id)as bookingUser");
List<Bookings> bk2= bookingsJoinMapper.selectJoinList(Bookings.class,bq2);
Integer bookingUser=0;
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
index 5d03593..146954b 100644
--- 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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
@@ -23,7 +24,6 @@
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.*;
@@ -54,7 +54,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("business:bookings:create")
+ @CloudRequiredPermission("business:bookings:create")
public ApiResponse create(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
LoginUserInfo user = getLoginUser(token);
bookings.setLoginUserInfo(user);
@@ -64,7 +64,7 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
- @RequiresPermissions("business:bookings:delete")
+ @CloudRequiredPermission("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);
@@ -72,7 +72,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
- @RequiresPermissions("business:bookings:delete")
+ @CloudRequiredPermission("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<>();
@@ -85,7 +85,7 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
- @RequiresPermissions("business:bookings:update")
+ @CloudRequiredPermission("business:bookings:update")
public ApiResponse updateById(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
LoginUserInfo user = getLoginUser(token);
bookings.setLoginUserInfo(user);
@@ -96,21 +96,21 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @RequiresPermissions("business:bookings:query")
+ @CloudRequiredPermission("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")
+ @CloudRequiredPermission("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")
+ @CloudRequiredPermission("business:bookings:query")
public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(bookingsService.getMeetingDetail(id));
}
@@ -118,7 +118,7 @@
@ApiOperation("鍙栨秷")
@PostMapping("/cancelById")
- @RequiresPermissions("business:bookings:update")
+ @CloudRequiredPermission("business:bookings:update")
public ApiResponse cancelById(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
bookings.setLoginUserInfo(this.getLoginUser(token));
bookingsService.cancelById(bookings);
@@ -127,21 +127,21 @@
@ApiOperation("浼氳瀹や娇鐢ㄦ椂闀跨粺璁�")
@GetMapping("/getRoomStatistics")
- @RequiresPermissions("business:bookings:update")
+ @CloudRequiredPermission("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")
+ @CloudRequiredPermission("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")
+ @CloudRequiredPermission("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();
@@ -165,7 +165,7 @@
@ApiOperation("浼氳瀹や娇鐢ㄦ椂闀跨粺璁″鍑篍xcel")
@PostMapping("/exportRoomStatistics")
- @RequiresPermissions("business:bookings:exportExcel")
+ @CloudRequiredPermission("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)){
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
index ae7b0bf..65809ef 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
@@ -19,6 +19,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* @author 姹熻箘韫�
@@ -93,13 +94,12 @@
return ApiResponse.success(projectsService.findById(id));
}
-
-
@ApiOperation("浼氳鍏宠仈鐨勯」鐩�")
@PostMapping("/findListByObjId")
@CloudRequiredPermission("business:projects:query")
- public ApiResponse<List<ProjectsResponse>> findListByObjId (@RequestParam Integer objId, @RequestParam Integer objType, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- return ApiResponse.success(projectsService.getProjectsList(objId,objType));
+ public ApiResponse<List<ProjectsResponse>> findListByObjId (@RequestBody Map<String,Object> param, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+// @RequestParam Integer objId, @RequestParam Integer objType,
+ return ApiResponse.success(projectsService.getProjectsList((Integer) param.get("objId"), (Integer) param.get("objType")));
}
}
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroConfig.java b/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroConfig.java
index 5ad5c9e..5628eb0 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroConfig.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/config/shiro/ShiroConfig.java
@@ -59,6 +59,7 @@
DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
securityManager.setRealm(shiroRealm);
securityManager.setSessionManager(this.sessionManager());
+
securityManager.setCacheManager(shiroCacheManager);
return securityManager;
}
@@ -67,7 +68,7 @@
public ShiroFilterFactoryBean shiroFilterFactoryBean(SecurityManager securityManager) {
ShiroFilterFactoryBean shiroFilterFactoryBean = new ShiroFilterFactoryBean();
shiroFilterFactoryBean.setSecurityManager(securityManager);
- Map<String, String> map = new HashMap<>();
+ Map<String, String> map = new LinkedHashMap<>();
// 璺緞鎷︽埅閰嶇疆
map.put("/system/login", "anon");
map.put("/system/logout", "anon");
@@ -75,7 +76,6 @@
//鏂囦欢涓婁紶鍙栨秷鎷︽埅
map.put("/public/**", "anon");
map.put(Constants.CLOUD_SERVICE_URL_INDEX+"/**", "anon");
-
// - 鏀捐swagger
map.put("/doc.html", "anon");
map.put("/webjars/**", "anon");
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 abdbaeb..eff84fa 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
@@ -513,7 +513,7 @@
prquery.selectAll(ProjectRel.class);
prquery.eq(ProjectRel::getIsdeleted, MeetConstants.ZERO);
prquery.eq(ProjectRel::getObjId, s.getId());
- prquery.select("(select p.name from projects p where t.PROJECT_ID = p.id and p.ISDELETED = 0 ) as projectName");
+ prquery.select("(select p.name from meeting_projects p where t.PROJECT_ID = p.id and p.ISDELETED = 0 ) as projectName");
List<ProjectRel> prList = projectRelJoinMapper.selectJoinList(ProjectRel.class, prquery);
s.setProjectList(prList);
@@ -744,7 +744,7 @@
@Override
public List<Bookings> getMyBookings(Integer userId, String dateMsg) {
return bookingsMapper.selectList(new QueryWrapper<Bookings>()
- .apply(" id in ( select u.OBJ_ID from user_rel u where u.USER_ID = '" + userId + "' and u.ISDELETED = 0 and OBJ_TYPE = 1 ) ")
+ .apply(" id in ( select u.OBJ_ID from meeting_user_rel u where u.USER_ID = '" + userId + "' and u.ISDELETED = 0 and OBJ_TYPE = 1 ) ")
.eq("ISDELETED",MeetConstants.ZERO)
// .eq("STATUS",MeetConstants.ZERO)
.apply(" ROOM_ID in ( select r.id from rooms r where r.ISDELETED = 0 and r.STATUS = 0 )")
@@ -765,7 +765,7 @@
j -> j.like("a.NAME",pageWrap.getModel().getRoomsName()).or()
.like(" b.NAME", pageWrap.getModel().getRoomsName()))
.exists(pageWrap.getModel().getQueryType().equals(MeetConstants.ONE) && !Objects.isNull(pageWrap.getModel().getUserId()),
- " select 1 from user_rel u where a.id = u.OBJ_ID and u.USER_ID = '" + pageWrap.getModel().getUserId() + "' and u.ISDELETED = 0 and OBJ_TYPE = 1 ")
+ " select 1 from meeting_user_rel u where a.id = u.OBJ_ID and u.USER_ID = '" + pageWrap.getModel().getUserId() + "' and u.ISDELETED = 0 and OBJ_TYPE = 1 ")
.eq(pageWrap.getModel().getQueryType().equals(MeetConstants.TWO) && !Objects.isNull(pageWrap.getModel().getUserId()), "a.CREATOR", pageWrap.getModel().getUserId())
.like(StringUtils.isNotBlank(pageWrap.getModel().getQueryDate()), "a.START_TIME", pageWrap.getModel().getQueryDate())
.eq(!Objects.isNull(pageWrap.getModel().getRoomsId()), "b.id", pageWrap.getModel().getRoomsId())
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java
index 41d302c..73988e0 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/ProjectsServiceImpl.java
@@ -180,7 +180,7 @@
public List<ProjectsResponse> getProjectsList(Integer objId,Integer objType) {
return projectsMapper.getProjectsList(new QueryWrapper<ProjectsResponse>()
.eq("ISDELETED",MeetConstants.ZERO)
- .exists(" select 1 from project_rel p where p.PROJECT_ID = projects.id and p.OBJ_ID = "+objId+" and p.OBJ_TYPE = "+objType+" ")
+ .exists(" select 1 from meeting_project_rel p where p.PROJECT_ID = projects.id and p.OBJ_ID = "+objId+" and p.OBJ_TYPE = "+objType+" ")
);
}
}
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
index 90bf637..a3d4dae 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/RoomsServiceImpl.java
@@ -450,7 +450,7 @@
// queryWrapper.leftJoin(UserRel.class,UserRel::getObjId,Rooms::getId);
List<Integer> collect = pageWrap.getModel().getSysList().stream().map(UserRel::getUserId).collect(Collectors.toList());
- queryWrapper.exists("select u.id from user_rel u where u.ISDELETED=0 and u.OBJ_ID =t.id and u.USER_ID in (" + StringUtils.strip(collect.toString(),"[]")+" )");
+ queryWrapper.exists("select u.id from meeting_user_rel u where u.ISDELETED=0 and u.OBJ_ID =t.id and u.USER_ID in (" + StringUtils.strip(collect.toString(),"[]")+" )");
}
String path = systemDictDataBiz.queryByCode(Constants.FTP, Constants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
@@ -536,7 +536,7 @@
.eq("STATUS",Constants.ZERO)
.eq("ISDELETED",Constants.ZERO)
.like(StringUtils.isNotBlank(pageWrap.getModel().getRoomsName()),"NAME",pageWrap.getModel().getRoomsName())
- .exists(" select 1 from user_rel u where u.USER_ID = "+pageWrap.getModel().getUserId()+" and u.ISDELETED = 0 and u.OBJ_ID = rooms.id and u.OBJ_TYPE = 0 ")
+ .exists(" select 1 from meeting_user_rel u where u.USER_ID = "+pageWrap.getModel().getUserId()+" and u.ISDELETED = 0 and u.OBJ_ID = rooms.id and u.OBJ_TYPE = 0 ")
.orderByDesc("CREATE_DATE")
);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP, Constants.FTP_RESOURCE_PATH).getCode()
diff --git a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
index 6237e62..a9d3ae1 100644
--- a/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
+++ b/server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java
@@ -145,7 +145,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璺緞鍙傛暟涓嶅畬鏁�");
}
SystemDict queryDto = new SystemDict();
- queryDto.setCode(Constants.OSS);
+ queryDto.setCode(Constants.FTP);
queryDto.setDeleted(Boolean.FALSE);
SystemDict dictData = systemDictService.findOne(queryDto);
if (dictData == null) {
diff --git a/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java b/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
index 0228c3a..f06ee51 100644
--- a/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
+++ b/server/system_service/src/main/java/com/doumee/config/cloudfilter/LoginHandlerInterceptor.java
@@ -32,46 +32,51 @@
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
- HandlerMethod handlerMethod = (HandlerMethod) handler;
- Class<?> beanType = handlerMethod.getBeanType();
- if (!beanType.isAnnotationPresent(LoginNoRequired.class) && !handlerMethod.hasMethodAnnotation(LoginNoRequired.class)) {
- //鑾峰彇token
- Cookie[] cookies = request.getCookies();
- String token = request.getHeader(Constants.HEADER_USER_TOKEN); // 浠� http 璇锋眰澶翠腑鍙栧嚭 token
- if(StringUtils.isBlank(token)){
- for(Cookie c :cookies){
- if(StringUtils.equals(c.getName(),Constants.HEADER_USER_TOKEN)){
- token = c.getValue();
+ if(handler instanceof HandlerMethod){
+ HandlerMethod handlerMethod = (HandlerMethod) handler;
+ Class<?> beanType = handlerMethod.getBeanType();
+ if (!beanType.isAnnotationPresent(LoginNoRequired.class) && !handlerMethod.hasMethodAnnotation(LoginNoRequired.class)) {
+ //鑾峰彇token
+ Cookie[] cookies = request.getCookies();
+ String token = request.getHeader(Constants.HEADER_USER_TOKEN); // 浠� http 璇锋眰澶翠腑鍙栧嚭 token
+ if(StringUtils.isBlank(token)){
+ for(Cookie c :cookies){
+ if(StringUtils.equals(c.getName(),Constants.HEADER_USER_TOKEN)){
+ token = c.getValue();
+ }
}
}
- }
- if (StringUtils.isNotBlank(token)) {
- LoginUserInfo user = checkLogin(token);
- if (handlerMethod.hasMethodAnnotation(CloudRequiredPermission.class)) {
- CloudRequiredPermission p = handlerMethod.getMethodAnnotation(CloudRequiredPermission.class);
- if(p.value()!=null && p.value().length>0){
- boolean hasPermission = false;
- for(String s :p.value()){
- if(user.getPermissions()!=null){
- for(String t :user.getPermissions()){
- if(StringUtils.equals(t,s)){
- hasPermission = true;
- break;
+ if (StringUtils.isNotBlank(token)) {
+ LoginUserInfo user = checkLogin(token);
+ if (handlerMethod.hasMethodAnnotation(CloudRequiredPermission.class)) {
+ CloudRequiredPermission p = handlerMethod.getMethodAnnotation(CloudRequiredPermission.class);
+ if(p.value()!=null && p.value().length>0){
+ boolean hasPermission = false;
+ for(String s :p.value()){
+ if(user.getPermissions()!=null){
+ for(String t :user.getPermissions()){
+ if(StringUtils.equals(t,s)){
+ hasPermission = true;
+ break;
+ }
}
}
}
+ if(!hasPermission) {
+ //娌℃湁鎿嶄綔鏉冮檺
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"娌℃湁璇ユ搷浣滄潈闄�");
+ }
}
- if(!hasPermission) {
- //娌℃湁鎿嶄綔鏉冮檺
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"娌℃湁璇ユ搷浣滄潈闄�");
- }
- }
+ }
+ } else {
+ throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
}
- } else {
- throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
}
+ }else{
+ throw new BusinessException(ResponseStatus.NO_LOGIN.getCode(),"鏈櫥褰�");
}
+
return true;
}
diff --git a/server/system_service/src/main/java/com/doumee/core/model/LoginUserModel.java b/server/system_service/src/main/java/com/doumee/core/model/LoginUserModel.java
index 3511ec0..3647a7c 100644
--- a/server/system_service/src/main/java/com/doumee/core/model/LoginUserModel.java
+++ b/server/system_service/src/main/java/com/doumee/core/model/LoginUserModel.java
@@ -1,6 +1,8 @@
package com.doumee.core.model;
import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
import lombok.Data;
/**
@@ -11,6 +13,7 @@
@Data
public class LoginUserModel {
@TableField(exist = false)
+ @ApiModelProperty(hidden = true)
private LoginUserInfo loginUserInfo;
}
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 c81fad3..8f88b2b 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
@@ -32,6 +32,8 @@
@ApiModelProperty(value = "涓婚敭", example = "1")
@NotNull(message = "涓婚敭涓嶈兘涓虹┖", groups = {OperaType.Update.class})
private Integer id;
+ @ApiModelProperty(value = "鐢ㄦ埛缂栫爜锛堝叧鑱攎ember)", example = "1")
+ private Integer memberId;
@ApiModelProperty(value = "鐢ㄦ埛鍚�")
@NotBlank(message = "鐢ㄦ埛鍚嶄笉鑳戒负绌�")
--
Gitblit v1.9.3