1

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml

@@ -174,17 +174,17 @@ hikvision:
     register-appointment: /api/visitor/v1/order/register # 新增登记接口
     visitor-checkout: /api/visitor/v1/visitor/out # 新增签离接口
 
-mini-platform:
-  mini-app:
-    wechat-config:
-      app-id: wx11771c7bf2913cb2
-      app-secret: a6b0d036b229117595687a7c1705d332
-      merchant-id: 1106210589
-      api-v2-key: qr0w9WkAu6GG3uuxPjDT7bcdIVoBr0rw
-      merchant-serial-path: /Users/dengzhangchen/Desktop/backups/pay/third_cert/apiclient_cert.p12
-      pay-callback-url: https://dzc-test-1.fy.takin.cc/third/third-mini-app-pay/app/pay-callback
-      refund-callback-url: https://dzc-test-1.fy.takin.cc/third/third-mini-app-pay/app/refund-callback
-      spbill-create-ip: 59.202.170.152
-      base-url: https://api.mch.weixin.qq.com
-    ali-pay-config:
-      app-id:
+#mini-platform:
+#  mini-app:
+#    wechat-config:
+#      app-id: wx11771c7bf2913cb2
+#      app-secret: a6b0d036b229117595687a7c1705d332
+#      merchant-id: 1106210589
+#      api-v2-key: qr0w9WkAu6GG3uuxPjDT7bcdIVoBr0rw
+#      merchant-serial-path: /Users/dengzhangchen/Desktop/backups/pay/third_cert/apiclient_cert.p12
+#      pay-callback-url: https://dzc-test-1.fy.takin.cc/third/third-mini-app-pay/app/pay-callback
+#      refund-callback-url: https://dzc-test-1.fy.takin.cc/third/third-mini-app-pay/app/refund-callback
+#      spbill-create-ip: 59.202.170.152
+#      base-url: https://api.mch.weixin.qq.com
+#    ali-pay-config:
+#      app-id:

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserFaceController.java

@@ -104,14 +104,23 @@ public class SysUserFaceController {
     /* ************************************* start android start ************************************* */
     @Operation(summary = "android查询人脸数据库", description = "android查询人脸数据库")
     @GetMapping("/ad/find-face")
-    public R adFinFace(@ParameterObject Page page, @RequestParam(required = false) Long userId,
-                       @RequestParam(required = false) Long merchantDeptId) {
+    public R adFinFace(@ParameterObject Page page, @RequestParam(required = false) Long userId, @RequestParam(required = false) Long merchantDeptId) {
         SysUserFaceDto dto = new SysUserFaceDto();
         dto.setUserId(userId);
         dto.setMerchantDeptIdOrGlobal(merchantDeptId);
         dto.setProcessStatus(TaskCheckStatusEnum.RESULT.getCode());
         return R.ok(sysUserFaceService.pageJoin(page, dto).getRecords());
     }
+
+    @Operation(summary = "android查询人脸数据库", description = "android查询人脸数据库")
+    @GetMapping("/ad/v2/find-face")
+    public R adV2FinFace(@ParameterObject Page page, @RequestParam(required = false) Long userId, @RequestParam(required = false) Long merchantDeptId) {
+        SysUserFaceDto dto = new SysUserFaceDto();
+        dto.setUserId(userId);
+        dto.setMerchantDeptIdOrGlobal(merchantDeptId);
+        dto.setProcessStatus(TaskCheckStatusEnum.RESULT.getCode());
+        return R.ok(sysUserFaceService.allPageJoin(page, dto).getRecords());
+    }
     /* ************************************* start android start ************************************* */
 
     @Operation(summary = "设置为全局人脸", description = "设置为全局人脸")

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserFaceMapper.java

@@ -69,4 +69,7 @@ public interface SysUserFaceMapper extends PjcloudBaseMapper<SysUserFaceEntity>
         }
         return selectJoinPage(page, SysUserFaceVo.class, wrapper);
     }
+
+    Page<SysUserFaceVo> allPageJoin(Page page, @Param("pa") SysUserFaceDto pa);
+
 }

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/SysUserFaceService.java

@@ -23,6 +23,8 @@ public interface SysUserFaceService extends IService<SysUserFaceEntity> {
 
     Page<SysUserFaceVo> scopePageList(Page page, SysUserFaceDto dto, DataScope dataScope);
 
+    Page<SysUserFaceVo> allPageJoin(Page page, SysUserFaceDto dto);
+
     Page<SysUserFaceVo> pageJoin(Page page, SysUserFaceDto dto);
 
     SysUserFaceVo join(Long id);

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserFaceServiceImpl.java

@@ -176,6 +176,18 @@ public class SysUserFaceServiceImpl extends ServiceImpl<SysUserFaceMapper, SysUs
         return list;
     }
 
