Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

4 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.dingTalk.DingTalk;
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.dao.*;
import com.doumee.dao.business.vo.GeneralDataVO;
@@ -98,6 +99,12 @@

    @Autowired
    private ApproveMapper approveMapper;

    @Autowired
    private DingTalk dingTalk;
    
    @Autowired
    private DdNoticeConfigMapper ddNoticeConfigMapper;


    @Override
@@ -213,13 +220,12 @@
        notices.setInfo("待"+member.getName()+"处理");
        noticesJoinMapper.insert(notices);


        if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getPhone())){
            //发送短信通知
            SmsEmailServiceImpl.sendHiddenDangerSms(systemDictDataBiz,
                    emayService,smsEmailMapper,smsConfigMapper,hiddenDangerMapper,hiddenDanger.getId(),
                    SmsConstants.hiddenDangerContent.hiddenDangerDealUser,
                    Arrays.asList(member.getPhone().split(","))
                    Arrays.asList(member.getPhone().split(",")),hiddenDangerCate.getName()
            );
        }

@@ -248,6 +254,16 @@
                    systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                    Arrays.asList(checkUser.getOpenid().split(",")));
        }

//        if(StringUtils.isNotBlank(member.getDdId())){
//            dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
//                    member.getDdId(),
//                    ddNoticeConfigMapper.selectCount(new QueryWrapper<DdNoticeConfig>().lambda()
//                            .eq(DdNoticeConfig::getIsdeleted,Constants.ZERO).eq(DdNoticeConfig::getStatus,Constants.ZERO)
//                            .eq(DdNoticeConfig::getObjType,14))>Constants.ZERO?
//                    dingTalk.getHiddenDangerNoticeMsg(hiddenDanger):null);
//        }

        return hiddenDanger.getId();
    }

@@ -493,6 +509,7 @@
                .like(pageWrap.getModel().getCompanyName() != null,"t4.company_name_path",pageWrap.getModel().getCompanyName())
                .like(pageWrap.getModel().getDutyCompanyName() != null,"t5.company_name_path",pageWrap.getModel().getDutyCompanyName())

                .eq(pageWrap.getModel().getCheckTypeId() != null, HiddenDanger::getCheckTypeId, pageWrap.getModel().getCheckTypeId())
                .and(StringUtils.isNotBlank(pageWrap.getModel().getMemberName()), ms->ms.like(Member::getName,pageWrap.getModel().getMemberName())
                        .or().like(Member::getPhone,pageWrap.getModel().getMemberName()))
                .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), HiddenDanger::getSubmitTime,pageWrap.getModel().getQueryStartTime())
@@ -573,7 +590,7 @@
                SmsEmailServiceImpl.sendHiddenDangerSms(systemDictDataBiz,
                        emayService,smsEmailMapper,smsConfigMapper,hiddenDangerMapper,hiddenDanger.getId(),
                        SmsConstants.hiddenDangerContent.hiddenDangerDealOver,
                        Arrays.asList(memberUser.getMobile().split(","))
                        Arrays.asList(memberUser.getMobile().split(",")),hiddenDangerCate.getName()
                );
            }
        }
@@ -781,7 +798,7 @@
            SmsEmailServiceImpl.sendHiddenDangerSms(systemDictDataBiz,
                    emayService,smsEmailMapper,smsConfigMapper,hiddenDangerMapper,hiddenDanger.getId(),
                    SmsConstants.hiddenDangerContent.hiddenDangerDealUser,
                    Arrays.asList(checkUser.getMobile().split(","))
                    Arrays.asList(checkUser.getMobile().split(",")),hiddenDangerCate.getName()
            );
        }

@@ -794,6 +811,16 @@
                    systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                    Arrays.asList(checkUser.getOpenid().split(",")));
        }

//        if(StringUtils.isNotBlank(member.getDdId())){
//            dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
//                    member.getDdId(),
//                    ddNoticeConfigMapper.selectCount(new QueryWrapper<DdNoticeConfig>().lambda()
//                            .eq(DdNoticeConfig::getIsdeleted,Constants.ZERO).eq(DdNoticeConfig::getStatus,Constants.ZERO)
//                            .eq(DdNoticeConfig::getObjType,14))>Constants.ZERO?
//                            dingTalk.getHiddenDangerNoticeMsg(hiddenDanger):null);
//        }

    }


