优化提交

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/usercharacteristic/UserCharacteristicController.java

@@ -5,9 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.system.controller.admin.usercharacteristic.vo.UserCharacteristicPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.usercharacteristic.vo.UserCharacteristicRespVO;
-import cn.iocoder.yudao.module.system.dal.dataobject.attribute.AttributeDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.UserCharacteristicDO;
-import cn.iocoder.yudao.module.system.service.attribute.AttributeService;
 import cn.iocoder.yudao.module.system.service.usercharacteristic.UserCharacteristicService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -31,8 +29,6 @@ public class UserCharacteristicController {
 
     @Resource
     private UserCharacteristicService userCharacteristicService;
-    @Resource
-    private AttributeService attributeService;
 
     @DeleteMapping("/deleteUserCharacteristicList")
     @Parameter(name = "ids", description = "编号", required = true)
@@ -63,13 +59,7 @@ public class UserCharacteristicController {
     @Operation(summary = "新增指纹录入-指纹图片转成dat存储")
     @PostMapping("/insertUserFingerprintDat")
     public CommonResult<Boolean> insertUserFingerprintDat(MultipartFile file, String userName) throws Exception {
-        userName = "admin";
-        AttributeDO one = attributeService.getAttributeByKey("sys.fingerprint.limit");
-        String sysAttrValue = null;
-        if (one != null) {
-            sysAttrValue = one.getSysAttrValue();
-        }
-        return CommonResult.success(userCharacteristicService.insertUserFingerprintDat(file, userName, sysAttrValue));
+        return CommonResult.success(userCharacteristicService.insertUserFingerprintDat(file, userName));
     }
 
 

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/usercharacteristic/UserCharacteristicService.java

@@ -38,7 +38,7 @@ public interface UserCharacteristicService extends IService<UserCharacteristicDO
      */
     PageResult<UserCharacteristicDO> getUserCharacteristicPage(UserCharacteristicPageReqVO pageReqVO);
 
-    Boolean insertUserFingerprintDat(MultipartFile file, String userName, String sysAttrValue) throws Exception;
+    Boolean insertUserFingerprintDat(MultipartFile file, String userName) throws Exception;
 
 
 }

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/usercharacteristic/UserCharacteristicServiceImpl.java

@@ -11,9 +11,11 @@ import cn.iocoder.yudao.module.infra.framework.file.core.client.local.LocalFileC
 import cn.iocoder.yudao.module.infra.service.file.FileConfigService;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
 import cn.iocoder.yudao.module.system.controller.admin.usercharacteristic.vo.UserCharacteristicPageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.attribute.AttributeDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.UserCharacteristicDO;
 import cn.iocoder.yudao.module.system.dal.mysql.user.UserCharacteristicMapper;
+import cn.iocoder.yudao.module.system.service.attribute.AttributeService;
 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -49,6 +51,8 @@ public class UserCharacteristicServiceImpl extends ServiceImpl<UserCharacteristi
     private FileService fileService;
     @Resource
     private FileConfigService fileConfigService;
+    @Resource
+    private AttributeService attributeService;
 
     @Value("${local-file.finger-path}")
     private String fingerPath;
@@ -71,14 +75,17 @@ public class UserCharacteristicServiceImpl extends ServiceImpl<UserCharacteristi
     }
 
     @Override
-    public Boolean insertUserFingerprintDat(MultipartFile file, String userName, String sysAttrValue) throws Exception {
+    public Boolean insertUserFingerprintDat(MultipartFile file, String userName) throws Exception {
         Assert.notBlank(userName, "请告知我这是哪个用户的指纹！");
         Assert.isTrue(file.getSize() > 0, "指纹信息不能为空！");
         AdminUserDO user = adminUserService.getOne(Wrappers.<AdminUserDO>lambdaQuery()
                 .eq(AdminUserDO::getUsername, userName));
         Assert.isFalse(user == null, "系统中无该用户！");
         Long userId = user.getId();
-        if (StringUtils.isNotBlank(sysAttrValue)) {
+        // 检查个人上传指纹上限设置
+        AttributeDO one = attributeService.getAttributeByKey("sys.fingerprint.limit");
+        if (one != null && StringUtils.isNotBlank(one.getSysAttrValue())) {
+            String sysAttrValue = one.getSysAttrValue();
             // 检查人员指纹上限
             long count = count(Wrappers.<UserCharacteristicDO>lambdaQuery()
                     .eq(UserCharacteristicDO::getType, "1")
@@ -142,6 +149,7 @@ public class UserCharacteristicServiceImpl extends ServiceImpl<UserCharacteristi
 
     /**
      * 从URL中提取文件名主体部分（不含扩展名）
+     *
      * @param urlStr 目标URL字符串
      * @return 提取的文件名主体，例如"光猪_1751351611494"
      * @throws URISyntaxException URL格式无效时抛出