From ebd596d0d25712bfe0d4b1c95611cee78f727c85 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Sun, 20 Oct 2024 10:52:14 +0800 Subject: [PATCH] TASK:aida; --- .../com/ai/da/common/utils/SendEmailUtil.java | 22 +-- .../controller/SavedCollectionController.java | 6 + .../secondary/AttributeRetrievalMapper.java | 2 + .../ai/da/service/UserLikeGroupService.java | 2 + .../da/service/impl/AccountServiceImpl.java | 144 +++++++++--------- .../impl/UserLikeGroupServiceImpl.java | 122 +++++++++++++++ .../secondary/AttributeRetrievalMapper.xml | 8 + 7 files changed, 223 insertions(+), 83 deletions(-) diff --git a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java index eb42ea2a..a89115f8 100644 --- a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java +++ b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java @@ -389,20 +389,20 @@ public class SendEmailUtil { // 根据邮件类型设置不同的主题和模板 String subject = ""; Template template = new Template(); -// if (type == 1) { -// subject = "Upcoming System Upgrade for AiDA 3.0"; -// template.setTemplateID(UPGRADE_NOTIFICATION_ID); -// }else { -// subject = "即将到来的AiDA 3.0系统升级"; -// template.setTemplateID(UPGRADE_NOTIFICATION_ID_CHINESE); -// } if (type == 1) { - subject = "Successful System Upgrade and New Features in AiDA 3.0"; - template.setTemplateID(UPGRADE_SUCCESS_NOTIFICATION_ID); + subject = "Upcoming System Upgrade for AiDA 3.0"; + template.setTemplateID(UPGRADE_NOTIFICATION_ID); }else { - subject = "系统升级成功和AiDA 3.0新功能"; - template.setTemplateID(UPGRADE_SUCCESS_NOTIFICATION_ID_CHINESE); + subject = "即将到来的AiDA 3.0系统升级"; + template.setTemplateID(UPGRADE_NOTIFICATION_ID_CHINESE); } +// if (type == 1) { +// subject = "Successful System Upgrade and New Features in AiDA 3.1"; +// template.setTemplateID(UPGRADE_SUCCESS_NOTIFICATION_ID); +// }else { +// subject = "系统升级成功和AiDA 3.1新功能"; +// template.setTemplateID(UPGRADE_SUCCESS_NOTIFICATION_ID_CHINESE); +// } template.setTemplateData(buildAccountData(account)); req.setSubject(subject); diff --git a/src/main/java/com/ai/da/controller/SavedCollectionController.java b/src/main/java/com/ai/da/controller/SavedCollectionController.java index 76addf89..29cbabac 100644 --- a/src/main/java/com/ai/da/controller/SavedCollectionController.java +++ b/src/main/java/com/ai/da/controller/SavedCollectionController.java @@ -239,4 +239,10 @@ public class SavedCollectionController { List magicToolResultVOList = userLikeGroupService.getRelightResult(taskIdList); return Response.success(magicToolResultVOList); } + + @ApiOperation(value = "likeHistoryRelSketch") + @PostMapping("/likeHistoryRelSketch") + public Response likeHistoryRelSketch() { + return Response.success(userLikeGroupService.likeHistoryRelSketch()); + } } diff --git a/src/main/java/com/ai/da/mapper/secondary/AttributeRetrievalMapper.java b/src/main/java/com/ai/da/mapper/secondary/AttributeRetrievalMapper.java index 1c3be31b..74fa789a 100644 --- a/src/main/java/com/ai/da/mapper/secondary/AttributeRetrievalMapper.java +++ b/src/main/java/com/ai/da/mapper/secondary/AttributeRetrievalMapper.java @@ -28,4 +28,6 @@ public interface AttributeRetrievalMapper { void updateStyleById(Long idByFileName, String style, String tableName); void updateStyleByFileName(String style, String fileName, String tableName); + + String getStyleByUrl(String replace,String tableName); } diff --git a/src/main/java/com/ai/da/service/UserLikeGroupService.java b/src/main/java/com/ai/da/service/UserLikeGroupService.java index d50214b0..71edbc50 100644 --- a/src/main/java/com/ai/da/service/UserLikeGroupService.java +++ b/src/main/java/com/ai/da/service/UserLikeGroupService.java @@ -60,4 +60,6 @@ public interface UserLikeGroupService extends IService { List relight(ToProductImageDTO toProductImageDTO); List getRelightResult(List taskIdList); + + String likeHistoryRelSketch(); } 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 23669ede..6c328642 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -1011,30 +1011,27 @@ public class AccountServiceImpl extends ServiceImpl impl @Override public void upgradeNotification() { -// QueryWrapper queryWrapper = new QueryWrapper<>(); -//// queryWrapper.eq("id", 88L); -// queryWrapper.and(wrapper -> -// wrapper.gt("valid_end_time", 1720540799000L) -// .or().isNull("valid_end_time")) -// .isNotNull("user_email"); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lt("valid_end_time", 1720540799000L); + queryWrapper.and(wrapper -> + wrapper.gt("valid_end_time", 1729237154000L) + .or().isNull("valid_end_time") + .isNull("valid_start_time")) + .isNotNull("user_email"); + + +// QueryWrapper queryWrapper = new QueryWrapper<>(); +// queryWrapper.lt("valid_end_time", 1729237154000L); List accountList = accountMapper.selectList(queryWrapper); System.out.println(accountList); int i = 0; for (Account account : accountList) { -// SendEmailUtil.sendUpgradeNotification(account, null, 0); -// SendEmailUtil.sendUpgradeNotification(account, null, 1); - if (i > 6) { - if (account.getLanguage().equals(Language.CHINESE_SIMPLIFIED.name())) { + if (account.getLanguage().equals(Language.CHINESE_SIMPLIFIED.name())) { SendEmailUtil.sendUpgradeNotification(account, null, 0); } else { // 英文 SendEmailUtil.sendUpgradeNotification(account, null, 1); } - } i ++; } } @@ -1044,8 +1041,9 @@ public class AccountServiceImpl extends ServiceImpl impl // 所有试用用户 不管过没过期 所有转为游客的正式用户以及试用用户 QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().ne(Account::getSystemUser, 0); - queryWrapper.lambda().isNotNull(Account::getUserEmail); + queryWrapper.lambda().eq(Account::getId, 6L); +// queryWrapper.lambda().ne(Account::getSystemUser, 0); +// queryWrapper.lambda().isNotNull(Account::getUserEmail); List accountList = accountMapper.selectList(queryWrapper); List halfPricePromotionList = new ArrayList<>(accountList); // queryWrapper.lambda().eq(Account::getSystemUser, 3); @@ -1058,69 +1056,71 @@ public class AccountServiceImpl extends ServiceImpl impl // queryWrapper1.lambda().isNotNull(Account::getValidStartTime); // List accountList1 = accountMapper.selectList(queryWrapper1); // halfPricePromotionList.addAll(accountList1); - QueryWrapper queryWrapper1 = new QueryWrapper<>(); - queryWrapper1.lambda().eq(Account::getSystemUser, 0); - queryWrapper1.lambda().isNotNull(Account::getValidStartTime); - List accountList1 = accountMapper.selectList(queryWrapper1); - halfPricePromotionList.addAll(accountList1); +// QueryWrapper queryWrapper1 = new QueryWrapper<>(); +// queryWrapper1.lambda().eq(Account::getSystemUser, 0); +// queryWrapper1.lambda().isNotNull(Account::getValidStartTime); +// List accountList1 = accountMapper.selectList(queryWrapper1); +// halfPricePromotionList.addAll(accountList1); // List sendUserEmail = halfPricePromotionList.stream().map(Account::getUserEmail).collect(Collectors.toList()); // log.info(JSON.toJSONString(sendUserEmail)); - List emailList = Arrays.asList( - "xingxingzou@aidlab.hk", "kaicpang.pang@connect.polyu.hk", "21122693r@connect.polyu.hk", - "fangjianliao@aidlab.hk", "kimwong@code-create.com.hk", "aixfashion@aidlab.hk", - "cobracreation@netvigator.com", "dongmei.mo@connect.polyu.hk", "Angel@angelchen.com", - "carlovolpi@upwhk.com", "houdeyumail@gmail.com", "luluwangwk@gmail.com", "Kuochitkuo@gmail.com", - "mgl220053@gmail.com", "lamheimanwendy@gmail.com", "millamhy@hotmail.com", - "cshirleyshirley3@gmail.com", "puipui07130713@gmail.com", "19054532d@connect.polyu.hk", - "20064811d@connect.polyu.hk", "20061894D@connect.polyu.hk", "20051773d@connect.polyu.hk", - "nlourens@truworths.co.za", "mandychan@aidlab.hk", "calvinwong@aidlab.hk", "mkt.gp@aidlab.hk", - "winniechan@aidlab.hk", "Avis.chung@viviennetam.com.hk", "teresa@viviennetam.com.hk", - "X1627315083@163.com", "Sharon.Tsui@hongkong.messefrankfurt.com", "xupei3360@163.com", - "shahaibodd99@gmail.com", "zchengrong@yeah.net", "mavistse@vtc.edu.hk", - "fashionxai.demo@gmail.com", "savus@konkuk.ac.kr", "arthur.chan@vtc.edu.hk", "Ankh.yiu@tienhu.com", - "tvicente@ripleyhk.com", "aida@hkfda.org", "mark.thompson@leverstyle.com", - "julianapiccininim@gmail.com", "siriusace38@gmail.com", "kittingchoi@aidlab.hk", "cnewhj@126.com", - "youis14@sina.com", "mandyyyuk@gmail.com", "JadePoon@frontline.com.hk", "ritachen@csc-groups.com", - "derrickcheng@ygmtrading.com", "karen11066827@gmail.com", "cathy.wong@alvanon.com", - "maggie.guo@xxhtech.com", "morris.mamiye@mambro.com", "sky@taihill.vc", "lokchun.com@gmail.com", - "t-mavistse@stu.vtc.edu.hk", "CFLAIDA@cflhk.com", "kim_wong_99@yahoo.com", "dltnwls6061@gmail.com", - "jsj000904@naver.com", "leelokyin@naver.com", "rin2.200088@gmail.com", "setinares@gmail.com", - "ysy6016@gmail.com", "ziniko104@gmail.com", "soooo8404@gmail.com", "hanbinna0613@nate.com", - "leeapparel71@gmail.com", "miriammiraekim@gmail.com", "coffeeling@icloud.com", - "klilb13997@gmail.com", "badriyah.alharthi@gmail.com", "laurenrawbone@woolworths.co.za", - "georgeashcroft@yahoo.co.uk", "salahraghadddaaa@gmail.com", "wuhengchee@gmail.com", - "gigiwu33@hotmail.com", "wuhengchee@yahoo.com.hk", "willis@zavvy-ave.com", "102561143@qq.com", - "3352798788@qq.com", "3428163743@qq.com", "1933674928@qq.com", "fengjie980923@163.com", - "502565733@qq.com", "3506556587@qq.com", "964664177@qq.com", "3123416129@qq.com", - "1627315082@qq.com", "ra129364@uem.br", "kristytsang623@gmail.com", "2122413626@qq.com", - "kongxinliaobiao@163.com", "1916606467@qq.com", "suhang2001411@gmail.com", - "2048374531@qq.com", "2257158028@qq.com", "1290989834@qq.com", "3315547200@qq.com", - "1011544060@qq.com", "1512170380@qq.com", "newagegoodyouth@gmail.com", - "isadorasilva2106@gmail.com", "3276879691@qq.com", "dsl@rasl.net", "2693383459@qq.com", - "zaiven@gmail.com", "2990670940@qq.com", "3057762191@qq.com", "3265315306@qq.com", - "2571543589@qq.com", "871210016@qq.com", "wwtwzx@live.cn", "1248609518@qq.com", - "1309757247@qq.com", "15920129936@163.com", "48485720@qq.com", "1372397040@qq.com", - "130320126@qq.com", "soomeiqi@gmail.com", "3305671192@qq.com", "2859439611@qq.com", - "1604753494@qq.com", "2979519992@qq.com", "2787394282@qq.com", "nfzy0215@126.com", - "2323278768@qq.com" - ); +// List emailList = Arrays.asList( +// "xingxingzou@aidlab.hk", "kaicpang.pang@connect.polyu.hk", "21122693r@connect.polyu.hk", +// "fangjianliao@aidlab.hk", "kimwong@code-create.com.hk", "aixfashion@aidlab.hk", +// "cobracreation@netvigator.com", "dongmei.mo@connect.polyu.hk", "Angel@angelchen.com", +// "carlovolpi@upwhk.com", "houdeyumail@gmail.com", "luluwangwk@gmail.com", "Kuochitkuo@gmail.com", +// "mgl220053@gmail.com", "lamheimanwendy@gmail.com", "millamhy@hotmail.com", +// "cshirleyshirley3@gmail.com", "puipui07130713@gmail.com", "19054532d@connect.polyu.hk", +// "20064811d@connect.polyu.hk", "20061894D@connect.polyu.hk", "20051773d@connect.polyu.hk", +// "nlourens@truworths.co.za", "mandychan@aidlab.hk", "calvinwong@aidlab.hk", "mkt.gp@aidlab.hk", +// "winniechan@aidlab.hk", "Avis.chung@viviennetam.com.hk", "teresa@viviennetam.com.hk", +// "X1627315083@163.com", "Sharon.Tsui@hongkong.messefrankfurt.com", "xupei3360@163.com", +// "shahaibodd99@gmail.com", "zchengrong@yeah.net", "mavistse@vtc.edu.hk", +// "fashionxai.demo@gmail.com", "savus@konkuk.ac.kr", "arthur.chan@vtc.edu.hk", "Ankh.yiu@tienhu.com", +// "tvicente@ripleyhk.com", "aida@hkfda.org", "mark.thompson@leverstyle.com", +// "julianapiccininim@gmail.com", "siriusace38@gmail.com", "kittingchoi@aidlab.hk", "cnewhj@126.com", +// "youis14@sina.com", "mandyyyuk@gmail.com", "JadePoon@frontline.com.hk", "ritachen@csc-groups.com", +// "derrickcheng@ygmtrading.com", "karen11066827@gmail.com", "cathy.wong@alvanon.com", +// "maggie.guo@xxhtech.com", "morris.mamiye@mambro.com", "sky@taihill.vc", "lokchun.com@gmail.com", +// "t-mavistse@stu.vtc.edu.hk", "CFLAIDA@cflhk.com", "kim_wong_99@yahoo.com", "dltnwls6061@gmail.com", +// "jsj000904@naver.com", "leelokyin@naver.com", "rin2.200088@gmail.com", "setinares@gmail.com", +// "ysy6016@gmail.com", "ziniko104@gmail.com", "soooo8404@gmail.com", "hanbinna0613@nate.com", +// "leeapparel71@gmail.com", "miriammiraekim@gmail.com", "coffeeling@icloud.com", +// "klilb13997@gmail.com", "badriyah.alharthi@gmail.com", "laurenrawbone@woolworths.co.za", +// "georgeashcroft@yahoo.co.uk", "salahraghadddaaa@gmail.com", "wuhengchee@gmail.com", +// "gigiwu33@hotmail.com", "wuhengchee@yahoo.com.hk", "willis@zavvy-ave.com", "102561143@qq.com", +// "3352798788@qq.com", "3428163743@qq.com", "1933674928@qq.com", "fengjie980923@163.com", +// "502565733@qq.com", "3506556587@qq.com", "964664177@qq.com", "3123416129@qq.com", +// "1627315082@qq.com", "ra129364@uem.br", "kristytsang623@gmail.com", "2122413626@qq.com", +// "kongxinliaobiao@163.com", "1916606467@qq.com", "suhang2001411@gmail.com", +// "2048374531@qq.com", "2257158028@qq.com", "1290989834@qq.com", "3315547200@qq.com", +// "1011544060@qq.com", "1512170380@qq.com", "newagegoodyouth@gmail.com", +// "isadorasilva2106@gmail.com", "3276879691@qq.com", "dsl@rasl.net", "2693383459@qq.com", +// "zaiven@gmail.com", "2990670940@qq.com", "3057762191@qq.com", "3265315306@qq.com", +// "2571543589@qq.com", "871210016@qq.com", "wwtwzx@live.cn", "1248609518@qq.com", +// "1309757247@qq.com", "15920129936@163.com", "48485720@qq.com", "1372397040@qq.com", +// "130320126@qq.com", "soomeiqi@gmail.com", "3305671192@qq.com", "2859439611@qq.com", +// "1604753494@qq.com", "2979519992@qq.com", "2787394282@qq.com", "nfzy0215@126.com", +// "2323278768@qq.com" +// ); log.info("AiDA workshop 活动通知名单：" + JSON.toJSONString(halfPricePromotionList)); int i = 0; for (Account account : halfPricePromotionList) { - if (i >= 0) { - if (!emailList.contains(account.getUserEmail())) { - try { - if (account.getLanguage().equals(Language.CHINESE_SIMPLIFIED.name())) { - SendEmailUtil.halfPricePromotion(account, null, 0); - }else { - SendEmailUtil.halfPricePromotion(account, null, 1); - } - }catch (Exception e) { - log.info(e.getMessage()); - } - } - } + SendEmailUtil.sendUpgradeNotification(account, null, 0); + SendEmailUtil.sendUpgradeNotification(account, null, 1); +// if (i >= 0) { +// if (!emailList.contains(account.getUserEmail())) { +// try { +// if (account.getLanguage().equals(Language.CHINESE_SIMPLIFIED.name())) { +// SendEmailUtil.halfPricePromotion(account, null, 0); +// }else { +// SendEmailUtil.halfPricePromotion(account, null, 1); +// } +// }catch (Exception e) { +// log.info(e.getMessage()); +// } +// } +// } i ++; log.info("十月优惠邮件成功发送第" + i + "条"); } diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index d640eddc..2c51cfa6 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -8,6 +8,7 @@ import com.ai.da.common.enums.CreditsEventsEnum; import com.ai.da.common.utils.*; import com.ai.da.mapper.primary.*; import com.ai.da.mapper.primary.entity.*; +import com.ai.da.mapper.secondary.AttributeRetrievalMapper; import com.ai.da.model.dto.PortfolioDTO; import com.ai.da.model.dto.ProductImageLikeDTO; import com.ai.da.model.dto.ToProductImageDTO; @@ -72,6 +73,12 @@ public class UserLikeGroupServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); + List userLikeGroups = userLikeGroupMapper.selectList(qw); + Map>>> result = new HashMap<>(); + for (UserLikeGroup userLikeGroup : userLikeGroups) { + Long accountId = userLikeGroup.getAccountId(); + Long collectionId = userLikeGroup.getCollectionId(); + + QueryWrapper collectionElementQueryWrapper = new QueryWrapper<>(); + collectionElementQueryWrapper.lambda().eq(CollectionElement::getCollectionId, collectionId); + collectionElementQueryWrapper.lambda().eq(CollectionElement::getLevel1Type, "Sketchboard"); + List collectionElements = collectionElementMapper.selectList(collectionElementQueryWrapper); + List urlList = collectionElements.stream().map(CollectionElement::getUrl).collect(Collectors.toList()); + + QueryWrapper userLikeQueryWrapper = new QueryWrapper<>(); + userLikeQueryWrapper.lambda().eq(UserLike::getUserLikeGroupId, userLikeGroup.getId()); + List userLikes = userLikeMapper.selectList(userLikeQueryWrapper); + + List> list = new ArrayList<>(); + + for (UserLike userLike : userLikes) { + QueryWrapper designItemDetailQueryWrapper = new QueryWrapper<>(); + designItemDetailQueryWrapper.lambda().eq(DesignItemDetail::getDesignItemId, userLike.getDesignItemId()); + designItemDetailQueryWrapper.lambda().ne(DesignItemDetail::getType, "Body"); + List designItemDetails = designItemDetailMapper.selectList(designItemDetailQueryWrapper); + Map sketch = new HashMap<>(); + for (DesignItemDetail designItemDetail : designItemDetails) { + String path = designItemDetail.getPath(); + sketch.put("type", designItemDetail.getType()); + sketch.put("path", path); + if (urlList.contains(path)) { + sketch.put("beSelected", true); + }else { + sketch.put("beSelected", false); + } + if (path.contains("aida-sys-image/images/")) { + String searchPath = new String(path); + String replace = searchPath.replace("aida-sys-image/images/", ""); + String style = getStyleByUrl(replace); + if (!StringUtils.isEmpty(style)) { + sketch.put("style", style); + } + } + } + list.add(sketch); + } + if (result.containsKey(accountId)) { + result.get(accountId).add(list); + }else { + List>> lists = new ArrayList<>(); + lists.add(list); + result.put(accountId, lists); + } + } + System.out.println(JSONObject.toJSONString(result)); + return null; + } + + private String getStyleByUrl(String replace) { + String[] split = replace.split("/"); + String tableName = getTableName(split); + if (StringUtils.isEmpty(tableName)) { + return null; + }else { + return attributeRetrievalMapper.getStyleByUrl(replace, tableName); + } + } + + private String getTableName(String[] split) { + switch (split[0]) { + case "female": { + switch (split[1]) { + case "blouse": { + return "female_top"; + } + case "trousers": { + return "female_pants"; + } + case "skirt": { + return "female_skirt"; + } + case "outwear": { + return "female_outwear"; + } + case "dress": { + return "female_dress"; + } + default: { + return null; + } + } + } + case "male": { + switch (split[1]) { + case "top": { + return "male_top"; + } + case "bottom": { + return "male_bottom"; + } + case "outwear": { + return "male_outwear"; + } + default: { + return null; + } + } + } + default: { + return null; + } + } + } } diff --git a/src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml b/src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml index 85891d07..3c2f0f49 100644 --- a/src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml +++ b/src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml @@ -102,4 +102,12 @@ WHERE img_name = #{fileName} + +