取消监听所有消息队列

# Conflicts:
#	src/main/java/com/ai/da/service/impl/DesignServiceImpl.java

src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java

@@ -559,7 +559,7 @@ public class GenerateConsumer {
         log.info("============ProcessPoseTransformResult End listening==========");
     }
 
-    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
+    /*@RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
     @RabbitHandler
     public void generateConsumer1(Message msg, Channel channel) {
         generate(msg, channel, "consumer 1");
@@ -635,7 +635,7 @@ public class GenerateConsumer {
     @RabbitHandler
     public void getPoseTransformationResult(Message msg, Channel channel) {
         processPoseTransformResult(msg, channel);
-    }
+    }*/
 //    @RabbitListener(queues = "#{rabbitMQProperties.queues.designBatch}")
 //    @RabbitHandler
 //    public void getDesignBatchResult(Message msg, Channel channel) {

src/main/java/com/ai/da/common/task/AccountTask.java

@@ -40,8 +40,8 @@ public class AccountTask {
         accountService.extendValidityForCC();
     }
 
-    // 每天凌晨0点执行一次
-    @Scheduled(cron = "0 0 0 * * ?")
+    // 每天凌晨0点执行一次  目前已没有角色类型为4的用户
+    /*@Scheduled(cron = "0 0 0 * * ?")
     public void cancelActivityBenefits() {
         // 1、查询当前所有参与了活动且过期的用户
         List<Account> accountList = accountService.getExpiredUserBySystemUser(4);
@@ -51,7 +51,7 @@ public class AccountTask {
             log.info("参与活动的用户{} : {} 于 {} 账号有效期到期，置为游客", account.getId(), account.getUserEmail(), account.getValidEndTime());
             accountService.toVisitor(account);
         }
-    }
+    }*/
 
     // 每天检测正式用户到期情况，每天凌晨0点执行
     @Scheduled(cron = "0 0 0 * * ?")

src/main/java/com/ai/da/controller/ConvenientInquiryController.java

