取消监听所有消息队列

# 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点执行一次
+    // 每天凌晨0点执行一次  目前已没有角色类型为4的用户
-    @Scheduled(cron = "0 0 0 * * ?")
+    /*@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/mapper/primary/entity/Contestant.java

@@ -44,9 +44,6 @@ public class Contestant {
     @TableField("phone_number")
     private String phoneNumber;
 
-    @TableField("portfolio_url")
-    private String portfolioUrl;
-
     @TableField("design_title")
     private String designTitle;
 
@@ -65,8 +62,6 @@ public class Contestant {
     @TableField("updated_at")
     private LocalDateTime updatedAt;
 
-    @TableField("created_by")
-    private Long createdBy;
 }
 
 

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/impl/DesignItemServiceImpl.java

@@ -443,6 +443,15 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
             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);
+            }
         });
 
         // 逻辑删除未复用的旧记录

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

@@ -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/GlobalAwardServiceImpl.java

@@ -151,7 +151,6 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
                     .age(request.getAge())
                     .countryRegionCity(request.getCountryRegionCity())
                     .phoneNumber(request.getPhoneNumber())
-                    .portfolioUrl(request.getPortfolioUrl())
                     .designTitle(request.getDesignTitle())
                     .designDescription(request.getDesignDescription())
                     .pdfPath(request.getPdfPath())
@@ -172,7 +171,6 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
             existing.setAge(request.getAge());
             existing.setCountryRegionCity(request.getCountryRegionCity());
             existing.setPhoneNumber(request.getPhoneNumber());
-            existing.setPortfolioUrl(request.getPortfolioUrl());
             existing.setDesignTitle(request.getDesignTitle());
             existing.setDesignDescription(request.getDesignDescription());
             existing.setPdfPath(request.getPdfPath());
@@ -202,7 +200,6 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
         dto.setAge(existing.getAge());
         dto.setCountryRegionCity(existing.getCountryRegionCity());
         dto.setPhoneNumber(existing.getPhoneNumber());
-        dto.setPortfolioUrl(existing.getPortfolioUrl());
         dto.setDesignTitle(existing.getDesignTitle());
         dto.setDesignDescription(existing.getDesignDescription());
         dto.setPdfPath(existing.getPdfPath());

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/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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