+    @Override
+    public Page<SysUserFaceVo> allPageJoin(Page page, SysUserFaceDto dto) {
+        if (ObjectUtil.isNotEmpty(dto.getMerchantDeptIdOrGlobal())) {
+            List<SysDept> deptList = sysDeptService.listDescendant(dto.getMerchantDeptIdOrGlobal());
+            if (ObjectUtil.isNotEmpty(deptList)) {
+                List<Long> deptIds = deptList.stream().map(SysDept::getDeptId).toList();
+                dto.setDeptIds(deptIds);
+            }
+        }
+        return baseMapper.allPageJoin(page, dto);
+    }
+
     @Override
     public Page<SysUserFaceVo> pageJoin(Page page, SysUserFaceDto dto) {
         if (ObjectUtil.isNotEmpty(dto.getMerchantDeptIdOrGlobal())) {

pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserFaceMapper.xml

@@ -2,17 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.bsd.pjcloud.admin.mapper.SysUserFaceMapper">
-    <resultMap id="sysUserFaceMap" type="com.bsd.pjcloud.admin.api.entity.SysUserFaceEntity">
-        <id property="id" column="id"/>
-        <result property="userId" column="user_id"/>
-        <result property="faceImg" column="face_img"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-        <result property="tenantId" column="tenant_id"/>
-    </resultMap>
 
     <sql id="selectA">
         select a.id,
@@ -35,9 +24,18 @@
         <if test="pa.userId != null">
             and a.user_id = #{pa.userId}
         </if>
+        <if test="pa.userIds != null and pa.userIds.size() != 0">
+            and a.user_id in
+            <foreach collection="pa.userIds" item="v" open="(" close=")" separator=",">
+                #{v}
+            </foreach>
+        </if>
         <if test="pa.processStatus != null">
             and a.process_status = #{pa.processStatus}
         </if>
+        <if test="pa.isProcessIdNotNull != null and pa.isProcessIdNotNull == true ">
+            and a.process_id is not null
+        </if>
     </sql>
 
     <select id="scopePageList" resultType="com.bsd.pjcloud.admin.api.vo.SysUserFaceVo">
@@ -49,14 +47,14 @@
         u.dept_id as deptId,
         d.name as deptName
         from sys_user_face a
-        left join sys_user u on u.user_id = a.user_id and u.del_flag = '0'
-        left join sys_dept d on d.dept_id = u.dept_id and d.del_flag = '0'
+        inner join sys_user u on u.user_id = a.user_id and u.del_flag = '0'
+        inner join sys_dept d on d.dept_id = u.dept_id and d.del_flag = '0'
         <where>
             <include refid="whereA"/>
-            <if test="pa.username != null">
+            <if test="pa.username != null and pa.username != '' ">
                 and u.name LIKE CONCAT('%', #{pa.username}, '%')
             </if>
-            <if test="pa.phone != null">
+            <if test="pa.phone != null and pa.phone != '' ">
                 and u.phone LIKE CONCAT('%', #{pa.phone}, '%')
             </if>
         </where>
@@ -81,4 +79,51 @@
         </where>
         GROUP BY a.user_id
     </select>
+
+    <select id="allPageJoin" resultType="com.bsd.pjcloud.admin.api.vo.SysUserFaceVo">
+        <include refid="selectA"/>
+        u.name as username,
+        u.phone as userMobile,
+        u.avatar as userAvatar,
+        d.dept_id as deptId,
+        d.name as deptName
+        from sys_user_face a
+        inner join sys_user u on u.user_id = a.user_id and u.del_flag = '0'
+        inner join sys_dept d on d.dept_id = u.dept_id and d.del_flag = '0'
+        <where>
+            <if test="pa.userId != null">
+                and a.user_id = #{pa.userId}
+            </if>
+            <if test="pa.userIds != null and pa.userIds.size() != 0">
+                and a.user_id in
+                <foreach collection="pa.userIds" item="v" open="(" close=")" separator=",">
+                    #{v}
+                </foreach>
+            </if>
+            <if test="pa.processStatus != null">
+                and a.process_status = #{pa.processStatus}
+            </if>
+            <if test="pa.isProcessIdNotNull != null and pa.isProcessIdNotNull == true ">
+                and a.process_id is not null
+            </if>
+            <if test="pa.deptIds != null and pa.deptIds.size() != 0">
+                <choose>
+                    <when test="pa.isInclude != null and pa.isInclude == true">
+                        and d.dept_id IN
+                    </when>
+                    <when test="pa.isInclude != null and pa.isInclude == false">
+                        and d.dept_id NOT IN
+                    </when>
+                    <otherwise>
+                        and d.dept_id IN
+                    </otherwise>
+                </choose>
+                <foreach collection="pa.deptIds" item="v" open="(" close=")" separator=",">
+                    #{v}
+                </foreach>
+            </if>
+        </where>
+        order by a.create_time desc, a.id desc
+    </select>
+
 </mapper>

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletManageDto.java

@@ -4,7 +4,6 @@ import com.bsd.pjcloud.admin.api.vo.base.BaseIsIncludeTreeInterface;
 import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
 import lombok.Data;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -27,4 +26,9 @@ public class WalletManageDto extends WalletManageEntity implements BaseIsInclude
      */
     private Boolean isInclude;
 
+    /**
+     * 钱包余额大于等于
+     */
+    private Integer leBalance;
+
 }

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java

@@ -36,9 +36,6 @@ import java.util.List;
 
 /**
  * 钱包管理
- *
- * @author dzc
- * @date 2024-12-30 09:06:35
  */
 @RestController
 @RequiredArgsConstructor

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java

@@ -40,9 +40,10 @@ public interface WalletManageMapper extends PjcloudBaseMapper<WalletManageEntity
                         ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[0] : null,
                         ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[1] : null
                 )
-                .orderByDesc(WalletManageEntity::getCreateTime)
+                .le(ObjectUtil.isNotEmpty(dto.getLeBalance()), WalletManageEntity::getBalance, dto.getLeBalance())
                 .orderByDesc(WalletManageEntity::getUserId)
-                .orderByDesc(WalletManageEntity::getWalletTypeId);
+                .orderByDesc(WalletManageEntity::getWalletTypeId)
+                .orderByDesc(WalletManageEntity::getCreateTime);
         if (ObjectUtil.isNotEmpty(dto.getIsInclude())) {
             if (dto.getIsInclude()) {
                 wrapper.in(ObjectUtil.isNotEmpty(dto.getDeptIds()), WalletManageEntity::getDeptId, dto.getDeptIds());