@@ -103,7 +103,7 @@ public class ConvenientInquiryController {
     @GetMapping("/recentNewUserChart")
     public Response<Map<String, Object>> recentNewUserChart(@Parameter(description = "startTime") @RequestParam @Nullable String startTime,
                                                             @Parameter(description = "endTime") @RequestParam @Nullable String endTime,
-                                                            @Parameter(description = "userType") @RequestParam Integer userType) {
+                                                            @Parameter(description = "userType") @RequestParam @Nullable Integer userType) {
         return Response.success(convenientInquiryService.recentNewUserChart(startTime, endTime, userType));
     }
 

src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java

@@ -1,5 +1,6 @@
 package com.ai.da.model.dto;
 
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import com.ai.da.mapper.primary.entity.Gradient;
@@ -73,10 +74,12 @@ public class DesignSingleItemDTO implements Serializable {
     @Schema(description = "45")
     private double rotate;
 
-    /*@Schema(description = "带overall印花未分割图片")
+    @Hidden
+    @Schema(description = "带overall印花未分割图片")
     private String undividedLayerBase64;
 
+    @Hidden
     @Schema(description = "带overall/single印花未分割图片")
-    private String undividedLayerWithSinglePrintBase64;*/
+    private String undividedLayerWithSinglePrintBase64;
 
 }

src/main/java/com/ai/da/python/PythonService.java

@@ -4309,7 +4309,7 @@ public class PythonService {
         Map<String, Object> map = new HashMap<>();
         map.put("prompt", prompt);
         AuthPrincipalVo userHolder = UserContext.getUserHolder();
-        map.put("user_id", userHolder.getId());
+        map.put("user_id", userHolder.getId().toString());
         log.info("brandDNAGenerate请求python 参数:####{}", map);
         String param = JSON.toJSONString(map, SerializerFeature.WriteNullStringAsEmpty);
         log.info(param);

src/main/java/com/ai/da/service/AccountService.java

@@ -246,4 +246,6 @@ public interface AccountService extends IService<Account> {
     void setEduAdminToExpire(Account adminAccount);
 
     String getOrganizationTypeByRole(Integer roleNum);
+
+    void validateUserValidaExpire(Account account);
 }

src/main/java/com/ai/da/service/DesignItemService.java

@@ -53,7 +53,7 @@ public interface DesignItemService extends IService<DesignItem> {
 
     DesignSingleVO designSingleIncludeLayers(DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO);
 
-     // Map<String, List<String>> setPriorityAndUndividedLayer(JSONArray layers, DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO);
+      Map<String, List<String>> setPriorityAndUndividedLayer(JSONArray layers, DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO);
 
     Map<String, String> setTypeAndUndividedLayer(JSONArray layers);
 

src/main/java/com/ai/da/service/impl/AccountServiceImpl.java

@@ -39,9 +39,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
+import org.springframework.context.ApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -83,6 +84,9 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> implements AccountService {
+    @Resource
+    private ApplicationContext applicationContext;
+
     @Resource
     private AccountMapper accountMapper;
 
@@ -279,7 +283,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
     // 定义常量(临时)
     private static final Integer SYSTEM_USER_TYPE_EDU_ADMIN = 7;
 
-    private void validateUserValidaExpire(Account account) {
+    public void validateUserValidaExpire(Account account) {
         Long currentTime = new Date().getTime();
         if (account.getSystemUser().equals(0)) {
             return;
@@ -297,7 +301,9 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
                 if (isEduAdmin) {
                     setEduAdminToExpire(account);
                 } else {
-                    toVisitor(account);
+                    // 这里调用代理的 toVisitor 方法
+                    AccountService proxy = applicationContext.getBean(AccountService.class);
+                    proxy.toVisitor(account);
 //                    return;
                      throw new BusinessException("account.expired", ResultEnum.PROMPT.getCode());
                 }
@@ -1949,6 +1955,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
         return baseMapper.selectList(queryWrapper);
     }
 
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void toVisitor(Account account) {
         accountMapper.toVisitor(account.getId());
     }

src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java

@@ -440,7 +440,18 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
 //            designItemDetail.setPrintJson(JSON.toJSONString(printObject));
 
             designItemDetail.setPartialDesign(Objects.isNull(detail.getPrint()) ? null : detail.getPrint().getPartial());
+            designItemDetail.setGradientString(detail.getGradientString());
+
             designItemDetails.add(designItemDetail);
+
+            // 处理gradientString为null的情况，强制更新为null
+            if (Objects.isNull(detail.getGradientString()) && Objects.nonNull(designItemDetail.getId())) {
+                UpdateWrapper<DesignItemDetail> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("id", designItemDetail.getId());
+                updateWrapper.set("gradient_string", null);
+                updateWrapper.set("update_date", DateUtil.getByTimeZone(timeZone));
+                designItemDetailService.update(null, updateWrapper);
+            }
         });
 
         // 逻辑删除未复用的旧记录
@@ -987,8 +998,6 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
         });
     }
 
-    /*
-    取消存储UndividedLayer和UndividedLayerWithSinglePrint字段
     private void undividedLayerBase64ToImage(List<DesignSingleItemDTO> designSingleItemDTOS) {
         designSingleItemDTOS.forEach(item -> {
             if (!StringUtil.isNullOrEmpty(item.getUndividedLayerBase64())) {
@@ -1023,10 +1032,9 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
                 }
             }
         });
-    }*/
+    }
 
-    /*@Override
-    取消存储UndividedLayer和UndividedLayerWithSinglePrint字段
+    @Override
     public Map<String, List<String>> setPriorityAndUndividedLayer(JSONArray layers, DesignSingleIncludeLayersDTO designSingleIncludeLayersDTO) {
        String designType = "default";
         if (Objects.nonNull(designSingleIncludeLayersDTO)) {
@@ -1055,7 +1063,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
         }
 
         return priorityAndLayer;
-    }*/
+    }
 
     // 由于在design过程中没有priority 优先级的概念，并且在design时，不会出现上下两件使用相同服装类型的情况，所以这里依然保留这个方法。
     @Override

src/main/java/com/ai/da/service/impl/DesignServiceImpl.java

