From d6b81d455996ddbbf5dd06218edff97afe6fe0b4 Mon Sep 17 00:00:00 2001 From: hdka <823267011@qq.com> Date: Thu, 21 Nov 2024 17:31:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=AF=B9=E4=B8=80=E8=81=8A=E5=A4=A9?= =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=8C=E6=9C=9F=E5=BE=85=E7=BE=A4=E8=81=8A?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 + .../system/SocketContactController.java | 29 +- .../system/SocketMessageController.java | 2 +- .../src/main/resources/application.yml | 2 +- .../framework/webSocket/WebSocketServer.java | 1 - .../oa/controller/SysOaArticleController.java | 1 + .../impl/SocketContactServiceImpl.java | 37 +- ruoyi-ui/src/layout/components/Navbar.vue | 119 ++- ruoyi-ui/src/utils/websocket.js | 2 +- ruoyi-ui/src/views/index.vue | 22 - ruoyi-ui/src/views/oa/oaWarehouse/index.vue | 1 - script/sql/20241120数据备份/ACT_EVT_LOG.sql | 0 .../sql/20241120数据备份/ACT_GE_BYTEARRAY.sql | 29 + .../sql/20241120数据备份/ACT_GE_PROPERTY.sql | 13 + .../sql/20241120数据备份/ACT_HI_ACTINST.sql | 32 + .../20241120数据备份/ACT_HI_ATTACHMENT.sql | 0 .../sql/20241120数据备份/ACT_HI_COMMENT.sql | 9 + script/sql/20241120数据备份/ACT_HI_DETAIL.sql | 0 .../20241120数据备份/ACT_HI_ENTITYLINK.sql | 0 .../20241120数据备份/ACT_HI_IDENTITYLINK.sql | 33 + .../sql/20241120数据备份/ACT_HI_PROCINST.sql | 6 + .../sql/20241120数据备份/ACT_HI_TASKINST.sql | 12 + .../sql/20241120数据备份/ACT_HI_TSK_LOG.sql | 0 .../sql/20241120数据备份/ACT_HI_VARINST.sql | 44 + .../sql/20241120数据备份/ACT_PROCDEF_INFO.sql | 0 .../20241120数据备份/ACT_RE_DEPLOYMENT.sql | 10 + script/sql/20241120数据备份/ACT_RE_MODEL.sql | 10 + .../sql/20241120数据备份/ACT_RE_PROCDEF.sql | 10 + .../sql/20241120数据备份/ACT_RU_ACTINST.sql | 19 + .../ACT_RU_DEADLETTER_JOB.sql | 0 .../20241120数据备份/ACT_RU_ENTITYLINK.sql | 0 .../20241120数据备份/ACT_RU_EVENT_SUBSCR.sql | 0 .../sql/20241120数据备份/ACT_RU_EXECUTION.sql | 10 + .../20241120数据备份/ACT_RU_EXTERNAL_JOB.sql | 0 .../20241120数据备份/ACT_RU_HISTORY_JOB.sql | 0 .../20241120数据备份/ACT_RU_IDENTITYLINK.sql | 12 + script/sql/20241120数据备份/ACT_RU_JOB.sql | 0 .../20241120数据备份/ACT_RU_SUSPENDED_JOB.sql | 0 script/sql/20241120数据备份/ACT_RU_TASK.sql | 5 + .../sql/20241120数据备份/ACT_RU_TIMER_JOB.sql | 0 .../sql/20241120数据备份/ACT_RU_VARIABLE.sql | 25 + .../FLW_CHANNEL_DEFINITION.sql | 0 .../20241120数据备份/FLW_EVENT_DEFINITION.sql | 0 .../20241120数据备份/FLW_EVENT_DEPLOYMENT.sql | 0 .../20241120数据备份/FLW_EVENT_RESOURCE.sql | 0 .../FLW_EV_DATABASECHANGELOG.sql | 3 + .../FLW_EV_DATABASECHANGELOGLOCK.sql | 1 + script/sql/20241120数据备份/FLW_RU_BATCH.sql | 0 .../20241120数据备份/FLW_RU_BATCH_PART.sql | 0 script/sql/20241120数据备份/gen_table.sql | 18 + .../sql/20241120数据备份/gen_table_column.sql | 216 ++++ .../sql/20241120数据备份/socket_contact.sql | 2 + .../sql/20241120数据备份/socket_message.sql | 47 + script/sql/20241120数据备份/sys_config.sql | 6 + script/sql/20241120数据备份/sys_dept.sql | 8 + script/sql/20241120数据备份/sys_dict_data.sql | 74 ++ script/sql/20241120数据备份/sys_dict_type.sql | 22 + .../sql/20241120数据备份/sys_logininfor.sql | 242 +++++ script/sql/20241120数据备份/sys_menu.sql | 219 ++++ script/sql/20241120数据备份/sys_notice.sql | 1 + .../sql/20241120数据备份/sys_oa_article.sql | 2 + .../20241120数据备份/sys_oa_attendance.sql | 7 + script/sql/20241120数据备份/sys_oa_bid.sql | 1 + .../sql/20241120数据备份/sys_oa_category.sql | 5 + .../sql/20241120数据备份/sys_oa_contract.sql | 41 + script/sql/20241120数据备份/sys_oa_detail.sql | 38 + .../sql/20241120数据备份/sys_oa_finance.sql | 26 + .../20241120数据备份/sys_oa_out_warehouse.sql | 18 + .../sql/20241120数据备份/sys_oa_project.sql | 2 + .../sql/20241120数据备份/sys_oa_purpose.sql | 1 + .../sys_oa_receive_account.sql | 1 + script/sql/20241120数据备份/sys_oa_remind.sql | 9 + script/sql/20241120数据备份/sys_oa_task.sql | 1 + .../sql/20241120数据备份/sys_oa_task_user.sql | 4 + .../sql/20241120数据备份/sys_oa_warehouse.sql | 4 + script/sql/20241120数据备份/sys_oa_work.sql | 0 script/sql/20241120数据备份/sys_oper_log.sql | 493 +++++++++ script/sql/20241120数据备份/sys_oss.sql | 0 .../sql/20241120数据备份/sys_oss_config.sql | 5 + script/sql/20241120数据备份/sys_post.sql | 7 + script/sql/20241120数据备份/sys_role.sql | 12 + script/sql/20241120数据备份/sys_role_dept.sql | 0 script/sql/20241120数据备份/sys_role_menu.sql | 937 ++++++++++++++++++ script/sql/20241120数据备份/sys_user.sql | 17 + script/sql/20241120数据备份/sys_user_post.sql | 8 + script/sql/20241120数据备份/sys_user_role.sql | 8 + script/sql/20241120数据备份/wf_category.sql | 9 + script/sql/20241120数据备份/wf_copy.sql | 1 + .../sql/20241120数据备份/wf_deploy_form.sql | 21 + script/sql/20241120数据备份/wf_form.sql | 11 + script/sql/20241120数据备份/xxl_job_group.sql | 1 + script/sql/20241120数据备份/xxl_job_info.sql | 1 + script/sql/20241120数据备份/xxl_job_lock.sql | 1 + script/sql/20241120数据备份/xxl_job_log.sql | 0 .../20241120数据备份/xxl_job_log_report.sql | 0 .../sql/20241120数据备份/xxl_job_logglue.sql | 0 .../sql/20241120数据备份/xxl_job_registry.sql | 0 script/sql/20241120数据备份/xxl_job_user.sql | 1 + script/sql/20241120表结构备份/ACT_EVT_LOG.sql | 18 + .../20241120表结构备份/ACT_GE_BYTEARRAY.sql | 14 + .../20241120表结构备份/ACT_GE_PROPERTY.sql | 9 + .../sql/20241120表结构备份/ACT_HI_ACTINST.sql | 35 + .../20241120表结构备份/ACT_HI_ATTACHMENT.sql | 17 + .../sql/20241120表结构备份/ACT_HI_COMMENT.sql | 15 + .../sql/20241120表结构备份/ACT_HI_DETAIL.sql | 36 + .../20241120表结构备份/ACT_HI_ENTITYLINK.sql | 32 + .../ACT_HI_IDENTITYLINK.sql | 35 + .../20241120表结构备份/ACT_HI_PROCINST.sql | 38 + .../20241120表结构备份/ACT_HI_TASKINST.sql | 46 + .../sql/20241120表结构备份/ACT_HI_TSK_LOG.sql | 20 + .../sql/20241120表结构备份/ACT_HI_VARINST.sql | 41 + .../20241120表结构备份/ACT_PROCDEF_INFO.sql | 19 + .../20241120表结构备份/ACT_RE_DEPLOYMENT.sql | 16 + .../sql/20241120表结构备份/ACT_RE_MODEL.sql | 25 + .../sql/20241120表结构备份/ACT_RE_PROCDEF.sql | 26 + .../sql/20241120表结构备份/ACT_RU_ACTINST.sql | 44 + .../ACT_RU_DEADLETTER_JOB.sql | 58 ++ .../20241120表结构备份/ACT_RU_ENTITYLINK.sql | 33 + .../ACT_RU_EVENT_SUBSCR.sql | 31 + .../20241120表结构备份/ACT_RU_EXECUTION.sql | 65 ++ .../ACT_RU_EXTERNAL_JOB.sql | 55 + .../20241120表结构备份/ACT_RU_HISTORY_JOB.sql | 20 + .../ACT_RU_IDENTITYLINK.sql | 42 + script/sql/20241120表结构备份/ACT_RU_JOB.sql | 61 ++ .../ACT_RU_SUSPENDED_JOB.sql | 59 ++ script/sql/20241120表结构备份/ACT_RU_TASK.sql | 54 + .../20241120表结构备份/ACT_RU_TIMER_JOB.sql | 64 ++ .../20241120表结构备份/ACT_RU_VARIABLE.sql | 36 + .../FLW_CHANNEL_DEFINITION.sql | 20 + .../FLW_EVENT_DEFINITION.sql | 17 + .../FLW_EVENT_DEPLOYMENT.sql | 12 + .../20241120表结构备份/FLW_EVENT_RESOURCE.sql | 10 + .../FLW_EV_DATABASECHANGELOG.sql | 19 + .../FLW_EV_DATABASECHANGELOGLOCK.sql | 10 + .../sql/20241120表结构备份/FLW_RU_BATCH.sql | 16 + .../20241120表结构备份/FLW_RU_BATCH_PART.sql | 25 + script/sql/20241120表结构备份/gen_table.sql | 26 + .../20241120表结构备份/gen_table_column.sql | 28 + .../sql/20241120表结构备份/socket_contact.sql | 16 + .../sql/20241120表结构备份/socket_message.sql | 17 + script/sql/20241120表结构备份/sys_config.sql | 16 + script/sql/20241120表结构备份/sys_dept.sql | 20 + .../sql/20241120表结构备份/sys_dict_data.sql | 20 + .../sql/20241120表结构备份/sys_dict_type.sql | 17 + .../sql/20241120表结构备份/sys_logininfor.sql | 15 + script/sql/20241120表结构备份/sys_menu.sql | 25 + script/sql/20241120表结构备份/sys_notice.sql | 16 + .../sql/20241120表结构备份/sys_oa_article.sql | 19 + .../20241120表结构备份/sys_oa_attendance.sql | 17 + script/sql/20241120表结构备份/sys_oa_bid.sql | 29 + .../20241120表结构备份/sys_oa_category.sql | 15 + .../20241120表结构备份/sys_oa_contract.sql | 27 + .../sql/20241120表结构备份/sys_oa_detail.sql | 17 + .../sql/20241120表结构备份/sys_oa_finance.sql | 24 + .../sys_oa_out_warehouse.sql | 15 + .../sql/20241120表结构备份/sys_oa_project.sql | 36 + .../sql/20241120表结构备份/sys_oa_purpose.sql | 19 + .../sys_oa_receive_account.sql | 13 + .../sql/20241120表结构备份/sys_oa_remind.sql | 18 + script/sql/20241120表结构备份/sys_oa_task.sql | 21 + .../20241120表结构备份/sys_oa_task_user.sql | 6 + .../20241120表结构备份/sys_oa_warehouse.sql | 18 + script/sql/20241120表结构备份/sys_oa_work.sql | 17 + .../sql/20241120表结构备份/sys_oper_log.sql | 22 + script/sql/20241120表结构备份/sys_oss.sql | 16 + .../sql/20241120表结构备份/sys_oss_config.sql | 24 + script/sql/20241120表结构备份/sys_post.sql | 16 + script/sql/20241120表结构备份/sys_role.sql | 20 + .../sql/20241120表结构备份/sys_role_dept.sql | 8 + .../sql/20241120表结构备份/sys_role_menu.sql | 8 + script/sql/20241120表结构备份/sys_user.sql | 28 + .../sql/20241120表结构备份/sys_user_post.sql | 8 + .../sql/20241120表结构备份/sys_user_role.sql | 8 + script/sql/20241120表结构备份/wf_category.sql | 15 + script/sql/20241120表结构备份/wf_copy.sql | 22 + .../sql/20241120表结构备份/wf_deploy_form.sql | 12 + script/sql/20241120表结构备份/wf_form.sql | 15 + .../sql/20241120表结构备份/xxl_job_group.sql | 12 + .../sql/20241120表结构备份/xxl_job_info.sql | 30 + .../sql/20241120表结构备份/xxl_job_lock.sql | 7 + script/sql/20241120表结构备份/xxl_job_log.sql | 27 + .../20241120表结构备份/xxl_job_log_report.sql | 14 + .../20241120表结构备份/xxl_job_logglue.sql | 13 + .../20241120表结构备份/xxl_job_registry.sql | 14 + .../sql/20241120表结构备份/xxl_job_user.sql | 13 + 185 files changed, 5034 insertions(+), 88 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 script/sql/20241120数据备份/ACT_EVT_LOG.sql create mode 100644 script/sql/20241120数据备份/ACT_GE_BYTEARRAY.sql create mode 100644 script/sql/20241120数据备份/ACT_GE_PROPERTY.sql create mode 100644 script/sql/20241120数据备份/ACT_HI_ACTINST.sql create mode 100644 script/sql/20241120数据备份/ACT_HI_ATTACHMENT.sql create mode 100644 script/sql/20241120数据备份/ACT_HI_COMMENT.sql create mode 100644 script/sql/20241120数据备份/ACT_HI_DETAIL.sql create mode 100644 script/sql/20241120数据备份/ACT_HI_ENTITYLINK.sql create mode 100644 script/sql/20241120数据备份/ACT_HI_IDENTITYLINK.sql create mode 100644 script/sql/20241120数据备份/ACT_HI_PROCINST.sql create mode 100644 script/sql/20241120数据备份/ACT_HI_TASKINST.sql create mode 100644 script/sql/20241120数据备份/ACT_HI_TSK_LOG.sql create mode 100644 script/sql/20241120数据备份/ACT_HI_VARINST.sql create mode 100644 script/sql/20241120数据备份/ACT_PROCDEF_INFO.sql create mode 100644 script/sql/20241120数据备份/ACT_RE_DEPLOYMENT.sql create mode 100644 script/sql/20241120数据备份/ACT_RE_MODEL.sql create mode 100644 script/sql/20241120数据备份/ACT_RE_PROCDEF.sql create mode 100644 script/sql/20241120数据备份/ACT_RU_ACTINST.sql create mode 100644 script/sql/20241120数据备份/ACT_RU_DEADLETTER_JOB.sql create mode 100644 script/sql/20241120数据备份/ACT_RU_ENTITYLINK.sql create mode 100644 script/sql/20241120数据备份/ACT_RU_EVENT_SUBSCR.sql create mode 100644 script/sql/20241120数据备份/ACT_RU_EXECUTION.sql create mode 100644 script/sql/20241120数据备份/ACT_RU_EXTERNAL_JOB.sql create mode 100644 script/sql/20241120数据备份/ACT_RU_HISTORY_JOB.sql create mode 100644 script/sql/20241120数据备份/ACT_RU_IDENTITYLINK.sql create mode 100644 script/sql/20241120数据备份/ACT_RU_JOB.sql create mode 100644 script/sql/20241120数据备份/ACT_RU_SUSPENDED_JOB.sql create mode 100644 script/sql/20241120数据备份/ACT_RU_TASK.sql create mode 100644 script/sql/20241120数据备份/ACT_RU_TIMER_JOB.sql create mode 100644 script/sql/20241120数据备份/ACT_RU_VARIABLE.sql create mode 100644 script/sql/20241120数据备份/FLW_CHANNEL_DEFINITION.sql create mode 100644 script/sql/20241120数据备份/FLW_EVENT_DEFINITION.sql create mode 100644 script/sql/20241120数据备份/FLW_EVENT_DEPLOYMENT.sql create mode 100644 script/sql/20241120数据备份/FLW_EVENT_RESOURCE.sql create mode 100644 script/sql/20241120数据备份/FLW_EV_DATABASECHANGELOG.sql create mode 100644 script/sql/20241120数据备份/FLW_EV_DATABASECHANGELOGLOCK.sql create mode 100644 script/sql/20241120数据备份/FLW_RU_BATCH.sql create mode 100644 script/sql/20241120数据备份/FLW_RU_BATCH_PART.sql create mode 100644 script/sql/20241120数据备份/gen_table.sql create mode 100644 script/sql/20241120数据备份/gen_table_column.sql create mode 100644 script/sql/20241120数据备份/socket_contact.sql create mode 100644 script/sql/20241120数据备份/socket_message.sql create mode 100644 script/sql/20241120数据备份/sys_config.sql create mode 100644 script/sql/20241120数据备份/sys_dept.sql create mode 100644 script/sql/20241120数据备份/sys_dict_data.sql create mode 100644 script/sql/20241120数据备份/sys_dict_type.sql create mode 100644 script/sql/20241120数据备份/sys_logininfor.sql create mode 100644 script/sql/20241120数据备份/sys_menu.sql create mode 100644 script/sql/20241120数据备份/sys_notice.sql create mode 100644 script/sql/20241120数据备份/sys_oa_article.sql create mode 100644 script/sql/20241120数据备份/sys_oa_attendance.sql create mode 100644 script/sql/20241120数据备份/sys_oa_bid.sql create mode 100644 script/sql/20241120数据备份/sys_oa_category.sql create mode 100644 script/sql/20241120数据备份/sys_oa_contract.sql create mode 100644 script/sql/20241120数据备份/sys_oa_detail.sql create mode 100644 script/sql/20241120数据备份/sys_oa_finance.sql create mode 100644 script/sql/20241120数据备份/sys_oa_out_warehouse.sql create mode 100644 script/sql/20241120数据备份/sys_oa_project.sql create mode 100644 script/sql/20241120数据备份/sys_oa_purpose.sql create mode 100644 script/sql/20241120数据备份/sys_oa_receive_account.sql create mode 100644 script/sql/20241120数据备份/sys_oa_remind.sql create mode 100644 script/sql/20241120数据备份/sys_oa_task.sql create mode 100644 script/sql/20241120数据备份/sys_oa_task_user.sql create mode 100644 script/sql/20241120数据备份/sys_oa_warehouse.sql create mode 100644 script/sql/20241120数据备份/sys_oa_work.sql create mode 100644 script/sql/20241120数据备份/sys_oper_log.sql create mode 100644 script/sql/20241120数据备份/sys_oss.sql create mode 100644 script/sql/20241120数据备份/sys_oss_config.sql create mode 100644 script/sql/20241120数据备份/sys_post.sql create mode 100644 script/sql/20241120数据备份/sys_role.sql create mode 100644 script/sql/20241120数据备份/sys_role_dept.sql create mode 100644 script/sql/20241120数据备份/sys_role_menu.sql create mode 100644 script/sql/20241120数据备份/sys_user.sql create mode 100644 script/sql/20241120数据备份/sys_user_post.sql create mode 100644 script/sql/20241120数据备份/sys_user_role.sql create mode 100644 script/sql/20241120数据备份/wf_category.sql create mode 100644 script/sql/20241120数据备份/wf_copy.sql create mode 100644 script/sql/20241120数据备份/wf_deploy_form.sql create mode 100644 script/sql/20241120数据备份/wf_form.sql create mode 100644 script/sql/20241120数据备份/xxl_job_group.sql create mode 100644 script/sql/20241120数据备份/xxl_job_info.sql create mode 100644 script/sql/20241120数据备份/xxl_job_lock.sql create mode 100644 script/sql/20241120数据备份/xxl_job_log.sql create mode 100644 script/sql/20241120数据备份/xxl_job_log_report.sql create mode 100644 script/sql/20241120数据备份/xxl_job_logglue.sql create mode 100644 script/sql/20241120数据备份/xxl_job_registry.sql create mode 100644 script/sql/20241120数据备份/xxl_job_user.sql create mode 100644 script/sql/20241120表结构备份/ACT_EVT_LOG.sql create mode 100644 script/sql/20241120表结构备份/ACT_GE_BYTEARRAY.sql create mode 100644 script/sql/20241120表结构备份/ACT_GE_PROPERTY.sql create mode 100644 script/sql/20241120表结构备份/ACT_HI_ACTINST.sql create mode 100644 script/sql/20241120表结构备份/ACT_HI_ATTACHMENT.sql create mode 100644 script/sql/20241120表结构备份/ACT_HI_COMMENT.sql create mode 100644 script/sql/20241120表结构备份/ACT_HI_DETAIL.sql create mode 100644 script/sql/20241120表结构备份/ACT_HI_ENTITYLINK.sql create mode 100644 script/sql/20241120表结构备份/ACT_HI_IDENTITYLINK.sql create mode 100644 script/sql/20241120表结构备份/ACT_HI_PROCINST.sql create mode 100644 script/sql/20241120表结构备份/ACT_HI_TASKINST.sql create mode 100644 script/sql/20241120表结构备份/ACT_HI_TSK_LOG.sql create mode 100644 script/sql/20241120表结构备份/ACT_HI_VARINST.sql create mode 100644 script/sql/20241120表结构备份/ACT_PROCDEF_INFO.sql create mode 100644 script/sql/20241120表结构备份/ACT_RE_DEPLOYMENT.sql create mode 100644 script/sql/20241120表结构备份/ACT_RE_MODEL.sql create mode 100644 script/sql/20241120表结构备份/ACT_RE_PROCDEF.sql create mode 100644 script/sql/20241120表结构备份/ACT_RU_ACTINST.sql create mode 100644 script/sql/20241120表结构备份/ACT_RU_DEADLETTER_JOB.sql create mode 100644 script/sql/20241120表结构备份/ACT_RU_ENTITYLINK.sql create mode 100644 script/sql/20241120表结构备份/ACT_RU_EVENT_SUBSCR.sql create mode 100644 script/sql/20241120表结构备份/ACT_RU_EXECUTION.sql create mode 100644 script/sql/20241120表结构备份/ACT_RU_EXTERNAL_JOB.sql create mode 100644 script/sql/20241120表结构备份/ACT_RU_HISTORY_JOB.sql create mode 100644 script/sql/20241120表结构备份/ACT_RU_IDENTITYLINK.sql create mode 100644 script/sql/20241120表结构备份/ACT_RU_JOB.sql create mode 100644 script/sql/20241120表结构备份/ACT_RU_SUSPENDED_JOB.sql create mode 100644 script/sql/20241120表结构备份/ACT_RU_TASK.sql create mode 100644 script/sql/20241120表结构备份/ACT_RU_TIMER_JOB.sql create mode 100644 script/sql/20241120表结构备份/ACT_RU_VARIABLE.sql create mode 100644 script/sql/20241120表结构备份/FLW_CHANNEL_DEFINITION.sql create mode 100644 script/sql/20241120表结构备份/FLW_EVENT_DEFINITION.sql create mode 100644 script/sql/20241120表结构备份/FLW_EVENT_DEPLOYMENT.sql create mode 100644 script/sql/20241120表结构备份/FLW_EVENT_RESOURCE.sql create mode 100644 script/sql/20241120表结构备份/FLW_EV_DATABASECHANGELOG.sql create mode 100644 script/sql/20241120表结构备份/FLW_EV_DATABASECHANGELOGLOCK.sql create mode 100644 script/sql/20241120表结构备份/FLW_RU_BATCH.sql create mode 100644 script/sql/20241120表结构备份/FLW_RU_BATCH_PART.sql create mode 100644 script/sql/20241120表结构备份/gen_table.sql create mode 100644 script/sql/20241120表结构备份/gen_table_column.sql create mode 100644 script/sql/20241120表结构备份/socket_contact.sql create mode 100644 script/sql/20241120表结构备份/socket_message.sql create mode 100644 script/sql/20241120表结构备份/sys_config.sql create mode 100644 script/sql/20241120表结构备份/sys_dept.sql create mode 100644 script/sql/20241120表结构备份/sys_dict_data.sql create mode 100644 script/sql/20241120表结构备份/sys_dict_type.sql create mode 100644 script/sql/20241120表结构备份/sys_logininfor.sql create mode 100644 script/sql/20241120表结构备份/sys_menu.sql create mode 100644 script/sql/20241120表结构备份/sys_notice.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_article.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_attendance.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_bid.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_category.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_contract.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_detail.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_finance.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_out_warehouse.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_project.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_purpose.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_receive_account.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_remind.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_task.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_task_user.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_warehouse.sql create mode 100644 script/sql/20241120表结构备份/sys_oa_work.sql create mode 100644 script/sql/20241120表结构备份/sys_oper_log.sql create mode 100644 script/sql/20241120表结构备份/sys_oss.sql create mode 100644 script/sql/20241120表结构备份/sys_oss_config.sql create mode 100644 script/sql/20241120表结构备份/sys_post.sql create mode 100644 script/sql/20241120表结构备份/sys_role.sql create mode 100644 script/sql/20241120表结构备份/sys_role_dept.sql create mode 100644 script/sql/20241120表结构备份/sys_role_menu.sql create mode 100644 script/sql/20241120表结构备份/sys_user.sql create mode 100644 script/sql/20241120表结构备份/sys_user_post.sql create mode 100644 script/sql/20241120表结构备份/sys_user_role.sql create mode 100644 script/sql/20241120表结构备份/wf_category.sql create mode 100644 script/sql/20241120表结构备份/wf_copy.sql create mode 100644 script/sql/20241120表结构备份/wf_deploy_form.sql create mode 100644 script/sql/20241120表结构备份/wf_form.sql create mode 100644 script/sql/20241120表结构备份/xxl_job_group.sql create mode 100644 script/sql/20241120表结构备份/xxl_job_info.sql create mode 100644 script/sql/20241120表结构备份/xxl_job_lock.sql create mode 100644 script/sql/20241120表结构备份/xxl_job_log.sql create mode 100644 script/sql/20241120表结构备份/xxl_job_log_report.sql create mode 100644 script/sql/20241120表结构备份/xxl_job_logglue.sql create mode 100644 script/sql/20241120表结构备份/xxl_job_registry.sql create mode 100644 script/sql/20241120表结构备份/xxl_job_user.sql diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..7b016a8 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.compile.nullAnalysis.mode": "automatic" +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SocketContactController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SocketContactController.java index c12bdd9..2227912 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SocketContactController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SocketContactController.java @@ -2,12 +2,12 @@ package com.ruoyi.web.controller.system; import java.util.List; import java.util.Arrays; -import java.util.concurrent.TimeUnit; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; -import cn.dev33.satoken.annotation.SaCheckPermission; + +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import com.ruoyi.common.annotation.RepeatSubmit; @@ -15,14 +15,16 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.system.domain.vo.SocketContactVo; import com.ruoyi.system.domain.bo.SocketContactBo; import com.ruoyi.system.service.ISocketContactService; +import com.ruoyi.system.service.ISysUserService; +import com.ruoyi.system.service.impl.SysUserServiceImpl; import com.ruoyi.common.core.page.TableDataInfo; /** @@ -39,6 +41,9 @@ public class SocketContactController extends BaseController { private final ISocketContactService iSocketContactService; + @Autowired + private ISysUserService userService; + /** * 查询通信目录列表 */ @@ -100,4 +105,22 @@ public class SocketContactController extends BaseController { @PathVariable Long[] ids) { return toAjax(iSocketContactService.deleteWithValidByIds(Arrays.asList(ids), true)); } + + @GetMapping("/script") + public R script() { + List selectUserList = userService.selectUserList(new SysUser()); + for (int i = 0; i < selectUserList.size(); i++) { + SysUser sysUser = selectUserList.get(i); + Long userId = sysUser.getUserId(); + for (int i1 = i+1; i1 < selectUserList.size(); i1++) { + SocketContactBo socketContactBo = new SocketContactBo(); + socketContactBo.setUserId(userId); + socketContactBo.setRoomId(0L); + socketContactBo.setContactUserId(selectUserList.get(i1).getUserId()); + iSocketContactService.insertByBo(socketContactBo); + } + + } + return R.ok(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SocketMessageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SocketMessageController.java index 5278989..3a61b2a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SocketMessageController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SocketMessageController.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.controller; +package com.ruoyi.web.controller.system; import java.util.List; import java.util.Arrays; diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index cbcee68..8766b4c 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -57,7 +57,7 @@ logging: user: password: # 密码最大错误次数 - maxRetryCount: 5 + maxRetryCount: 999 # 密码锁定时间（默认10分钟） lockTime: 10 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/webSocket/WebSocketServer.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/webSocket/WebSocketServer.java index f79c5fa..0144392 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/webSocket/WebSocketServer.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/webSocket/WebSocketServer.java @@ -73,7 +73,6 @@ public class WebSocketServer { String userId = jsonObject.getString("userId"); String type = jsonObject.getString("type"); if (type.equals(MessageType.CHAT.getType())) { - log.debug("聊天消息推送"); sendToUser(userId, JSONObject.toJSONString(jsonObject)); } } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaArticleController.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaArticleController.java index b60eaed..44c483c 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaArticleController.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/controller/SysOaArticleController.java @@ -78,6 +78,7 @@ public class SysOaArticleController extends BaseController { @GetMapping("/{articleId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long articleId) { SysOaArticle sysOaArticle = iSysOaArticleService.selectArticleById(articleId); + return R.ok(sysOaArticle); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SocketContactServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SocketContactServiceImpl.java index 480e9ce..0721caa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SocketContactServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SocketContactServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.bean.BeanUtil; import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.domain.PageQuery; @@ -15,6 +16,7 @@ import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.service.ISysUserService; import liquibase.pro.packaged.S; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.system.domain.bo.SocketContactBo; @@ -26,6 +28,7 @@ import com.ruoyi.system.service.ISocketContactService; import java.util.List; import java.util.Map; import java.util.Collection; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -34,6 +37,7 @@ import java.util.stream.Collectors; * @author hdka * @date 2024-10-21 */ +@Slf4j @RequiredArgsConstructor @Service public class SocketContactServiceImpl implements ISocketContactService { @@ -53,12 +57,10 @@ public class SocketContactServiceImpl implements ISocketContactService { LambdaQueryWrapper socketMessageLambdaQueryWrapper = new LambdaQueryWrapper<>(); socketMessageLambdaQueryWrapper.eq(SocketMessage::getRoomId, socketContactVo.getRoomId()) .and(item -> - item.eq(SocketMessage::getUserId, socketContactVo.getContactUserId()) - .or() - .eq(SocketMessage::getUserId, socketContactVo.getUserId()) + item.eq(SocketMessage::getContactId,id) ); - - socketContactVo.setUser(sysUserMapper.selectUserById(socketContactVo.getContactUserId())); + Long userId = LoginHelper.getUserId(); + socketContactVo.setUser(sysUserMapper.selectUserById(Objects.equals(socketContactVo.getContactUserId(), userId) ?socketContactVo.getUserId():socketContactVo.getContactUserId())); List socketMessageVos = socketMessageMapper.selectVoList(socketMessageLambdaQueryWrapper); socketMessageVos.stream() .peek(item->{ @@ -77,7 +79,7 @@ public class SocketContactServiceImpl implements ISocketContactService { LambdaQueryWrapper socketContactLambdaQueryWrapper = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), socketContactLambdaQueryWrapper); for (SocketContactVo record : result.getRecords()) { - SysUser sysUser = sysUserMapper.selectUserById(record.getContactUserId()); + SysUser sysUser = sysUserMapper.selectUserById(Objects.equals(record.getContactUserId(), bo.getUserId()) ? record.getUserId() : record.getContactUserId()); record.setUser(sysUser); } return TableDataInfo.build(result); @@ -95,8 +97,9 @@ public class SocketContactServiceImpl implements ISocketContactService { private LambdaQueryWrapper buildQueryWrapper(SocketContactBo bo) { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(bo.getContactUserId() != null, SocketContact::getContactUserId, bo.getContactUserId()); - lqw.eq(bo.getUserId() != null, SocketContact::getUserId, bo.getUserId()); + lqw.eq(bo.getUserId() != null, SocketContact::getContactUserId, bo.getUserId()) + .or() + .eq(bo.getUserId() != null, SocketContact::getUserId, bo.getUserId()); return lqw; } @@ -116,15 +119,15 @@ public class SocketContactServiceImpl implements ISocketContactService { bo.setId(add.getId()); } - - // 反向存 - add.setContactUserId(bo.getUserId()); - add.setUserId(bo.getContactUserId()); - validEntityBeforeSave(add); - flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setId(add.getId()); - } +// +// // 反向存 +// add.setContactUserId(bo.getUserId()); +// add.setUserId(bo.getContactUserId()); +// validEntityBeforeSave(add); +// flag = baseMapper.insert(add) > 0; +// if (flag) { +// bo.setId(add.getId()); +// } return flag; } diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index fbbba08..44101e0 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -1,6 +1,7 @@