导出

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/BusinessReminderCardController.java

@@ -222,13 +222,13 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         if (StringUtils.isNotBlank(numberResults_MultiString)){
             queryWrapper.like("number_results",numberResults_MultiString);
         }
-        if (numberResults.size()!=0){
+        if (numberResults.size()!=0 && numberResults.size()!=1){
             List<Integer> collect = numberResults.stream().map(Integer::valueOf)
                     .collect(Collectors.toList());
-            if (collect.contains(3)){
-                collect.add(4);
-            }
-            queryWrapper.in("number_results",collect);
+            queryWrapper.like("number_results",collect);
+        }
+        if (numberResults.size() == 1){
+            queryWrapper.like("number_results",numberResults.get(0));
         }
         queryWrapper.orderByDesc("create_time");
         return  queryWrapper;
@@ -288,13 +288,13 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
                         str.append("非高危");
                     }
                     if (s.equals("2")){
-                        str.append("已报关停");
+                        str.append("上报关停");
                     }
                     if (s.equals("3")){
-                        str.append("已报蓝名单");
+                        str.append("上报蓝名单");
                     }
                     if (s.equals("4")){
-                        str.append("已报紫名单");
+                        str.append("上报紫名单");
                     }
                 }
                 reminderCard.setNumberResults(str.toString());
@@ -317,10 +317,24 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         //上报蓝紫 nameList
         List<ShowDownExcel>excelList =new ArrayList<>();
 
