This commit is contained in:
zjf committed 2025-05-21 11:15:35 +08:00
1 parent 7f691e621d
commit 82fe8afa3e
2 files changed
+29 -30

No files matched your search

@@ -63,7 +63,6 @@ public class AppUserController {
private final AppUserService appUserService;
private final RemoteUserService remoteUserService;
@Inner
@GetMapping("/info/{username}")
@@ -131,14 +130,14 @@ public class AppUserController {
* @param appUser app用户表
* @return R
*/
@Operation(summary = "新增app用户表", description = "新增app用户表")
@SysLog("新增app用户表")
@PostMapping
@HasPermission("app_appuser_add")
public R save(@RequestBody AppUserDTO appUser) {
appUserService.saveUser(appUser);
return R.ok();
}
// @Operation(summary = "新增app用户表", description = "新增app用户表")
// @SysLog("新增app用户表")
// @PostMapping
// @HasPermission("app_appuser_add")
// public R save(@RequestBody AppUserDTO appUser) {
// appUserService.saveUser(appUser);
// return R.ok();
// }
/**
* 修改app用户表
@@ -168,15 +167,15 @@ public class AppUserController {
/**
* 导出excel 表格
* @param appUser 查询条件
// * @param appUser 查询条件
* @return excel 文件流
*/
@ResponseExcel
@GetMapping("/export")
@HasPermission("app_appuser_export")
public List<AppUserExcelVO> export(AppUserDTO appUser) {
return appUserService.listUser(appUser);
}
// @ResponseExcel
// @GetMapping("/export")
// @HasPermission("app_appuser_export")
// public List<AppUserExcelVO> export(AppUserDTO appUser) {
// return appUserService.listUser(appUser);
// }
@SysLog("修改个人信息")
@PutMapping("/edit")
@@ -195,22 +194,21 @@ public class AppUserController {
* @param bindingResult 错误信息列表
* @return R
*/
@PostMapping("/import")
@HasPermission("app_appuser_export")
public R importUser(@RequestExcel List<AppUserExcelVO> excelVOList, BindingResult bindingResult) {
return appUserService.importUser(excelVOList, bindingResult);
}
// @PostMapping("/import")
// @HasPermission("app_appuser_export")
// public R importUser(@RequestExcel List<AppUserExcelVO> excelVOList, BindingResult bindingResult) {
// return appUserService.importUser(excelVOList, bindingResult);
// }
@Operation(summary = "注册app用户表", description = "注册app用户表")
@SysLog("注册app用户表")
@Inner(value = false)
@PostMapping("/register")
public R register(@RequestBody AppUserDTO appUser) {
return appUserService.registerAppUser(appUser);
}
// @Operation(summary = "注册app用户表", description = "注册app用户表")
// @SysLog("注册app用户表")
// @Inner(value = false)
// @PostMapping("/register")
// public R register(@RequestBody AppUserDTO appUser) {
// return appUserService.registerAppUser(appUser);
// }
//------------------------------------以下是经过系统表查询,原因的app接口不适用---------------
@@ -164,7 +164,8 @@ public class VisitorService extends BaseHikvisionService {
JSONObject json = new JSONObject();
json.put("orderId", request.getOrderId());
json.put("visitEndTime", request.getVisitEndTime()
.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME));
// .format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)
);
if (StringUtils.isNotBlank(request.getCardNo())) {
json.put("cardNo", request.getCardNo());