Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-api-cloud

db/1schema.sql

@@ -33,6 +33,6 @@ create database `pjcloudx_thirdparty` default character set utf8mb4 collate utf8
 create database `pjcloudx_canteen` default character set utf8mb4 collate utf8mb4_general_ci;
 create database `pjcloudx_erp` default character set utf8mb4 collate utf8mb4_general_ci;
 create database `pjcloudx_supermarket` default character set utf8mb4 collate utf8mb4_general_ci;
-create database `pjcloudx_supermarket_erp` default character set utf8mb4 collate utf8mb4_general_ci;
+create database `pjcloudx_integrated` default character set utf8mb4 collate utf8mb4_general_ci;
 create database `pjcloudx_wallet` default character set utf8mb4 collate utf8mb4_general_ci;
 create database `pjcloudx_hardware` default character set utf8mb4 collate utf8mb4_general_ci;

pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/api/feign/RemoterThirdPartySmsService.java

@@ -0,0 +1,48 @@
+/*
+ *
+ *      Copyright (c) 2018-2025, pjcloud All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the pig4cloud.com developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: pjcloud
+ *
+ */
+
+package com.bsd.pjcloud.thirdparty.api.feign;
+
+import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.feign.annotation.NoToken;
+import com.bsd.pjcloud.thirdparty.entity.ThirdPartyUserEntity;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(contextId = "remoterThirdPartySmsService", value = ServiceNameConstants.THIRDPARTY_SERVICE)
+public interface RemoterThirdPartySmsService {
+
+	// 简单发送
+	@PostMapping("/sendMsg")
+	public void sendSimpleMsg(@RequestParam String mobile, @RequestParam String templateId, @RequestParam("clientIp") String clientIp);
+
+	// 带参数发送
+	@PostMapping("/sendMsgParams")
+	public void sendParamsMsg(
+			@RequestParam("mobile") String mobile,@RequestParam("templateId") String templateId,
+			@RequestBody Map<String, String> params,@RequestParam("clientIp") String clientIp);
+}

pjcloud-thirdparty/pjcloud-thirdparty-biz/pom.xml

@@ -42,6 +42,10 @@
             <groupId>com.bsd</groupId>
             <artifactId>pjcloud-common-data</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.bsd</groupId>
+            <artifactId></artifactId>
+        </dependency>
         <!--必备：pigx安全模块-->
         <dependency>
             <groupId>com.bsd</groupId>

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/SmsController.java

