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

优化手写信息采集相关功能

cgp 1 день назад
Родитель
Сommit
02d7367871

+ 3 - 0
fs-company/src/main/java/com/fs/company/controller/handwrite/HandwriteCollectionController.java

@@ -97,6 +97,9 @@ public class HandwriteCollectionController extends BaseController
      * */
     @GetMapping("/getOrderCodeInfo/{orderCode}")
     public AjaxResult getOrderCodeInfo(@PathVariable String orderCode) {
+        if (StringUtils.isBlank(orderCode)){
+            return AjaxResult.error("订单号不能为空");
+        }
         return AjaxResult.success(handwriteCollectionService.getOrderCodeInfo(orderCode));
     }
 

+ 26 - 7
fs-company/src/main/java/com/fs/company/controller/qw/FsCompanyCustomerController.java

@@ -64,18 +64,37 @@ public class FsCompanyCustomerController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo list(FsCompanyCustomer fsCompanyCustomer) {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        fsCompanyCustomer.setCompanyUserId(loginUser.getUser().getUserId());
-        //管理员查看所有数据
-        Long isAdmin = roleMapper.companyUserIsAdmin(fsCompanyCustomer.getCompanyUserId());
-        if (isAdmin != null) {
-            fsCompanyCustomer.setCompanyUserId(null);
-        }
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        fsCompanyCustomer.setCompanyUserId(loginUser.getUser().getUserId());
+//        //管理员查看所有数据
+//        Long isAdmin = roleMapper.companyUserIsAdmin(fsCompanyCustomer.getCompanyUserId());
+//        if (isAdmin != null) {
+//            fsCompanyCustomer.setCompanyUserId(null);
+//        }
         PageHelper.startPage(fsCompanyCustomer.getPageNum(), fsCompanyCustomer.getPageSize());
         List<FsCompanyCustomer> list = fsCompanyCustomerService.selectFsCompanyCustomerList(fsCompanyCustomer);
+        // 遍历集合,对每个对象的 phone 属性进行脱敏赋值
+        list.forEach(customer -> {
+            customer.setPhone(maskPhoneMiddleFive(customer.getPhone()));
+        });
         return getDataTable(list);
     }
 
+    /**
+     * 手机号中间5位脱敏处理 (例如: 13812345678 -> 138******678)
+     * @param phone 原始手机号
+     * @return 脱敏后的手机号
+     */
+    public static String maskPhoneMiddleFive(String phone) {
+        // 判断是否为空,不为空才进行替换处理
+        if (phone == null || phone.isEmpty()) {
+            return phone;
+        }
+        // 使用正则表达式将中间5位数字替换为 *****
+        // (\\d{3}) 匹配前3位并作为分组1,\\d{5} 匹配中间5位,(\\d{3}) 匹配后3位并作为分组2
+        return phone.replaceAll("(\\d{3})\\d{5}(\\d{3})", "$1*****$2");
+    }
+
     /**
      * 导出客户信息
      */

+ 0 - 1
fs-company/src/main/java/com/fs/framework/config/SecurityConfig.java

@@ -135,7 +135,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/qw/data/**").anonymous()
                 .antMatchers("/qw/user/selectCloudByCompany").anonymous()
                 .antMatchers("/qw/user/qwExternalContactAddAndDelByRedis").anonymous()
-                .antMatchers("/handwrite/collection/**").anonymous()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

+ 0 - 2
fs-service/src/main/java/com/fs/handwrite/service/impl/HandwriteCollectionServiceImpl.java

@@ -28,7 +28,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.UUID;
 
 /**
  * 手写信息采集表Service业务层处理
@@ -166,7 +165,6 @@ public class HandwriteCollectionServiceImpl implements IHandwriteCollectionServi
 
         //解析记录
         FsOrcAiRecord record = new FsOrcAiRecord();
-        record.setCollectionId(collectionOrcParam.getCollectionId());
         record.setCompanyUserId(collectionOrcParam.getCompanyUserId());
         record.setImgUrl(collectionOrcParam.getImgUrl());
         record.setCreateTime(new Date());