@@ -869,35 +896,36 @@
                }
                hiddenDangerDataVO.setCateList(cateGeneralDataList);
            }

            //全部隐患区域部门数据
            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);
                List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>()
                        .lambda().eq(Company::getIsdeleted,Constants.ZERO));
                for (HiddenDangerCompanyVO hiddenDangerCompanyVO:companyIdSetList) {
                    if(Objects.isNull(hiddenDangerCompanyVO)
                    || Objects.isNull(hiddenDangerCompanyVO.getId())
                    || StringUtils.isBlank(hiddenDangerCompanyVO.getCategoryName())){
                        continue;
                    }
                    Optional<Company> optionalCompany = companyList.stream().filter(i->Constants.equalsInteger(i.getId(),hiddenDangerCompanyVO.getId())).findAny();
                    if(optionalCompany.isPresent()){
                        GeneralDataVO generalDataVO = new GeneralDataVO();
                        Company company = optionalCompany.get();
                        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());
                        companyGeneralDataList.add(generalDataVO);
                    }
                }
                hiddenDangerDataVO.setDepartmentList(companyGeneralDataList);
            }
//            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);
//                List<Company> companyList = companyMapper.selectList(new QueryWrapper<Company>()
//                        .lambda().eq(Company::getIsdeleted,Constants.ZERO));
//                for (HiddenDangerCompanyVO hiddenDangerCompanyVO:companyIdSetList) {
//                    if(Objects.isNull(hiddenDangerCompanyVO)
//                    || Objects.isNull(hiddenDangerCompanyVO.getId())
//                    || StringUtils.isBlank(hiddenDangerCompanyVO.getCategoryName())){
//                        continue;
//                    }
//                    Optional<Company> optionalCompany = companyList.stream().filter(i->Constants.equalsInteger(i.getId(),hiddenDangerCompanyVO.getId())).findAny();
//                    if(optionalCompany.isPresent()){
//                        GeneralDataVO generalDataVO = new GeneralDataVO();
//                        Company company = optionalCompany.get();
//                        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());
//                        companyGeneralDataList.add(generalDataVO);
//                    }
//                }
//                hiddenDangerDataVO.setDepartmentList(companyGeneralDataList);
//            }
//            if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(hiddenDangerDataVO.getDepartmentList())){
//                List<GeneralDataVO> topList = hiddenDangerDataVO.getDepartmentList();
//                    Collections.sort(topList, new Comparator<GeneralDataVO>() {
@@ -913,9 +941,30 @@
        }


        List<Map<String,Object>> companyMapList = hiddenDangerMapper.selectJoinMaps(new MPJLambdaWrapper<HiddenDanger>()
                .select(" t2.name as companyName , count(1) total ")
                .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getAreaId)
                .leftJoin(Company.class,Company::getId,HiddenDangerParam::getCompanyId)
                .eq(HiddenDanger::getIsdeleted,Constants.ZERO)
                .apply(" DATE_FORMAT(t.CREATE_DATE, '%Y%M') = DATE_FORMAT(now(), '%Y%M') ")
                .groupBy("  t2.name")
        );
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(companyMapList)){
            List<GeneralDataVO> list = new ArrayList<>();
            for (Map<String,Object> map:companyMapList) {
                GeneralDataVO generalDataVO = new GeneralDataVO();
                generalDataVO.setTotal(Integer.valueOf(map.get("total").toString()));
                generalDataVO.setName(map.get("companyName").toString());
                list.add(generalDataVO);
            }
            hiddenDangerDataVO.setDepartmentList(list);
        }



        List<Map<String,Object>> mapList = hiddenDangerMapper.selectJoinMaps(new MPJLambdaWrapper<HiddenDanger>()
                        .select(" t1.name as cateName,t2.name as companyName , count(1) total ")
                .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId)
                .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getAreaId)
                .leftJoin(Company.class,Company::getId,HiddenDangerParam::getCompanyId)
                        .eq(HiddenDanger::getIsdeleted,Constants.ZERO)
                        .apply(" DATE_FORMAT(t.CREATE_DATE, '%Y%M') = DATE_FORMAT(now(), '%Y%M') ")