用户的指纹、面部初始化

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

@@ -1,30 +1,25 @@
 package cn.iocoder.yudao.module.system.controller.admin.usercharacteristic;
 
-import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 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.controller.admin.usercharacteristic.vo.UserCharacteristicSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.UserCharacteristicDO;
 import cn.iocoder.yudao.module.system.service.usercharacteristic.UserCharacteristicService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.List;
 
-import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 @Tag(name = "管理后台 - 用户特征表(指纹、面部)")
@@ -36,21 +31,6 @@ public class UserCharacteristicController {
     @Resource
     private UserCharacteristicService userCharacteristicService;
 
-    @PostMapping("/insertUserCharacteristic")
-    @Operation(summary = "创建用户特征表(指纹、面部)")
-    @PreAuthorize("@ss.hasPermission('iscs:user-characteristic:create')")
-    public CommonResult<Long> insertUserCharacteristic(@Valid @RequestBody UserCharacteristicSaveReqVO createReqVO) {
-        return success(userCharacteristicService.createUserCharacteristic(createReqVO));
-    }
-
-    @PutMapping("/updateUserCharacteristic")
-    @Operation(summary = "更新用户特征表(指纹、面部)")
-    @PreAuthorize("@ss.hasPermission('iscs:user-characteristic:update')")
-    public CommonResult<Boolean> updateUserCharacteristic(@Valid @RequestBody UserCharacteristicSaveReqVO updateReqVO) {
-        userCharacteristicService.updateUserCharacteristic(updateReqVO);
-        return success(true);
-    }
-
     @DeleteMapping("/deleteUserCharacteristicList")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除用户特征表(指纹、面部)")
@@ -77,17 +57,19 @@ public class UserCharacteristicController {
         return success(BeanUtils.toBean(pageResult, UserCharacteristicRespVO.class));
     }
 
-    @GetMapping("/exportUserCharacteristicExcel")
-    @Operation(summary = "导出用户特征表(指纹、面部) Excel")
-    @PreAuthorize("@ss.hasPermission('iscs:user-characteristic:export')")
-    @ApiAccessLog(operateType = EXPORT)
-    public void exportUserCharacteristicExcel(@Valid UserCharacteristicPageReqVO pageReqVO,
-              HttpServletResponse response) throws IOException {
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<UserCharacteristicDO> list = userCharacteristicService.getUserCharacteristicPage(pageReqVO).getList();
-        // 导出 Excel
-        ExcelUtils.write(response, "用户特征表(指纹、面部).xls", "数据", UserCharacteristicRespVO.class,
-                        BeanUtils.toBean(list, UserCharacteristicRespVO.class));
+    @Operation(summary = "新增指纹录入-指纹图片转成dat存储")
+    @PostMapping("/insertUserFingerprintDat")
+    public CommonResult<Boolean> insertUserFingerprintDat(MultipartFile file, String userName) throws IOException {
+        /*IsSystemAttribute one = isSystemAttributeService.getIsSystemAttributeByKey("sys.fingerprint.limit");
+        String sysAttrValue = null;
+        if (one != null) {
+            sysAttrValue = one.getSysAttrValue();
+        }
+        String url = serverConfig.getUrl();*/
+        //return CommonResult.success(sysUserCharacteristicService.insertUserFingerprintDat(file, userName, sysAttrValue, url));
+        // return CommonResult.success(sysUserCharacteristicService.insertUserFace(file, userName, sysAttrValue, url));
+        return null;
     }
 
+
 }

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/UserCharacteristicMapper.java

@@ -5,8 +5,11 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.usercharacteristic.vo.UserCharacteristicPageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.UserCharacteristicDO;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 用户特征表(指纹、面部) Mapper
  *
@@ -15,6 +18,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface UserCharacteristicMapper extends BaseMapperX<UserCharacteristicDO> {
 
+
     default PageResult<UserCharacteristicDO> selectPage(UserCharacteristicPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<UserCharacteristicDO>()
                 .eqIfPresent(UserCharacteristicDO::getUserId, reqVO.getUserId())
@@ -32,4 +36,15 @@ public interface UserCharacteristicMapper extends BaseMapperX<UserCharacteristic
                 .orderByDesc(UserCharacteristicDO::getId));
     }
 
+    @Delete({
+            "<script>",
+            "DELETE FROM sys_user_characteristic",
+            "WHERE id IN",
+            "<foreach item='id' collection='ids' open='(' separator=',' close=')'>",
+            "#{id}",
+            "</foreach>",
+            "</script>"
+    })
+    Boolean deleteUserCharacteristicListByIds(List<Long> ids);
+
 }

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

