diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 25f53f5c9..6d0d6e35f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2363,7 +2363,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userIdList, String content, String contentInfo) { + public SysAnnouncement getSysAnnouncement(List userIdList, String content, String contentInfo) { SysAnnouncement sysAnnouncement = new SysAnnouncement(); sysAnnouncement.setDelFlag("0"); sysAnnouncement.setSendStatus("0"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyReadEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyReadEOService.java index 9937f66b0..0cfb5b9bc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyReadEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyReadEOService.java @@ -1,7 +1,8 @@ package com.jero.modules.dummy.service; -import com.jero.modules.dummy.entity.DummyReadEO; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.dummy.entity.DummyReadEO; + import java.util.List; /** @@ -18,7 +19,7 @@ public interface IDummyReadEOService extends IService { * @param dummyReadEO * @return */ - void add(DummyReadEO dummyReadEO); + void add(DummyReadEO dummyReadEO); /** * 更新 @@ -26,7 +27,7 @@ public interface IDummyReadEOService extends IService { * @param dummyReadEO * @return */ - void editById(DummyReadEO dummyReadEO); + void editById(DummyReadEO dummyReadEO); /** * 通过id删除 @@ -34,7 +35,7 @@ public interface IDummyReadEOService extends IService { * @param id * @return */ - void deleteById(String id); + void deleteById(String id); /** * 批量删除 @@ -42,7 +43,7 @@ public interface IDummyReadEOService extends IService { * @param ids * @return */ - void deleteByIds(List ids); + void deleteByIds(List ids); /** * 通过id查询 @@ -50,12 +51,16 @@ public interface IDummyReadEOService extends IService { * @param id * @return */ - DummyReadEO queryById(String id); + DummyReadEO queryById(String id); - /** + /** * 列表查询 * * @return */ - List queryList(); + List queryList(); + + + /**查询订阅虚拟清单的用户*/ + List queryReadUserInfo(String dummyInventoryBaseId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index c2dce9736..c74e3b024 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -6,7 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; +import com.jero.modules.domain.service.DomainUserRelService; import com.jero.modules.dummy.entity.DummyContentChangeEO; import com.jero.modules.dummy.entity.DummyInventoryBaseEO; import com.jero.modules.dummy.entity.DummyInventoryInfoEO; @@ -19,16 +22,23 @@ import com.jero.modules.dummy.service.IDummyInventoryBaseEOService; import com.jero.modules.dummy.service.IDummyInventoryInfoEOService; import com.jero.modules.dummy.service.IDummyReadEOService; import com.jero.modules.dummy.util.ListDiff; +import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.message.websocket.WebSocket; +import com.jero.modules.system.entity.SysAnnouncement; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysAnnouncementService; import com.jero.modules.system.service.ISysUserService; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import javax.annotation.Resource; +import java.io.IOException; +import java.util.*; import java.util.stream.Collectors; /** @@ -50,8 +60,18 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl发消息,删除dummy_content_change中上一次存入的数据,将本次数据存入 //没有变化-->不发消息,数据不处理 @@ -257,7 +277,6 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl infoDiff = null; + List> infoDiffList=null; + String addSerialNumber=null; + String deleteSerialNumber=null; + List addSerialNumberList =null; + List deleteSerialNumberList =null; + //对比,获取值不同的字段 + for(DummyContentChangeEO dummyContentChangeEO : dummyContentChangeEOInfoList) { String infoCJ = dummyContentChangeEO.getContentJson(); - List infoCJList = JSONArray.parseArray(infoCJ,DummyInventoryInfoEO.class);//json转list - //对比,获取值不同的字段 - Map infoDiff = null; - if(infoCJList.size()==dummyInventoryInfoEOList.size()) {//现在的详情数据数量和数据库里的一样 - for (int i = 0; i < infoCJList.size(); i++) { - DummyInventoryInfoEO h = infoCJList.get(i); - DummyInventoryInfoEO g = dummyInventoryInfoEOList.get(i); - infoDiff = ListDiff.compareObject(infoCJList.get(i), dummyInventoryInfoEOList.get(i)); - System.out.println(infoDiff);//不同的字段原,现 - } - }else{//现在的详情数据数量和数据库里的不一样<--详情的id不一样 - String diffId=null; - StringBuilder diffIdBuilder=new StringBuilder(); - for(DummyInventoryInfoEO dummyInventoryInfoEO : infoCJList) { - diffId = dummyInventoryInfoEOList.stream().filter(e -> !dummyInventoryInfoEO.equals(e.getId())) - .map(f->f.getId()).collect(Collectors.joining(",")); - diffIdBuilder.append(diffId).append(","); - - } - diffIdBuilder.substring(0,diffIdBuilder.toString().length()-1); + List infoCJList = JSONArray.parseArray(infoCJ, DummyInventoryInfoEO.class);//json转list + //获取数据库和传入同时存在的编号 + List infoCJBaseSerialNumberList = infoCJList.stream().map(e -> e.getSerialNumber()).collect(Collectors.toList()); + List dummyInventoryInfoEOSerialNumberList = dummyInventoryInfoEOList.stream().map(e -> e.getSerialNumber()).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(dummyInventoryInfoEOSerialNumberList)) { + dummyInventoryInfoEOSerialNumberList.removeIf(s -> !infoCJBaseSerialNumberList.contains(s)); } - System.out.println(infoCJList); + System.out.println(dummyInventoryInfoEOSerialNumberList); + + //4.2.1处理原有详情数据 + for (int i = 0; i < infoCJList.size(); i++) { + infoDiff = ListDiff.compareObject(infoCJList.get(i), dummyInventoryInfoEOList.get(i)); + infoDiffList.add(infoDiff); + } + + //4.2.2处理新增数据 + List infoCJSerialNumberList = infoCJList.stream().map(e -> e.getSerialNumber()).collect(Collectors.toList()); + for (DummyInventoryInfoEO dummyInventoryInfoEO : infoCJList) { + addSerialNumberList = dummyInventoryInfoEOList.stream().filter(e -> !dummyInventoryInfoEO.equals(e.getId())) + .map(f -> f.getSerialNumber()).collect(Collectors.toList()); + } + //去掉发布时传入的和数据库同时有的数据 + for(String midSerialNumber:infoCJSerialNumberList){ + addSerialNumberList.remove(midSerialNumber); + } + addSerialNumber =StringUtils.join(addSerialNumberList,","); -// JsonDiff.compareJson(infoCJjson,info,null); - + //4.2.3处理删除的数据 + for (DummyInventoryInfoEO dummyInventoryInfoEO : infoCJList) { + deleteSerialNumberList = dummyInventoryInfoEOList.stream().filter(e -> !dummyInventoryInfoEO.equals(e.getId())) + .map(f -> f.getSerialNumber()).collect(Collectors.toList()); + } + for(String midSerialNumber:deleteSerialNumberList){ + infoCJSerialNumberList.remove(midSerialNumber); + } + deleteSerialNumber=StringUtils.join(infoCJSerialNumberList,","); } + //向订阅该领域管理的人发消息和飞书 + sendMsg(baseDiff,dummyContentChangeEOBaseList.get(0).getConnectId(),infoDiff,addSerialNumber,deleteSerialNumber); - //6.数据对比完成后.删除之前保存的dummy_inventory_info中的数据,重新保存最新的数据 + //5.数据对比完成后.删除之前保存的dummy_inventory_info中的数据,重新保存最新的数据 } @@ -312,4 +351,167 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl baseDiff, String idTemp,Map infoDiff,String addSerialNumber,String deleteSerialNumber) { + + String baseName=queryById(idTemp).getName();//基础表id + List userNameList = dummyReadEOService.queryReadUserInfo(idTemp); + List userIdList=sysUserService.queryUserIdListByNameList(userNameList).stream().map(e->e.getId()).collect(Collectors.toList()); + //给发送消息的用户 + if(userIdList.size() == 0){ + return; + } + List sysUsers = sysUserService.listByIds(userIdList); + List thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList()); + if (userIdList.size() != 0) { + String href = backUrl + "/dummy/dummyInventoryBaseEO/issue?id=" + idTemp; + + //The xx virtual list you subscribed to has been updated as follows:1 . xxxxx 2.xxxx + String content ="The " + baseName + " virtual list you subscribed to has been updated."; + String contentInfo ="The " + baseName + " virtual list you subscribed to has been updated as follows : " + "\r\n"; + setContentInfo(contentInfo,baseDiff,infoDiff,addSerialNumber,deleteSerialNumber); + + //封装消息的实体类 + SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo); + sysAnnouncementService.saveAnnouncement(sysAnnouncement); + bussDocumentLibraryEOService.sendWebsocket(idTemp, idTemp); + //飞书 + try { + iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), content, MessageTypeEnum.PUSH.getName(), href); + } catch (IOException e) { + log.error("飞书消息推送失败"); + } + } + } + + public void setContentInfo(String contentInfo,Map baseDiff,Map infoDiff,String addSerialNumber,String deleteSerialNumber) { + int row = 1; + //设置虚拟清单列表的修改消息 + if(MapUtils.isNotEmpty(baseDiff)) { + //虚拟清单名称 + if (StringUtils.isNotBlank(baseDiff.get("name"))) { + List nameList = Arrays.asList(baseDiff.get("name").split(",")); + String baseDiffOldName = nameList.get(0); + String baseDiffNewName = nameList.get(1); + contentInfo += row + ". The name of virtual list has been changed from " + baseDiffOldName + " to " + baseDiffNewName + ".\r\n"; + row++; + } + //适用说明 + if (StringUtils.isNotBlank(baseDiff.get("useExplain"))) { + List useExplainList = Arrays.asList(baseDiff.get("useExplain").split(",")); + String baseDiffOldUseExplain = useExplainList.get(0); + String baseDiffNewUseExplain = useExplainList.get(1); + contentInfo += row + ". The applicable instructions of virtual list has been changed from " + baseDiffOldUseExplain + " to " + baseDiffNewUseExplain + ".\r\n"; + row++; + } + } + + //设置维护清单的新增消息 + if (StringUtils.isNotBlank(addSerialNumber)) { + contentInfo += row + ". " + "This virtual list has been added serial number : " + addSerialNumber + ".\r\n"; + row++; + } + + //设置维护清单的删除消息 + if (StringUtils.isNotBlank(deleteSerialNumber)) { + contentInfo += row + ". " + "This virtual list has been deleted serial number : " + deleteSerialNumber + ".\r\n"; + row++; + } + + //设置维护清单的修改消息 + if(MapUtils.isNotEmpty(infoDiff)) { + //技术领域 + if (StringUtils.isNotBlank(infoDiff.get("technologyTerritory"))) { + List technologyTerritoryList = Arrays.asList(infoDiff.get("technologyTerritory").split(",")); + String infoDiffOldTechnologyTerritory = technologyTerritoryList.get(0); + String infoDiffNewTechnologyTerritory = technologyTerritoryList.get(1); + contentInfo += row + ". " + infoDiffOldTechnologyTerritory + " has been changed to" + infoDiffNewTechnologyTerritory + ".\r\n"; + row++; + } + //新车型实施日期 + if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1"))) { + List xin1Che1Xing2Shi2Shi1Ri4Qi1List = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1").split(",")); + String infoDiffOldXin1Che1Xing2Shi2Shi1Ri4Qi1 = xin1Che1Xing2Shi2Shi1Ri4Qi1List.get(0); + String infoDiffNewXin1Che1Xing2Shi2Shi1Ri4Qi1 = xin1Che1Xing2Shi2Shi1Ri4Qi1List.get(1); + contentInfo += row + ". " + infoDiffOldXin1Che1Xing2Shi2Shi1Ri4Qi1 + " has been changed to" + infoDiffNewXin1Che1Xing2Shi2Shi1Ri4Qi1 + ".\r\n"; + row++; + } + //在产车实施日期 + if (StringUtils.isNotBlank(infoDiff.get("implementTime"))) { + List implementTimeList = Arrays.asList(infoDiff.get("implementTime").split(",")); + String infoDiffOldImplementTime = implementTimeList.get(0); + String infoDiffNewImplementTime = implementTimeList.get(1); + contentInfo += row + ". " + infoDiffOldImplementTime + " has been changed to" + infoDiffNewImplementTime + ".\r\n"; + row++; + } + //WVTA ID + if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) { + List wvtaIdList = Arrays.asList(infoDiff.get("wvtaId").split(",")); + String infoDiffOldWvtaId = wvtaIdList.get(0); + String infoDiffNewWvtaId = wvtaIdList.get(1); + contentInfo += row + ". " + infoDiffOldWvtaId + " has been changed to" + infoDiffNewWvtaId + ".\r\n"; + row++; + } + //子标题 + if (StringUtils.isNotBlank(infoDiff.get("subtitle"))) { + List subtitleList = Arrays.asList(infoDiff.get("subtitle").split(",")); + String infoDiffOldSubtitle = subtitleList.get(0); + String infoDiffNewSubtitle = subtitleList.get(1); + contentInfo += row + ". " + infoDiffOldSubtitle + " has been changed to" + infoDiffNewSubtitle + ".\r\n"; + row++; + } + //实施类别 + if (StringUtils.isNotBlank(infoDiff.get("implementType"))) { + List implementTypeList = Arrays.asList(infoDiff.get("implementType").split(",")); + String infoDiffOldImplementType = implementTypeList.get(0); + String infoDiffNewImplementType = implementTypeList.get(1); + contentInfo += row + ". " + infoDiffOldImplementType + " has been changed to" + infoDiffNewImplementType + ".\r\n"; + row++; + } + //认证类型 + if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) { + List attestationTypeList = Arrays.asList(infoDiff.get("attestationType").split(",")); + String infoDiffOldAttestationType = attestationTypeList.get(0); + String infoDiffNewAttestationType = attestationTypeList.get(1); + contentInfo += row + ". " + infoDiffOldAttestationType + " has been changed to" + infoDiffNewAttestationType + ".\r\n"; + row++; + } + + //认证级别 + //责任领域 + //备注 + //设计符合性确认-交付物类型 + //设计符合性确认-交付物模板 + //设计符合性确认-发起人 + //设计符合性确认-责任人 + //prehomo确认-交付物类型 + //prehomo确认-交付物模板 + //prehomo确认-发起人 + //prehomo确认-责任人 + //验证符合性确认-交付物类型 + //验证符合性确认-交付物模板 + //验证符合性确认-发起人 + //验证符合性确认-责任人 + + + + + + + + + + } + } + + public void setContent(String contentInfo,Map infoDiff, String field,int row){ + + if (StringUtils.isNotBlank(infoDiff.get(field))) { + List list = Arrays.asList(infoDiff.get(field).split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentInfo += row + ". " + infoDiffOld + " has been changed to" + infoDiffNew + ".\r\n"; + row++; + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyReadEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyReadEOServiceImpl.java index 0a416f321..28f98395f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyReadEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyReadEOServiceImpl.java @@ -1,12 +1,17 @@ package com.jero.modules.dummy.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.exception.JeroBootException; import com.jero.modules.dummy.entity.DummyReadEO; import com.jero.modules.dummy.mapper.DummyReadEOMapper; import com.jero.modules.dummy.service.IDummyReadEOService; +import me.zhyd.oauth.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.*; +import java.util.stream.Collectors; /** * @Description: 虚拟清单订阅表 @@ -16,6 +21,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; */ @Service public class DummyReadEOServiceImpl extends ServiceImpl implements IDummyReadEOService { + @Autowired + private DummyReadEOMapper dummyReadEOMapper; + /** * 保存 @@ -24,12 +32,12 @@ public class DummyReadEOServiceImpl extends ServiceImpl ids) { - removeByIds(ids); - } + public void deleteByIds(List ids) { + removeByIds(ids); + } /** * 通过id查询 @@ -73,17 +81,35 @@ public class DummyReadEOServiceImpl extends ServiceImpl queryList() { - return list(); - } + public List queryList() { + return list(); + } + + /** + * 查询订阅虚拟清单的用户 + * + * @return + */ + @Override + public List queryReadUserInfo(String dummyInventoryBaseId) { + //获取订阅该虚拟清单的所有用户信息 + if(StringUtils.isNotEmpty(dummyInventoryBaseId)){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("create_by").eq("dummy_inventory_base_id",dummyInventoryBaseId); + List readUserList = list(queryWrapper).stream().map(e -> e.getCreateBy()).distinct().collect(Collectors.toList()); + return readUserList; + }else{ + throw new JeroBootException("The virtual inventory is not subscribed.");//该虚拟清单未被订阅 + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java index 65f855bea..2986bef8f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java @@ -19,8 +19,8 @@ public class ListDiff { e.printStackTrace(); } - if( ! equals(v1, v2) - && !f.getName().equals("updateTime") ){ + if( ! equals(v1, v2) && !f.getName().contains("create") + && !f.getName().contains("update") ){ StringBuilder v1String= new StringBuilder(String.valueOf(v1)); StringBuilder v2String= new StringBuilder(String.valueOf(v2)); @@ -28,7 +28,7 @@ public class ListDiff { result.put(f.getName(), v1String.append(",").append(v2String).toString()); - System.out.println("zlzl"); + } } return result;