@@ -713,9 +713,9 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
         Map<String, Integer> typePriority = list.stream().collect(Collectors.toMap(d -> d.getImageCategory().split("_")[0],
                 d -> Math.abs(d.getPriority()),
                 (existing, replacement) -> replacement));
-//        Map<String, String> typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers);
-//        log.info("all typeLayers Map:{}", typeAndUndividedLayer);
-//        Map<String, List<String>> priorityAndUndividedLayer = designItemService.setPriorityAndUndividedLayer(layers, null);
+        Map<String, String> typeAndUndividedLayer = designItemService.setTypeAndUndividedLayer(layers);
+        log.info("all typeLayers Map:{}", typeAndUndividedLayer);
+        Map<String, List<String>> priorityAndUndividedLayer = designItemService.setPriorityAndUndividedLayer(layers, null);
         for (DesignPythonItem detail : item.getItems()) {
             if (null == detail) {
                 continue;
@@ -727,10 +727,10 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
             designItemDetail.setCollectionElementId(detail.getElementId());
             designItemDetail.setCreateDate(DateUtil.getByTimeZone(timeZone));
             log.info("detail.getType():{}", detail.getType());
-/*            if (!detail.getType().equals("Body")) {
+            if (!detail.getType().equals("Body")) {
                 log.info("layer : {}", typeAndUndividedLayer.get(designItemDetail.getType()));
                 designItemDetail.setUndividedLayer(typeAndUndividedLayer.get(designItemDetail.getType()));
-            }*/
+            }
             if (SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType())) {
                 designItemDetail.setPath(detail.getBody_path());
                 //BODY不关联businessId
@@ -742,8 +742,8 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
                 DesignPythonItemPrint printObject = detail.getPrint().getOverall();
 //                designItemDetail.setPrintPath(Objects.isNull(printObject) ? "" : printObject.getPath());
                 designItemDetail.setPrintPath(CollectionUtils.isEmpty(printObject.getPrint_path_list()) ? "" : printObject.getPrint_path_list().get(0));
-                /*designItemDetail.setUndividedLayer(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString()).get(0));
-                designItemDetail.setUndividedLayerWithSinglePrint(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString()).get(1));*/
+                designItemDetail.setUndividedLayer(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString()).get(0));
+                designItemDetail.setUndividedLayerWithSinglePrint(priorityAndUndividedLayer.get(designItemDetail.getPriority().toString()).get(1));
             }
             designItemDetailService.save(designItemDetail);
             if (!SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType()) && !StringUtil.isNullOrEmpty(designItemDetail.getPrintPath())) {
@@ -1154,7 +1154,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
                         .toLocalDateTime());
                 userPreference.setDesignItemId(designItem.getId());
                 userPreference.setProjectId(projectId);
