From 71bc16b2c4e21a5298491cd2ad049833d62ba8bc Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Tue, 4 Mar 2025 16:18:34 +0800
Subject: [PATCH] 1

---
 src/main/java/com/ycwl/basic/biz/TemplateBiz.java         | 8 ++++----
 .../com/ycwl/basic/controller/viid/ViidController.java    | 4 ++--
 .../basic/service/impl/mobile/AppScenicServiceImpl.java   | 1 -
 .../ycwl/basic/service/impl/mobile/GoodsServiceImpl.java  | 6 ++++++
 src/main/java/com/ycwl/basic/utils/WxMpUtil.java          | 2 +-
 src/main/resources/application-dev.yml                    | 4 ++--
 6 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/biz/TemplateBiz.java b/src/main/java/com/ycwl/basic/biz/TemplateBiz.java
index 77e8947..993a8e4 100644
--- a/src/main/java/com/ycwl/basic/biz/TemplateBiz.java
+++ b/src/main/java/com/ycwl/basic/biz/TemplateBiz.java
@@ -49,10 +49,6 @@ public class TemplateBiz {
             return true;
         }
         FaceEntity face = faceRepository.getFace(faceId);
-        List<FaceSampleEntity> faceSampleList = faceRepository.getFaceSampleList(faceId);
-        if (faceSampleList == null || faceSampleList.isEmpty()) {
-            return false;
-        }
         long count;
         if (scanSource) {
             List<SourceEntity> sourceEntities = sourceMapper.listVideoByScenicFaceRelation(face.getScenicId(), faceId);
@@ -66,6 +62,10 @@ public class TemplateBiz {
                     .filter(deviceId -> placeholderList.contains(deviceId.toString()))
                     .count();
         } else {
+            List<FaceSampleEntity> faceSampleList = faceRepository.getFaceSampleList(faceId);
+            if (faceSampleList == null || faceSampleList.isEmpty()) {
+                return false;
+            }
             count = faceSampleList.stream()
                     .map(FaceSampleEntity::getDeviceId)
                     .filter(Objects::nonNull) // 添加对 null 的检查
diff --git a/src/main/java/com/ycwl/basic/controller/viid/ViidController.java b/src/main/java/com/ycwl/basic/controller/viid/ViidController.java
index 05344ca..e233752 100644
--- a/src/main/java/com/ycwl/basic/controller/viid/ViidController.java
+++ b/src/main/java/com/ycwl/basic/controller/viid/ViidController.java
@@ -365,8 +365,8 @@ public class ViidController {
 
     @RequestMapping(value = "/Images", method = RequestMethod.POST)
     @IgnoreLogReq
-    @RequestToFile
-    public VIIDBaseResp images(@RequestBody ImageUploadReq req) {
+    public VIIDBaseResp images(@RequestBody String req) {
+        log.info("Images:{}", req);
         return new VIIDBaseResp(
                 new ResponseStatusObject("1", "/VIID/Faces", "0", "OK", sdfTime.format(new Date()))
         );
diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java
index b379f64..d70b5e8 100644
--- a/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java
@@ -187,7 +187,6 @@ public class AppScenicServiceImpl implements AppScenicService {
             contentList.add(sourceVideoContent);
         }
         sourceList.stream().collect(Collectors.groupingBy(SourceRespVO::getType)).forEach((type, list) -> {
-            ContentPageVO contentPageVO = new ContentPageVO();
             if (type == 1) {
                 sourceVideoContent.setLockType(0);
                 sourceVideoContent.setTemplateCoverUrl(list.get(0).getUrl());
diff --git a/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java
index 0008aa8..7857d99 100644
--- a/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/impl/mobile/GoodsServiceImpl.java
@@ -350,6 +350,12 @@ public class GoodsServiceImpl implements GoodsService {
                     return taskById.getStatus() == 1;
                 }).count();
         response.setCount(finishedTask);
+        int faceCutStatus = taskStatusBiz.getFaceCutStatus(faceId);
+        if (Integer.valueOf(0).equals(faceCutStatus)) {
+            response.setTemplateId(notFinishedTasks.get(0).getTemplateId());
+            response.setStatus(2);
+            return response;
+        }
         if (!notFinishedTasks.isEmpty()) {
             response.setTemplateId(notFinishedTasks.get(0).getTemplateId());
             response.setTaskId(notFinishedTasks.get(0).getTaskId());
diff --git a/src/main/java/com/ycwl/basic/utils/WxMpUtil.java b/src/main/java/com/ycwl/basic/utils/WxMpUtil.java
index 86b3aa4..b6b6b19 100644
--- a/src/main/java/com/ycwl/basic/utils/WxMpUtil.java
+++ b/src/main/java/com/ycwl/basic/utils/WxMpUtil.java
@@ -58,6 +58,6 @@ public class WxMpUtil {
     }
 
     public static void main(String[] args) throws Exception {
-//        generateWXAQRCode("wxe7ff26af70bfc37c", "5252fbbc68513bc77b7cc0052b9f9695", "pages/home/index?scenicId=3946669713328836608", "cxzh_t.jpg");
+        generateWXAQRCode("wxe7ff26af70bfc37c", "5252fbbc68513bc77b7cc0052b9f9695", "trial", "pages/home/index?scenicId=3946669713328836608", "cxzh_t.jpg");
     }
 }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index bd43f48..b6e26bd 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -30,10 +30,10 @@ spring:
     date-format: "yyyy-MM-dd HH:mm:ss"
     time-zone: GMT+8
   redis:
-    host: 10.59.3.242
+    host: 10.59.3.218
     port: 6379
     # 密码过于复杂需要使用''引起来，要不可能导致项目无法启动，因为无法识别特殊字符
-    password: yckj2018
+    password: ZhEnTuAi
     jedis:
       pool:
         max-active: -1 # 连接池最大连接数（使用负值表示没有限制）