From 19b4df8634bf6d3298699403d3bcc16c650e52ec Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 28 Oct 2022 09:53:33 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1--=E9=A3=9E=E4=B9=A6?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FeishuServiceImpl.java | 31 ++++++-- .../modules/warn/service/TimedTaskWarn.java | 78 +++++++++++++++++-- 2 files changed, 97 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java index f5dd95a83..72761116a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/service/impl/FeishuServiceImpl.java @@ -512,9 +512,19 @@ public class FeishuServiceImpl implements IFeishuService { contentSb.append("\"tag\": \"div\","); contentSb.append("\"text\": {"); contentSb.append("\"content\": \"" + "编号: " + feishuMsgVo.getRegulationNo() + "\n") - .append("标题: "+feishuMsgVo.getDocumentTitleCn() + "\n") - .append("新车型实施日期: "+feishuMsgVo.getNewTypeExecutionDate()+ "\n") - .append("在产车实施日期: "+feishuMsgVo.getNewVehicleExecutionDate()+ "\","); + .append("标题: "+feishuMsgVo.getDocumentTitleCn() + "\n"); + if (StringUtils.isNotBlank(feishuMsgVo.getNewTypeExecutionDate())) { + contentSb.append("新车型实施日期: " + feishuMsgVo.getNewTypeExecutionDate() + "\n"); + } else { + contentSb.append("新车型实施日期: "+ "\n"); + } + if (StringUtils.isNotBlank(feishuMsgVo.getNewVehicleExecutionDate())) { + contentSb.append("在产车实施日期: " + feishuMsgVo.getNewVehicleExecutionDate()); + } else { + contentSb.append("在产车实施日期: "); + } + contentSb.append("\","); + contentSb.append("\"tag\": \"lark_md\""); contentSb.append("}"); contentSb.append("},"); @@ -535,9 +545,18 @@ public class FeishuServiceImpl implements IFeishuService { contentSb.append("\"tag\": \"div\","); contentSb.append("\"text\": {"); contentSb.append("\"content\": \"" + "Regulation No: " + feishuMsgVo.getRegulationNo() + "\n") - .append("Title: " + feishuMsgVo.getDocumentTitleEn() + "\n") - .append("New Type Execution Date: " + feishuMsgVo.getNewTypeExecutionDate() + "\n") - .append("New Vehicle Execution Date: " + feishuMsgVo.getNewVehicleExecutionDate() + "\","); + .append("Title: " + feishuMsgVo.getDocumentTitleEn() + "\n"); + if (StringUtils.isNotBlank(feishuMsgVo.getNewTypeExecutionDate())) { + contentSb.append("New Type Execution Date: " + feishuMsgVo.getNewTypeExecutionDate() + "\n"); + } else { + contentSb.append("New Type Execution Date: "+ "\n"); + } + if (StringUtils.isNotBlank(feishuMsgVo.getNewVehicleExecutionDate())) { + contentSb.append("New Vehicle Execution Date: " + feishuMsgVo.getNewVehicleExecutionDate()); + } else { + contentSb.append("New Vehicle Execution Date: "); + } + contentSb.append("\","); contentSb.append("\"tag\": \"lark_md\""); contentSb.append("}"); contentSb.append("},"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java index 86300e2b0..204629c96 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java @@ -4,6 +4,7 @@ import com.jero.common.constant.enums.MessageTypeEnum; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; import com.jero.modules.feishu.service.IFeishuService; +import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.subscribe.entity.OnlCgformSubscribe; import com.jero.modules.subscribe.service.IOnlCgformSubscribeService; import com.jero.modules.system.entity.SysAnnouncement; @@ -133,6 +134,18 @@ public class TimedTaskWarn implements Job { String msgTitle = content; sendMessage(msgTitle, content,contentInfo,content, url, userIdList, thirdIdList); } + if(currentTime.equals(beforeTimeSixTen)){ + //发送飞书消息(提前一年) + sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"1"); + } + if(currentTime.equals(beforeTimeSix)){ + //发送飞书消息(提前6个月) + sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"6"); + } + if(currentTime.equals(xin1Che1Xing2Shi2Shi1Ri4Qi1Str)){ + //发送飞书消息(当天) + sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"0"); + } } //在产车实施日期 @@ -154,10 +167,63 @@ public class TimedTaskWarn implements Job { String msgTitle = content; sendMessage(msgTitle, content,contentInfo,content, url, userIdList, thirdIdList); } + if(currentTime.equals(beforeTimeSixTen)){ + //发送飞书消息(提前一年) + sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"1"); + } + if(currentTime.equals(beforeTimeSix)){ + //发送飞书消息(提前6个月) + sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"6"); + } + if(currentTime.equals(implementTimeStr)){ + //发送飞书消息(当天) + sendFeishu(sdf, bussDocumentLibraryEO, url, thirdIdList,"0"); + } } } } + private void sendFeishu(SimpleDateFormat sdf, + BussDocumentLibraryEO bussDocumentLibraryEO, + String url, + List thirdIdList, + String flag) { + FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); + feishuMsgVo.setTitle(MessageTypeEnum.WARN.getNameCn()+"/"+MessageTypeEnum.WARN.getName()); + feishuMsgVo.setUrl(url); + String contentCn = ""; + String contentEn = ""; + if("1".equals(flag)){ + contentCn = "您所订阅的法规将于1年后实施."; + contentEn = "The regulation you subscribed to will be implemented in one year."; + } + if("6".equals(flag)){ + contentCn = "您所订阅的法规将于6个月后实施."; + contentEn = "The regulation you subscribed to will be implemented in six months."; + } + if("0".equals(flag)){ + contentCn = "您所订阅的法规已实施."; + contentEn = "The regulation you subscribed to is implemented."; + } + feishuMsgVo.setContent(contentCn); + feishuMsgVo.setContentEn(contentEn); + feishuMsgVo.setRegulationNo(bussDocumentLibraryEO.getSerialNumber()); + feishuMsgVo.setDocumentTitleCn(bussDocumentLibraryEO.getTitle()); + feishuMsgVo.setDocumentTitleEn(bussDocumentLibraryEO.getTitleEn()); + if(ObjectUtils.isNotEmpty(bussDocumentLibraryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){ + feishuMsgVo.setNewTypeExecutionDate(sdf.format(bussDocumentLibraryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())); + } + if(ObjectUtils.isNotEmpty(bussDocumentLibraryEO.getImplementTime())){ + feishuMsgVo.setNewVehicleExecutionDate(sdf.format(bussDocumentLibraryEO.getImplementTime())); + } + + try { + iFeishuService.sendCardMsgWarn(thirdIdList.toArray(new String[]{}),feishuMsgVo); + } catch (IOException e) { + e.printStackTrace(); + } + } + private void sendMessage(String title, String content,String contentInfo,String contentFeiShu, String url, List userIdList, List thirdIdList) { //站内消息 //封装消息的实体类 @@ -165,12 +231,12 @@ public class TimedTaskWarn implements Job { sysAnnouncementService.saveAnnouncement(sysAnnouncement); bussDocumentLibraryEOService.sendWebsocket(StringUtils.join(userIdList, ","), content); - //飞书消息 - try { - iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentFeiShu, MessageTypeEnum.WARN.getName(), url); - } catch (IOException e) { - e.printStackTrace(); - } +// //飞书消息 +// try { +// iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentFeiShu, MessageTypeEnum.WARN.getName(), url); +// } catch (IOException e) { +// e.printStackTrace(); +// } } private String beforeTime (int month,Date date){ From 91a7cae62a23d8cb093b560a0183063802961e77 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 28 Oct 2022 11:54:29 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tools/HeaderNotice.vue | 13 +++++- .../src/views/dashboard/components/myNews.vue | 14 +++++-- .../src/views/system/UserAnnouncementList.vue | 40 ++++++++++++------- 3 files changed, 47 insertions(+), 20 deletions(-) diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue index e3ea56c27..0233fec30 100644 --- a/jero-web/src/components/tools/HeaderNotice.vue +++ b/jero-web/src/components/tools/HeaderNotice.vue @@ -15,7 +15,10 @@

- {{ record.msgContent }} + + {{ language == 'zh-cn'?record.msgContentCn:record.msgContent }} +

@@ -50,6 +53,7 @@ data() { return { loadding: false, + language: '', url: { listCementByUser: '/sys/sysAnnouncementSend/getMessageUnreadList', editCementSend: '/sys/sysAnnouncementSend/editByAnntIdAndUserId', @@ -91,6 +95,7 @@ }, created() { this.loadData() + this.language = localStorage.getItem('language') || '' // this.initWebSocket() if (store.getters.userInfo) { this.$socketPublic.dispatch('webSocketInit')//初始化ws @@ -139,7 +144,11 @@ showAnnouncement(record) { getAction(this.url.readAllMsg, { ids: record.id }).then((res) => { }) - localStorage.setItem('msgContent', record.msgContent) + if (this.language == 'zh-cn') { + localStorage.setItem('msgContent', record.msgContentCn) + } else { + localStorage.setItem('msgContent', record.msgContent) + } this.$router.push({ path: '/isps/userAnnouncement', query: { diff --git a/jero-web/src/views/dashboard/components/myNews.vue b/jero-web/src/views/dashboard/components/myNews.vue index 719748291..3d693062a 100644 --- a/jero-web/src/views/dashboard/components/myNews.vue +++ b/jero-web/src/views/dashboard/components/myNews.vue @@ -11,8 +11,8 @@
-
- {{item.msgContent}} +
+ {{language == 'zh-cn'?item.msgContentCn:item.msgContent}}
{{item.sendTime}} @@ -44,11 +44,13 @@ loading: false, pageNo: 1, pageSize: 4, - dataSource: [] + dataSource: [], + language: '' } }, mounted() { this.getList() + this.language = localStorage.getItem('language') || '' }, methods: { getList() { @@ -69,7 +71,11 @@ magClick(row) { getAction(this.url.readAllMsg, { ids: row.id }).then((res) => { }) - localStorage.setItem('msgContent', row.msgContent) + if (this.language == 'zh-cn'){ + localStorage.setItem('msgContent', row.msgContentCn) + }else{ + localStorage.setItem('msgContent', row.msgContent) + } this.$router.push({ path: '/isps/userAnnouncement', query: { diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index fbb96c3d5..1c0262c0b 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -71,8 +71,9 @@ @change="handleTableChange"> - - {{text}} + + {{language == 'zh-cn' ? scope.msgContentCn : scope.msgContent}} @@ -82,7 +83,7 @@

- +

@@ -163,10 +164,10 @@ dataIndex: 'sendTime' }, { - title:'', + title: '', align: 'left', ellipsis: true, - width: 50, + width: 50 } ], url: { @@ -177,7 +178,8 @@ }, loading: false, openPath: '', - formData: '' + formData: '', + language: '' } }, watch: { @@ -186,16 +188,25 @@ this.loadData() } }, + mounted() { + this.language = localStorage.getItem('language') || '' + }, methods: { expandIcon(props) { if (props.expanded) { - return { - props.onExpand(props.record, e); - }}/>; + return + { + props.onExpand(props.record, e) + } + } + />; } else { - return { - props.onExpand(props.record, e); - }}/>; + return + { + props.onExpand(props.record, e) + } + } + />; } }, getQueryParams() { @@ -359,8 +370,9 @@ height: 38px; /*margin-top: 2px;*/ } - ::v-deep .ant-table .ant-table-row-indent + .ant-table-row-expand-icon{ - margin-right: 0; + + ::v-deep .ant-table .ant-table-row-indent + .ant-table-row-expand-icon { + margin-right: 0; }