@@ -2,6 +2,7 @@ package com.bsd.pjcloud.thirdparty.controller;
 
 import com.bsd.pjcloud.common.security.annotation.Inner;
 import com.bsd.pjcloud.thirdparty.service.SmsService;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -12,22 +13,22 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class SmsController {
 
+
     private final SmsService smsService;
 
     // 简单发送
     @PostMapping("/sendMsg")
-    public void sendVerifyCode(@RequestParam String mobile) {
-        smsService.sendSms(mobile, "20657");
+    public void sendSimpleMsg(@RequestParam String mobile,@RequestParam String templateId,@RequestParam("clientIp") String clientIp) {
+        smsService.sendSms(mobile, templateId,clientIp);
     }
 
     // 带参数发送
     @PostMapping("/sendMsgParams")
     @Inner(value = false)
-    public void sendOrderNotify(
-            @RequestParam String mobile,
-            @RequestBody Map<String, String> params
-    ) {
-        smsService.sendSms(mobile, "20657", params);
+    public void sendParamsMsg(
+            @RequestParam("mobile") String mobile, @RequestParam("templateId") String templateId,
+            @RequestBody Map<String, String> params, @RequestParam("clientIp") String clientIp) {
+        smsService.sendSms(mobile, templateId, params,clientIp);
     }
 
 }

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java

@@ -7,32 +7,37 @@ import com.bsd.pjcloud.admin.api.entity.SysUser;
 import com.bsd.pjcloud.admin.api.feign.RemoteTokenService;
 import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
 import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.core.util.WebUtils;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.annotation.Inner;
 import com.bsd.pjcloud.thirdparty.dto.SHJNSSODTO;
 import com.bsd.pjcloud.thirdparty.dto.UrlTokenDTO;
 import com.bsd.pjcloud.thirdparty.dto.ZZDUserDTO;
 import com.bsd.pjcloud.thirdparty.entity.ThirdPartyUserEntity;
+import com.bsd.pjcloud.thirdparty.service.SmsService;
 import com.bsd.pjcloud.thirdparty.service.ThirdPartyOAuth2Service;
 import com.bsd.pjcloud.thirdparty.service.ThirdPartyUserService;
+import com.bsd.pjcloud.thirdparty.utils.DeviceFingerprintUtil;
+import com.bsd.pjcloud.thirdparty.utils.SmsCodeUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.seata.spring.annotation.GlobalTransactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpHeaders;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 @RestController
 @RequiredArgsConstructor
@@ -49,6 +54,9 @@ public class ThirdPartyOAth2Cotroller {
 
     private final ThirdPartyUserService thirdPartyUserService;
 
+    private final SmsService smsService;
+    @Autowired
+    private RedisTemplate redisTemplate;
 
 //    @Operation(summary = "浙政钉token" )
 //    @GetMapping("/zzd/sso" )
@@ -196,20 +204,21 @@ public class ThirdPartyOAth2Cotroller {
     @Transactional
     @GlobalTransactional
     public R shjnsso(@RequestBody @Valid SHJNSSODTO shjnsso) {
+        //检查设备指纹
         ZZDUserDTO  zzdUserDTO = thirdPartyOAuth2Service.shjnsso(shjnsso.getAccountId(), shjnsso.getSessionId());
         if (null==zzdUserDTO){
             throw new RuntimeException("");
         }
         ZZDUserDTO.Ext ext = zzdUserDTO.getExt();
         String mobile = zzdUserDTO.getMobile();
-        R<Map> r;
         R<List<SysUser>> userByMobileOrEmployeeCode = remoteUserService.getUserByMobileOrEmployeeCode(null, mobile);
         List<SysUser> sysUserList =  userByMobileOrEmployeeCode.getData();
         if(!CollectionUtils.isEmpty(sysUserList)){
             //登录成功生成token
             UserTokenDTO userTokenDTO = new UserTokenDTO();
             userTokenDTO.setSysUser(sysUserList.get(0));
-            r=remoteTokenService.generateToken(userTokenDTO);
+
+            return remoteTokenService.generateToken(userTokenDTO);
         }else {
             //自动注册
 //            UserDTO userDTO = new UserDTO();
@@ -230,10 +239,25 @@ public class ThirdPartyOAth2Cotroller {
 //            r=remoteTokenService.generateToken(userTokenDTO);
             return R.failed("系统中没有当前用户信息,请联系管理员进行申请！");
         }
-        return r;
+
     }
 
-
+    // 在shjnsso方法中添加验证
+//    @PostMapping("/shjnsso")
+//    public R shjnsso(..., HttpServletRequest request) {
+//        // 设备指纹验证
+//        String clientFingerprint = DeviceFingerprintUtil.generate(request);
+//        String storedFingerprint = redisTemplate.opsForValue().get("device_fp:" + shjnsso.getAccountId());
+//
+//        if (!clientFingerprint.equals(storedFingerprint)) {
+//            // 新设备需要短信验证
+//            String code = SmsCodeUtil.generateNumberCode(6);
+//            smsService.sendSms(mobile, "验证码模板ID", Map.of("code", code));
+//            return R.failed("new_device").data("needSmsVerify", true);
+//        }
+//
+//        // 原有逻辑继续执行...
+//    }
     @Inner(value = false)
     @GetMapping("/getAuthToken/{token}")
     public R info(@PathVariable(name = "token") String token) {
@@ -257,4 +281,37 @@ public class ThirdPartyOAth2Cotroller {
     }
 
 
+
+    @PostMapping("/loginSms")
+    @Operation(summary = "短信登录认证")
+    @SysLog("短信登录认证")
+    @Inner(value = false)
+    public R loginSms(@RequestParam String mobilePhone,HttpServletRequest httpServletRequest) {
+        Map<String, String> stringHashMap =  new LinkedHashMap<>();
+        String s = SmsCodeUtil.generateNumberCode(6);
+        stringHashMap.put("code",s);
+        stringHashMap.put("date","5");
+        System.out.println(WebUtils.getIP());
+        System.out.println(WebUtils.getIP(httpServletRequest));
+        smsService.sendSms(mobilePhone, "20657",stringHashMap, WebUtils.getIP());
+
+        redisTemplate.opsForSet().add("smsCode_"+mobilePhone,s, 5, TimeUnit.MINUTES);
+
+        //记录信任的设备
+        // 2. 记录信任设备
+//        String deviceFingerprint = DeviceFingerprintUtil.generate(request);
+//        deviceService.addTrustedDevice(
+//                dto.getUserId(),
+//                deviceFingerprint,
+//                LocalDateTime.now().plusMonths(3) // 信任3个月
+//        );
+//
+//        // 3. 生成令牌
+//        User user = userService.getById(dto.getUserId());
+//        String token = jwtService.generateToken(user);
+//        return R.ok().data("token", token);
+        return R.ok();
+    }
+
+
 }

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/SmsService.java

@@ -5,12 +5,16 @@ import com.bsd.pjcloud.thirdparty.config.SmsConfig;
 import com.bsd.pjcloud.thirdparty.dto.sms.SmsRequest;
 import com.bsd.pjcloud.thirdparty.dto.sms.SmsResponse;
 import com.bsd.pjcloud.thirdparty.exception.SmsException;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 @Service
 @RequiredArgsConstructor
@@ -19,13 +23,30 @@ public class SmsService {
     private final SmsConfig config;
     private final SmsHttpClient httpClient;
 
+    @Autowired
+    private RedisTemplate redisTemplate;
+    private static final String SMS_IP_LIMIT_PREFIX = "sms:ip_limit:";
+    private static final String SMS_LIMIT_PREFIX = "sms:limit:";
+
+    /**
+     * 同一个ip，一分钟内只能请求五次
+     */
+    private static final int MAX_IP_REQUESTS = 5;
+    private static final int IP_LIMIT_EXPIRE_SECONDS = 60;
+
+    private static final int LIMIT_EXPIRE_SECONDS = 60;
+
     /**
      * 发送短信（最简版）
      * @param mobile 手机号
      * @param templateId 模板ID
      */
-    public void sendSms(String mobile, String templateId) {
+    public void sendSms(String mobile, String templateId, String clientIp) {
         validateMobile(mobile);
+        // IP限流检查
+        checkIpLimit(clientIp);
+
+        checkPhoneLimit(mobile);
         SmsConfig.TemplateConfig template = getTemplate(templateId);
 
         if (!template.getParams().isEmpty()) {
@@ -41,8 +62,15 @@ public class SmsService {
      * @param templateId 模板ID
      * @param params 参数Map
      */
-    public void sendSms(String mobile, String templateId, Map<String, String> params) {
+    public void sendSms(String mobile, String templateId, Map<String, String> params,String clientIp) {
         validateMobile(mobile);
+        //todo redisson分布式形式检查
+
+//         IP限流检查
+        checkIpLimit(clientIp);
+
+        checkPhoneLimit(mobile);
+
         SmsConfig.TemplateConfig template = getTemplate(templateId);
 
         String content = replacePlaceholders(template.getContent(), params, template.getParams());
@@ -95,8 +123,55 @@ public class SmsService {
     }
 
     private void validateMobile(String mobile) {
+
         if (!mobile.matches("^1[3-9]\\d{9}$")) {
             throw new SmsException("无效的手机号码: " + mobile);
         }
     }
+
+    private void checkIpLimit(String clientIp) {
+        String ipLimitKey = SMS_IP_LIMIT_PREFIX + clientIp;
+        Long requestCount = redisTemplate.opsForValue().increment(ipLimitKey);
+
+        if (requestCount == 1) {
+            // 首次设置时添加过期时间
+            redisTemplate.expire(ipLimitKey, IP_LIMIT_EXPIRE_SECONDS, TimeUnit.SECONDS);
+        }
+
+        if (requestCount != null && requestCount > MAX_IP_REQUESTS) {
+            throw new RuntimeException("当前IP请求过于频繁，请稍后再试");
+        }
+    }
+
+    private void checkPhoneLimit(String phoneNumber) {
+        String limitKey = SMS_LIMIT_PREFIX + phoneNumber;
+        if (Boolean.TRUE.equals(redisTemplate.hasKey(limitKey))) {
+            throw new RuntimeException("手机号操作过于频繁，请稍后再试");
+        }
+        redisTemplate.opsForValue().set(limitKey, "1", LIMIT_EXPIRE_SECONDS, TimeUnit.SECONDS);
+    }
+
+
+
+    private String getClientIp(HttpServletRequest request) {
+        String[] headersToCheck = {
+                "X-Forwarded-For",
+                "Proxy-Client-IP",
+                "WL-Proxy-Client-IP",
+                "HTTP_CLIENT_IP",
+                "HTTP_X_FORWARDED_FOR"
+        };
+
+        // 遍历代理头
+        for (String header : headersToCheck) {
+            String ip = request.getHeader(header);
+            if (ip != null && !ip.isEmpty() && !"unknown".equalsIgnoreCase(ip)) {
+                return ip.split(",")[0].trim(); // 处理多级代理
+            }
+        }
+
+        // 最终回退方案
+        return request.getRemoteAddr();
+    }
+
 }

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/utils/DeviceFingerprintUtil.java

@@ -0,0 +1,14 @@
+package com.bsd.pjcloud.thirdparty.utils;
+
+import com.bsd.pjcloud.common.core.util.WebUtils;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.util.DigestUtils;
+
+public class DeviceFingerprintUtil {
+    public static String generate(HttpServletRequest request) {
+        String userAgent = request.getHeader("User-Agent");
+        String ip = WebUtils.getIP(request);
+        String accept = request.getHeader("Accept");
+        return DigestUtils.md5DigestAsHex((userAgent + ip + accept).getBytes());
+    }
+}

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/utils/SmsCodeUtil.java

@@ -0,0 +1,75 @@
+package com.bsd.pjcloud.thirdparty.utils;
+
+import java.security.SecureRandom;
+import java.util.Collections;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+/**
+ * 短信验证码生成工具类
+ */
+public class SmsCodeUtil {
+
+    // 数字字符集
+    private static final String NUMERIC_CHARS = "0123456789";
+
+    // 字母数字字符集（排除易混淆字符）
+    private static final String ALPHANUMERIC_CHARS =
+            "23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz";
+
+    // 使用安全随机数生成器
+    private static final SecureRandom random = new SecureRandom();
+
+    /**
+     * 生成6位纯数字验证码
+     */
+    public static String generateNumericCode() {
+        return generateCustomCode(6, NUMERIC_CHARS);
+    }
+
+    /**
+     * 生成6位字母数字验证码（排除易混淆字符）
+     */
+    public static String generateAlphanumericCode() {
+        return generateCustomCode(6, ALPHANUMERIC_CHARS);
+    }
+
+    /**
+     * 自定义验证码生成
+     * @param length 验证码长度
+     * @param charSet 使用的字符集
+     */
+    public static String generateCustomCode(int length, String charSet) {
+        if (length < 1) throw new IllegalArgumentException("验证码长度不能小于1");
+        if (charSet == null || charSet.isEmpty()) {
+            throw new IllegalArgumentException("字符集不能为空");
+        }
+
+        return IntStream.range(0, length)
+                .map(i -> random.nextInt(charSet.length()))
+                .mapToObj(charSet::charAt)
+                .collect(Collectors.collectingAndThen(
+                        Collectors.toList(),
+                        list -> {
+                            Collections.shuffle(list);
+                            return list.stream();
+                        }
+                ))
+                .collect(StringBuilder::new, StringBuilder::append, StringBuilder::append)
+                .toString();
+    }
+
+    /**
+     * 旧版本兼容：生成指定位数的纯数字验证码
+     * @param length 验证码长度 (4-9)
+     */
+    public static String generateNumberCode(int length) {
+        if (length < 4 || length > 9) {
+            throw new IllegalArgumentException("验证码长度需在4-9位之间");
+        }
+
+        int min = (int) Math.pow(10, length - 1);
+        int max = (int) Math.pow(10, length) - 1;
+        return String.valueOf(min + random.nextInt(max - min));
+    }
+}

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/UserTrustedDeviceEntity.java

@@ -0,0 +1,95 @@
+package com.bsd.pjcloud.admin.api.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.time.LocalDateTime;
+
+/**
+ * 设备指纹
+ *
+ * @author zjf
+ * @date 2025-04-22 17:14:57
+ */
+@Data
+@TableName("user_trusted_device")
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "设备指纹")
+public class UserTrustedDeviceEntity extends Model<UserTrustedDeviceEntity> {
+
+
+	/**
+	* 主键ID
+	*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @Schema(description="主键ID")
+    private Long id;
+
+	/**
+	* 用户id
+	*/
+    @Schema(description="用户id")
+    private Long userId;
+
+	/**
+	* MD5
+	*/
+    @Schema(description="MD5")
+    private String deviceFingerprint;
+
+	/**
+	* 设备名称
+	*/
+    @Schema(description="设备名称")
+    private String deviceName;
+
+	/**
+	* 最后一次登录时间
+	*/
+    @Schema(description="最后一次登录时间")
+    private LocalDateTime lastLoginTime;
+
+	/**
+	* 过期时间
+	*/
+    @Schema(description="过期时间")
+    private LocalDateTime expireTime;
+
+	/**
+	* 创建人
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建人")
+    private String createBy;
+
+	/**
+	* 创建时间
+	*/
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="创建时间")
+    private LocalDateTime createTime;
+
+	/**
+	* 更新时间
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="更新时间")
+    private String updateBy;
+
+	/**
+	* 更新时间
+	*/
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    @Schema(description="更新时间")
+    private LocalDateTime updateTime;
+
+	/**
+	* 删除标记
+	*/
+    @TableLogic
+	@TableField(fill = FieldFill.INSERT)
+    @Schema(description="删除标记")
+    private String delFlag;
+}

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/vo/SimpleUserListVO.java

@@ -0,0 +1,15 @@
+package com.bsd.pjcloud.admin.api.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "简要用户信息,不包含手机号")
+public class SimpleUserListVO {
+
+    private Long userId;
+
+    @Schema(description = "姓名")
+    private String name;
+}

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

@@ -92,6 +92,21 @@ public class SysDeptController {
         return R.ok(sysDeptService.selectTree(deptName, parentId));
     }
 
+
+    /**
+     *
+     * 查询所有，无权限过滤
+     * simpleTree
+     * @param deptName
+     * @param parentId
+     * @return
+     */
+    @GetMapping(value = "/simpleTree")
+    public R getSimpleTree(String deptName, Long parentId) {
+        return R.ok(sysDeptService.selectSimpleTree(deptName, parentId));
+    }
+
+
     /**
      * 添加
      *

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

@@ -29,10 +29,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.admin.api.dto.UserDTO;
 import com.bsd.pjcloud.admin.api.dto.UserInfo;
 import com.bsd.pjcloud.admin.api.entity.SysUser;
-import com.bsd.pjcloud.admin.api.vo.SimpleUserAllListVO;
-import com.bsd.pjcloud.admin.api.vo.UserExcelFaceVo;
-import com.bsd.pjcloud.admin.api.vo.UserExcelVO;
-import com.bsd.pjcloud.admin.api.vo.UserVO;
+import com.bsd.pjcloud.admin.api.vo.*;
 import com.bsd.pjcloud.admin.service.SysUserService;
 import com.bsd.pjcloud.common.core.constant.CommonConstants;
 import com.bsd.pjcloud.common.core.exception.ErrorCodes;
@@ -362,6 +359,18 @@ public class SysUserController {
         return R.ok(userService.listUserIdByDeptIds(CollUtil.toList(deptIdList)));
     }
 
+    /**
+     * 根据部门id查询用户列表
+     * @param deptId
+     * @return
+     */
+//    @Inner
+    @GetMapping("/getUserIdListByDeptId")
+    public R<List<SimpleUserListVO>> getUserIdListByDeptId(@RequestParam("deptId")Long deptId,
+                                                           @RequestParam(value = "name",required = false) String name) {
+        return R.ok(userService.listUserIdByDeptId(deptId,name));
+    }
+
     /**
      * 根据用户名获取用户列表
      *

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

@@ -0,0 +1,118 @@
+package com.bsd.pjcloud.admin.controller;
+
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.admin.api.entity.UserTrustedDeviceEntity;
+import com.bsd.pjcloud.admin.service.UserTrustedDeviceService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 设备指纹
+ *
+ * @author zjf
+ * @date 2025-04-22 17:14:57
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/userTrustedDevice" )
+@Tag(description = "userTrustedDevice" , name = "设备指纹管理" )
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class UserTrustedDeviceController {
+
+    private final  UserTrustedDeviceService userTrustedDeviceService;
+
+    /**
+     * 分页查询
+     * @param page 分页对象
+     * @param userTrustedDevice 设备指纹
+     * @return
+     */
+    @Operation(summary = "分页查询" , description = "分页查询" )
+    @GetMapping("/page" )
+    @PreAuthorize("@pms.hasPermission('admin_userTrustedDevice_view')" )
+    public R getUserTrustedDevicePage(@ParameterObject Page page, @ParameterObject UserTrustedDeviceEntity userTrustedDevice) {
+        LambdaQueryWrapper<UserTrustedDeviceEntity> wrapper = Wrappers.lambdaQuery();
+        return R.ok(userTrustedDeviceService.page(page, wrapper));
+    }
+
+
+    /**
+     * 通过id查询设备指纹
+     * @param id id
+     * @return R
+     */
+    @Operation(summary = "通过id查询" , description = "通过id查询" )
+    @GetMapping("/{id}" )
+    @PreAuthorize("@pms.hasPermission('admin_userTrustedDevice_view')" )
+    public R getById(@PathVariable("id" ) Long id) {
+        return R.ok(userTrustedDeviceService.getById(id));
+    }
+
+    /**
+     * 新增设备指纹
+     * @param userTrustedDevice 设备指纹
+     * @return R
+     */
+    @Operation(summary = "新增设备指纹" , description = "新增设备指纹" )
+    @SysLog("新增设备指纹" )
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('admin_userTrustedDevice_add')" )
+    public R save(@RequestBody UserTrustedDeviceEntity userTrustedDevice) {
+        return R.ok(userTrustedDeviceService.save(userTrustedDevice));
+    }
+
+    /**
+     * 修改设备指纹
+     * @param userTrustedDevice 设备指纹
+     * @return R
+     */
+    @Operation(summary = "修改设备指纹" , description = "修改设备指纹" )
+    @SysLog("修改设备指纹" )
+    @PutMapping
+    @PreAuthorize("@pms.hasPermission('admin_userTrustedDevice_edit')" )
+    public R updateById(@RequestBody UserTrustedDeviceEntity userTrustedDevice) {
+        return R.ok(userTrustedDeviceService.updateById(userTrustedDevice));
+    }
+
+    /**
+     * 通过id删除设备指纹
+     * @param ids id列表
+     * @return R
+     */
+    @Operation(summary = "通过id删除设备指纹" , description = "通过id删除设备指纹" )
+    @SysLog("通过id删除设备指纹" )
+    @DeleteMapping
+    @PreAuthorize("@pms.hasPermission('admin_userTrustedDevice_del')" )
+    public R removeById(@RequestBody Long[] ids) {
+        return R.ok(userTrustedDeviceService.removeBatchByIds(CollUtil.toList(ids)));
+    }
+
+
+    /**
+     * 导出excel 表格
+     * @param userTrustedDevice 查询条件
+   	 * @param ids 导出指定ID
+     * @return excel 文件流
+     */
+    @ResponseExcel
+    @GetMapping("/export")
+    @PreAuthorize("@pms.hasPermission('admin_userTrustedDevice_export')" )
+    public List<UserTrustedDeviceEntity> export(UserTrustedDeviceEntity userTrustedDevice,Long[] ids) {
+        return userTrustedDeviceService.list(Wrappers.lambdaQuery(userTrustedDevice).in(ArrayUtil.isNotEmpty(ids), UserTrustedDeviceEntity::getId, ids));
+    }
+}

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

@@ -0,0 +1,11 @@
+package com.bsd.pjcloud.admin.mapper;
+
+import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import com.bsd.pjcloud.admin.api.entity.UserTrustedDeviceEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UserTrustedDeviceMapper extends PjcloudBaseMapper<UserTrustedDeviceEntity> {
+
+
+}

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

@@ -50,6 +50,8 @@ public interface SysDeptService extends IService<SysDept> {
      */
     List<Tree<Long>> selectTree(String deptName, Long parentId);
 
+    List<Tree<Long>> selectSimpleTree(String deptName, Long parentId);
+
     /**
      * 删除部门
      *

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

@@ -26,10 +26,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.admin.api.dto.UserDTO;
 import com.bsd.pjcloud.admin.api.dto.UserInfo;
 import com.bsd.pjcloud.admin.api.entity.SysUser;
-import com.bsd.pjcloud.admin.api.vo.SimpleUserAllListVO;
-import com.bsd.pjcloud.admin.api.vo.UserExcelFaceVo;
-import com.bsd.pjcloud.admin.api.vo.UserExcelVO;
-import com.bsd.pjcloud.admin.api.vo.UserVO;
+import com.bsd.pjcloud.admin.api.vo.*;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordAssignUserParamDto;
 
@@ -221,4 +218,13 @@ public interface SysUserService extends IService<SysUser> {
      * @return
      */
     List<SysUser> listScopeByLikeNameOrByMobileScope(LambdaQueryWrapper<SysUser> eq);
+
+
+    /**
+     * 根据部门id/姓名，获取用户信息
+     * @param deptId
+     * @param name
+     * @return
+     */
+    List<SimpleUserListVO> listUserIdByDeptId(Long deptId, String name);
 }

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

@@ -0,0 +1,8 @@
+package com.bsd.pjcloud.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.bsd.pjcloud.admin.api.entity.UserTrustedDeviceEntity;
+
+public interface UserTrustedDeviceService extends IService<UserTrustedDeviceEntity> {
+
+}

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

@@ -177,6 +177,30 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         return TreeUtil.build(collect, parentId == null ? 0 : parentId);
     }
 
+    @Override
+    public List<Tree<Long>> selectSimpleTree(String deptName, Long parentId) {
+        // 查询全部部门
+        List<SysDept> deptAllList = deptMapper
+                .selectList(Wrappers.<SysDept>lambdaQuery().like(StrUtil.isNotBlank(deptName), SysDept::getName, deptName));
+
+        List<TreeNode<Long>> collect = deptAllList.stream()
+                .filter(dept -> dept.getDeptId().intValue() != dept.getParentId())
+                .sorted(Comparator.comparingInt(SysDept::getSortOrder))
+                .map(dept -> {
+                    TreeNode<Long> treeNode = new TreeNode<>();
+                    treeNode.setId(dept.getDeptId());
+                    treeNode.setParentId(dept.getParentId());
+                    treeNode.setName(dept.getName());
+                    return treeNode;
+                })
+                .collect(Collectors.toList());
+
+        List<Tree<Long>> build = TreeUtil.build(collect, parentId == null ? 0 : parentId);
+
+        return build;
+
+    }
+
     /**
      * 导出部门
      *

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

@@ -913,4 +913,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private SysUserServiceImpl getSelf() {
         return SpringUtil.getBean(getClass());
     }
+
+
+
+    public List<SimpleUserListVO> listUserIdByDeptId(Long deptId, String name) {
+        List<SysUser> sysUsers = baseMapper.selectList(Wrappers.<SysUser>lambdaQuery()
+                .eq(SysUser::getDeptId, deptId)
+                .like(StrUtil.isNotBlank(name),SysUser::getName, name));
+        return com.bsd.pjcloud.common.core.util.BeanUtils.toBean(sysUsers, SimpleUserListVO.class);
+    }
+
 }

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

@@ -0,0 +1,16 @@
+package com.bsd.pjcloud.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.bsd.pjcloud.admin.api.entity.UserTrustedDeviceEntity;
+import com.bsd.pjcloud.admin.mapper.UserTrustedDeviceMapper;
+import com.bsd.pjcloud.admin.service.UserTrustedDeviceService;
+import org.springframework.stereotype.Service;
+/**
+ * 设备指纹
+ *
+ * @author zjf
+ * @date 2025-04-22 17:14:57
+ */
+@Service
+public class UserTrustedDeviceServiceImpl extends ServiceImpl<UserTrustedDeviceMapper, UserTrustedDeviceEntity> implements UserTrustedDeviceService {
+}

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.UserTrustedDeviceMapper">
+
+  <resultMap id="userTrustedDeviceMap" type="com.bsd.pjcloud.admin.api.entity.UserTrustedDeviceEntity">
+        <id property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="deviceFingerprint" column="device_fingerprint"/>
+        <result property="deviceName" column="device_name"/>
+        <result property="lastLoginTime" column="last_login_time"/>
+        <result property="expireTime" column="expire_time"/>
+        <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"/>
+  </resultMap>
+</mapper>