-                if (workspaceRelStyles == null) {
+                if (workspaceRelStyles == null||workspaceRelStyles.isEmpty()) {
                     //查不到记录，style应该是all
                     userPreference.setWorkspaceRelStyleId(0L);
                 } else {

src/main/java/com/ai/da/service/impl/MessageCenterServiceImpl.java

@@ -194,6 +194,8 @@ public class MessageCenterServiceImpl extends ServiceImpl<NotificationMapper, No
         if (!type.equals("system")) {
             // 个人未读消息
             count = getUnreadCountByType(type, receiverId);
+        } else if (Objects.isNull(receiverId)) {
+            count = 1L;
         } else {
             // 系统未读消息
             count = getUnreadSystemNotification(receiverId);
@@ -253,12 +255,14 @@ public class MessageCenterServiceImpl extends ServiceImpl<NotificationMapper, No
         // 计算总的系统通知数量
         QueryWrapper<Notification> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(Notification::getType, "system")
-                .gt(Notification::getCreateTime, account.getCreateDate())
                 .and(wrapper -> wrapper
                         .isNull(Notification::getReceiverId)
                         .or()
                         .eq(Notification::getReceiverId, receiverId)
                 );
+        if (Objects.nonNull(account)) {
+            queryWrapper.lambda().gt(Notification::getCreateTime, account.getCreateDate());
+        }
         Long totalSysCount = baseMapper.selectCount(queryWrapper);
 
         // 计算单个用户读了多少条系统数据

src/main/java/com/ai/da/service/impl/PanToneServiceImpl.java

@@ -258,6 +258,11 @@ public class PanToneServiceImpl extends ServiceImpl<PanToneMapper, PanTone> impl
                 d.setH(getRgbByHsvBatchDTO.getH());
                 d.setS(getRgbByHsvBatchDTO.getS());
                 d.setV(getRgbByHsvBatchDTO.getV());
+                // 不使用数据库中存储的RGB值，使用通过hsv计算得到的RGB值
+                int[] rgb = PantoneUtils.hsvToRgb(d.getH(), d.getS(), d.getV());
+                d.setR(rgb[0]);
+                d.setG(rgb[1]);
+                d.setB(rgb[2]);
             }
         });
         Map<Integer, PantoneVO> valueToPantoneVo = templateResposne.stream().collect(Collectors.toMap(

src/main/resources/application-dev.properties

@@ -181,4 +181,4 @@ file.upload.max.size.video=104857600
 # 上传任务过期时间（小时）
 file.upload.task.expiry.hours=24
 
-global.award.link=https://develop.aida.com.hk/contestants/
+global.award.link=https://develop.aida.com.hk/award/contestants?id=

src/main/resources/application-prod.properties

@@ -179,4 +179,4 @@ file.upload.max.size.video=104857600
 # 上传任务过期时间（小时）
 file.upload.task.expiry.hours=24
 
-global.award.link=https://www.aida.com.hk/contestants/
+global.award.link=https://www.aida.com.hk/award/contestants?id=

src/main/resources/payment.properties

@@ -27,20 +27,20 @@ paypal.webhook_id=1D107312EX592781K
 ##### Stripe
 
 # developer
-#stripe.private-key=sk_test_51P4ZZL02n1TEydyN8qQHjOA9imsFU7Oxs2HMHGy2urHnnQgSHnZuu5vVP6pKhEACwUpsKNyrbZpdcg5TJWJLRHcY008dEO1fn2
+stripe.private-key=sk_test_51P4ZZL02n1TEydyN8qQHjOA9imsFU7Oxs2HMHGy2urHnnQgSHnZuu5vVP6pKhEACwUpsKNyrbZpdcg5TJWJLRHcY008dEO1fn2
 # dev 端点
-#stripe.webhook-sign-secret=whsec_e0dBiJngx6qqgJj6yPyJ2A9ouh1Cjv5w
+stripe.webhook-sign-secret=whsec_e0dBiJngx6qqgJj6yPyJ2A9ouh1Cjv5w
 # local 端点
 #stripe.webhook-sign-secret=whsec_TJcMSnAkh4uktrNY1M6Iy8XaVze4Rzqm
 
 # kim - test
-stripe.private-key=sk_test_51LwPrxH7nPZ8bkrNj67TFD7sxucaTANs1lf0KGSu1QSJfxYXcnigq2wTaZyZzST7y0fMbhhvaJZ4LjjFhr95M83a00eXrmOTL0
+#stripe.private-key=sk_test_51LwPrxH7nPZ8bkrNj67TFD7sxucaTANs1lf0KGSu1QSJfxYXcnigq2wTaZyZzST7y0fMbhhvaJZ4LjjFhr95M83a00eXrmOTL0
 # prod 端点
 #stripe.webhook-sign-secret=whsec_GoyVEAaBtuGD5Rt55z83JnPnLDAZTN3u
 # local 端点
 #stripe.webhook-sign-secret=whsec_NvwM3hDQiN5GXclYOYekE9IKHLjmROF8
 # dev 端点
-stripe.webhook-sign-secret=whsec_pX0pPMQm85PaUSWnFMEzoccb3MGNkjoL
+#stripe.webhook-sign-secret=whsec_pX0pPMQm85PaUSWnFMEzoccb3MGNkjoL
 
 # kim - live
 #stripe.private-key=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