Просмотр исходного кода

fix: 消费服务
1.兼容新消费APP,增加生成所有人员特征码接口

luoyb 1 год назад
Родитель
Сommit
1c6230535e

+ 8 - 0
ruoyi-api/ruoyi-api-backstage/src/main/java/org/dromara/backstage/api/RemoteUserAccountService.java

@@ -4,6 +4,8 @@ import org.dromara.backstage.api.domain.bo.RemoteUserAccountBo;
 import org.dromara.backstage.api.domain.vo.RemoteUserAccountVo;
 import org.dromara.common.core.domain.R;
 
+import java.util.List;
+
 /**
  * name: RemoteUserAccountService
  * package: org.dromara.backstage.api
@@ -74,4 +76,10 @@ public interface RemoteUserAccountService {
      */
     int delByUserAndDeptId(Long userId,Long deptId, Long operatorId);
 
+    /**
+     * 查询所有的一卡通账户
+     * @return 账户列表
+     */
+    List<RemoteUserAccountVo> getAllUserAccountVo();
+
 }

+ 8 - 0
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/dubbo/RemoteUserAccountServiceImpl.java

@@ -14,6 +14,8 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * name: RemoteUserAccountServiceImpl
  * package: org.dromara.backstage.payment.dubbo
@@ -134,4 +136,10 @@ public class RemoteUserAccountServiceImpl implements RemoteUserAccountService {
         return userAccountService.delByUserAndDeptId(userId, deptId, operatorId);
     }
 
+    @Override
+    public List<RemoteUserAccountVo> getAllUserAccountVo() {
+        PtUserAccountBo bo = new PtUserAccountBo();
+        List<PtUserAccountVo> voList = userAccountService.queryList(bo);
+        return MapstructUtils.convert(voList,RemoteUserAccountVo.class);
+    }
 }

+ 10 - 0
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/ArcFaceBusiness.java

@@ -1,5 +1,6 @@
 package org.dromara.server.consume.business;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.arcsoft.face.toolkit.ImageInfo;
@@ -156,4 +157,13 @@ public class ArcFaceBusiness {
     public Integer updateFaceVersionByTerm(Integer termNo, Long versionTime) {
         return termFaceVersionService.updateFaceVersionByTerm(termNo, versionTime);
     }
+
+    public void createAllFeatureDataUser(){
+        List<RemoteUserAccountVo> userAccountVoList = remoteUserAccountService.getAllUserAccountVo();
+        if (CollectionUtil.isNotEmpty(userAccountVoList)) {
+            userAccountVoList.parallelStream().forEach(p->{
+                YcFaceFeatureVo vo = this.getOneFeatureDataUser(p.getUserId());
+            });
+        }
+    }
 }

+ 11 - 0
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/controller/v1/FaceCollectController.java

@@ -3,6 +3,7 @@ package org.dromara.server.consume.controller.v1;
 import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.api.ReturnResult;
+import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.server.consume.business.ArcFaceBusiness;
 import org.dromara.server.consume.domain.vo.YcFaceFeatureVo;
@@ -131,4 +132,14 @@ public class FaceCollectController {
         }
         return vo;
     }
+
+    /**
+     * 生成所有有照片人员的特征码
+     * @return 生成结果
+     */
+    @GetMapping("/feature/create/all")
+    public Object createAllFeature(){
+        faceBusiness.createAllFeatureDataUser();
+        return R.ok();
+    }
 }