添加权限

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

@@ -180,7 +180,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
 
 
 
-    private  QueryWrapper<BusinessReminderCard> getQueryWrapper(HttpServletRequest request,BusinessReminderCard businessReminderCard){
+    private  QueryWrapper<BusinessReminderCard> getQueryWrapper(HttpServletRequest request,BusinessReminderCard businessReminderCard,String info){
         String sysBusinessHall = request.getParameterMap().get("sysBusinessHall")==null?"":
                 Arrays.toString(request.getParameterMap().get("sysBusinessHall")).replace("[", "").replace("]", "").replace("*", "");
 
@@ -222,13 +222,21 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         if (StringUtils.isNotBlank(numberResults_MultiString)){
             queryWrapper.like("number_results",numberResults_MultiString);
         }
-        if (numberResults.size()!=0 && numberResults.size()!=1){
-            List<Integer> collect = numberResults.stream().map(Integer::valueOf)
-                    .collect(Collectors.toList());
-            queryWrapper.like("number_results",collect);
-        }
-        if (numberResults.size() == 1){
-            queryWrapper.like("number_results",numberResults.get(0));
+
+        if (info.equals("up")){
+            if (numberResults.size() == 1){
+                queryWrapper.like("number_results",numberResults.get(0));
+            }
+        }else {
+            if (numberResults.size()>0){
+                if (numberResults.contains("3")){
+                    numberResults.add("4");
+                }
+                List<Integer> collect = numberResults.stream().map(Integer::valueOf)
+                        .collect(Collectors.toList());
+                queryWrapper.in("number_results",collect);
+            }
+
         }
         queryWrapper.orderByDesc("create_time");
         return  queryWrapper;
@@ -239,8 +247,31 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
     public ModelAndView exportXls(HttpServletRequest request, BusinessReminderCard businessReminderCard)  throws Exception {
         // Step.1 组装查询条件
 
-        QueryWrapper<BusinessReminderCard> queryWrapper =getQueryWrapper( request,businessReminderCard);
+        QueryWrapper<BusinessReminderCard> queryWrapper =getQueryWrapper( request,businessReminderCard,"out");
+        return exportXlsMe(request,businessReminderCard,queryWrapper,"out");
+    }
+
+    @PostMapping(value = "/type")
+    public  Result<?> getType(@RequestBody List<BusinessReminderCard>params){
+
 
+         Set<String> set = new HashSet<>();
+        for (BusinessReminderCard card : params) {
+            set.add(card.getNumberResults());
+        }
+        return Result.OK(set);
+    }
+
+    @ApiOperation(value = "入网信息业务-导出", notes = "入网信息业务-导出")
+    @GetMapping(value = "/exportXlsUp")
+    public ModelAndView exportXlsUp(HttpServletRequest request, BusinessReminderCard businessReminderCard)  throws Exception {
+        // Step.1 组装查询条件
+
+        QueryWrapper<BusinessReminderCard> queryWrapper =getQueryWrapper( request,businessReminderCard,"up");
+        return exportXlsMe(request,businessReminderCard,queryWrapper,"up");
+    }
+
+    public ModelAndView exportXlsMe(HttpServletRequest request, BusinessReminderCard businessReminderCard,QueryWrapper<BusinessReminderCard> queryWrapper,String info)  throws Exception {
 
         // Step.2 获取导出数据
         List<BusinessReminderCard> pageList = businessReminderCardService.list(queryWrapper);
@@ -320,48 +351,101 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
 
         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);
+        if (info.equals("up")){
+            if (numberResults!=null && numberResults.size()==1){
+                if (numberResults.get(0).equals("3")){
+                    for (BusinessReminderCard reminderCard : exportList) {
+                        reminderCard.setNumberResults("上报蓝名单");
+                    }
+                    List<NameListExcel> excelsNew =new ArrayList<>();
+                    copyList(exportList,excels,NameListExcel.class);
+                    for (NameListExcel excel : excels) {
+                        excel.setApplicationDate(format);
+                        String[]  split= excel.getNewPhone().split(",");
+                        if (split.length>1){
+                            for (String s : split) {
+                                NameListExcel nameListExcel = new NameListExcel();
+                                BeanUtils.copyProperties(excel ,nameListExcel);
+                                nameListExcel.setNewPhone(s);
+                                excelsNew.add(nameListExcel);
+                            }
+                        }else {
+                            excelsNew.add(excel);
+                        }
+                    }
+                    return getModelAndView(excelsNew,"骚扰电话\\诈骗电话管控申请表",NameListExcel.class);
                 }
-                return getModelAndView(excels,"骚扰电话\\诈骗电话管控申请表",NameListExcel.class);
-            }
-            //关停  shutDown
-            if (numberResults.get(0).equals("2")){
-                copyList(exportList,excelList,ShowDownExcel.class);
-                int i =1;
-                for (ShowDownExcel showDownExcel : excelList) {
-                    showDownExcel.setIndex(i);
-                    i++;
-                    if (showDownExcel.getStatus().equals("0")){
-                        showDownExcel.setIsNow("否");
-                        showDownExcel.setLabel("安防停机-不可复开");
+                if (numberResults.get(0).equals("4")){
+                    List<NameListExcel> excelsNew =new ArrayList<>();
+                    for (BusinessReminderCard reminderCard : exportList) {
+                        reminderCard.setNumberResults("上报紫名单");
                     }
-                    if (showDownExcel.getStatus().equals("1")){
-                        showDownExcel.setIsNow("是");
-                        showDownExcel.setLabel("安防停机-不可复开");
+                    copyList(exportList,excels,NameListExcel.class);
+                    for (NameListExcel excel : excels) {
+                        excel.setApplicationDate(format);
+                        String[]  split= excel.getNewPhone().split(",");
+                        if (split.length>1){
+                            for (String s : split) {
+                                NameListExcel nameListExcel = new NameListExcel();
+                                BeanUtils.copyProperties(excel ,nameListExcel);
+                                nameListExcel.setNewPhone(s);
+                                excelsNew.add(nameListExcel);
+                            }
+
+                        }else {
+                            excelsNew.add(excel);
+                        }
                     }
+                    return getModelAndView(excelsNew,"骚扰电话\\诈骗电话管控申请表",NameListExcel.class);
+                }
+                //关停  shutDown
+                if (numberResults.get(0).equals("2")){
+                    List<ShowDownExcel>excelListNew =new ArrayList<>();
+                    copyList(exportList,excelList,ShowDownExcel.class);
+                    int i =1;
+                    for (ShowDownExcel showDownExcel : excelList) {
+                        showDownExcel.setIndex(i);
+                        i++;
+                        if (showDownExcel.getStatus().equals("0")){
+                            showDownExcel.setIsNow("否");
+                            showDownExcel.setLabel("安防停机-不可复开");
+                        }
+                        if (showDownExcel.getStatus().equals("1")){
+                            showDownExcel.setIsNow("是");
+                            showDownExcel.setLabel("安防停机-不可复开");
+                        }
+                        String[] split = showDownExcel.getNewPhone().split(",");
+                        if (split.length>1){
+                            for (String s : split) {
+                                ShowDownExcel showDownExcel1 = new ShowDownExcel();
+                                BeanUtils.copyProperties(showDownExcel ,showDownExcel1);
+                                showDownExcel1.setNewPhone(s);
+                                excelListNew.add(showDownExcel1);
+                            }
+                        }else {
+                            excelListNew.add(showDownExcel);
+                        }
+                    }
+                    return getModelAndView(excelListNew,"上报关停号码列表",ShowDownExcel.class);
                 }
-                return getModelAndView(excelList,"上报关停号码列表",ShowDownExcel.class);
             }
         }
 
-         return getModelAndView(exportList,"入网信息业务",BusinessReminderCard.class);
+        List<BusinessReminderCard> exportListNew = new ArrayList<>();
+        for (BusinessReminderCard card : exportList) {
+            String[] split = card.getNewPhone().split(",");
+            if (split.length>1){
+                for (String s : split) {
+                    BusinessReminderCard businessReminderCard1 = new BusinessReminderCard();
+                    BeanUtils.copyProperties(card ,businessReminderCard1);
+                    businessReminderCard1.setNewPhone(s);
+                    exportListNew.add(businessReminderCard1);
+                }
+            }else{
+                exportListNew.add(card);
+            }
+        }
+         return getModelAndView(exportListNew,"入网信息业务",BusinessReminderCard.class);
     }
 
 
@@ -465,6 +549,17 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         businessReminderCard.setStatus("0");
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         businessReminderCard.setUserId(sysUser.getId());
+        businessReminderCard.setBusinessAddress(businessReminderCardService.getBusinessAddress(sysUser.getOrgCode()));
+        String newPhone = businessReminderCard.getNewPhone();
+        String[] split = newPhone.split(",");
+        Set<String>set =new HashSet();
+        for (String s : split) {
+            set.add(s);
+        }
+        if (set.size()!=split.length){
+            return Result.error("新办号码 不可重复!");
+        }
+
         boolean save = businessReminderCardService.save(businessReminderCard);
         if (save) {
             return Result.OK();
@@ -633,56 +728,16 @@ 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<BusinessReminderCard> businessReminderCards =new ArrayList<>();
 
         for (BusinessReminderCard u : businessReminderCard) {
+            u.setAge(evaluate(u.getCardNo()));
             if (!u.getNumberResults().contains("1")) {
                 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"));
@@ -691,13 +746,54 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
         }else {
             return Result.OK(businessReminderCard);
         }
+    }
 
 
+    public String evaluate(String sfzjh){
+        String age ="";
+        Calendar cal = Calendar.getInstance();
+        int yearNow = cal.get(Calendar.YEAR);
+        int monthNow = cal.get(Calendar.MONTH)+1;
+        int dayNow = cal.get(Calendar.DATE);
 
+        int year = Integer.valueOf(sfzjh.substring(6, 10));
+        int month = Integer.valueOf(sfzjh.substring(10,12));
+        int day = Integer.valueOf(sfzjh.substring(12,14));
 
+        if ((month < monthNow) || (month == monthNow && day<= dayNow) ){
+            age = String.valueOf(yearNow - year);
+        }else {
+            age = String.valueOf(yearNow - year-1);
+        }
+        return age;
     }
 
 
+    @GetMapping(value = "/queryByCardNoOne")
+    public Result<?> queryByCardNoOne(HttpServletRequest request) {
+        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<>();
+        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);
+        if (businessReminderCard.isEmpty()){
+            return Result.OK();
+        }
+        BusinessReminderCard businessReminderCard1 = businessReminderCard.get(0);
+        List<BusinessReminderCardVo> businessReminderCardList = new ArrayList<>();
+
+        BusinessReminderCardVo card = new BusinessReminderCardVo();
+        BeanUtils.copyProperties(businessReminderCard1,card);
+        businessReminderCardList.add(card);
+        return Result.OK(businessReminderCardList);
+    }
+
     @GetMapping(value = "/querySizeByCardNo")
     public Result<?> querySizeByCardNo(HttpServletRequest request) {
         String cardNo = request.getParameterMap().get("cardNo")==null?"": Arrays.toString(request.getParameterMap().get("cardNo")).replace("[", "").replace("]", "").replace("*", "");
@@ -821,7 +917,7 @@ public class BusinessReminderCardController  extends JeecgController<BusinessRem
             return Result.error("Id为空");
         }
         UpdateWrapper<BusinessReminderCard> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.in("id", list).set("status", 1);
+        updateWrapper.in("id", list).set("status", 1).set("up_time",new Date());
         boolean update = businessReminderCardService.update(updateWrapper);
         if (update) {
             return Result.ok("上报成功");

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

@@ -9,9 +9,11 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.smscheck.entity.*;
 import org.jeecg.modules.smscheck.mapper.SysCompanyMapper;
 import org.jeecg.modules.smscheck.service.SysBusinessHallService;

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

@@ -131,7 +131,7 @@ public class BusinessReminderCard {
     @Excel(name = "更新人", width = 15)
     private String updateBy;
     @ApiModelProperty(value = "更新人营业厅")
-    @Excel(name = "更新人营业厅", width = 15)
+    //@Excel(name = "更新人营业厅", width = 15)
     private String newBusinessAddress;
     @ApiModelProperty(value = "新开手机号码")
     @Excel(name = "新开手机号码", width = 15)
@@ -213,4 +213,7 @@ public class BusinessReminderCard {
     private String status;
 
     private String userId;
+    private String age;
+
+    private Date upTime;
 }

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

@@ -38,4 +38,6 @@ public class SysBusinessHall {
 
     private String  notes;
 
+    private String orgCode;
+
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/mapper/BusinessReminderCardMapper.java

@@ -2,6 +2,8 @@ package org.jeecg.modules.smscheck.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.smscheck.entity.BusinessReminderCard;
 import org.jeecg.modules.smscheck.entity.SmcLotCheckLog;
 
@@ -10,4 +12,10 @@ import org.jeecg.modules.smscheck.entity.SmcLotCheckLog;
  */
 @Mapper
 public interface BusinessReminderCardMapper  extends BaseMapper<BusinessReminderCard> {
+
+
+    @Select({"select depart_name from sys_depart where org_code = #{orgCode}"})
+    String  queryBusinessAddress(@Param("orgCode") String orgCode );
+
+
 }

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

@@ -47,7 +47,7 @@ public class DesensitizationSerialize extends JsonSerializer<String> implements
                 break;
             // 身份证脱敏
             case ID_CARD:
-                jsonGenerator.writeString(DesensitizedUtil.idCardNum(String.valueOf(str), 5, 4));
+                jsonGenerator.writeString(DesensitizedUtil.idCardNum(String.valueOf(str), 6, 4));
                 break;
             // 固定电话脱敏
             case FIXED_PHONE:
@@ -88,10 +88,13 @@ public class DesensitizationSerialize extends JsonSerializer<String> implements
         if (StrUtil.isBlank(fullName)) {
             return StrUtil.EMPTY;
         }
-        if (fullName.length()==3 || fullName.length()==2){
+        if (  fullName.length()==2){
+            return StrUtil.hide(fullName, 1, fullName.length());
+        }
+        if (  fullName.length()==3){
             return StrUtil.hide(fullName, 1, fullName.length()-1);
         }
-        return StrUtil.hide(fullName, 1, fullName.length()-2);
+        return StrUtil.hide(fullName, 1, fullName.length()-1);
     }
 
     public static String newPhone(String newPhone) {

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/BusinessReminderCardService.java

@@ -4,5 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.smscheck.entity.BusinessReminderCard;
 import org.jeecg.modules.smscheck.entity.SmcLotCheckLog;
 
+import java.util.List;
+
 public interface BusinessReminderCardService extends IService<BusinessReminderCard> {
+
+     String  getBusinessAddress(String ogCode);
+
+
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/BusinessReminderCardServiceImpl.java

@@ -6,10 +6,21 @@ import org.jeecg.modules.smscheck.mapper.BusinessReminderCardMapper;
 import org.jeecg.modules.smscheck.service.BusinessReminderCardService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * 入网信息业务层
  */
 @Service
 public class BusinessReminderCardServiceImpl extends ServiceImpl<BusinessReminderCardMapper, BusinessReminderCard> implements BusinessReminderCardService {
 
+    @Resource
+    private BusinessReminderCardMapper businessReminderCardMapper;
+
+    @Override
+    public String  getBusinessAddress(String orgCode) {
+
+        return businessReminderCardMapper.queryBusinessAddress(orgCode);
+    }
 }

tnc-sms/src/main/java/org/jeecg/modules/smscheck/service/impl/SysBusinessHallServiceImpl.java

@@ -2,7 +2,9 @@ package org.jeecg.modules.smscheck.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.smscheck.entity.BusinessReminderCard;
 import org.jeecg.modules.smscheck.entity.SysBusinessHall;
 import org.jeecg.modules.smscheck.entity.SysBusinessHallAndSysCompany;
@@ -37,7 +39,10 @@ public class SysBusinessHallServiceImpl  extends ServiceImpl<SysBusinessHallMapp
         for (SysCompany sysCompany : list) {
             SysBusinessHall sysBusinessHall = new SysBusinessHall();
             sysBusinessHall.setCompanyId(sysCompany.getId());
+            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+
             QueryWrapper<SysBusinessHall> queryWrapper = QueryGenerator.initQueryWrapper(sysBusinessHall,null);
+            queryWrapper.likeRight("org_code",sysUser.getOrgCode());
             List<SysBusinessHall> sysBusinessHalls = sysBusinessHallMapper.selectList(queryWrapper);
             SysBusinessHallAndSysCompany sysBusinessHallAndSysCompany =new SysBusinessHallAndSysCompany();
             sysBusinessHallAndSysCompany.setId(sysCompany.getId());