@@ -2,10 +2,8 @@ package cn.iocoder.yudao.module.system.service.usercharacteristic;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.controller.admin.usercharacteristic.vo.UserCharacteristicPageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.usercharacteristic.vo.UserCharacteristicSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.UserCharacteristicDO;
 import com.baomidou.mybatisplus.extension.service.IService;
-import jakarta.validation.Valid;
 
 import java.util.List;
 
@@ -16,28 +14,6 @@ import java.util.List;
  */
 public interface UserCharacteristicService extends IService<UserCharacteristicDO> {
 
-    /**
-     * 创建用户特征表(指纹、面部)
-     *
-     * @param createReqVO 创建信息
-     * @return 编号
-     */
-    Long createUserCharacteristic(@Valid UserCharacteristicSaveReqVO createReqVO);
-
-    /**
-     * 更新用户特征表(指纹、面部)
-     *
-     * @param updateReqVO 更新信息
-     */
-    void updateUserCharacteristic(@Valid UserCharacteristicSaveReqVO updateReqVO);
-
-    /**
-     * 删除用户特征表(指纹、面部)
-     *
-     * @param id 编号
-     */
-    void deleteUserCharacteristic(Long id);
-
     /**
     * 批量删除用户特征表(指纹、面部)
     *

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

@@ -1,10 +1,7 @@
 package cn.iocoder.yudao.module.system.service.usercharacteristic;
 
-import cn.hutool.core.collection.CollUtil;
 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.UserCharacteristicSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.user.UserCharacteristicDO;
 import cn.iocoder.yudao.module.system.dal.mysql.user.UserCharacteristicMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,52 +24,11 @@ public class UserCharacteristicServiceImpl extends ServiceImpl<UserCharacteristi
     private UserCharacteristicMapper userCharacteristicMapper;
 
     @Override
-    public Long createUserCharacteristic(UserCharacteristicSaveReqVO createReqVO) {
-        // 插入
-        UserCharacteristicDO userCharacteristic = BeanUtils.toBean(createReqVO, UserCharacteristicDO.class);
-        userCharacteristicMapper.insert(userCharacteristic);
-
-        // 返回
-        return userCharacteristic.getId();
-    }
-
-    @Override
-    public void updateUserCharacteristic(UserCharacteristicSaveReqVO updateReqVO) {
-        // 校验存在
-        validateUserCharacteristicExists(updateReqVO.getId());
-        // 更新
-        UserCharacteristicDO updateObj = BeanUtils.toBean(updateReqVO, UserCharacteristicDO.class);
-        userCharacteristicMapper.updateById(updateObj);
-    }
-
-    @Override
-    public void deleteUserCharacteristic(Long id) {
-        // 校验存在
-        validateUserCharacteristicExists(id);
+    public void deleteUserCharacteristicListByIds(List<Long> ids) {
         // 删除
-        userCharacteristicMapper.deleteById(id);
+        userCharacteristicMapper.deleteUserCharacteristicListByIds(ids);
     }
 
-    @Override
-        public void deleteUserCharacteristicListByIds(List<Long> ids) {
-        // 校验存在
-        validateUserCharacteristicExists(ids);
-        // 删除
-        userCharacteristicMapper.deleteByIds(ids);
-        }
-
-    private void validateUserCharacteristicExists(List<Long> ids) {
-        List<UserCharacteristicDO> list = userCharacteristicMapper.selectByIds(ids);
-        if (CollUtil.isEmpty(list) || list.size() != ids.size()) {
-            /// throw exception(USER_CHARACTERISTIC_NOT_EXISTS);
-        }
-    }
-
-    private void validateUserCharacteristicExists(Long id) {
-        if (userCharacteristicMapper.selectById(id) == null) {
-            /// throw exception(USER_CHARACTERISTIC_NOT_EXISTS);
-        }
-    }
 
     @Override
     public UserCharacteristicDO getUserCharacteristic(Long id) {