server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -160,8 +160,9 @@ private Integer categoryId; @ApiModelProperty(value = "关联分类名称") @ExcelColumn(name="关联分类名称") @ExcelColumn(name="车辆分类" ,index = 8,width = 16) private String categoryName; @ApiModelProperty(value = "关联父级分类编码（关联category)", example = "1") @ExcelColumn(name="关联父级分类编码（关联category)") private Integer categoryParentId; server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/vo/RetentionCarsVO.java
@@ -55,4 +55,6 @@ private Date endTime; @ApiModelProperty(value = "访客公司名称") private String visitCompanyName; @ApiModelProperty(value = "车辆分类") private String categoryName; } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -809,10 +809,15 @@ if(CollectionUtils.isEmpty(hiddenDangerAllList)){ return hiddenDangerDataVO; } Integer nowYear = DateUtil.getNowYearNum(); Integer nowMonth = DateUtil.getNowMonthNum(); String nowDate = DateUtil.getFomartDate(new Date(),"yyyy-MM-dd"); for (int i = 1; i <=12 ; i++) { GeneralDataVO generalDataVO = new GeneralDataVO(); generalDataVO.setName(Integer.toString(i)); generalDataVO.setTotal(hiddenDangerAllList.stream().filter(j->Constants.equalsInteger(Integer.valueOf(generalDataVO.getName()),Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM")))).collect(Collectors.toList()).size()); generalDataVO.setTotal( hiddenDangerAllList.stream().filter(j->Constants.equalsInteger(nowYear,Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"yyyy")))&&Constants.equalsInteger(Integer.valueOf(generalDataVO.getName()), Integer.valueOf(DateUtil.formatDate(j.getCreateDate(),"MM")))).collect(Collectors.toList()).size()); generalDataVO.setName(generalDataVO.getName()+"月"); yearDataList.add(generalDataVO); } @@ -827,7 +832,7 @@ hiddenDangerDataVO.setTodayNew(hiddenDangerAllList.stream().filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM-dd").equals(DateUtil.formatDate(new Date(),"yyyy-MM-dd"))).collect(Collectors.toList()).size()); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(hiddenDangerAllList)){ List<Integer> cateList = hiddenDangerAllList.stream().map(i->i.getCateId()).collect(Collectors.toList()); List<Integer> cateList = hiddenDangerAllList.stream().filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(nowDate.substring(0,7))).map(i->i.getCateId()).collect(Collectors.toList()); //全部隐患分类数据 if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(cateList)){ List<GeneralDataVO> cateGeneralDataList = new ArrayList<>(); @@ -842,7 +847,7 @@ if(optionalHiddenDanger.isPresent()){ GeneralDataVO generalDataVO = new GeneralDataVO(); HiddenDangerParam hiddenDangerParam = optionalHiddenDanger.get(); Integer total = hiddenDangerAllList.stream().filter(i->Constants.equalsInteger(i.getCateId(),hiddenDangerParam.getId())).collect(Collectors.toList()).size(); Integer total = hiddenDangerAllList.stream().filter(i->Constants.equalsInteger(i.getCateId(),hiddenDangerParam.getId())&& DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(nowDate.substring(0,7))).collect(Collectors.toList()).size(); generalDataVO.setName(hiddenDangerParam.getName()); generalDataVO.setTotal(total); generalDataVO.setRata( @@ -856,8 +861,10 @@ hiddenDangerDataVO.setCateList(cateGeneralDataList); } //全部隐患区域部门数据 List<Integer> companyIdList = hiddenDangerAllList.stream().map(i->i.getAreaCompanyId()).collect(Collectors.toList()); List<HiddenDangerCompanyVO> hiddenDangerCompanyVOList = hiddenDangerAllList.stream().map(i->new HiddenDangerCompanyVO(i.getAreaName(),i.getAreaCompanyId())).collect(Collectors.toList()); List<HiddenDangerCompanyVO> hiddenDangerCompanyVOList = hiddenDangerAllList.stream(). filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(nowDate.substring(0,7))) .map(i->new HiddenDangerCompanyVO(i.getAreaName(),i.getAreaCompanyId())).collect(Collectors.toList()); if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(hiddenDangerCompanyVOList)){ List<GeneralDataVO> companyGeneralDataList = new ArrayList<>(); Set<HiddenDangerCompanyVO> companyIdSetList = new HashSet<>(hiddenDangerCompanyVOList); @@ -873,7 +880,7 @@ if(optionalCompany.isPresent()){ GeneralDataVO generalDataVO = new GeneralDataVO(); Company company = optionalCompany.get(); Integer total = hiddenDangerAllList.stream().filter(i->Constants.equalsInteger(i.getAreaCompanyId(),company.getId())).collect(Collectors.toList()).size(); Integer total = hiddenDangerAllList.stream().filter(i->DateUtil.formatDate(i.getCreateDate(),"yyyy-MM").equals(nowDate.substring(0,7))&&Constants.equalsInteger(i.getAreaCompanyId(),company.getId())).collect(Collectors.toList()).size(); generalDataVO.setName(company.getName()); generalDataVO.setTotal(total); generalDataVO.setCategoryName(hiddenDangerCompanyVO.getCategoryName()); server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java
@@ -247,10 +247,12 @@ .and(StringUtils.isNotBlank(pageWrap.getModel().getCompanyName()), p-> p.like(Company::getName, pageWrap.getModel().getCompanyName()) .or().like(Member::getVisitCompanyName, pageWrap.getModel().getCompanyName())) .eq(Objects.nonNull(pageWrap.getModel().getCarType()), Retention::getCarType,pageWrap.getModel().getCarType()) // .eq(Objects.nonNull(pageWrap.getModel().getCarType()), // Retention::getCarType,pageWrap.getModel().getCarType()) .like(Objects.nonNull(pageWrap.getModel().getCarNo()), Retention::getCarNo,pageWrap.getModel().getCarNo()) .like(Objects.nonNull(pageWrap.getModel().getCategoryName()), Retention::getCategoryName,pageWrap.getModel().getCategoryName()) .ge(Objects.nonNull(pageWrap.getModel().getStartTime()), Retention::getCreateDate,pageWrap.getModel().getStartTime()) .le(Objects.nonNull(pageWrap.getModel().getEndTime()), server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -896,38 +896,41 @@ List<Member> addList = new ArrayList<>(); List<Member> editList = new ArrayList<>(); //申请人信息 Member m = getMemberListParam(visits.getIdcardNo(),visits,addList,editList); Member m = getMemberListParam(visits.getPhone(),visits.getIdcardNo(),visits,addList,editList); //随访人员信息处理 if(visits.getWithUserList()!= null && visits.getWithUserList().size()>0){ for(Visits model:visits.getWithUserList()){ model.setBirthday(Constants.getBirthdyByCardNo(model.getIdcardNo())); model.setStarttime(visits.getStarttime()); model.setEndtime(visits.getEndtime()); //校验随访人员填报数据合法性 isValidWithVisitParam(model,addList,editList); model.setCreateDate(visits.getCreateDate()); Member visitsMember = getMemberListParam(model.getIdcardNo(),model,addList,editList); model.setMemberId(visitsMember.getId()); } } // if(visits.getWithUserList()!= null && visits.getWithUserList().size()>0){ // for(Visits model:visits.getWithUserList()){ // model.setBirthday(Constants.getBirthdyByCardNo(model.getIdcardNo())); // model.setStarttime(visits.getStarttime()); // model.setEndtime(visits.getEndtime()); // //校验随访人员填报数据合法性 // isValidWithVisitParam(model,addList,editList); // model.setCreateDate(visits.getCreateDate()); // Member visitsMember = getMemberListParam(model.getIdcardNo(),model,addList,editList); // model.setMemberId(visitsMember.getId()); // } // } return m; } private Member getMemberListParam(String cardno, Visits visits, List<Member> addList, List<Member> editList) { private Member getMemberListParam(String phone,String cardno, Visits visits, List<Member> addList, List<Member> editList) { if(StringUtils.isNotBlank(visits.getCarNos()) &&Objects.isNull(Constants.getVehiclePlateNo(visits.getCarNos())) ){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，车牌号【"+visits.getCarNos()+"】不合法，请核实后重试~"); } if(Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&cardno.length()!=18 //&&!IdcardUtil.isValidCard(cardno) ){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，身份证【"+cardno+"】号码有误，请核实后重试！"); } // if(StringUtils.isNotBlank(cardno)&&Constants.equalsInteger(Constants.ZERO, visits.getIdcardType())&&cardno.length()!=18 // //&&!IdcardUtil.isValidCard(cardno) // ){ // throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "对不起，身份证【"+cardno+"】号码有误，请核实后重试！"); // } Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda() .eq(Member::getType,Constants.memberType.visitor) .eq(Member::getIdcardType,visits.getIdcardType()) .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, cardno)).last("limit 1" ) .eq(Member::getPhone,phone) // .eq(Member::getIdcardNo,DESUtil.encrypt(Constants.EDS_PWD, cardno)) .last("limit 1" ) ); if(member == null){ member = new Member(); @@ -935,12 +938,14 @@ member.setCreateDate(visits.getCreateDate()); member.setIsdeleted(Constants.ZERO); member.setIdcardNo(visits.getIdcardNo()); member.setBirthday(Constants.getBirthdyByCardNo(cardno)); member.setIdcardDecode(visits.getIdcardDecode()); if(StringUtils.isNotBlank(cardno)){ member.setBirthday(Constants.getBirthdyByCardNo(cardno)); member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//身份证号加密 member.setIdcardDecode(Constants.getTuominStr(cardno));//脱敏手机号 member.setFaceImg(visits.getFaceImg()); member.setSex(Constants.getSexByCardNo(cardno)); } member.setFaceImg(visits.getFaceImg()); member.setImgurl(StringUtils.isNotBlank(visits.getImgurl())?visits.getImgurl():null); member.setIdcardType(visits.getIdcardType()); member.setName(visits.getName()); @@ -948,7 +953,6 @@ member.setOpenid(visits.getOpenid()); member.setType(Constants.memberType.visitor); member.setStatus(Constants.ZERO); member.setSex(Constants.getSexByCardNo(cardno)); member.setHkStatus(Constants.ZERO); member.setErpStatus(Constants.ZERO); member.setVisitCompanyName(visits.getCompanyName()); @@ -958,7 +962,7 @@ }else{ if(!Constants.equalsInteger(Constants.ZERO,member.getStatus() )){ //如果用户状态异常，则提示 throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，【"+member.getName()+"】身份证号【"+cardno+"】在黑名单内，无法申请进入园区"); throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，【"+member.getName()+"】在黑名单内，无法申请进入园区"); } //核查预约用户是否存在未签离的预约记录 // isExsitNoOutVisisRecord(member); @@ -966,13 +970,15 @@ member.setImgurl(StringUtils.isNotBlank(visits.getImgurl())?visits.getImgurl():null); member.setEditDate(visits.getCreateDate()); member.setIsdeleted(Constants.ZERO); member.setSex(Constants.getSexByCardNo(cardno)); if(StringUtils.isNotBlank(cardno)){ member.setBirthday(Constants.getBirthdyByCardNo(cardno)); member.setIdcardNo(DESUtil.encrypt(Constants.EDS_PWD, cardno));//身份证号加密 member.setIdcardDecode(Constants.getTuominStr(cardno));//脱敏身份证号 member.setIdcardDecode(Constants.getTuominStr(cardno));//脱敏手机号 member.setSex(Constants.getSexByCardNo(cardno)); } member.setName(visits.getName()); member.setPhone(visits.getPhone()); member.setOpenid(visits.getOpenid()); member.setSex(Constants.getSexByCardNo(cardno)); member.setHkStatus(Constants.ZERO); member.setErpStatus(Constants.ZERO); member.setVisitCompanyName(visits.getCompanyName()); @@ -986,16 +992,14 @@ ,Constants.VisitStatus.xfFail ,Constants.VisitStatus.signout ,Constants.VisitStatus.invalid) .eq(Visits::getIdcardDecode, Constants.getTuominStr(cardno)) .and(ms -> ms.eq(Visits::getPhone, visits.getPhone()) .or().eq(Visits::getIdcardDecode, Constants.getTuominStr(cardno))) .and(ms -> ms.eq(Visits::getPhone, visits.getPhone())) .and(ms -> ms.apply(" visits.STARTTIME <= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.ENDTIME >= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' ") .or().apply(" visits.STARTTIME <= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.ENDTIME >= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' ") .or().apply(" visits.STARTTIME >= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.STARTTIME <= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' ") .or().apply(" visits.ENDTIME >= '" + DateUtil.DateToStr(visits.getStarttime(),"yyyy-MM-dd HH:mm:ss") + "' and visits.ENDTIME <= '" + DateUtil.DateToStr(visits.getEndtime(),"yyyy-MM-dd HH:mm:ss") + "' ") ) ) > Constants.ZERO) { throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，手机号【"+member.getPhone()+"】或身份证【"+ member.getIdcardDecode() +"】存在预约时间冲突，无法申请哦！"); throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "对不起，手机号【"+member.getPhone()+"】存在预约时间冲突，无法申请哦！"); } return member; } server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -658,6 +658,7 @@ MinitorDataSearchRequest param = new MinitorDataSearchRequest(); param.setResourceTypeCodes(new String[]{}); param.setRegionIndexCode("root000000"); //60-液位 61-水压 param.setResourceTypeCodes("60,61".split(",")); param.setIncludeDown("1"); param.setUserId("admin"); @@ -681,6 +682,8 @@ if(model.getValues()!=null){ List<MonitorDataInfoVO> dataList = new ArrayList<>(); for(MonitorDataValResponse v : model.getValues()){ //液压固定值：254001 //水压固定值：253958 if(Constants.equalsInteger(model.getType(),60)){ if(v.getMonitorTypeCode().equals("254001")){ MonitorDataInfoVO vm = new MonitorDataInfoVO();
