脱敏

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

@@ -612,28 +612,35 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         String cardNo = request.getParameterMap().get("cardNo")==null?"": Arrays.toString(request.getParameterMap().get("cardNo")).replace("[", "").replace("]", "").replace("*", "");
         String id = request.getParameterMap().get("id")==null?"": Arrays.toString(request.getParameterMap().get("id")).replace("[", "").replace("]", "").replace("*", "");
          LambdaQueryWrapper<BusinessReminderCard> queryWrapperData = new LambdaQueryWrapper<>();
-        queryWrapperData.eq(BusinessReminderCard::getCardNo, cardNo).eq(BusinessReminderCard::getDelFlag, CommonConstant.DEL_FLAG_0).orderByDesc(BusinessReminderCard::getUpdateTime);
+         if (StringUtils.isNotBlank(cardNo)){
+             queryWrapperData.eq(BusinessReminderCard::getCardNo, cardNo);
+         }
+        queryWrapperData.eq(BusinessReminderCard::getDelFlag, CommonConstant.DEL_FLAG_0).orderByDesc(BusinessReminderCard::getUpdateTime);
         if (StringUtils.isNotBlank(id)){
             queryWrapperData.eq(BusinessReminderCard::getId,id);
         }
         List<BusinessReminderCard> businessReminderCard = businessReminderCardService.list(queryWrapperData);
-        List<BusinessReminderCard> businessReminderCards =new ArrayList<>();
-
+        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(u);
+                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(businessReminderCard);
+            return Result.OK(businessReminderCardVos);
         }
 
 

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

