From 568e38a95cb6fb20fe16b53d17f610aefc6f744f Mon Sep 17 00:00:00 2001 From: rk <94314517@qq.com> Date: 星期四, 09 十月 2025 18:29:29 +0800 Subject: [PATCH] 钉钉通知 与钥匙柜开发 --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 237 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 224 insertions(+), 13 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java index 6cafaea..bc8fae7 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java @@ -7,8 +7,12 @@ 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.UserActionMapper; +import com.doumee.dao.business.dao.*; +import com.doumee.dao.business.vo.GeneralDataVO; +import com.doumee.dao.business.vo.HiddenDangerCompanyVO; +import com.doumee.dao.business.vo.HiddenDangerDataVO; import com.doumee.service.business.third.model.LoginUserInfo; import com.doumee.service.business.third.model.PageData; import com.doumee.service.business.third.model.PageWrap; @@ -19,9 +23,6 @@ import com.doumee.core.wx.wxPlat.WxPlatConstants; import com.doumee.core.wx.wxPlat.WxPlatNotice; import com.doumee.dao.business.*; -import com.doumee.dao.business.dao.MemberMapper; -import com.doumee.dao.business.dao.SmsConfigMapper; -import com.doumee.dao.business.dao.SmsEmailMapper; import com.doumee.dao.business.model.*; import com.doumee.dao.business.model.Member; import com.doumee.dao.system.MultifileMapper; @@ -41,7 +42,9 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; /** * 闅愭偅淇℃伅琛⊿ervice瀹炵幇 @@ -74,6 +77,9 @@ @Autowired private UserActionMapper userActionMapper; + @Autowired + private CompanyMapper companyMapper; + @Autowired private NoticesJoinMapper noticesJoinMapper; @@ -91,6 +97,12 @@ @Autowired private WxNoticeConfigMapper wxNoticeConfigMapper; + @Autowired + private ApproveMapper approveMapper; + + @Autowired + private DingTalk dingTalk; + @Override public Integer create(HiddenDanger hiddenDanger) { @@ -100,6 +112,7 @@ || Objects.isNull(hiddenDanger.getCateId()) || Objects.isNull(hiddenDanger.getApplyCheckUserId()) || Objects.isNull(hiddenDanger.getCheckUserId()) + || Objects.isNull(hiddenDanger.getCheckTypeId()) || Objects.isNull(hiddenDanger.getSubmitTime()) || StringUtils.isBlank(hiddenDanger.getContent()) ){ @@ -113,6 +126,10 @@ hiddenDanger.setIsdeleted(Constants.ZERO); hiddenDanger.setCreateDate(new Date()); hiddenDanger.setEditDate(new Date()); + HiddenDangerParam hiddenDangerCheckParam = hiddenDangerParamMapper.selectById(hiddenDanger.getCheckTypeId()); + if(Objects.isNull(hiddenDangerCheckParam)){ + throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅妫�鏌ョ被鍨�"); + } HiddenDangerParam hiddenDangerParam = hiddenDangerParamMapper.selectById(hiddenDanger.getAreaId()); if(Objects.isNull(hiddenDangerParam)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅鍖哄煙"); @@ -200,13 +217,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() ); } @@ -235,6 +251,13 @@ 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(), + dingTalk.getHiddenDangerNoticeMsg(hiddenDanger)); + } + return hiddenDanger.getId(); } @@ -286,6 +309,12 @@ params[2]=model.getAreaName()+"-銆�"+model.getContent()+"銆�"; //璁板綍鍒犻櫎鏃ュ織 UserActionServiceImpl.saveUserActionBiz(user,id,Constants.UserActionType.HIDEN_DANGER_DEL,userActionMapper,date,params,JSONObject.toJSONString(model)); + + //鏍囪浠诲姟璁板綍 + VisitsServiceImpl.dealCancelNoticesData(noticesJoinMapper,approveMapper,"绯荤粺鍒犻櫎",model.getId(), + null, + Constants.noticesObjectType.dangerDeal + ); } @Override @@ -327,12 +356,14 @@ .select("t2.name",HiddenDanger::getCheckorName) .select("t2.phone",HiddenDanger::getCheckorPhone) .select("t5.company_name_path",HiddenDanger::getDutyCompanyName) - .select("t4.company_name_path",HiddenDanger::getCompanyName); + .select("t4.company_name_path",HiddenDanger::getCompanyName) + .select("t6.name", HiddenDanger::getCheckTypeName); queryWrapper.leftJoin(Member.class,Member::getId,HiddenDanger::getMemberId) .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId) .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId) .leftJoin("company t4 on t1.company_id=t4.id") - .leftJoin("company t5 on t2.company_id=t5.id"); + .leftJoin("company t5 on t2.company_id=t5.id") + .leftJoin("hidden_danger_param t6 on t.check_type_id=t6.id"); queryWrapper .eq(HiddenDanger::getId, id) .eq(HiddenDanger::getIsdeleted, Constants.ZERO) @@ -406,6 +437,7 @@ @Override public List<HiddenDanger> findList(HiddenDanger hiddenDanger) { + hiddenDanger.setIsdeleted(Constants.ZERO); QueryWrapper<HiddenDanger> wrapper = new QueryWrapper<>(hiddenDanger); return hiddenDangerMapper.selectList(wrapper); } @@ -419,6 +451,7 @@ queryWrapper.selectAll(HiddenDanger.class) .selectAs(HiddenDangerParam::getName,HiddenDanger::getCategoryName) .select("t1.name", HiddenDanger::getMemberName) + .select("t6.name", HiddenDanger::getCheckTypeName) .select("t1.phone",HiddenDanger::getMemberPhone) .select("t2.name",HiddenDanger::getCheckorName) .select("t2.phone",HiddenDanger::getCheckorPhone) @@ -428,6 +461,7 @@ .leftJoin(Member.class,Member::getId,HiddenDanger::getCheckUserId) .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getCateId) .leftJoin("company t4 on t1.company_id=t4.id") + .leftJoin("hidden_danger_param t6 on t.check_type_id=t6.id") .leftJoin("company t5 on t2.company_id=t5.id"); //鏁版嵁鏉冮檺寮�濮�--------------------start---------------- @@ -438,7 +472,7 @@ //鍙兘鐪嬭嚜宸� queryWrapper.and(w->{ w.eq(HiddenDanger::getCreator,userInfo.getId()).or(). - eq(HiddenDanger::getCheckUserId,userInfo.getId()); + eq(HiddenDanger::getCheckUserId,userInfo.getMemberId()); }); }else{ queryWrapper.in("t1.company_id" ,userInfo.getCompanyIdList()); @@ -469,10 +503,11 @@ .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()), Empower::getCreateDate,pageWrap.getModel().getQueryStartTime()) - .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()),Empower::getCreateDate,pageWrap.getModel().getQueryEndTime()) + .ge(Objects.nonNull(pageWrap.getModel().getQueryStartTime()), HiddenDanger::getSubmitTime,pageWrap.getModel().getQueryStartTime()) + .le(Objects.nonNull(pageWrap.getModel().getQueryEndTime()),HiddenDanger::getSubmitTime,pageWrap.getModel().getQueryEndTime()) .orderByDesc(Visits::getCreateDate) ; for(PageWrap.SortData sortData: pageWrap.getSorts()) { @@ -487,6 +522,7 @@ @Override public long count(HiddenDanger hiddenDanger) { + hiddenDanger.setIsdeleted(Constants.ZERO); QueryWrapper<HiddenDanger> wrapper = new QueryWrapper<>(hiddenDanger); return hiddenDangerMapper.selectCount(wrapper); } @@ -548,7 +584,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() ); } } @@ -756,7 +792,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() ); } @@ -769,7 +805,182 @@ 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(), + dingTalk.getHiddenDangerNoticeMsg(hiddenDanger)); + } + } + /** + * 闅忔墜鎷嶇粺璁℃暟鎹� + */ + @Override + public HiddenDangerDataVO hiddenDangerData(HiddenDanger hiddenDanger){ + HiddenDangerDataVO hiddenDangerDataVO = new HiddenDangerDataVO(); + List<HiddenDanger> hiddenDangerAllList = hiddenDangerMapper.selectJoinList(HiddenDanger.class, + new MPJLambdaWrapper<HiddenDanger>() + .selectAll(HiddenDanger.class) + .selectAs(HiddenDangerParam::getCompanyId, HiddenDanger::getAreaCompanyId) + .leftJoin(HiddenDangerParam.class,HiddenDangerParam::getId,HiddenDanger::getAreaId) //闅愭偅鍖哄煙 + .eq(HiddenDanger::getIsdeleted,Constants.ZERO) + .eq(Objects.nonNull(hiddenDanger.getStatus()),HiddenDanger::getStatus,hiddenDanger.getStatus()) +// .apply(" ( DATE_FORMAT(t.CREATE_DATE, '%Y') = DATE_FORMAT(now(), '%Y') ) ") +// .ge(Objects.nonNull(hiddenDanger.getQueryStartTime()), HiddenDanger::getCreateDate,hiddenDanger.getQueryStartTime()) +// .le(Objects.nonNull(hiddenDanger.getQueryEndTime()),HiddenDanger::getCreateDate,hiddenDanger.getQueryEndTime()) + ); + List<GeneralDataVO> yearDataList = new ArrayList<>(); + 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(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); + } + hiddenDangerDataVO.setYearList(yearDataList); + + + + hiddenDangerDataVO.setTotal(hiddenDangerAllList.size()); + hiddenDangerDataVO.setWaitDeal(hiddenDangerAllList.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ZERO)).collect(Collectors.toList()).size()); + hiddenDangerDataVO.setBack(hiddenDangerAllList.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.TWO)).collect(Collectors.toList()).size()); + hiddenDangerDataVO.setDealFinish(hiddenDangerAllList.stream().filter(i->Constants.equalsInteger(i.getStatus(),Constants.ONE)).collect(Collectors.toList()).size()); + 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().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<>(); + Set<Integer> cateSetList = new HashSet<>(cateList); + List<HiddenDangerParam> hiddenDangerParamList = hiddenDangerParamMapper.selectList(new QueryWrapper<HiddenDangerParam>() + .lambda().eq(HiddenDangerParam::getIsdeleted,Constants.ZERO).eq(HiddenDangerParam::getType,Constants.ONE)); + for (Integer cateId:cateSetList) { + if(Objects.isNull(cateId)){ + continue; + } + Optional<HiddenDangerParam> optionalHiddenDanger = hiddenDangerParamList.stream().filter(i->Constants.equalsInteger(i.getId(),cateId)).findAny(); + if(optionalHiddenDanger.isPresent()){ + GeneralDataVO generalDataVO = new GeneralDataVO(); + HiddenDangerParam hiddenDangerParam = optionalHiddenDanger.get(); + 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( + Constants.equalsInteger(total,Constants.ZERO)? + BigDecimal.ZERO:new BigDecimal(total.toString()) + .divide(new BigDecimal(hiddenDangerDataVO.getTotal().toString()),2,BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")) + ); + cateGeneralDataList.add(generalDataVO); + } + } + 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); +// } +// if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(hiddenDangerDataVO.getDepartmentList())){ +// List<GeneralDataVO> topList = hiddenDangerDataVO.getDepartmentList(); +// Collections.sort(topList, new Comparator<GeneralDataVO>() { +// @Override +// public int compare(GeneralDataVO o1, GeneralDataVO o2) { +// // 杩斿洖鍊间负int绫诲瀷锛屽ぇ浜�0琛ㄧず姝e簭锛屽皬浜�0琛ㄧず閫嗗簭 +// return o2.getTotal() - o1.getTotal(); +// } +// }); +// hiddenDangerDataVO.setDepartmentSortList(topList); +// } + + } + + + 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::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("t1.name , t2.name") + .orderByDesc(" count(1) ") + ); + if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(mapList)){ + List<GeneralDataVO> topList = new ArrayList<>(); + for (Map<String,Object> map:mapList) { + GeneralDataVO generalDataVO = new GeneralDataVO(); + generalDataVO.setTotal(Integer.valueOf(map.get("total").toString())); + generalDataVO.setName(map.get("companyName").toString()); + generalDataVO.setCategoryName(map.get("cateName").toString()); + topList.add(generalDataVO); + } + hiddenDangerDataVO.setDepartmentSortList(topList); + } + + + + return hiddenDangerDataVO; + } + + + + + } -- Gitblit v1.9.3