提交代码

This commit is contained in:
zlwu committed 2025-08-02 10:28:19 +08:00
1 parent b81479819f
commit d45af45132
7 files changed
+76 -19

No files matched your search

@@ -79,7 +79,7 @@ public class AuthController {
* @param body 登录信息
* @return 结果
*/
@ApiEncrypt
@ApiEncrypt(response = true)
@PostMapping("/login")
public R<LoginVo> login(@RequestBody String body) {
LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class);
@@ -15,6 +15,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.encrypt.annotation.ApiEncrypt;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.hq.domain.vo.HqHallInfoVo;
@@ -39,6 +40,7 @@ public class HqHallInfoController extends BaseController {
/**
* 查询报告厅信息列表
*/
@ApiEncrypt(response = true)
@SaCheckPermission("hq:hallInfo:list")
@GetMapping("/list")
public TableDataInfo<HqHallInfoVo> list(HqHallInfoBo bo, PageQuery pageQuery) {
@@ -48,6 +50,7 @@ public class HqHallInfoController extends BaseController {
/**
* 导出报告厅信息列表
*/
@ApiEncrypt(response = true)
@SaCheckPermission("hq:hallInfo:export")
@Log(title = "报告厅信息", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@@ -61,16 +64,17 @@ public class HqHallInfoController extends BaseController {
*
* @param id 主键
*/
@ApiEncrypt(response = true)
@SaCheckPermission("hq:hallInfo:query")
@GetMapping("/{id}")
public R<HqHallInfoVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
public R<HqHallInfoVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
return R.ok(hqHallInfoService.queryById(id));
}
/**
* 新增报告厅信息
*/
@ApiEncrypt(response = true)
@SaCheckPermission("hq:hallInfo:add")
@Log(title = "报告厅信息", businessType = BusinessType.INSERT)
@RepeatSubmit()
@@ -82,6 +86,7 @@ public class HqHallInfoController extends BaseController {
/**
* 修改报告厅信息
*/
@ApiEncrypt(response = true)
@SaCheckPermission("hq:hallInfo:edit")
@Log(title = "报告厅信息", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@@ -95,11 +100,11 @@ public class HqHallInfoController extends BaseController {
*
* @param ids 主键串
*/
@ApiEncrypt(response = true)
@SaCheckPermission("hq:hallInfo:remove")
@Log(title = "报告厅信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
return toAjax(hqHallInfoService.deleteWithValidByIds(List.of(ids), true));
}
}
@@ -15,6 +15,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.encrypt.annotation.ApiEncrypt;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
import org.dromara.hq.domain.vo.HqHallReservationVo;
@@ -42,6 +43,7 @@ public class HqHallReservationController extends BaseController {
/**
* 查询报告厅预约列表
*/
@ApiEncrypt(response = true)
@SaCheckPermission("hq:hallReservation:list")
@GetMapping("/list")
public TableDataInfo<HqHallReservationVo> list(HqHallReservationBo bo, PageQuery pageQuery) {
@@ -51,6 +53,7 @@ public class HqHallReservationController extends BaseController {
/**
* 导出报告厅预约列表
*/
@ApiEncrypt(response = true)
@SaCheckPermission("hq:hallReservation:export")
@Log(title = "报告厅预约", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@@ -64,6 +67,7 @@ public class HqHallReservationController extends BaseController {
*
* @param id 主键
*/
@ApiEncrypt(response = true)
@SaCheckPermission("hq:hallReservation:query")
@GetMapping("/{id}")
public R<HqHallReservationVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
@@ -73,6 +77,7 @@ public class HqHallReservationController extends BaseController {
/**
* 新增报告厅预约
*/
@ApiEncrypt(response = true)
@SaCheckPermission("hq:hallReservation:add")
@Log(title = "报告厅预约", businessType = BusinessType.INSERT)
@RepeatSubmit()
@@ -84,6 +89,7 @@ public class HqHallReservationController extends BaseController {
/**
* 修改报告厅预约
*/
@ApiEncrypt(response = true)
@SaCheckPermission("hq:hallReservation:edit")
@Log(title = "报告厅预约", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@@ -97,6 +103,7 @@ public class HqHallReservationController extends BaseController {
*
* @param ids 主键串
*/
@ApiEncrypt(response = true)
@SaCheckPermission("hq:hallReservation:remove")
@Log(title = "报告厅预约", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@@ -107,6 +114,7 @@ public class HqHallReservationController extends BaseController {
/**
* 审核报告厅预约(批准/拒绝)
*/
@ApiEncrypt(response = true)
@SaCheckPermission("hq:hallReservation:audit")
@Log(title = "报告厅预约审核", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@@ -118,6 +126,7 @@ public class HqHallReservationController extends BaseController {
/**
* 检查报告厅时间冲突
*/
@ApiEncrypt(response = true)
@SaCheckPermission("hq:hallReservation:query")
@PostMapping("/checkTimeConflict")
public R<HqHallTimeCheckVo> checkTimeConflict(@Validated @RequestBody HqHallTimeCheckBo timeCheckBo) {
+16 -4
View File
@@ -8,7 +8,10 @@ export function listHallReservation(query: HallReservationQuery) {
return request<TableDataInfo<HallReservationVO>>({
url: '/hq/hallReservation/list',
method: 'get',
params: query
params: query,
headers: {
isEncrypt: 'true'
}
});
}
@@ -16,7 +19,10 @@ export function listHallReservation(query: HallReservationQuery) {
export function getHallReservation(id: string | number) {
return request<R<HallReservationVO>>({
url: '/hq/hallReservation/' + id,
method: 'get'
method: 'get',
headers: {
isEncrypt: 'true'
}
});
}
@@ -25,7 +31,10 @@ export function auditHallReservation(data: HallReservationAuditForm) {
return request<R<any>>({
url: '/hq/hallReservation/audit',
method: 'put',
data: data
data: data,
headers: {
isEncrypt: 'true'
}
});
}
@@ -34,6 +43,9 @@ export function checkTimeConflict(data: TimeCheckParams) {
return request<R<TimeCheckResult>>({
url: '/hq/hallReservation/checkTimeConflict',
method: 'post',
data: data
data: data,
headers: {
isEncrypt: 'true'
}
});
}
+20 -5
View File
@@ -12,7 +12,10 @@ export const listHallInfo = (query?: HallInfoQuery): AxiosPromise<HallInfoVO[]>
return request({
url: '/hq/hallInfo/list',
method: 'get',
params: query
params: query,
headers: {
isEncrypt: 'true'
}
});
};
@@ -23,7 +26,10 @@ export const listHallInfo = (query?: HallInfoQuery): AxiosPromise<HallInfoVO[]>
export const getHallInfo = (id: string | number): AxiosPromise<HallInfoVO> => {
return request({
url: '/hq/hallInfo/' + id,
method: 'get'
method: 'get',
headers: {
isEncrypt: 'true'
}
});
};
@@ -35,7 +41,10 @@ export const addHallInfo = (data: HallInfoForm) => {
return request({
url: '/hq/hallInfo',
method: 'post',
data: data
data: data,
headers: {
isEncrypt: 'true'
}
});
};
@@ -47,7 +56,10 @@ export const updateHallInfo = (data: HallInfoForm) => {
return request({
url: '/hq/hallInfo',
method: 'put',
data: data
data: data,
headers: {
isEncrypt: 'true'
}
});
};
@@ -58,6 +70,9 @@ export const updateHallInfo = (data: HallInfoForm) => {
export const delHallInfo = (id: string | number | Array<string | number>) => {
return request({
url: '/hq/hallInfo/' + id,
method: 'delete'
method: 'delete',
headers: {
isEncrypt: 'true'
}
});
};
+20 -5
View File
@@ -12,7 +12,10 @@ export const listHallReservation = (query?: HallReservationQuery): AxiosPromise<
return request({
url: '/hq/hallReservation/list',
method: 'get',
params: query
params: query,
headers: {
isEncrypt: 'true'
}
});
};
@@ -23,7 +26,10 @@ export const listHallReservation = (query?: HallReservationQuery): AxiosPromise<
export const getHallReservation = (id: string | number): AxiosPromise<HallReservationVO> => {
return request({
url: '/hq/hallReservation/' + id,
method: 'get'
method: 'get',
headers: {
isEncrypt: 'true'
}
});
};
@@ -35,7 +41,10 @@ export const addHallReservation = (data: HallReservationForm) => {
return request({
url: '/hq/hallReservation',
method: 'post',
data: data
data: data,
headers: {
isEncrypt: 'true'
}
});
};
@@ -47,7 +56,10 @@ export const updateHallReservation = (data: HallReservationForm) => {
return request({
url: '/hq/hallReservation',
method: 'put',
data: data
data: data,
headers: {
isEncrypt: 'true'
}
});
};
@@ -58,6 +70,9 @@ export const updateHallReservation = (data: HallReservationForm) => {
export const delHallReservation = (id: string | number | Array<string | number>) => {
return request({
url: '/hq/hallReservation/' + id,
method: 'delete'
method: 'delete',
headers: {
isEncrypt: 'true'
}
});
};
@@ -254,6 +254,7 @@ const { queryParams, form, rules } = toRefs(data);
const getList = async () => {
loading.value = true;
const res = await listHallInfo(queryParams.value);
console.log('res', res);
hallInfoList.value = res.rows;
total.value = res.total;
loading.value = false;