@@ -14,6 +14,7 @@ import org.jeecg.modules.smscheck.enums.DesensitizationTypeEnum;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 入网信息表
@@ -28,7 +29,6 @@ public class BusinessReminderCard {
     /** 主键 */
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
-    @Desensitization(type = DesensitizationTypeEnum.CHINESE_NAME)
     private String id;
     /** 联电归属地 */
     private String address;
@@ -102,6 +102,7 @@ public class BusinessReminderCard {
     /** 证件号 */
     @Excel(name = "证件号", width = 15)
     @ApiModelProperty(value = "证件号")
+    @Desensitization(type = DesensitizationTypeEnum.ID_CARD,startInclude = 5,endExclude = 10)
     private String cardNo;
 
     /** 姓名 */

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

@@ -0,0 +1,211 @@
+package org.jeecg.modules.smscheck.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.modules.smscheck.annotation.Desensitization;
+import org.jeecg.modules.smscheck.enums.DesensitizationTypeEnum;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 入网信息表
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class BusinessReminderCardVo {
+
+    /** 主键 */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /** 联电归属地 */
+    private String address;
+    /** 拨测联系电话 */
+    // CUSTOMER 是自定义类型
+    private String phone;
+    /** 拨测结果 */
+    private String calltestResults;
+    /** 证件地址 */
+    private String idCardAddress;
+    /** 现住地址 */
+    private String currentAddress;
+    /** 现用号码运营商 */
+    private String operator;
+    /** 现用号码运营商类型 */
+    private String operatorType;
+    /** 现用号码运营商类型备注 */
+    private String operatorTypeNote;
+    /** 现用号码使用年限 */
+    private Integer useLife;
+    /** 现用号码使用用途 */
+    private String phonePurpose;
+    /** 客户名下无电信号码 */
+    private Integer isDxNumber;
+    /** 客户名下无电信号码备注 */
+    private String isDxNumberNote;
+    /** 申请号码办理征信类、融合宽带业务 */
+    private Integer isBroadband;
+    /** 申请号码办理征信类、融合宽带业务备注 */
+    private String isBroadbandNote;
+    /** 申请号码使用用途异常 */
+    private Integer isUseTo;
+    /** 申请号码使用用途异常备注 */
+    private String isUseToNote;
+    /** 客户名下号码存在异常高频率充值、退费 */
+    private Integer isRefund;
+    /** 客户名下号码存在异常高频率充值、退费备注 */
+    private String isRefundNote;
+    /** 客户名下已有号码（含已注销号码）存在各类关停 */
+    private Integer isShutDown;
+    /** 客户名下已有号码（含已注销号码）存在各类关停备注 */
+    private String isShutDownNote;
+    /** 客户名下在用号码无使用记录，仍要求新办号码 */
+    private Integer isNewly;
+    /** 客户名下在用号码无使用记录，仍要求新办号码备注 */
+    private String isNewlyNote;
+    /** 在多个渠道多频次入网的异常情况 */
+    private Integer isChannel;
+    /** 在多个渠道多频次入网的异常情况备注 */
+    private String isChannelNote;
+    /** 黑名单到期客户新入网的高危疑似涉诈号码 */
+    private Integer isInvolvingFraud;
+    /** 黑名单到期客户新入网的高危疑似涉诈号码备注 */
+    private String isInvolvingFraudNote;
+    //客户直接要求办理移动号码入网
+    private Integer directRequirements;
+    private String directRequirementsNode;
+    //客户主动申请一次性办理超过一个号码
+    private Integer passOne;
+    private String passOneNode;
+    //所办金额不符合客户消费能力
+    private Integer nonConformance;
+    private String nonConformanceNode;
+
+
+    /** 删除标识 */
+    //@Excel(name = "删除标识", width = 15)
+    @ApiModelProperty(value = "删除标识")
+    private Integer delFlag;
+    /** 证件号 */
+    @Excel(name = "证件号", width = 15)
+    @ApiModelProperty(value = "证件号")
+    //@Desensitization(type = DesensitizationTypeEnum.ID_CARD,startInclude = 5,endExclude = 10)
+    private String cardNo;
+
+    /** 姓名 */
+    @Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private String cardName;
+
+
+    /** 创建人 */
+    @ApiModelProperty(value = "创建人")
+    @Excel(name = "创建人", width = 15)
+    private String createBy;
+    /** 创建日期 */
+
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+
+
+    @ApiModelProperty(value = "判研营业厅")
+    private String sysBusinessHall;
+    /** 更新人 */
+    @ApiModelProperty(value = "更新人")
+    @Excel(name = "更新人", width = 15)
+    private String updateBy;
+    @ApiModelProperty(value = "更新人营业厅")
+    @Excel(name = "更新人营业厅", width = 15)
+    private String newBusinessAddress;
+    @ApiModelProperty(value = "新开手机号码")
+    @Excel(name = "新开手机号码", width = 15)
+    private String newPhone;
+
+    @ApiModelProperty(value = "判研结果")
+    @Excel(name = "判研结果", width = 15)
+    /** 是否将高危号码上报蓝、紫名单或不可复开关停 */
+    private String numberResults;
+    /** 更新日期 */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+    /** 所属部门 */
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+
+
+    /** 有效期结束 */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "有效期结束")
+    private Date cardEndTime;
+    /** 有效期开始 */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "有效期开始")
+    private Date cardStartTime;
+
+
+    /** 位置信息 */
+    @ApiModelProperty(value = "位置信息")
+    private String positionInformation;
+
+
+    /** 工作地址 */
+    @ApiModelProperty(value = "工作地址")
+    private String wordAddress;
+
+    /** 营业厅地址 */
+    @ApiModelProperty(value = "创建人营业厅地址")
+    @Excel(name = "创建人营业厅地址", width = 15)
+    private String businessAddress;
+
+    // 研判结果 个数
+    private String isSizeNumberResults;
+
+
+    /** 客户所属行业 */
+    @ApiModelProperty(value = "客户所属行业")
+    private String industry;
+    /** 新开手机号码 */
+
+
+
+
+    private String company;
+
+    private  String judgmentResearch;
+
+    //各个运营商个数
+    private String yidong;
+    private String dianxin;
+    private String liantong;
+    private String qita;
+
+
+
+    //身份证是否有期
+    private String cardStartTimeAndEnd ;
+    //staffNo  这个未使用 导出时候暂用下  进行日期转换
+    @Excel(name = "创建日期", width = 15)
+    private String staffNo;
+    //地址判研
+    private String judgmentResearchAddress;
+
+    private String status;
+
+    private String userId;
+}