diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index 55e4981..4fdc66f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -250,9 +250,9 @@ Map sluiceWellDictMap = dictList.stream() .collect(Collectors.toMap(e -> e.getCode(), e -> e.getName())); - Integer taskId = appDeviceAddService.getStartTask(); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + Integer taskId = appDeviceAddService.getStartTask(currentUserId); if (null == taskId || taskId != 1) { - Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); @@ -277,7 +277,8 @@ @ResponseBody public Object batchLogs(String begTime, String endTime) { Page page = new PageFactory().defaultPage(); - return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(begTime, endTime, page))); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page))); } @CrossOrigin diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index 55e4981..4fdc66f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -250,9 +250,9 @@ Map sluiceWellDictMap = dictList.stream() .collect(Collectors.toMap(e -> e.getCode(), e -> e.getName())); - Integer taskId = appDeviceAddService.getStartTask(); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + Integer taskId = appDeviceAddService.getStartTask(currentUserId); if (null == taskId || taskId != 1) { - Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); @@ -277,7 +277,8 @@ @ResponseBody public Object batchLogs(String begTime, String endTime) { Page page = new PageFactory().defaultPage(); - return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(begTime, endTime, page))); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page))); } @CrossOrigin diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 04feeff..0aafd03 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -48,12 +48,12 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getPhone()); - super.getSession().setAttribute("role", appUser.getRole()); + AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getUsername()); if (appUserService.checkPassWord(appUserLoginDTO, appUser)) { + super.getSession().setAttribute("role", appUser.getRole()); return appUserService.bindWechatUser(appUserLoginDTO, appUser); - } else { - throw new BusinessException(BusinessExceptionEnum.PASSWORD_ERROR); + }else { + return ResponseData.error(BusinessExceptionEnum.PASSWORD_ERROR.getCode(),BusinessExceptionEnum.PASSWORD_ERROR.getMessage()); } } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index 55e4981..4fdc66f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -250,9 +250,9 @@ Map sluiceWellDictMap = dictList.stream() .collect(Collectors.toMap(e -> e.getCode(), e -> e.getName())); - Integer taskId = appDeviceAddService.getStartTask(); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + Integer taskId = appDeviceAddService.getStartTask(currentUserId); if (null == taskId || taskId != 1) { - Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); @@ -277,7 +277,8 @@ @ResponseBody public Object batchLogs(String begTime, String endTime) { Page page = new PageFactory().defaultPage(); - return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(begTime, endTime, page))); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page))); } @CrossOrigin diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 04feeff..0aafd03 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -48,12 +48,12 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getPhone()); - super.getSession().setAttribute("role", appUser.getRole()); + AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getUsername()); if (appUserService.checkPassWord(appUserLoginDTO, appUser)) { + super.getSession().setAttribute("role", appUser.getRole()); return appUserService.bindWechatUser(appUserLoginDTO, appUser); - } else { - throw new BusinessException(BusinessExceptionEnum.PASSWORD_ERROR); + }else { + return ResponseData.error(BusinessExceptionEnum.PASSWORD_ERROR.getCode(),BusinessExceptionEnum.PASSWORD_ERROR.getMessage()); } } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index f68b014..177f387 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -87,9 +87,9 @@ //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); if (isBind) { - ResponseData.success(openid); + return ResponseData.success(openid); } else { - ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); + return ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); } //返回绑定信息 } catch (Exception e) { diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index 55e4981..4fdc66f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -250,9 +250,9 @@ Map sluiceWellDictMap = dictList.stream() .collect(Collectors.toMap(e -> e.getCode(), e -> e.getName())); - Integer taskId = appDeviceAddService.getStartTask(); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + Integer taskId = appDeviceAddService.getStartTask(currentUserId); if (null == taskId || taskId != 1) { - Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); @@ -277,7 +277,8 @@ @ResponseBody public Object batchLogs(String begTime, String endTime) { Page page = new PageFactory().defaultPage(); - return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(begTime, endTime, page))); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page))); } @CrossOrigin diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 04feeff..0aafd03 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -48,12 +48,12 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getPhone()); - super.getSession().setAttribute("role", appUser.getRole()); + AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getUsername()); if (appUserService.checkPassWord(appUserLoginDTO, appUser)) { + super.getSession().setAttribute("role", appUser.getRole()); return appUserService.bindWechatUser(appUserLoginDTO, appUser); - } else { - throw new BusinessException(BusinessExceptionEnum.PASSWORD_ERROR); + }else { + return ResponseData.error(BusinessExceptionEnum.PASSWORD_ERROR.getCode(),BusinessExceptionEnum.PASSWORD_ERROR.getMessage()); } } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index f68b014..177f387 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -87,9 +87,9 @@ //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); if (isBind) { - ResponseData.success(openid); + return ResponseData.success(openid); } else { - ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); + return ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); } //返回绑定信息 } catch (Exception e) { diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 3a73e15..74b4578 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.app.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.modular.app.dto.user.AppUserListDTO; import com.casic.missiles.modular.app.model.AppUser; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -13,4 +17,7 @@ String getPhoneByOpenId(@Param("openId") String openId); + List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index 55e4981..4fdc66f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -250,9 +250,9 @@ Map sluiceWellDictMap = dictList.stream() .collect(Collectors.toMap(e -> e.getCode(), e -> e.getName())); - Integer taskId = appDeviceAddService.getStartTask(); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + Integer taskId = appDeviceAddService.getStartTask(currentUserId); if (null == taskId || taskId != 1) { - Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); @@ -277,7 +277,8 @@ @ResponseBody public Object batchLogs(String begTime, String endTime) { Page page = new PageFactory().defaultPage(); - return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(begTime, endTime, page))); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page))); } @CrossOrigin diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 04feeff..0aafd03 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -48,12 +48,12 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getPhone()); - super.getSession().setAttribute("role", appUser.getRole()); + AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getUsername()); if (appUserService.checkPassWord(appUserLoginDTO, appUser)) { + super.getSession().setAttribute("role", appUser.getRole()); return appUserService.bindWechatUser(appUserLoginDTO, appUser); - } else { - throw new BusinessException(BusinessExceptionEnum.PASSWORD_ERROR); + }else { + return ResponseData.error(BusinessExceptionEnum.PASSWORD_ERROR.getCode(),BusinessExceptionEnum.PASSWORD_ERROR.getMessage()); } } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index f68b014..177f387 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -87,9 +87,9 @@ //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); if (isBind) { - ResponseData.success(openid); + return ResponseData.success(openid); } else { - ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); + return ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); } //返回绑定信息 } catch (Exception e) { diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 3a73e15..74b4578 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.app.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.modular.app.dto.user.AppUserListDTO; import com.casic.missiles.modular.app.model.AppUser; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -13,4 +17,7 @@ String getPhoneByOpenId(@Param("openId") String openId); + List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml index 64371d6..f0257e9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml @@ -21,4 +21,28 @@ limit 1 + + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index 55e4981..4fdc66f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -250,9 +250,9 @@ Map sluiceWellDictMap = dictList.stream() .collect(Collectors.toMap(e -> e.getCode(), e -> e.getName())); - Integer taskId = appDeviceAddService.getStartTask(); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + Integer taskId = appDeviceAddService.getStartTask(currentUserId); if (null == taskId || taskId != 1) { - Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); @@ -277,7 +277,8 @@ @ResponseBody public Object batchLogs(String begTime, String endTime) { Page page = new PageFactory().defaultPage(); - return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(begTime, endTime, page))); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page))); } @CrossOrigin diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 04feeff..0aafd03 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -48,12 +48,12 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getPhone()); - super.getSession().setAttribute("role", appUser.getRole()); + AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getUsername()); if (appUserService.checkPassWord(appUserLoginDTO, appUser)) { + super.getSession().setAttribute("role", appUser.getRole()); return appUserService.bindWechatUser(appUserLoginDTO, appUser); - } else { - throw new BusinessException(BusinessExceptionEnum.PASSWORD_ERROR); + }else { + return ResponseData.error(BusinessExceptionEnum.PASSWORD_ERROR.getCode(),BusinessExceptionEnum.PASSWORD_ERROR.getMessage()); } } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index f68b014..177f387 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -87,9 +87,9 @@ //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); if (isBind) { - ResponseData.success(openid); + return ResponseData.success(openid); } else { - ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); + return ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); } //返回绑定信息 } catch (Exception e) { diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 3a73e15..74b4578 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.app.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.modular.app.dto.user.AppUserListDTO; import com.casic.missiles.modular.app.model.AppUser; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -13,4 +17,7 @@ String getPhoneByOpenId(@Param("openId") String openId); + List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml index 64371d6..f0257e9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml @@ -21,4 +21,28 @@ limit 1 + + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml index 2d072e0..05a1b7e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml @@ -2,8 +2,10 @@ + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index 55e4981..4fdc66f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -250,9 +250,9 @@ Map sluiceWellDictMap = dictList.stream() .collect(Collectors.toMap(e -> e.getCode(), e -> e.getName())); - Integer taskId = appDeviceAddService.getStartTask(); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + Integer taskId = appDeviceAddService.getStartTask(currentUserId); if (null == taskId || taskId != 1) { - Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); @@ -277,7 +277,8 @@ @ResponseBody public Object batchLogs(String begTime, String endTime) { Page page = new PageFactory().defaultPage(); - return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(begTime, endTime, page))); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page))); } @CrossOrigin diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 04feeff..0aafd03 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -48,12 +48,12 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getPhone()); - super.getSession().setAttribute("role", appUser.getRole()); + AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getUsername()); if (appUserService.checkPassWord(appUserLoginDTO, appUser)) { + super.getSession().setAttribute("role", appUser.getRole()); return appUserService.bindWechatUser(appUserLoginDTO, appUser); - } else { - throw new BusinessException(BusinessExceptionEnum.PASSWORD_ERROR); + }else { + return ResponseData.error(BusinessExceptionEnum.PASSWORD_ERROR.getCode(),BusinessExceptionEnum.PASSWORD_ERROR.getMessage()); } } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index f68b014..177f387 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -87,9 +87,9 @@ //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); if (isBind) { - ResponseData.success(openid); + return ResponseData.success(openid); } else { - ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); + return ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); } //返回绑定信息 } catch (Exception e) { diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 3a73e15..74b4578 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.app.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.modular.app.dto.user.AppUserListDTO; import com.casic.missiles.modular.app.model.AppUser; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -13,4 +17,7 @@ String getPhoneByOpenId(@Param("openId") String openId); + List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml index 64371d6..f0257e9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml @@ -21,4 +21,28 @@ limit 1 + + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml index 2d072e0..05a1b7e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml @@ -2,8 +2,10 @@ + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java index 3ed408e..41649ac 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java @@ -5,7 +5,7 @@ @Data public class AppUserLoginDTO { - private String phone; + private String username; private String password; private String openId; private String weChatName; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index 55e4981..4fdc66f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -250,9 +250,9 @@ Map sluiceWellDictMap = dictList.stream() .collect(Collectors.toMap(e -> e.getCode(), e -> e.getName())); - Integer taskId = appDeviceAddService.getStartTask(); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + Integer taskId = appDeviceAddService.getStartTask(currentUserId); if (null == taskId || taskId != 1) { - Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); @@ -277,7 +277,8 @@ @ResponseBody public Object batchLogs(String begTime, String endTime) { Page page = new PageFactory().defaultPage(); - return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(begTime, endTime, page))); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page))); } @CrossOrigin diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 04feeff..0aafd03 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -48,12 +48,12 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getPhone()); - super.getSession().setAttribute("role", appUser.getRole()); + AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getUsername()); if (appUserService.checkPassWord(appUserLoginDTO, appUser)) { + super.getSession().setAttribute("role", appUser.getRole()); return appUserService.bindWechatUser(appUserLoginDTO, appUser); - } else { - throw new BusinessException(BusinessExceptionEnum.PASSWORD_ERROR); + }else { + return ResponseData.error(BusinessExceptionEnum.PASSWORD_ERROR.getCode(),BusinessExceptionEnum.PASSWORD_ERROR.getMessage()); } } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index f68b014..177f387 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -87,9 +87,9 @@ //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); if (isBind) { - ResponseData.success(openid); + return ResponseData.success(openid); } else { - ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); + return ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); } //返回绑定信息 } catch (Exception e) { diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 3a73e15..74b4578 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.app.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.modular.app.dto.user.AppUserListDTO; import com.casic.missiles.modular.app.model.AppUser; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -13,4 +17,7 @@ String getPhoneByOpenId(@Param("openId") String openId); + List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml index 64371d6..f0257e9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml @@ -21,4 +21,28 @@ limit 1 + + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml index 2d072e0..05a1b7e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml @@ -2,8 +2,10 @@ + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java index 3ed408e..41649ac 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java @@ -5,7 +5,7 @@ @Data public class AppUserLoginDTO { - private String phone; + private String username; private String password; private String openId; private String weChatName; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java index 8a5f81a..beb9f87 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -49,7 +49,7 @@ void batchDownloadFiles(String recentDir,HttpServletResponse response); - Integer getStartTask(); + Integer getStartTask(Long currentUserId); - Page batchLogs(String begTime, String endTime, Page page); + Page batchLogs(Long currentUserId,String begTime, String endTime, Page page); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index 55e4981..4fdc66f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -250,9 +250,9 @@ Map sluiceWellDictMap = dictList.stream() .collect(Collectors.toMap(e -> e.getCode(), e -> e.getName())); - Integer taskId = appDeviceAddService.getStartTask(); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + Integer taskId = appDeviceAddService.getStartTask(currentUserId); if (null == taskId || taskId != 1) { - Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); @@ -277,7 +277,8 @@ @ResponseBody public Object batchLogs(String begTime, String endTime) { Page page = new PageFactory().defaultPage(); - return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(begTime, endTime, page))); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page))); } @CrossOrigin diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 04feeff..0aafd03 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -48,12 +48,12 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getPhone()); - super.getSession().setAttribute("role", appUser.getRole()); + AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getUsername()); if (appUserService.checkPassWord(appUserLoginDTO, appUser)) { + super.getSession().setAttribute("role", appUser.getRole()); return appUserService.bindWechatUser(appUserLoginDTO, appUser); - } else { - throw new BusinessException(BusinessExceptionEnum.PASSWORD_ERROR); + }else { + return ResponseData.error(BusinessExceptionEnum.PASSWORD_ERROR.getCode(),BusinessExceptionEnum.PASSWORD_ERROR.getMessage()); } } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index f68b014..177f387 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -87,9 +87,9 @@ //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); if (isBind) { - ResponseData.success(openid); + return ResponseData.success(openid); } else { - ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); + return ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); } //返回绑定信息 } catch (Exception e) { diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 3a73e15..74b4578 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.app.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.modular.app.dto.user.AppUserListDTO; import com.casic.missiles.modular.app.model.AppUser; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -13,4 +17,7 @@ String getPhoneByOpenId(@Param("openId") String openId); + List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml index 64371d6..f0257e9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml @@ -21,4 +21,28 @@ limit 1 + + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml index 2d072e0..05a1b7e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml @@ -2,8 +2,10 @@ + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java index 3ed408e..41649ac 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java @@ -5,7 +5,7 @@ @Data public class AppUserLoginDTO { - private String phone; + private String username; private String password; private String openId; private String weChatName; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java index 8a5f81a..beb9f87 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -49,7 +49,7 @@ void batchDownloadFiles(String recentDir,HttpServletResponse response); - Integer getStartTask(); + Integer getStartTask(Long currentUserId); - Page batchLogs(String begTime, String endTime, Page page); + Page batchLogs(Long currentUserId,String begTime, String endTime, Page page); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java index 68eb4aa..a71b460 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -2,6 +2,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.hutool.core.stream.CollectorUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; @@ -158,11 +159,13 @@ File invalidFile = new File(currentStampDir); //删除子目录 if (invalidFile != null && invalidFile.isDirectory()) { - deleteFile(invalidFile, currentStampDir); + deleteFile(invalidFile, null); } } //删除日志 - this.deleteBatchIds(ids); + if (userIds.size() > 0) { + this.deleteBatchIds(ids); + } } @Override @@ -193,8 +196,10 @@ appDeviceAdds.forEach(appDeviceAdd -> { appDeviceAdd.setWelltype(sluiceWellDictMap.get(appDeviceAdd.getWelltype())); }); + Long stampeDir = System.currentTimeMillis(); //以当前时间戳为目录 - String currentStampDir = filePath + currentUserId + File.separator; + String currentStampDir = filePath + currentUserId + File.separator + stampeDir + File.separator; + setLocalFileDir(currentStampDir); List batchExportLogsList = new ArrayList<>(); try { @@ -214,7 +219,7 @@ } }; executor.submit(task); - batchExportLogsList.add(createBatchFileLogs(currentUserId, partitionNumber, fileName, String.valueOf(currentStampDir))); + batchExportLogsList.add(createBatchFileLogs(currentUserId, partitionNumber, fileName, currentUserId + File.separator + stampeDir)); } while (true) { Long activeCount = ((ThreadPoolExecutor) executor).getTaskCount() - ((ThreadPoolExecutor) executor).getCompletedTaskCount(); @@ -225,7 +230,7 @@ //删除所有的文件日志 this.batchExportLogMapper.delete(query); //删除所有历史文件 - deleteFile(new File(currentStampDir), String.valueOf(currentStampDir)); + deleteFile(new File(filePath + currentUserId + File.separator), String.valueOf(stampeDir)); //批量导入日志 batchExportLogsList.stream().forEach( batchExportLog -> this.batchExportLogMapper.insert(batchExportLog) @@ -250,7 +255,7 @@ * 对导出产生的日志、进行清除，还原空间 */ private void deleteFile(File invalidFile, String currentFileStr) { - //为当前文件目录删除 + //为当前文件目录不删除 if (invalidFile.getAbsoluteFile().getName().equals(currentFileStr)) { return; } @@ -264,7 +269,7 @@ files[i].delete(); } } else if (files[i].isDirectory()) { - //通过递归的方法找到子目录的文件 + //通过递归的方法找到子目录的文件，不删除当前指定的文件 deleteFile(files[i], currentFileStr); } } @@ -274,7 +279,7 @@ } if (!invalidFile.getAbsolutePath().equals(filePath)) { //删除子目录 - if (invalidFile != null && invalidFile.isDirectory()) { + if (invalidFile != null && invalidFile.isDirectory() && invalidFile.listFiles().length == 0) { invalidFile.delete(); } } @@ -364,10 +369,11 @@ } @Override - public Page batchLogs(String begTime, String endTime, Page page) { + public Page batchLogs(Long currentUserId, String begTime, String endTime, Page page) { EntityWrapper batchEntityWrapper = new EntityWrapper<>(); batchEntityWrapper.le(StringUtils.isNotEmpty(begTime), "create_time", begTime) .or().ge(StringUtils.isNotEmpty(endTime), "create_time", endTime); + batchEntityWrapper.eq("create_user_id", currentUserId); batchEntityWrapper.orderDesc(Arrays.asList("create_time")); List batchExportLogs = this.batchExportLogMapper.selectPage(page, batchEntityWrapper); page.setRecords(batchExportLogs); @@ -386,9 +392,10 @@ } @Override - public Integer getStartTask() { + public Integer getStartTask(Long currentUserId) { EntityWrapper batchEntityWrapper = new EntityWrapper<>(); batchEntityWrapper.where("create_time>date_add(now(), interval -1 hour) "); + batchEntityWrapper.eq("create_user_id", currentUserId); batchEntityWrapper.orderDesc(Arrays.asList("create_time")) .last(" limit 1"); List batchExportLogs = this.batchExportLogMapper.selectList(batchEntityWrapper); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index 55e4981..4fdc66f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -250,9 +250,9 @@ Map sluiceWellDictMap = dictList.stream() .collect(Collectors.toMap(e -> e.getCode(), e -> e.getName())); - Integer taskId = appDeviceAddService.getStartTask(); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + Integer taskId = appDeviceAddService.getStartTask(currentUserId); if (null == taskId || taskId != 1) { - Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); @@ -277,7 +277,8 @@ @ResponseBody public Object batchLogs(String begTime, String endTime) { Page page = new PageFactory().defaultPage(); - return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(begTime, endTime, page))); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page))); } @CrossOrigin diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 04feeff..0aafd03 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -48,12 +48,12 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getPhone()); - super.getSession().setAttribute("role", appUser.getRole()); + AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getUsername()); if (appUserService.checkPassWord(appUserLoginDTO, appUser)) { + super.getSession().setAttribute("role", appUser.getRole()); return appUserService.bindWechatUser(appUserLoginDTO, appUser); - } else { - throw new BusinessException(BusinessExceptionEnum.PASSWORD_ERROR); + }else { + return ResponseData.error(BusinessExceptionEnum.PASSWORD_ERROR.getCode(),BusinessExceptionEnum.PASSWORD_ERROR.getMessage()); } } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index f68b014..177f387 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -87,9 +87,9 @@ //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); if (isBind) { - ResponseData.success(openid); + return ResponseData.success(openid); } else { - ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); + return ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); } //返回绑定信息 } catch (Exception e) { diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 3a73e15..74b4578 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.app.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.modular.app.dto.user.AppUserListDTO; import com.casic.missiles.modular.app.model.AppUser; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -13,4 +17,7 @@ String getPhoneByOpenId(@Param("openId") String openId); + List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml index 64371d6..f0257e9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml @@ -21,4 +21,28 @@ limit 1 + + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml index 2d072e0..05a1b7e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml @@ -2,8 +2,10 @@ + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java index 3ed408e..41649ac 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java @@ -5,7 +5,7 @@ @Data public class AppUserLoginDTO { - private String phone; + private String username; private String password; private String openId; private String weChatName; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java index 8a5f81a..beb9f87 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -49,7 +49,7 @@ void batchDownloadFiles(String recentDir,HttpServletResponse response); - Integer getStartTask(); + Integer getStartTask(Long currentUserId); - Page batchLogs(String begTime, String endTime, Page page); + Page batchLogs(Long currentUserId,String begTime, String endTime, Page page); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java index 68eb4aa..a71b460 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -2,6 +2,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.hutool.core.stream.CollectorUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; @@ -158,11 +159,13 @@ File invalidFile = new File(currentStampDir); //删除子目录 if (invalidFile != null && invalidFile.isDirectory()) { - deleteFile(invalidFile, currentStampDir); + deleteFile(invalidFile, null); } } //删除日志 - this.deleteBatchIds(ids); + if (userIds.size() > 0) { + this.deleteBatchIds(ids); + } } @Override @@ -193,8 +196,10 @@ appDeviceAdds.forEach(appDeviceAdd -> { appDeviceAdd.setWelltype(sluiceWellDictMap.get(appDeviceAdd.getWelltype())); }); + Long stampeDir = System.currentTimeMillis(); //以当前时间戳为目录 - String currentStampDir = filePath + currentUserId + File.separator; + String currentStampDir = filePath + currentUserId + File.separator + stampeDir + File.separator; + setLocalFileDir(currentStampDir); List batchExportLogsList = new ArrayList<>(); try { @@ -214,7 +219,7 @@ } }; executor.submit(task); - batchExportLogsList.add(createBatchFileLogs(currentUserId, partitionNumber, fileName, String.valueOf(currentStampDir))); + batchExportLogsList.add(createBatchFileLogs(currentUserId, partitionNumber, fileName, currentUserId + File.separator + stampeDir)); } while (true) { Long activeCount = ((ThreadPoolExecutor) executor).getTaskCount() - ((ThreadPoolExecutor) executor).getCompletedTaskCount(); @@ -225,7 +230,7 @@ //删除所有的文件日志 this.batchExportLogMapper.delete(query); //删除所有历史文件 - deleteFile(new File(currentStampDir), String.valueOf(currentStampDir)); + deleteFile(new File(filePath + currentUserId + File.separator), String.valueOf(stampeDir)); //批量导入日志 batchExportLogsList.stream().forEach( batchExportLog -> this.batchExportLogMapper.insert(batchExportLog) @@ -250,7 +255,7 @@ * 对导出产生的日志、进行清除，还原空间 */ private void deleteFile(File invalidFile, String currentFileStr) { - //为当前文件目录删除 + //为当前文件目录不删除 if (invalidFile.getAbsoluteFile().getName().equals(currentFileStr)) { return; } @@ -264,7 +269,7 @@ files[i].delete(); } } else if (files[i].isDirectory()) { - //通过递归的方法找到子目录的文件 + //通过递归的方法找到子目录的文件，不删除当前指定的文件 deleteFile(files[i], currentFileStr); } } @@ -274,7 +279,7 @@ } if (!invalidFile.getAbsolutePath().equals(filePath)) { //删除子目录 - if (invalidFile != null && invalidFile.isDirectory()) { + if (invalidFile != null && invalidFile.isDirectory() && invalidFile.listFiles().length == 0) { invalidFile.delete(); } } @@ -364,10 +369,11 @@ } @Override - public Page batchLogs(String begTime, String endTime, Page page) { + public Page batchLogs(Long currentUserId, String begTime, String endTime, Page page) { EntityWrapper batchEntityWrapper = new EntityWrapper<>(); batchEntityWrapper.le(StringUtils.isNotEmpty(begTime), "create_time", begTime) .or().ge(StringUtils.isNotEmpty(endTime), "create_time", endTime); + batchEntityWrapper.eq("create_user_id", currentUserId); batchEntityWrapper.orderDesc(Arrays.asList("create_time")); List batchExportLogs = this.batchExportLogMapper.selectPage(page, batchEntityWrapper); page.setRecords(batchExportLogs); @@ -386,9 +392,10 @@ } @Override - public Integer getStartTask() { + public Integer getStartTask(Long currentUserId) { EntityWrapper batchEntityWrapper = new EntityWrapper<>(); batchEntityWrapper.where("create_time>date_add(now(), interval -1 hour) "); + batchEntityWrapper.eq("create_user_id", currentUserId); batchEntityWrapper.orderDesc(Arrays.asList("create_time")) .last(" limit 1"); List batchExportLogs = this.batchExportLogMapper.selectList(batchEntityWrapper); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java index 352cdfc..005f5cd 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java @@ -61,17 +61,13 @@ @Override public Boolean checkPassWord(AppUserLoginDTO appUserLoginDTO, AppUser appUser) { - try { - appUserLoginDTO.setPassword(RSAUtils.decrypt(appUserLoginDTO.getPassword(), ShiroKit.getSession().getAttribute(RSAUtils.RSAPrivateKey).toString())); - } catch (Exception var5) { - throw new BusinessException(BusinessExceptionEnum.DECRYPTION_ERROR); + if (appUserLoginDTO != null && appUser != null) { + String userPassword = ShiroKit.md5(appUserLoginDTO.getPassword(), appUser.getSalt()); + if (userPassword.equals(appUser.getPassword())) { + return true; + } } - String userPassword = ShiroKit.md5(appUserLoginDTO.getPassword(), appUser.getSalt()); - if (userPassword.equals(appUser.getPassword())) { - return true; - } else { - return false; - } + return false; } @Override @@ -110,6 +106,9 @@ log.error("密码解密异常", var5); return new ErrorResponseData(GunsExceptionEnum.SERVER_ERROR.getCode(), "添加app用户失败(密码解密失败)!"); } + if (StringUtils.isEmpty(userDTO.getRole())) { + userDTO.setRole("2"); + } userDTO.setSalt(ShiroKit.getRandomSalt(5)); userDTO.setPassword(ShiroKit.md5(userDTO.getPassword(), userDTO.getSalt())); userDTO.setStatus(NOT_BOUND); @@ -127,6 +126,9 @@ if (updateFlag) { return ResponseData.success(); } + if (StringUtils.isEmpty(userDTO.getRole())) { + userDTO.setRole("2"); + } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -142,8 +144,8 @@ user.setId(appUserDTO.getId()); user.setSalt(ShiroKit.getRandomSalt(5)); user.setPassword(ShiroKit.md5(user.getPassword(), user.getSalt())); - Boolean updateFlag=this.updateById(user); - if(updateFlag){ + Boolean updateFlag = this.updateById(user); + if (updateFlag) { return ResponseData.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -153,12 +155,12 @@ @Override public Object project(String openId) { EntityWrapper appUserWrapper = new EntityWrapper(); - appUserWrapper.eq(openId, openId); + appUserWrapper.eq("openId", openId); List appUserList = this.baseMapper.selectList(appUserWrapper); Optional appUserOptional = appUserList.stream().findFirst(); if (appUserOptional.isPresent()) { AppUser appUser = appUserOptional.get(); - List projects = tranIdsToListNames(appUser.getProjectIds()); + List> projects = tranIdsToListNames(appUser.getProjectIds()); return ResponseData.success(projects); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -318,13 +320,16 @@ /** * 通过项目ids获取项目名称列表 */ - private List tranIdsToListNames(String projectIds) { + private List> tranIdsToListNames(String projectIds) { Map wellPreMaps = appWellPreService.getProjestIdMap(); - List projectNamelist = new ArrayList<>(); + List> projectNamelist = new ArrayList<>(); String[] projectIdStrs = projectIds.split(","); for (String projectId : projectIdStrs) { if (!StringUtils.isEmpty(projectId)) { - projectNamelist.add(wellPreMaps.get(projectId)); + Map projectMap=new HashMap(); + projectMap.put("projectId",projectId); + projectMap.put("projectName",wellPreMaps.get(projectId)); + projectNamelist.add(projectMap); } } return projectNamelist; @@ -333,6 +338,7 @@ private EntityWrapper initQueryParam(AppUserListDTO appUserListDTO) { EntityWrapper query = new EntityWrapper<>(); query.like(StringUtils.isNotEmpty(appUserListDTO.getPhone()), "phone", appUserListDTO.getPhone()); + //位数一致，且唯一 query.like(StringUtils.isNotEmpty(appUserListDTO.getProjectId()), "projectIds", appUserListDTO.getProjectId()); query.like(StringUtils.isNotEmpty(appUserListDTO.getName()), "name", appUserListDTO.getName()); if (!ALL_USER.equals(appUserListDTO.getUserStatus())) { diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index 55e4981..4fdc66f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -250,9 +250,9 @@ Map sluiceWellDictMap = dictList.stream() .collect(Collectors.toMap(e -> e.getCode(), e -> e.getName())); - Integer taskId = appDeviceAddService.getStartTask(); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + Integer taskId = appDeviceAddService.getStartTask(currentUserId); if (null == taskId || taskId != 1) { - Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); @@ -277,7 +277,8 @@ @ResponseBody public Object batchLogs(String begTime, String endTime) { Page page = new PageFactory().defaultPage(); - return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(begTime, endTime, page))); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page))); } @CrossOrigin diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 04feeff..0aafd03 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -48,12 +48,12 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getPhone()); - super.getSession().setAttribute("role", appUser.getRole()); + AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getUsername()); if (appUserService.checkPassWord(appUserLoginDTO, appUser)) { + super.getSession().setAttribute("role", appUser.getRole()); return appUserService.bindWechatUser(appUserLoginDTO, appUser); - } else { - throw new BusinessException(BusinessExceptionEnum.PASSWORD_ERROR); + }else { + return ResponseData.error(BusinessExceptionEnum.PASSWORD_ERROR.getCode(),BusinessExceptionEnum.PASSWORD_ERROR.getMessage()); } } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index f68b014..177f387 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -87,9 +87,9 @@ //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); if (isBind) { - ResponseData.success(openid); + return ResponseData.success(openid); } else { - ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); + return ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); } //返回绑定信息 } catch (Exception e) { diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 3a73e15..74b4578 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.app.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.modular.app.dto.user.AppUserListDTO; import com.casic.missiles.modular.app.model.AppUser; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -13,4 +17,7 @@ String getPhoneByOpenId(@Param("openId") String openId); + List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml index 64371d6..f0257e9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml @@ -21,4 +21,28 @@ limit 1 + + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml index 2d072e0..05a1b7e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml @@ -2,8 +2,10 @@ + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java index 3ed408e..41649ac 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java @@ -5,7 +5,7 @@ @Data public class AppUserLoginDTO { - private String phone; + private String username; private String password; private String openId; private String weChatName; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java index 8a5f81a..beb9f87 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -49,7 +49,7 @@ void batchDownloadFiles(String recentDir,HttpServletResponse response); - Integer getStartTask(); + Integer getStartTask(Long currentUserId); - Page batchLogs(String begTime, String endTime, Page page); + Page batchLogs(Long currentUserId,String begTime, String endTime, Page page); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java index 68eb4aa..a71b460 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -2,6 +2,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.hutool.core.stream.CollectorUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; @@ -158,11 +159,13 @@ File invalidFile = new File(currentStampDir); //删除子目录 if (invalidFile != null && invalidFile.isDirectory()) { - deleteFile(invalidFile, currentStampDir); + deleteFile(invalidFile, null); } } //删除日志 - this.deleteBatchIds(ids); + if (userIds.size() > 0) { + this.deleteBatchIds(ids); + } } @Override @@ -193,8 +196,10 @@ appDeviceAdds.forEach(appDeviceAdd -> { appDeviceAdd.setWelltype(sluiceWellDictMap.get(appDeviceAdd.getWelltype())); }); + Long stampeDir = System.currentTimeMillis(); //以当前时间戳为目录 - String currentStampDir = filePath + currentUserId + File.separator; + String currentStampDir = filePath + currentUserId + File.separator + stampeDir + File.separator; + setLocalFileDir(currentStampDir); List batchExportLogsList = new ArrayList<>(); try { @@ -214,7 +219,7 @@ } }; executor.submit(task); - batchExportLogsList.add(createBatchFileLogs(currentUserId, partitionNumber, fileName, String.valueOf(currentStampDir))); + batchExportLogsList.add(createBatchFileLogs(currentUserId, partitionNumber, fileName, currentUserId + File.separator + stampeDir)); } while (true) { Long activeCount = ((ThreadPoolExecutor) executor).getTaskCount() - ((ThreadPoolExecutor) executor).getCompletedTaskCount(); @@ -225,7 +230,7 @@ //删除所有的文件日志 this.batchExportLogMapper.delete(query); //删除所有历史文件 - deleteFile(new File(currentStampDir), String.valueOf(currentStampDir)); + deleteFile(new File(filePath + currentUserId + File.separator), String.valueOf(stampeDir)); //批量导入日志 batchExportLogsList.stream().forEach( batchExportLog -> this.batchExportLogMapper.insert(batchExportLog) @@ -250,7 +255,7 @@ * 对导出产生的日志、进行清除，还原空间 */ private void deleteFile(File invalidFile, String currentFileStr) { - //为当前文件目录删除 + //为当前文件目录不删除 if (invalidFile.getAbsoluteFile().getName().equals(currentFileStr)) { return; } @@ -264,7 +269,7 @@ files[i].delete(); } } else if (files[i].isDirectory()) { - //通过递归的方法找到子目录的文件 + //通过递归的方法找到子目录的文件，不删除当前指定的文件 deleteFile(files[i], currentFileStr); } } @@ -274,7 +279,7 @@ } if (!invalidFile.getAbsolutePath().equals(filePath)) { //删除子目录 - if (invalidFile != null && invalidFile.isDirectory()) { + if (invalidFile != null && invalidFile.isDirectory() && invalidFile.listFiles().length == 0) { invalidFile.delete(); } } @@ -364,10 +369,11 @@ } @Override - public Page batchLogs(String begTime, String endTime, Page page) { + public Page batchLogs(Long currentUserId, String begTime, String endTime, Page page) { EntityWrapper batchEntityWrapper = new EntityWrapper<>(); batchEntityWrapper.le(StringUtils.isNotEmpty(begTime), "create_time", begTime) .or().ge(StringUtils.isNotEmpty(endTime), "create_time", endTime); + batchEntityWrapper.eq("create_user_id", currentUserId); batchEntityWrapper.orderDesc(Arrays.asList("create_time")); List batchExportLogs = this.batchExportLogMapper.selectPage(page, batchEntityWrapper); page.setRecords(batchExportLogs); @@ -386,9 +392,10 @@ } @Override - public Integer getStartTask() { + public Integer getStartTask(Long currentUserId) { EntityWrapper batchEntityWrapper = new EntityWrapper<>(); batchEntityWrapper.where("create_time>date_add(now(), interval -1 hour) "); + batchEntityWrapper.eq("create_user_id", currentUserId); batchEntityWrapper.orderDesc(Arrays.asList("create_time")) .last(" limit 1"); List batchExportLogs = this.batchExportLogMapper.selectList(batchEntityWrapper); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java index 352cdfc..005f5cd 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java @@ -61,17 +61,13 @@ @Override public Boolean checkPassWord(AppUserLoginDTO appUserLoginDTO, AppUser appUser) { - try { - appUserLoginDTO.setPassword(RSAUtils.decrypt(appUserLoginDTO.getPassword(), ShiroKit.getSession().getAttribute(RSAUtils.RSAPrivateKey).toString())); - } catch (Exception var5) { - throw new BusinessException(BusinessExceptionEnum.DECRYPTION_ERROR); + if (appUserLoginDTO != null && appUser != null) { + String userPassword = ShiroKit.md5(appUserLoginDTO.getPassword(), appUser.getSalt()); + if (userPassword.equals(appUser.getPassword())) { + return true; + } } - String userPassword = ShiroKit.md5(appUserLoginDTO.getPassword(), appUser.getSalt()); - if (userPassword.equals(appUser.getPassword())) { - return true; - } else { - return false; - } + return false; } @Override @@ -110,6 +106,9 @@ log.error("密码解密异常", var5); return new ErrorResponseData(GunsExceptionEnum.SERVER_ERROR.getCode(), "添加app用户失败(密码解密失败)!"); } + if (StringUtils.isEmpty(userDTO.getRole())) { + userDTO.setRole("2"); + } userDTO.setSalt(ShiroKit.getRandomSalt(5)); userDTO.setPassword(ShiroKit.md5(userDTO.getPassword(), userDTO.getSalt())); userDTO.setStatus(NOT_BOUND); @@ -127,6 +126,9 @@ if (updateFlag) { return ResponseData.success(); } + if (StringUtils.isEmpty(userDTO.getRole())) { + userDTO.setRole("2"); + } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -142,8 +144,8 @@ user.setId(appUserDTO.getId()); user.setSalt(ShiroKit.getRandomSalt(5)); user.setPassword(ShiroKit.md5(user.getPassword(), user.getSalt())); - Boolean updateFlag=this.updateById(user); - if(updateFlag){ + Boolean updateFlag = this.updateById(user); + if (updateFlag) { return ResponseData.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -153,12 +155,12 @@ @Override public Object project(String openId) { EntityWrapper appUserWrapper = new EntityWrapper(); - appUserWrapper.eq(openId, openId); + appUserWrapper.eq("openId", openId); List appUserList = this.baseMapper.selectList(appUserWrapper); Optional appUserOptional = appUserList.stream().findFirst(); if (appUserOptional.isPresent()) { AppUser appUser = appUserOptional.get(); - List projects = tranIdsToListNames(appUser.getProjectIds()); + List> projects = tranIdsToListNames(appUser.getProjectIds()); return ResponseData.success(projects); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -318,13 +320,16 @@ /** * 通过项目ids获取项目名称列表 */ - private List tranIdsToListNames(String projectIds) { + private List> tranIdsToListNames(String projectIds) { Map wellPreMaps = appWellPreService.getProjestIdMap(); - List projectNamelist = new ArrayList<>(); + List> projectNamelist = new ArrayList<>(); String[] projectIdStrs = projectIds.split(","); for (String projectId : projectIdStrs) { if (!StringUtils.isEmpty(projectId)) { - projectNamelist.add(wellPreMaps.get(projectId)); + Map projectMap=new HashMap(); + projectMap.put("projectId",projectId); + projectMap.put("projectName",wellPreMaps.get(projectId)); + projectNamelist.add(projectMap); } } return projectNamelist; @@ -333,6 +338,7 @@ private EntityWrapper initQueryParam(AppUserListDTO appUserListDTO) { EntityWrapper query = new EntityWrapper<>(); query.like(StringUtils.isNotEmpty(appUserListDTO.getPhone()), "phone", appUserListDTO.getPhone()); + //位数一致，且唯一 query.like(StringUtils.isNotEmpty(appUserListDTO.getProjectId()), "projectIds", appUserListDTO.getProjectId()); query.like(StringUtils.isNotEmpty(appUserListDTO.getName()), "name", appUserListDTO.getName()); if (!ALL_USER.equals(appUserListDTO.getUserStatus())) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 5ab81c7..04191f0 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -37,7 +37,7 @@ public void doPost(@RequestParam("filename") String filename, HttpServletResponse response) throws IOException { logger.info(downloadPath); String tempDownloadPath=downloadPath; - if (tempDownloadPath.startsWith("/")) { + if (tempDownloadPath.startsWith(File.separator)) { tempDownloadPath = tempDownloadPath.substring(1); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java index 55e4981..4fdc66f 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java @@ -250,9 +250,9 @@ Map sluiceWellDictMap = dictList.stream() .collect(Collectors.toMap(e -> e.getCode(), e -> e.getName())); - Integer taskId = appDeviceAddService.getStartTask(); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + Integer taskId = appDeviceAddService.getStartTask(currentUserId); if (null == taskId || taskId != 1) { - Long currentUserId = permissionService.getCurrLoginUser().getId(); ExecutorService executor = Executors.newFixedThreadPool(1); executor.execute(() -> appDeviceAddService.exportImageExcel(sluiceWellDictMap, devcode, devtype, begTime, endTime, project, installPerson, currentUserId)); return ResponseData.success("后台正在处理导出任务中，请稍后刷新列表!"); @@ -277,7 +277,8 @@ @ResponseBody public Object batchLogs(String begTime, String endTime) { Page page = new PageFactory().defaultPage(); - return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(begTime, endTime, page))); + Long currentUserId = permissionService.getCurrLoginUser().getId(); + return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page))); } @CrossOrigin diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java index 04feeff..0aafd03 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserController.java @@ -48,12 +48,12 @@ Assert.isFalse(bindingResult.hasErrors(), () -> { throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getPhone()); - super.getSession().setAttribute("role", appUser.getRole()); + AppUser appUser = appUserService.getAppUserByAccount(appUserLoginDTO.getUsername()); if (appUserService.checkPassWord(appUserLoginDTO, appUser)) { + super.getSession().setAttribute("role", appUser.getRole()); return appUserService.bindWechatUser(appUserLoginDTO, appUser); - } else { - throw new BusinessException(BusinessExceptionEnum.PASSWORD_ERROR); + }else { + return ResponseData.error(BusinessExceptionEnum.PASSWORD_ERROR.getCode(),BusinessExceptionEnum.PASSWORD_ERROR.getMessage()); } } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java index f68b014..177f387 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppUserOpenidController.java @@ -87,9 +87,9 @@ //校验是否已经绑定 Boolean isBind = appUserOpenidService.isBindByOpenId(openid); if (isBind) { - ResponseData.success(openid); + return ResponseData.success(openid); } else { - ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); + return ResponseData.success(201, "微信用户未绑定小程序账号，请绑定", openid); } //返回绑定信息 } catch (Exception e) { diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java index 3a73e15..74b4578 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppUserMapper.java @@ -1,7 +1,11 @@ package com.casic.missiles.modular.app.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.casic.missiles.modular.app.dto.user.AppUserListDTO; import com.casic.missiles.modular.app.model.AppUser; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -13,4 +17,7 @@ String getPhoneByOpenId(@Param("openId") String openId); + List appUserList(@Param("page")Page page,@Param("request") AppUserListDTO appUserListDTO); + + } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml index 64371d6..f0257e9 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppUserMapper.xml @@ -21,4 +21,28 @@ limit 1 + + + + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml index 2d072e0..05a1b7e 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/BatchExportLogMapper.xml @@ -2,8 +2,10 @@ + diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java index 3ed408e..41649ac 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/user/AppUserLoginDTO.java @@ -5,7 +5,7 @@ @Data public class AppUserLoginDTO { - private String phone; + private String username; private String password; private String openId; private String weChatName; diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java index 8a5f81a..beb9f87 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java @@ -49,7 +49,7 @@ void batchDownloadFiles(String recentDir,HttpServletResponse response); - Integer getStartTask(); + Integer getStartTask(Long currentUserId); - Page batchLogs(String begTime, String endTime, Page page); + Page batchLogs(Long currentUserId,String begTime, String endTime, Page page); } diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java index 68eb4aa..a71b460 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java @@ -2,6 +2,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; +import cn.hutool.core.stream.CollectorUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; @@ -158,11 +159,13 @@ File invalidFile = new File(currentStampDir); //删除子目录 if (invalidFile != null && invalidFile.isDirectory()) { - deleteFile(invalidFile, currentStampDir); + deleteFile(invalidFile, null); } } //删除日志 - this.deleteBatchIds(ids); + if (userIds.size() > 0) { + this.deleteBatchIds(ids); + } } @Override @@ -193,8 +196,10 @@ appDeviceAdds.forEach(appDeviceAdd -> { appDeviceAdd.setWelltype(sluiceWellDictMap.get(appDeviceAdd.getWelltype())); }); + Long stampeDir = System.currentTimeMillis(); //以当前时间戳为目录 - String currentStampDir = filePath + currentUserId + File.separator; + String currentStampDir = filePath + currentUserId + File.separator + stampeDir + File.separator; + setLocalFileDir(currentStampDir); List batchExportLogsList = new ArrayList<>(); try { @@ -214,7 +219,7 @@ } }; executor.submit(task); - batchExportLogsList.add(createBatchFileLogs(currentUserId, partitionNumber, fileName, String.valueOf(currentStampDir))); + batchExportLogsList.add(createBatchFileLogs(currentUserId, partitionNumber, fileName, currentUserId + File.separator + stampeDir)); } while (true) { Long activeCount = ((ThreadPoolExecutor) executor).getTaskCount() - ((ThreadPoolExecutor) executor).getCompletedTaskCount(); @@ -225,7 +230,7 @@ //删除所有的文件日志 this.batchExportLogMapper.delete(query); //删除所有历史文件 - deleteFile(new File(currentStampDir), String.valueOf(currentStampDir)); + deleteFile(new File(filePath + currentUserId + File.separator), String.valueOf(stampeDir)); //批量导入日志 batchExportLogsList.stream().forEach( batchExportLog -> this.batchExportLogMapper.insert(batchExportLog) @@ -250,7 +255,7 @@ * 对导出产生的日志、进行清除，还原空间 */ private void deleteFile(File invalidFile, String currentFileStr) { - //为当前文件目录删除 + //为当前文件目录不删除 if (invalidFile.getAbsoluteFile().getName().equals(currentFileStr)) { return; } @@ -264,7 +269,7 @@ files[i].delete(); } } else if (files[i].isDirectory()) { - //通过递归的方法找到子目录的文件 + //通过递归的方法找到子目录的文件，不删除当前指定的文件 deleteFile(files[i], currentFileStr); } } @@ -274,7 +279,7 @@ } if (!invalidFile.getAbsolutePath().equals(filePath)) { //删除子目录 - if (invalidFile != null && invalidFile.isDirectory()) { + if (invalidFile != null && invalidFile.isDirectory() && invalidFile.listFiles().length == 0) { invalidFile.delete(); } } @@ -364,10 +369,11 @@ } @Override - public Page batchLogs(String begTime, String endTime, Page page) { + public Page batchLogs(Long currentUserId, String begTime, String endTime, Page page) { EntityWrapper batchEntityWrapper = new EntityWrapper<>(); batchEntityWrapper.le(StringUtils.isNotEmpty(begTime), "create_time", begTime) .or().ge(StringUtils.isNotEmpty(endTime), "create_time", endTime); + batchEntityWrapper.eq("create_user_id", currentUserId); batchEntityWrapper.orderDesc(Arrays.asList("create_time")); List batchExportLogs = this.batchExportLogMapper.selectPage(page, batchEntityWrapper); page.setRecords(batchExportLogs); @@ -386,9 +392,10 @@ } @Override - public Integer getStartTask() { + public Integer getStartTask(Long currentUserId) { EntityWrapper batchEntityWrapper = new EntityWrapper<>(); batchEntityWrapper.where("create_time>date_add(now(), interval -1 hour) "); + batchEntityWrapper.eq("create_user_id", currentUserId); batchEntityWrapper.orderDesc(Arrays.asList("create_time")) .last(" limit 1"); List batchExportLogs = this.batchExportLogMapper.selectList(batchEntityWrapper); diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java index 352cdfc..005f5cd 100644 --- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java +++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppUserServiceImpl.java @@ -61,17 +61,13 @@ @Override public Boolean checkPassWord(AppUserLoginDTO appUserLoginDTO, AppUser appUser) { - try { - appUserLoginDTO.setPassword(RSAUtils.decrypt(appUserLoginDTO.getPassword(), ShiroKit.getSession().getAttribute(RSAUtils.RSAPrivateKey).toString())); - } catch (Exception var5) { - throw new BusinessException(BusinessExceptionEnum.DECRYPTION_ERROR); + if (appUserLoginDTO != null && appUser != null) { + String userPassword = ShiroKit.md5(appUserLoginDTO.getPassword(), appUser.getSalt()); + if (userPassword.equals(appUser.getPassword())) { + return true; + } } - String userPassword = ShiroKit.md5(appUserLoginDTO.getPassword(), appUser.getSalt()); - if (userPassword.equals(appUser.getPassword())) { - return true; - } else { - return false; - } + return false; } @Override @@ -110,6 +106,9 @@ log.error("密码解密异常", var5); return new ErrorResponseData(GunsExceptionEnum.SERVER_ERROR.getCode(), "添加app用户失败(密码解密失败)!"); } + if (StringUtils.isEmpty(userDTO.getRole())) { + userDTO.setRole("2"); + } userDTO.setSalt(ShiroKit.getRandomSalt(5)); userDTO.setPassword(ShiroKit.md5(userDTO.getPassword(), userDTO.getSalt())); userDTO.setStatus(NOT_BOUND); @@ -127,6 +126,9 @@ if (updateFlag) { return ResponseData.success(); } + if (StringUtils.isEmpty(userDTO.getRole())) { + userDTO.setRole("2"); + } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } @@ -142,8 +144,8 @@ user.setId(appUserDTO.getId()); user.setSalt(ShiroKit.getRandomSalt(5)); user.setPassword(ShiroKit.md5(user.getPassword(), user.getSalt())); - Boolean updateFlag=this.updateById(user); - if(updateFlag){ + Boolean updateFlag = this.updateById(user); + if (updateFlag) { return ResponseData.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -153,12 +155,12 @@ @Override public Object project(String openId) { EntityWrapper appUserWrapper = new EntityWrapper(); - appUserWrapper.eq(openId, openId); + appUserWrapper.eq("openId", openId); List appUserList = this.baseMapper.selectList(appUserWrapper); Optional appUserOptional = appUserList.stream().findFirst(); if (appUserOptional.isPresent()) { AppUser appUser = appUserOptional.get(); - List projects = tranIdsToListNames(appUser.getProjectIds()); + List> projects = tranIdsToListNames(appUser.getProjectIds()); return ResponseData.success(projects); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -318,13 +320,16 @@ /** * 通过项目ids获取项目名称列表 */ - private List tranIdsToListNames(String projectIds) { + private List> tranIdsToListNames(String projectIds) { Map wellPreMaps = appWellPreService.getProjestIdMap(); - List projectNamelist = new ArrayList<>(); + List> projectNamelist = new ArrayList<>(); String[] projectIdStrs = projectIds.split(","); for (String projectId : projectIdStrs) { if (!StringUtils.isEmpty(projectId)) { - projectNamelist.add(wellPreMaps.get(projectId)); + Map projectMap=new HashMap(); + projectMap.put("projectId",projectId); + projectMap.put("projectName",wellPreMaps.get(projectId)); + projectNamelist.add(projectMap); } } return projectNamelist; @@ -333,6 +338,7 @@ private EntityWrapper initQueryParam(AppUserListDTO appUserListDTO) { EntityWrapper query = new EntityWrapper<>(); query.like(StringUtils.isNotEmpty(appUserListDTO.getPhone()), "phone", appUserListDTO.getPhone()); + //位数一致，且唯一 query.like(StringUtils.isNotEmpty(appUserListDTO.getProjectId()), "projectIds", appUserListDTO.getProjectId()); query.like(StringUtils.isNotEmpty(appUserListDTO.getName()), "name", appUserListDTO.getName()); if (!ALL_USER.equals(appUserListDTO.getUserStatus())) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java index 5ab81c7..04191f0 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/TemplateController.java @@ -37,7 +37,7 @@ public void doPost(@RequestParam("filename") String filename, HttpServletResponse response) throws IOException { logger.info(downloadPath); String tempDownloadPath=downloadPath; - if (tempDownloadPath.startsWith("/")) { + if (tempDownloadPath.startsWith(File.separator)) { tempDownloadPath = tempDownloadPath.substring(1); } diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index 15dc5bf..8b566be 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -13,14 +13,16 @@ #flowable数据源和多数据源配置 casic: kaptcha-open: false #是否开启登录时验证码 (true/false) - nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/appDeviceLog/listPage,/appDeviceAdd/add,/appDeviceLog/deviceDetail,/appDeviceLog/add,/appDeviceAdd/fileUpload,/appDeviceAdd/findListByCodes,/appDeviceAdd/findModeCodeByCode,/deviceType/getUser,/project/getProject,/appDeviceLog/deletePhoto,/deviceType/deviceType,/productRepairRecords/add,/appDeviceAdd/fileUploadMarker,/appDeviceAdd/getDevTypeLength,/appDeviceAdd/delete,/appUserOpenid/login,/appUserOpenid/add,/appUserOpenid/validate,/appDeviceAdd/getWellTypeList,/appDeviceAdd/*,/websocket/*,/template/download + nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/process/processDiagram,/appDeviceLog/listPage,/appDeviceAdd/add,/appDeviceLog/deviceDetail,/appDeviceLog/add,/appDeviceAdd/fileUpload,/appDeviceAdd/findListByCodes,/appDeviceAdd/findModeCodeByCode,/deviceType/getUser,/project/getProject,/appDeviceLog/deletePhoto,/deviceType/deviceType,/productRepairRecords/add,/appDeviceAdd/fileUploadMarker,/appDeviceAdd/getDevTypeLength,/appDeviceAdd/delete,/appUserOpenid/login,/appDeviceAdd/getWellTypeList,/appDeviceAdd/*,/websocket/*,/template/download, + /app/user/login,/app/user/project,/product/safe/add,/product/safe/sign-status,/product/safe/update,/well/pre/listPage file-upload-path: D:\cz\203\临时项目\批产小程序\product-device\casic-web\src\main\resources\excel\ - file-download-path: D:\cz\203\临时项目\批产小程序\product-device\casic-web\src\main\resources\excel\ + file-download-path: D:\cz\203\临时项目\批产小程序\product-device\casic-web\src\main\resources\excel\ + producerName: producer repairName: repair wxUrl: https://api.weixin.qq.com/sns/jscode2session #获取微信openid - appid: wx8f4b331065a9ac2e #微信小程序开发appid - secret: 335847f265b3875804c8f8de4231730b #微信小程序开发密钥 + appid: wx79419f886f8c77ef #微信小程序开发appid + secret: 1bb1a8ed46c5217715e674ecd077e9ff #微信小程序开发密钥 photoPath: https://logapi.smartlog.work/static/ #导出照片位置存放目录 export-file-delete: 0 0 */1 * * ? #日志文件有效扫描时间（现为一天扫描一次） file-valid-days: -1 #日志文件有效天数