diff --git a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java index 61e964ea..3e73536e 100644 --- a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java +++ b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java @@ -140,6 +140,9 @@ public class MyTaskScheduler { SendEmailUtil.sendExcelEmail("calvinwong@aidlab.hk", null, Files.readAllBytes(Paths.get(fileName)), fileName); SendEmailUtil.sendExcelEmail("kaicpang.pang@connect.polyu.hk", null, Files.readAllBytes(Paths.get(fileName)), fileName); SendEmailUtil.sendExcelEmail("kimwong@code-create.com.hk", null, Files.readAllBytes(Paths.get(fileName)), fileName); + SendEmailUtil.sendExcelEmail("ningning@code-create.com.hk", null, Files.readAllBytes(Paths.get(fileName)), fileName); + SendEmailUtil.sendExcelEmail("johnnyho@code-create.com.hk", null, Files.readAllBytes(Paths.get(fileName)), fileName); + SendEmailUtil.sendExcelEmail("ringolau@code-create.com.hk", null, Files.readAllBytes(Paths.get(fileName)), fileName); } } catch (IOException e) { e.printStackTrace(); @@ -149,6 +152,9 @@ public class MyTaskScheduler { SendEmailUtil.sendNoExcelEmail("calvinwong@aidlab.hk", null); SendEmailUtil.sendNoExcelEmail("kaicpang.pang@connect.polyu.hk", null); SendEmailUtil.sendNoExcelEmail("kimwong@code-create.com.hk", null); + SendEmailUtil.sendNoExcelEmail("ningning@code-create.com.hk", null); + SendEmailUtil.sendNoExcelEmail("johnnyho@code-create.com.hk", null); + SendEmailUtil.sendNoExcelEmail("ringolau@code-create.com.hk", null); } } diff --git a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java index 564819fa..9795ca1a 100644 --- a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java +++ b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java @@ -14,6 +14,8 @@ import com.ai.da.model.vo.QueryUserConditionsVO; import com.ai.da.service.AccountService; import com.ai.da.service.ConvenientInquiryService; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.itextpdf.text.pdf.PRIndirectReference; import io.netty.util.internal.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -47,7 +49,7 @@ public class ConvenientInquiryController { String userEmail = accountService.getById(accountId).getUserEmail(); if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L) - || userEmail.equals("joho8228@hotmail.com") + || userEmail.equals("joho8228@hotmail.com") || userEmail.equals("wanninghua160@gmail.com") ) { return Response.success(convenientInquiryService.getTrial(queryUserConditionsVO)); } else { @@ -60,7 +62,11 @@ public class ConvenientInquiryController { public Response> getDesignStatistic(@RequestParam String startTime, @RequestParam String endTime, @RequestParam(required = false) List ids, @RequestParam(required = false) String email) { Long accountId = UserContext.getUserHolder().getId(); - if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)) { + String userEmail = accountService.getById(accountId).getUserEmail(); + if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) + || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L) + || userEmail.equals("joho8228@hotmail.com") || userEmail.equals("wanninghua160@gmail.com") + ) { if (StringUtil.isNullOrEmpty(startTime)) startTime = "2024-02-01 00:00:00"; if (StringUtil.isNullOrEmpty(endTime)) { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); @@ -143,7 +149,14 @@ public class ConvenientInquiryController { @ApiOperation("添加用户") @PostMapping("/addUser") public Response addUser(@Valid @RequestBody AccountAddDTO accountAddDTO) { - return Response.success(convenientInquiryService.addUser(accountAddDTO)); + Long userAccountId = UserContext.getUserHolder().getId(); + if (userAccountId.equals(31L) || userAccountId.equals(87L) || userAccountId.equals(83L) + || userAccountId.equals(6L) || userAccountId.equals(4L) || userAccountId.equals(73L) + ) { + return Response.success(convenientInquiryService.addUser(accountAddDTO)); + } else { + return Response.fail("Sorry, you don't have permission"); + } } @ApiOperation("修改用户信息") @@ -152,14 +165,25 @@ public class ConvenientInquiryController { @ApiParam(value = "有效期截止时间的毫秒级unix格式") @RequestParam @Nullable Long validEndTime, @ApiParam(value = "用户类型 1/2/3/0 -> yearly/monthly/trial/visitor") @RequestParam @Nullable Integer systemUser, @ApiParam("积分") @RequestParam @Nullable Long credits) { - return Response.success(convenientInquiryService.modifyUser(accountId, validEndTime, systemUser, credits)); + Long userAccountId = UserContext.getUserHolder().getId(); + if (userAccountId.equals(31L) || userAccountId.equals(87L) || userAccountId.equals(83L) + || userAccountId.equals(6L) || userAccountId.equals(4L) || userAccountId.equals(73L) + ) { + return Response.success(convenientInquiryService.modifyUser(accountId, validEndTime, systemUser, credits)); + } else { + return Response.fail("Sorry, you don't have permission"); + } } @ApiOperation("获取用户信息") @PostMapping("/getUserInfo") public Response> getUserInfo(@Valid @RequestBody QueryUserConditionsVO queryUserConditionsVO) { Long accountId = UserContext.getUserHolder().getId(); - if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)) { + String userEmail = accountService.getById(accountId).getUserEmail(); + if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) + || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L) + || userEmail.equals("joho8228@hotmail.com") || userEmail.equals("wanninghua160@gmail.com") + ) { return Response.success(convenientInquiryService.getUserInfo(queryUserConditionsVO)); } else { return Response.fail("Sorry, you don't have permission"); diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index fea340e5..fac4f83f 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -835,6 +835,7 @@ public class AccountServiceImpl extends ServiceImpl impl throw new BusinessException("Machine not registered or machine identification has changed, login free has failed, please contact us at help@aida.com.hk."); } Account account = accountList.get(0); + validateUserValidaExpire(account); AccountLoginVO response = CopyUtil.copyObject(account, AccountLoginVO.class); String token = LocalCacheUtils.getTokenCache(String.valueOf(account.getId())); if (StringUtils.isNotBlank(token)) { diff --git a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java index 9c6fdf93..5f29b7c9 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java @@ -57,12 +57,12 @@ public class CollectionServiceImpl extends ServiceImpl