+
         List<String> numberResults = request.getParameterMap().get("numberResults[]")==null?new ArrayList<>():  new ArrayList<>(Arrays.asList(request.getParameterMap().get("numberResults[]")));
 
         if (numberResults!=null && numberResults.size()==1){
             if (numberResults.get(0).equals("3")){
+                for (BusinessReminderCard reminderCard : exportList) {
+                    reminderCard.setNumberResults("上报蓝名单");
+                }
+                copyList(exportList,excels,NameListExcel.class);
+                for (NameListExcel excel : excels) {
+                    excel.setApplicationDate(format);
+                }
+                return getModelAndView(excels,"骚扰电话\\诈骗电话管控申请表",NameListExcel.class);
+            }
+            if (numberResults.get(0).equals("4")){
+                for (BusinessReminderCard reminderCard : exportList) {
+                    reminderCard.setNumberResults("上报紫名单");
+                }
                 copyList(exportList,excels,NameListExcel.class);
                 for (NameListExcel excel : excels) {
                     excel.setApplicationDate(format);
@@ -619,31 +633,68 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         if (StringUtils.isNotBlank(id)){
             queryWrapperData.eq(BusinessReminderCard::getId,id);
         }
+//        List<BusinessReminderCard> businessReminderCard = businessReminderCardService.list(queryWrapperData);
+//        List<BusinessReminderCardVo> businessReminderCards =new ArrayList<>();
+//        List<BusinessReminderCardVo> businessReminderCardVos =new ArrayList<>();
+//        for (BusinessReminderCard u : businessReminderCard) {
+//            BusinessReminderCardVo vo =new BusinessReminderCardVo();
+//            BeanUtils.copyProperties(u,vo);
+//            if (!u.getNumberResults().contains("1")) {
+//                businessReminderCards.add(vo);
+//            }
+//            if (StringUtils.isNotBlank(id)){
+//                businessReminderCardVos.add(vo);
+//            }
+//        }
+//
+//
+//        if (StringUtils.isBlank(id)){
+//            if (businessReminderCards.size()>=2){
+//                businessReminderCards.stream().forEach(u->u.setIsSizeNumberResults("is"));
+//            }
+//            return Result.OK(businessReminderCards);
+//        }else {
+//            return Result.OK(businessReminderCardVos);
+//        }
         List<BusinessReminderCard> businessReminderCard = businessReminderCardService.list(queryWrapperData);
-        List<BusinessReminderCardVo> businessReminderCards =new ArrayList<>();
-        List<BusinessReminderCardVo> businessReminderCardVos =new ArrayList<>();
+        List<BusinessReminderCard> businessReminderCards =new ArrayList<>();
+
         for (BusinessReminderCard u : businessReminderCard) {
-            BusinessReminderCardVo vo =new BusinessReminderCardVo();
-            BeanUtils.copyProperties(u,vo);
             if (!u.getNumberResults().contains("1")) {
-                businessReminderCards.add(vo);
-            }
-            if (StringUtils.isNotBlank(id)){
-                businessReminderCardVos.add(vo);
+                businessReminderCards.add(u);
             }
+//            if (StringUtils.isNotBlank(u.getNewPhone())){
+//                String newPhone ="";
+//                String[] split = u.getNewPhone().split(",");
+//                for (int i = 0; i < split.length; i++) {
+//                    StringBuilder sb = new StringBuilder(split[i]);
+//                    sb.replace(3,7,"****");
+//                    if (i<split.length-1){
+//                        newPhone+=sb.toString()+",";
+//                    }else {
+//                        newPhone+=sb.toString();
+//                    }
+//
+//                }
+//                u.setNewPhone(newPhone);
+//            }
+
         }
 
 
+
         if (StringUtils.isBlank(id)){
             if (businessReminderCards.size()>=2){
                 businessReminderCards.stream().forEach(u->u.setIsSizeNumberResults("is"));
             }
             return Result.OK(businessReminderCards);
         }else {
-            return Result.OK(businessReminderCardVos);
+            return Result.OK(businessReminderCard);
         }
 
 
+
+
     }
 
 

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SysCompanyController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.smscheck.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -136,7 +137,14 @@ public class SysCompanyController {
             }
             SysCompany sysCompany = new SysCompany();
             sysCompany.setName(map.get("aname"));
-            sysCompanyService.save(sysCompany);
+            LambdaQueryWrapper<SysCompany> queryWrapperData = new LambdaQueryWrapper<>();
+            queryWrapperData.eq(SysCompany::getName, map.get("aname"));
+            SysCompany one = sysCompanyService.getOne(queryWrapperData);
+            if (one==null){
+                sysCompanyService.save(sysCompany);
+            }else {
+                sysCompany.setId(one.getId());
+            }
             SysBusinessHall sysBusinessHall = new SysBusinessHall();
             sysBusinessHall.setName(map.get("bname"));
             sysBusinessHall.setCompanyId(sysCompany.getId());

tnc-sms/src/main/java/org/jeecg/modules/smscheck/entity/BusinessReminderCard.java

@@ -34,7 +34,7 @@ public class BusinessReminderCard {
     private String address;
     /** 拨测联系电话 */
     // CUSTOMER 是自定义类型
-    @Desensitization(type = DesensitizationTypeEnum.CUSTOMER,startInclude = 5,endExclude = 10)
+    @Desensitization(type = DesensitizationTypeEnum.CUSTOMER,startInclude = 3,endExclude = 8)
     private String phone;
     /** 拨测结果 */
     private String calltestResults;
@@ -106,8 +106,9 @@ public class BusinessReminderCard {
     private String cardNo;
 
     /** 姓名 */
-    @Excel(name = "姓名", width = 15)
-    @ApiModelProperty(value = "姓名")
+    @Excel(name = "客户名", width = 15)
+    @ApiModelProperty(value = "客户名")
+    @Desensitization(type = DesensitizationTypeEnum.CHINESE_NAME)
     private String cardName;
 
 
@@ -134,6 +135,7 @@ public class BusinessReminderCard {
     private String newBusinessAddress;
     @ApiModelProperty(value = "新开手机号码")
     @Excel(name = "新开手机号码", width = 15)
+    @Desensitization(type = DesensitizationTypeEnum.NEW_PHONE)
     private String newPhone;
 
     @ApiModelProperty(value = "判研结果")

tnc-sms/src/main/java/org/jeecg/modules/smscheck/enums/DesensitizationTypeEnum.java

@@ -27,6 +27,8 @@ public enum DesensitizationTypeEnum {
     //中国大陆车牌，包含普通车辆、新能源车辆
     CAR_LICENSE,
     //银行卡
-    BANK_CARD
+    BANK_CARD,
+    //新办手机号
+    NEW_PHONE
 }
 

tnc-sms/src/main/java/org/jeecg/modules/smscheck/serialize/DesensitizationSerialize.java

@@ -2,6 +2,8 @@ package org.jeecg.modules.smscheck.serialize;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.DesensitizedUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.JsonMappingException;
@@ -41,11 +43,11 @@ public class DesensitizationSerialize extends JsonSerializer<String> implements
                 break;
             // 中文姓名脱敏
             case CHINESE_NAME:
-                jsonGenerator.writeString(DesensitizedUtil.chineseName(String.valueOf(str)));
+                jsonGenerator.writeString(chineseName(String.valueOf(str)));
                 break;
             // 身份证脱敏
             case ID_CARD:
-                jsonGenerator.writeString(DesensitizedUtil.idCardNum(String.valueOf(str), 1, 2));
+                jsonGenerator.writeString(DesensitizedUtil.idCardNum(String.valueOf(str), 5, 4));
                 break;
             // 固定电话脱敏
             case FIXED_PHONE:
@@ -71,6 +73,9 @@ public class DesensitizationSerialize extends JsonSerializer<String> implements
             case CAR_LICENSE:
                 jsonGenerator.writeString(DesensitizedUtil.carLicense(String.valueOf(str)));
                 break;
+            case NEW_PHONE:
+                jsonGenerator.writeString(newPhone(String.valueOf(str)));
+                break;
             // 银行卡脱敏
             case BANK_CARD:
                 jsonGenerator.writeString(DesensitizedUtil.bankCard(String.valueOf(str)));
@@ -79,7 +84,33 @@ public class DesensitizationSerialize extends JsonSerializer<String> implements
         }
 
     }
+    public static String chineseName(String fullName) {
+        if (StrUtil.isBlank(fullName)) {
+            return StrUtil.EMPTY;
+        }
+        if (fullName.length()==3 || fullName.length()==2){
+            return StrUtil.hide(fullName, 1, fullName.length()-1);
+        }
+        return StrUtil.hide(fullName, 1, fullName.length()-2);
+    }
 
+    public static String newPhone(String newPhone) {
+        String[] split = newPhone.split(",");
+        String newStr="";
+        if (StrUtil.isBlank(newPhone)) {
+            return StrUtil.EMPTY;
+        }
+        for (int i = 0; i < split.length; i++) {
+            String hide = StrUtil.hide(split[i], 3, split[i].length() - 4);
+            if (i < split.length - 1) {
+                newStr += hide.toString() + ",";
+            } else {
+                newStr += hide.toString();
+            }
+        }
+
+        return newStr;
+    }
     @Override
     public JsonSerializer<?> createContextual(SerializerProvider serializerProvider, BeanProperty beanProperty) throws JsonMappingException {
         if (beanProperty != null) {