diff --git a/skyeye-promote/pom.xml b/skyeye-promote/pom.xml index a5009005..83027d83 100644 --- a/skyeye-promote/pom.xml +++ b/skyeye-promote/pom.xml @@ -27,7 +27,6 @@ skyeye-knowlg skyeye-forum skyeye-disk-cloud - skyeye-note skyeye-light-app skyeye-code-doc skyeye-jobdiary diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/MqConstants.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/MqConstants.java deleted file mode 100644 index 908d8e09..00000000 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/MqConstants.java +++ /dev/null @@ -1,128 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.common.constans; - -/** - * @ClassName: MqConstants - * @Description: MQ消息队列常量类 - * @author: skyeye云系列--卫志强 - * @date: 2021/7/4 21:56 - * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. - * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 - */ -public class MqConstants { - - /** - * 等待处理 - */ - public static final String JOB_TYPE_IS_WAIT = "1"; - - /** - * 处理中 - */ - public static final String JOB_TYPE_IS_PROCESSING = "2"; - - /** - * 执行失败 - */ - public static final String JOB_TYPE_IS_FAIL = "3"; - - /** - * 执行成功 - */ - public static final String JOB_TYPE_IS_SUCCESS = "4"; - - /** - * 部分成功 - */ - public static final String JOB_TYPE_IS_PARTIAL_SUCCESS = "5"; - - public static enum JobMateMationJobType { - ORDINARY_MAIL_DELIVERY(2, 1, false, "邮件通知", "ordinaryMailDeliveryService"), - MAIL_ACCESS_INBOX(3, 2, true, "收件箱邮件获取", "mailAccessInboxService"), - MAIL_ACCESS_SENDED(3, 3, true, "已发送邮件获取", "mailAccessSendedService"), - MAIL_ACCESS_DELETE(3, 4, true, "已删除邮件获取", "mailAccessDeleteService"), - MAIL_ACCESS_DRAFTS(3, 5, true, "草稿箱邮件获取", "mailAccessDraftsService"), - COMPLEX_MAIL_DELIVERY(2, 6, false, "邮件发送", "complexMailDeliveryService"), - MAIL_DRAFTS_SAVE(2, 7, false, "保存草稿同步", "mailDraftsSaveService"), - MAIL_DRAFTS_EDIT(2, 8, false, "草稿编辑同步", "mailDraftsEditService"), - MAIL_DRAFTS_SEND(2, 9, false, "草稿箱邮件发送", "mailDraftsSendService"), - NOTICE_SEND(2, 10, false, "消息通知", "noticeSendService"), - WATI_WORKER_SEND(2, 11, false, "派工通知", "watiWorkerSendService"), - OUTPUT_NOTES_IS_ZIP(1, 100, true, "笔记输出压缩包", "outputNotesIsZipService"); - - // 所属大类 1.我的输出 2.我的发送 3.我的获取 - private int bigType; - private int jobType; - private boolean sendMsgToPage; - private String typeName; - private String serviceName; - - JobMateMationJobType(int bigType, int jobType, boolean sendMsgToPage, String typeName, String serviceName) { - this.bigType = bigType; - this.jobType = jobType; - this.sendMsgToPage = sendMsgToPage; - this.typeName = typeName; - this.serviceName = serviceName; - } - - public static String getTypeNameByJobType(String jobType) { - for (JobMateMationJobType bean : JobMateMationJobType.values()) { - if (bean.getJobType() == Integer.parseInt(jobType)) { - return bean.getTypeName(); - } - } - return ""; - } - - public static String getServiceNameByJobType(String jobType) { - for (JobMateMationJobType bean : JobMateMationJobType.values()) { - if (bean.getJobType() == Integer.parseInt(jobType)) { - return bean.getServiceName(); - } - } - return ""; - } - - public static int getBigTypeByJobType(String jobType) { - for (JobMateMationJobType bean : JobMateMationJobType.values()) { - if (bean.getJobType() == Integer.parseInt(jobType)) { - return bean.getBigType(); - } - } - return 0; - } - - public static boolean getSendMsgToPageByJobType(String jobType) { - for (JobMateMationJobType bean : JobMateMationJobType.values()) { - if (bean.getJobType() == Integer.parseInt(jobType)) { - return bean.isSendMsgToPage(); - } - } - return false; - } - - public int getBigType() { - return bigType; - } - - public int getJobType() { - return jobType; - } - - public String getTypeName() { - return typeName; - } - - public String getServiceName() { - return serviceName; - } - - public boolean isSendMsgToPage() { - return sendMsgToPage; - } - } - -} diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/NoteConstants.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/NoteConstants.java deleted file mode 100644 index 1a299b47..00000000 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/common/constans/NoteConstants.java +++ /dev/null @@ -1,56 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.common.constans; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @ClassName: NoteConstants - * @Description: 笔记系统相关的常量类 - * @author: skyeye云系列--卫志强 - * @date: 2021/6/14 11:55 - * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. - * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 - */ -public class NoteConstants { - - // 笔记管理---目录logo图片 - public static final String SYS_FILE_CONSOLE_IS_FOLDER_LOGO_PATH = "../../assets/images/folder-show.png"; - - // 笔记文件夹目录集合 - public static final String SYS_FILE_MYNOTE_LIST_MATION = "sys_file_mynote_list_mation_"; - - public static String getSysFileMyNoteListMation(String folderId, String userId) { - return SYS_FILE_MYNOTE_LIST_MATION + folderId + "_" + userId; - } - - /** - * 获取我的笔记默认的文件夹 - * - * @return - */ - public static final List> getFileMyNoteDefaultFolder() { - List> beans = new ArrayList<>(); - Map newnotes = new HashMap<>(); - newnotes.put("id", "1"); - newnotes.put("name", "最新笔记"); - newnotes.put("pId", "0"); - newnotes.put("isParent", 0);// 是否是文件夹 0否1是 - newnotes.put("icon", "../../assets/images/note-folder.png");// 图标 - beans.add(newnotes); - Map myfiles = new HashMap<>(); - myfiles.put("id", "2"); - myfiles.put("name", "我的文件夹"); - myfiles.put("pId", "0"); - myfiles.put("isParent", 1);// 是否是文件夹 0否1是 - myfiles.put("icon", "../../assets/images/my-folder-icon.png");// 图标 - beans.add(myfiles); - return beans; - } - -} diff --git a/skyeye-promote/skyeye-mq/pom.xml b/skyeye-promote/skyeye-mq/pom.xml index 87cd29ea..cda67ce2 100644 --- a/skyeye-promote/skyeye-mq/pom.xml +++ b/skyeye-promote/skyeye-mq/pom.xml @@ -22,20 +22,6 @@ 0.0.1-SNAPSHOT - - - org.apache.activemq - activemq-core - 5.7.0 - - - org.apache.activemq - activemq-pool - - - org.springframework - spring-jms - diff --git a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/controller/JobMateMationController.java b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/controller/JobMateMationController.java index 1bd66e74..028467f0 100644 --- a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/controller/JobMateMationController.java +++ b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/controller/JobMateMationController.java @@ -11,6 +11,8 @@ import com.skyeye.annotation.api.ApiOperation; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; import com.skyeye.eve.entity.mq.JobMateQueryDO; +import com.skyeye.eve.rest.mq.JobMateMation; +import com.skyeye.eve.rest.mq.JobMateUpdateMation; import com.skyeye.service.JobMateMationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; @@ -43,13 +45,23 @@ public class JobMateMationController { * @param outputObject 出参以及提示信息的返回值对象 */ @ApiOperation(id = "sendMQProducer", value = "其他模块同步生产消息", method = "POST", allUse = "2") - @ApiImplicitParams({ - @ApiImplicitParam(id = "jsonStr", name = "jsonStr", value = "消费者消费的json字符串", required = "required"), - @ApiImplicitParam(id = "userId", name = "userId", value = "用户id", required = "required")}) + @ApiImplicitParams(classBean = JobMateMation.class) @RequestMapping("/post/JobMateMationController/sendMQProducer") public void sendMQProducer(InputObject inputObject, OutputObject outputObject) { jobMateMationService.sendMQProducer(inputObject, outputObject); } + /** + * 修改任务信息 + * + * @param inputObject 入参以及用户信息等获取对象 + * @param outputObject 出参以及提示信息的返回值对象 + */ + @ApiOperation(id = "comMQJobMation", value = "修改任务信息", method = "POST", allUse = "0") + @ApiImplicitParams(classBean = JobMateUpdateMation.class) + @RequestMapping("/post/JobMateMationController/comMQJobMation") + public void comMQJobMation(InputObject inputObject, OutputObject outputObject) { + jobMateMationService.comMQJobMation(inputObject, outputObject); + } } diff --git a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/config/QueueConfig.java b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/config/QueueConfig.java deleted file mode 100644 index 6e84d225..00000000 --- a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/config/QueueConfig.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ -package com.skyeye.mq.config; - -import javax.jms.Queue; - -import org.apache.activemq.command.ActiveMQQueue; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * @author 卫志强 - * @ClassName: QueueConfig - * @Description: 创建一个队列 - * @date 2019年3月3日 - */ -@Configuration -public class QueueConfig { - - @Value("${queue}") - // 值就是skyeye - private String queueName; - - @Bean - public Queue queue() {// 消息队列的名字就是skyeye - return new ActiveMQQueue(queueName); - } -} diff --git a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/consumer/Consumer.java b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/consumer/Consumer.java deleted file mode 100644 index 410eee15..00000000 --- a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/consumer/Consumer.java +++ /dev/null @@ -1,44 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.mq.consumer; - -import cn.hutool.json.JSONUtil; -import com.skyeye.common.constans.MqConstants; -import com.skyeye.common.util.SpringUtils; -import com.skyeye.exception.CustomException; -import com.skyeye.mq.job.JobMateService; -import org.springframework.jms.annotation.JmsListener; -import org.springframework.stereotype.Component; - -import java.util.Map; - -/** - * @author 卫志强 - * @ClassName: Consumer - * @Description: 消费者 - * @date 2019年3月3日 - */ -@Component -public class Consumer { - - /** - * activeMq监听监听接收消息队列 - * - * @param data 从消息队列获得到的参数 - */ - @JmsListener(destination = "${queue}") - public void receive(String data) { - Map map = JSONUtil.toBean(data, null); - String type = map.get("type").toString(); - try { - Thread.sleep(3000); - } catch (InterruptedException ex) { - throw new CustomException(ex); - } - JobMateService jobMateService = SpringUtils.getBean(MqConstants.JobMateMationJobType.getServiceNameByJobType(type)); - jobMateService.call(data); - } - -} diff --git a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/MailDraftsEditServiceImpl.java b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/MailDraftsEditServiceImpl.java index 19c85314..3611fc72 100644 --- a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/MailDraftsEditServiceImpl.java +++ b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/MailDraftsEditServiceImpl.java @@ -4,11 +4,11 @@ package com.skyeye.mq.job.impl; import cn.hutool.json.JSONUtil; +import com.skyeye.common.constans.MqConstants; import com.skyeye.common.util.MailUtil; import com.skyeye.common.util.ToolUtil; import com.skyeye.dao.MQUserEmailDao; import com.skyeye.eve.service.SystemFoundationSettingsService; -import com.skyeye.common.constans.MqConstants; import com.skyeye.mq.job.JobMateService; import com.skyeye.service.JobMateMationService; import org.slf4j.Logger; diff --git a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/MailDraftsSaveServiceImpl.java b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/MailDraftsSaveServiceImpl.java index baba48cc..1352d218 100644 --- a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/MailDraftsSaveServiceImpl.java +++ b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/MailDraftsSaveServiceImpl.java @@ -4,11 +4,11 @@ package com.skyeye.mq.job.impl; import cn.hutool.json.JSONUtil; +import com.skyeye.common.constans.MqConstants; import com.skyeye.common.util.MailUtil; import com.skyeye.common.util.ToolUtil; import com.skyeye.dao.MQUserEmailDao; import com.skyeye.eve.service.SystemFoundationSettingsService; -import com.skyeye.common.constans.MqConstants; import com.skyeye.mq.job.JobMateService; import com.skyeye.service.JobMateMationService; import org.slf4j.Logger; diff --git a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/MailDraftsSendServiceImpl.java b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/MailDraftsSendServiceImpl.java index 0a6d1ac0..d9b234d2 100644 --- a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/MailDraftsSendServiceImpl.java +++ b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/MailDraftsSendServiceImpl.java @@ -4,11 +4,11 @@ package com.skyeye.mq.job.impl; import cn.hutool.json.JSONUtil; +import com.skyeye.common.constans.MqConstants; import com.skyeye.common.util.MailUtil; import com.skyeye.common.util.ToolUtil; import com.skyeye.dao.MQUserEmailDao; import com.skyeye.eve.service.SystemFoundationSettingsService; -import com.skyeye.common.constans.MqConstants; import com.skyeye.mq.job.JobMateService; import com.skyeye.service.JobMateMationService; import org.slf4j.Logger; diff --git a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/NoticeSendServiceImpl.java b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/NoticeSendServiceImpl.java index eae4a50f..7b7a6905 100644 --- a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/NoticeSendServiceImpl.java +++ b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/NoticeSendServiceImpl.java @@ -4,8 +4,8 @@ package com.skyeye.mq.job.impl; import cn.hutool.json.JSONUtil; -import com.skyeye.common.util.MailUtil; import com.skyeye.common.constans.MqConstants; +import com.skyeye.common.util.MailUtil; import com.skyeye.mq.job.JobMateService; import com.skyeye.service.JobMateMationService; import org.slf4j.Logger; diff --git a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/OrdinaryMailDeliveryServiceImpl.java b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/OrdinaryMailDeliveryServiceImpl.java index 96491279..24aff38f 100644 --- a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/OrdinaryMailDeliveryServiceImpl.java +++ b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/OrdinaryMailDeliveryServiceImpl.java @@ -4,8 +4,8 @@ package com.skyeye.mq.job.impl; import cn.hutool.json.JSONUtil; -import com.skyeye.common.util.MailUtil; import com.skyeye.common.constans.MqConstants; +import com.skyeye.common.util.MailUtil; import com.skyeye.mq.job.JobMateService; import com.skyeye.service.JobMateMationService; import org.slf4j.Logger; diff --git a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/WatiWorkerSendServiceImpl.java b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/WatiWorkerSendServiceImpl.java index e4be8728..b9f6eaa5 100644 --- a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/WatiWorkerSendServiceImpl.java +++ b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/mq/job/impl/WatiWorkerSendServiceImpl.java @@ -8,7 +8,6 @@ import cn.hutool.json.JSONUtil; import com.skyeye.common.constans.Constants; import com.skyeye.common.constans.MqConstants; import com.skyeye.common.util.DataCommonUtil; -import com.skyeye.common.util.DateUtil; import com.skyeye.common.util.MailUtil; import com.skyeye.common.util.ToolUtil; import com.skyeye.dao.MQUserEmailDao; diff --git a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/service/JobMateMationService.java b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/service/JobMateMationService.java index ba37b985..4e60491e 100644 --- a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/service/JobMateMationService.java +++ b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/service/JobMateMationService.java @@ -13,6 +13,8 @@ public interface JobMateMationService { void sendMQProducer(String jsonStr, String userId); + void comMQJobMation(InputObject inputObject, OutputObject outputObject); + void comMQJobMation(String jobId, String status, String responseBody); void sendMQProducer(InputObject inputObject, OutputObject outputObject); diff --git a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/service/impl/JobMateMationServiceImpl.java b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/service/impl/JobMateMationServiceImpl.java index 2adf8f08..7cf80c3a 100644 --- a/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/service/impl/JobMateMationServiceImpl.java +++ b/skyeye-promote/skyeye-mq/src/main/java/com/skyeye/service/impl/JobMateMationServiceImpl.java @@ -14,18 +14,21 @@ import com.skyeye.common.object.OutputObject; import com.skyeye.common.util.DateUtil; import com.skyeye.dao.JobMateMationDao; import com.skyeye.eve.entity.mq.JobMateQueryDO; +import com.skyeye.eve.rest.mq.JobMateMation; +import com.skyeye.eve.rest.mq.JobMateUpdateMation; import com.skyeye.exception.CustomException; import com.skyeye.service.JobMateMationService; import com.skyeye.websocket.TalkWebSocket; +import org.apache.rocketmq.client.producer.SendResult; +import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jms.core.JmsMessagingTemplate; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.messaging.support.MessageBuilder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.jms.Queue; -import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.HashMap; @@ -49,13 +52,13 @@ public class JobMateMationServiceImpl implements JobMateMationService { private JobMateMationDao jobMateMationDao; @Autowired - private JmsMessagingTemplate jmsMessagingTemplate; + private RocketMQTemplate rocketMQTemplate; @Autowired private TalkWebSocket talkWebSocket; - @Autowired - private Queue queue; + @Value("${spring.profiles.active}") + private String tag; /** * 根据大类获取任务信息 @@ -82,10 +85,8 @@ public class JobMateMationServiceImpl implements JobMateMationService { */ @Override public void sendMQProducer(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - String jsonStr = map.get("jsonStr").toString(); - String userId = map.get("userId").toString(); - this.sendMQProducer(jsonStr, userId); + JobMateMation jobMateMation = inputObject.getParams(JobMateMation.class); + this.sendMQProducer(jobMateMation.getJsonStr(), jobMateMation.getUserId()); } /** @@ -109,8 +110,13 @@ public class JobMateMationServiceImpl implements JobMateMationService { map.put("jobMateId", parentJob.get("jobId")); parentJob.put("requestBody", JSONUtil.toJsonStr(map)); jobMateMationDao.editJobRequestBodyMation(parentJob); + String jobType = parentJob.get("jobType").toString(); // 发起消息 - jmsMessagingTemplate.convertAndSend(queue, parentJob.get("requestBody").toString()); + String topic = MqConstants.JobMateMationJobType.getTopicByJobType(jobType); + // 同步发送 + SendResult sendResult = rocketMQTemplate.syncSend(topic + ":" + tag, + MessageBuilder.withPayload(parentJob.get("requestBody").toString()).build()); + LOGGER.info("mq send topic is [{}], send result: [{}]", topic, sendResult); } /** @@ -141,6 +147,19 @@ public class JobMateMationServiceImpl implements JobMateMationService { return job; } + /** + * 修改任务信息 + * + * @param inputObject 入参以及用户信息等获取对象 + * @param outputObject 出参以及提示信息的返回值对象 + */ + @Override + public void comMQJobMation(InputObject inputObject, OutputObject outputObject) { + JobMateUpdateMation jobMateUpdateMation = inputObject.getParams(JobMateUpdateMation.class); + LOGGER.info("update job [{}], status is {}", jobMateUpdateMation.getJobId(), jobMateUpdateMation.getStatus()); + this.comMQJobMation(jobMateUpdateMation.getJobId(), jobMateUpdateMation.getStatus(), jobMateUpdateMation.getResponseBody()); + } + /** * 任务状态修改 * diff --git a/skyeye-promote/skyeye-mq/src/main/resources/mapper/mqmapper/JobMateMationMapper.xml b/skyeye-promote/skyeye-mq/src/main/resources/mapper/mqmapper/JobMateMationMapper.xml index d215f0b0..62c6037d 100644 --- a/skyeye-promote/skyeye-mq/src/main/resources/mapper/mqmapper/JobMateMationMapper.xml +++ b/skyeye-promote/skyeye-mq/src/main/resources/mapper/mqmapper/JobMateMationMapper.xml @@ -63,7 +63,7 @@ a.type, a.request_body requestBody, a.response_body responseBody, - a.parent_id parentId + a.parent_id parentId, a.`status` FROM job_mate_mation a @@ -80,7 +80,7 @@ a.type, a.request_body requestBody, a.response_body responseBody, - a.parent_id parentId + a.parent_id parentId, a.`status` FROM job_mate_mation a diff --git a/skyeye-promote/skyeye-note/.gitignore b/skyeye-promote/skyeye-note/.gitignore deleted file mode 100644 index b83d2226..00000000 --- a/skyeye-promote/skyeye-note/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target/ diff --git a/skyeye-promote/skyeye-note/.project b/skyeye-promote/skyeye-note/.project deleted file mode 100644 index 91ab4c74..00000000 --- a/skyeye-promote/skyeye-note/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - skyeye-note - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/skyeye-promote/skyeye-note/pom.xml b/skyeye-promote/skyeye-note/pom.xml deleted file mode 100644 index 6e9056cd..00000000 --- a/skyeye-promote/skyeye-note/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - - com.skyeye - skyeye-promote - 0.0.1-SNAPSHOT - - - skyeye-note - skyeye-note - http://maven.apache.org - - - UTF-8 - - - - - - - com.skyeye - skyeye-mq - 0.0.1-SNAPSHOT - - - - - diff --git a/skyeye-promote/skyeye-note/src/main/java/com/skyeye/eve/controller/MyNoteController.java b/skyeye-promote/skyeye-note/src/main/java/com/skyeye/eve/controller/MyNoteController.java deleted file mode 100644 index 9544391a..00000000 --- a/skyeye-promote/skyeye-note/src/main/java/com/skyeye/eve/controller/MyNoteController.java +++ /dev/null @@ -1,177 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.eve.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -import com.skyeye.common.object.InputObject; -import com.skyeye.common.object.OutputObject; -import com.skyeye.eve.service.MyNoteService; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class MyNoteController { - - @Autowired - private MyNoteService myNoteService; - - /** - * 根据当前用户获取笔记文件夹 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/MyNoteController/queryFileMyNoteByUserId") - public void queryFileMyNoteByUserId(InputObject inputObject, OutputObject outputObject) { - myNoteService.queryFileMyNoteByUserId(inputObject, outputObject); - } - - /** - * 添加文件夹 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/MyNoteController/insertFileMyNoteByUserId") - public void insertFileMyNoteByUserId(InputObject inputObject, OutputObject outputObject) { - myNoteService.insertFileMyNoteByUserId(inputObject, outputObject); - } - - /** - * 删除文件夹以及文件夹下的所有文件 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/MyNoteController/deleteFileFolderById") - public void deleteFileFolderById(InputObject inputObject, OutputObject outputObject) { - myNoteService.deleteFileFolderById(inputObject, outputObject); - } - - /** - * 编辑文件夹名称 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/MyNoteController/editFileFolderById") - public void editFileFolderById(InputObject inputObject, OutputObject outputObject) { - myNoteService.editFileFolderById(inputObject, outputObject); - } - - /** - * 根据当前用户获取最新的笔记列表 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/MyNoteController/queryMyNoteListNewByUserId") - public void queryMyNoteListNewByUserId(InputObject inputObject, OutputObject outputObject) { - myNoteService.queryMyNoteListNewByUserId(inputObject, outputObject); - } - - /** - * 添加笔记 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/MyNoteController/insertMyNoteContentByUserId") - public void insertMyNoteContentByUserId(InputObject inputObject, OutputObject outputObject) { - myNoteService.insertMyNoteContentByUserId(inputObject, outputObject); - } - - /** - * 根据文件夹id获取文件夹下的文件夹和笔记列表 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/MyNoteController/queryFileAndContentListByFolderId") - public void queryFileAndContentListByFolderId(InputObject inputObject, OutputObject outputObject) { - myNoteService.queryFileAndContentListByFolderId(inputObject, outputObject); - } - - /** - * 编辑笔记时回显信息 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/MyNoteController/queryMyNoteContentMationById") - public void queryMyNoteContentMationById(InputObject inputObject, OutputObject outputObject) { - myNoteService.queryMyNoteContentMationById(inputObject, outputObject); - } - - /** - * 编辑笔记信息 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/MyNoteController/editMyNoteContentById") - public void editMyNoteContentById(InputObject inputObject, OutputObject outputObject) { - myNoteService.editMyNoteContentById(inputObject, outputObject); - } - - /** - * 保存文件夹拖拽后的信息 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/MyNoteController/editFileToDragById") - public void editFileToDragById(InputObject inputObject, OutputObject outputObject) { - myNoteService.editFileToDragById(inputObject, outputObject); - } - - /** - * 保存笔记移动后的信息 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/MyNoteController/editNoteToMoveById") - public void editNoteToMoveById(InputObject inputObject, OutputObject outputObject) { - myNoteService.editNoteToMoveById(inputObject, outputObject); - } - - /** - * 获取文件夹或笔记移动时的选择树 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/MyNoteController/queryTreeToMoveByUserId") - public void queryTreeToMoveByUserId(InputObject inputObject, OutputObject outputObject) { - myNoteService.queryTreeToMoveByUserId(inputObject, outputObject); - } - - /** - * 根据id获取分享笔记的内容 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/MyNoteController/queryShareNoteById") - public void queryShareNoteById(InputObject inputObject, OutputObject outputObject) { - myNoteService.queryShareNoteById(inputObject, outputObject); - } - - /** - * 根据id(文件夹或者笔记id)将笔记输出为压缩包 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @RequestMapping("/post/MyNoteController/outputNoteIsZipJob") - public void outputNoteIsZipJob(InputObject inputObject, OutputObject outputObject) { - myNoteService.outputNoteIsZipJob(inputObject, outputObject); - } - -} diff --git a/skyeye-promote/skyeye-note/src/main/java/com/skyeye/eve/dao/MyNoteDao.java b/skyeye-promote/skyeye-note/src/main/java/com/skyeye/eve/dao/MyNoteDao.java deleted file mode 100644 index ef4e5f69..00000000 --- a/skyeye-promote/skyeye-note/src/main/java/com/skyeye/eve/dao/MyNoteDao.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.eve.dao; - -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -public interface MyNoteDao { - - int insertFileFolderByUserId(Map map); - - List> queryFileFolderByUserIdAndParentId(Map map); - - Map queryFolderMationById(@Param("folderId") String folderId); - - int deleteFileFolderById(Map map); - - int deleteFilesByFolderId(Map map); - - int deleteFolderChildByFolderId(Map map); - - int deleteNoteContentById(Map map); - - int editFileFolderById(Map map); - - int editNoteContentNameById(Map map); - - List> queryMyNoteListNewByUserId(Map map); - - int insertMyNoteContentByUserId(Map map); - - List> queryFileAndContentListByFolderId(Map map); - - Map queryMyNoteContentMationById(Map map); - - int editMyNoteContentById(Map map); - - List> queryFileFolderListByList(List> folderBeans); - - int deleteFileFolderListByList(List> folderBeans); - - List> queryFileListByList(List> folderNew); - - int deleteFileListByList(List> folderNew); - - int insertFileFolderListByList(List> folderNew); - - int insertFileListByList(List> fileNew); - - List> queryTreeToMoveByUserId(Map map); - - Map queryShareNoteById(@Param("fileId") String fileId); - - List> queryAllFolderListByFolderId(@Param("folderId") String folderId); - - List> queryAllFileListByFolderList(List> beans); - - int editNoteToMoveById(@Param("fileId") String fileId, @Param("parentId") String parentId, @Param("userId") String userId); - -} diff --git a/skyeye-promote/skyeye-note/src/main/java/com/skyeye/eve/service/MyNoteService.java b/skyeye-promote/skyeye-note/src/main/java/com/skyeye/eve/service/MyNoteService.java deleted file mode 100644 index 892b4025..00000000 --- a/skyeye-promote/skyeye-note/src/main/java/com/skyeye/eve/service/MyNoteService.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.eve.service; - -import com.skyeye.common.object.InputObject; -import com.skyeye.common.object.OutputObject; - -public interface MyNoteService { - - void queryFileMyNoteByUserId(InputObject inputObject, OutputObject outputObject); - - void insertFileMyNoteByUserId(InputObject inputObject, OutputObject outputObject); - - void deleteFileFolderById(InputObject inputObject, OutputObject outputObject); - - void editFileFolderById(InputObject inputObject, OutputObject outputObject); - - void queryMyNoteListNewByUserId(InputObject inputObject, OutputObject outputObject); - - void insertMyNoteContentByUserId(InputObject inputObject, OutputObject outputObject); - - void queryFileAndContentListByFolderId(InputObject inputObject, OutputObject outputObject); - - void queryMyNoteContentMationById(InputObject inputObject, OutputObject outputObject); - - void editMyNoteContentById(InputObject inputObject, OutputObject outputObject); - - void editFileToDragById(InputObject inputObject, OutputObject outputObject); - - void editNoteToMoveById(InputObject inputObject, OutputObject outputObject); - - void queryTreeToMoveByUserId(InputObject inputObject, OutputObject outputObject); - - void queryShareNoteById(InputObject inputObject, OutputObject outputObject); - - void outputNoteIsZipJob(InputObject inputObject, OutputObject outputObject); - -} diff --git a/skyeye-promote/skyeye-note/src/main/java/com/skyeye/eve/service/impl/MyNoteServiceImpl.java b/skyeye-promote/skyeye-note/src/main/java/com/skyeye/eve/service/impl/MyNoteServiceImpl.java deleted file mode 100644 index 13f87f67..00000000 --- a/skyeye-promote/skyeye-note/src/main/java/com/skyeye/eve/service/impl/MyNoteServiceImpl.java +++ /dev/null @@ -1,477 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.eve.service.impl; - -import cn.hutool.json.JSONUtil; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import com.skyeye.common.constans.MqConstants; -import com.skyeye.common.constans.NoteConstants; -import com.skyeye.common.object.InputObject; -import com.skyeye.common.object.OutputObject; -import com.skyeye.common.util.DataCommonUtil; -import com.skyeye.common.util.DateUtil; -import com.skyeye.common.util.ToolUtil; -import com.skyeye.eve.dao.MyNoteDao; -import com.skyeye.eve.service.MyNoteService; -import com.skyeye.jedis.JedisClientService; -import com.skyeye.service.JobMateMationService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; - -import java.util.*; - -/** - * @ClassName: MyNoteServiceImpl - * @Description: 笔记管理服务类 - * @author: skyeye云系列--卫志强 - * @date: 2021/7/6 22:56 - * @Copyright: 2021 https://gitee.com/doc_wei01/skyeye Inc. All rights reserved. - * 注意：本内容仅限购买后使用.禁止私自外泄以及用于其他的商业目的 - */ -@Service -public class MyNoteServiceImpl implements MyNoteService { - - @Autowired - private MyNoteDao myNoteDao; - - @Autowired - public JedisClientService jedisClient; - - @Autowired - private JobMateMationService jobMateMationService; - - /** - * 根据当前用户获取笔记文件夹 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void queryFileMyNoteByUserId(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - if (ToolUtil.isBlank(map.get("parentId").toString()) || "0".equals(map.get("parentId").toString())) { - // 加载一级文件夹 - List> beans = new ArrayList<>(); - if (ToolUtil.isBlank(jedisClient.get(NoteConstants.SYS_FILE_MYNOTE_LIST_MATION))) { - beans = NoteConstants.getFileMyNoteDefaultFolder(); - jedisClient.set(NoteConstants.SYS_FILE_MYNOTE_LIST_MATION, JSONUtil.toJsonStr(beans)); - } else { - beans = JSONUtil.toList(jedisClient.get(NoteConstants.SYS_FILE_MYNOTE_LIST_MATION), null); - } - outputObject.setBeans(beans); - } else {//加载子文件夹 - Map user = inputObject.getLogParams(); - map.put("userId", user.get("id")); - List> beans = new ArrayList<>(); - String key = NoteConstants.getSysFileMyNoteListMation(map.get("parentId").toString(), map.get("userId").toString()); - if (ToolUtil.isBlank(jedisClient.get(key))) { - beans = myNoteDao.queryFileFolderByUserIdAndParentId(map); - jedisClient.set(key, JSONUtil.toJsonStr(beans)); - } else { - beans = JSONUtil.toList(jedisClient.get(key), null); - } - outputObject.setBeans(beans); - } - } - - /** - * 添加文件夹 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public void insertFileMyNoteByUserId(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - String userId = inputObject.getLogParams().get("id").toString(); - String key = NoteConstants.getSysFileMyNoteListMation(map.get("parentId").toString(), userId); - jedisClient.delKeys(key);//删除父文件夹的redis的key - String parentId = setParentId(map.get("parentId").toString()); - if ("0".equals(parentId)) { - outputObject.setreturnMessage("错误的文件夹编码！"); - return; - } - map.put("parentId", parentId); - map.put("state", 1); - DataCommonUtil.setCommonData(map, userId); - myNoteDao.insertFileFolderByUserId(map); - map.put("logoPath", NoteConstants.SYS_FILE_CONSOLE_IS_FOLDER_LOGO_PATH); - outputObject.setBean(map); - } - - /** - * 删除文件夹以及文件夹下的所有文件 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public void deleteFileFolderById(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - Map user = inputObject.getLogParams(); - map.put("userId", user.get("id")); - String id = map.get("id").toString(); - if ("folder".equals(map.get("fileType").toString())) {//操作文件夹表 - Map folder = myNoteDao.queryFolderMationById(id); - String[] str = folder.get("parentId").toString().split(","); - String key = NoteConstants.getSysFileMyNoteListMation(str[str.length - 1], user.get("id").toString()); - myNoteDao.deleteFileFolderById(map);//删除自身文件夹 - myNoteDao.deleteFolderChildByFolderId(map);//删除子文件夹 - myNoteDao.deleteFilesByFolderId(map);//删除子文件 - jedisClient.delKeys(key);//删除父文件夹的redis的key - } else {//操作笔记内容表 - myNoteDao.deleteNoteContentById(map);//删除自身文件 - } - } - - /** - * 编辑文件夹名称 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public void editFileFolderById(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - Map user = inputObject.getLogParams(); - map.put("userId", user.get("id")); - String id = map.get("id").toString(); - if ("folder".equals(map.get("fileType").toString())) {//操作文件夹表 - Map folder = myNoteDao.queryFolderMationById(id); - String[] str = folder.get("parentId").toString().split(","); - String key = NoteConstants.getSysFileMyNoteListMation(str[str.length - 1], user.get("id").toString()); - jedisClient.delKeys(key);//删除父文件夹的redis的key - myNoteDao.editFileFolderById(map); - } else {//操作笔记内容表 - myNoteDao.editNoteContentNameById(map); - } - } - - /** - * 根据当前用户获取最新的笔记列表 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void queryMyNoteListNewByUserId(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - Map user = inputObject.getLogParams(); - map.put("userId", user.get("id")); - Page pages = PageHelper.startPage(Integer.parseInt(map.get("page").toString()), Integer.parseInt(map.get("limit").toString())); - List> beans = myNoteDao.queryMyNoteListNewByUserId(map); - outputObject.setBeans(beans); - outputObject.settotal(pages.getTotal()); - } - - /** - * 添加笔记 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public void insertMyNoteContentByUserId(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - String parentId = setParentId(map.get("parentId").toString()); - if ("0".equals(parentId)) { - outputObject.setreturnMessage("错误的文件夹编码！"); - return; - } - map.put("parentId", parentId); - map.put("state", 1); - map.put("iconLogo", getIconLogoPathByType(map.get("type").toString())); - DataCommonUtil.setCommonData(map, inputObject.getLogParams().get("id").toString()); - myNoteDao.insertMyNoteContentByUserId(map); - outputObject.setBean(map); - } - - /** - * 根据笔记类型设置展示图标 - * - * @param type - * @return - */ - private String getIconLogoPathByType(String type) { - String iconLogo = "../../assets/images/%s"; - switch (type) { - case "1": - // 富文本编辑器 - iconLogo = String.format(Locale.ROOT, iconLogo, "note-1.png"); - break; - case "2": - // markdown笔记 - iconLogo = String.format(Locale.ROOT, iconLogo, "note-2.png"); - break; - case "3": - // word笔记 - iconLogo = String.format(Locale.ROOT, iconLogo, "note-3.png"); - break; - case "4": - // ecxel笔记 - iconLogo = String.format(Locale.ROOT, iconLogo, "note-4.png"); - break; - default: - break; - } - return iconLogo; - } - - /** - * 根据文件夹id获取文件夹下的文件夹和笔记列表 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void queryFileAndContentListByFolderId(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - Map user = inputObject.getLogParams(); - map.put("userId", user.get("id")); - List> beans = myNoteDao.queryFileAndContentListByFolderId(map); - outputObject.setBeans(beans); - outputObject.settotal(beans.size()); - } - - /** - * 编辑笔记时回显信息 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void queryMyNoteContentMationById(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - Map bean = myNoteDao.queryMyNoteContentMationById(map); - outputObject.setBean(bean); - } - - /** - * 编辑笔记信息 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public void editMyNoteContentById(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - String desc = map.get("desc").toString(); - if (desc.length() > 100) { - desc = desc.substring(0, 99); - } - map.put("desc", desc); - Map user = inputObject.getLogParams(); - map.put("userId", user.get("id")); - myNoteDao.editMyNoteContentById(map); - } - - /** - * 保存文件夹拖拽后的信息 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public void editFileToDragById(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - Map user = inputObject.getLogParams(); - String newParentId = ""; - String targetId = map.get("targetId").toString(); - String key = NoteConstants.getSysFileMyNoteListMation(targetId, user.get("id").toString()); - jedisClient.delKeys(key);//删除父文件夹的redis的key - if (targetId.equals("2")) { - newParentId = "2" + ","; - } else { - Map folder = myNoteDao.queryFolderMationById(targetId);//获取目标文件夹的父id - newParentId = folder.get("parentId").toString() + targetId + ",";//拖拽文件夹新的父id - } - String arrId = map.get("arrId").toString(); - String[] arr = arrId.split(",");//拖拽文件夹的id数组 - List> folderBeans = new ArrayList<>(); - for (int i = 0; i < arr.length; i++) { - Map bean = new HashMap<>(); - bean.put("id", arr[i]); - folderBeans.add(bean); - } - if (!folderBeans.isEmpty()) { - // 选择保存的文件夹不为空 - List> folderNew = myNoteDao.queryFileFolderListByList(folderBeans); - if (!folderNew.isEmpty()) {//删除之前的信息 - myNoteDao.deleteFileFolderListByList(folderNew); - } - List> fileNew = myNoteDao.queryFileListByList(folderNew); - if (!fileNew.isEmpty()) {//删除之前的信息 - myNoteDao.deleteFileListByList(fileNew); - } - for (Map folder : folderNew) {//重置父id - String[] str = folder.get("parentId").toString().split(","); - String thiskey = NoteConstants.getSysFileMyNoteListMation(str[str.length - 1], user.get("id").toString()); - jedisClient.delKeys(thiskey);//删除父文件夹的redis的key - folder.put("directParentId", str[str.length - 1]); - folder.put("newId", ToolUtil.getSurFaceId()); - } - //将数据转化为树的形式，方便进行父id重新赋值 - folderNew = ToolUtil.listToTree(folderNew, "id", "directParentId", "children"); - ToolUtil.FileListParentISEdit(folderNew, newParentId);//替换父id - folderNew = ToolUtil.FileTreeTransList(folderNew);//将树转为list - for (Map folder : folderNew) { - folder.put("createId", user.get("id")); - folder.put("createTime", DateUtil.getTimeAndToString()); - folder.put("state", 1); - } - //为文件重置新parentId参数 - for (Map folder : folderNew) { - String parentId = folder.get("parentId").toString() + folder.get("id").toString() + ","; - String nParentId = folder.get("newParentId").toString() + folder.get("newId").toString() + ","; - // 重置文件的参数 - for (Map file : fileNew) { - if (file.get("parentId").toString().equals(parentId)) { - file.put("newParentId", nParentId); - file.put("newId", ToolUtil.getSurFaceId()); - file.put("createId", user.get("id")); - file.put("createTime", DateUtil.getTimeAndToString()); - file.put("state", 1); - } - } - } - if (!folderNew.isEmpty()) { - myNoteDao.insertFileFolderListByList(folderNew); - } - if (!fileNew.isEmpty()) { - myNoteDao.insertFileListByList(fileNew); - } - } - } - - /** - * 根据节点id设置ParentId - * - * @param id - * @return - */ - private String setParentId(String id) { - if ("2".equals(id)) { - return id + ","; - } else { - Map folder = myNoteDao.queryFolderMationById(id); - if (!CollectionUtils.isEmpty(folder)) { - return folder.get("parentId").toString() + id + ","; - } else { - return "0"; - } - } - } - - /** - * 保存笔记移动后的信息 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public void editNoteToMoveById(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - // 要移动的笔记id - String rowId = map.get("moveId").toString(); - // 移动后的目录id - String toId = map.get("toId").toString(); - String parentId = setParentId(toId); - if ("0".equals(parentId)) { - outputObject.setreturnMessage("错误的文件夹编码！"); - return; - } - myNoteDao.editNoteToMoveById(rowId, parentId, inputObject.getLogParams().get("id").toString()); - } - - /** - * 获取文件夹或笔记移动时的选择树 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void queryTreeToMoveByUserId(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - if (ToolUtil.isBlank(map.get("parentId").toString()) || "0".equals(map.get("parentId").toString())) {//加载一级文件夹 - List> beans = new ArrayList<>(); - if (ToolUtil.isBlank(jedisClient.get(NoteConstants.SYS_FILE_MYNOTE_LIST_MATION))) { - beans = NoteConstants.getFileMyNoteDefaultFolder(); - jedisClient.set(NoteConstants.SYS_FILE_MYNOTE_LIST_MATION, JSONUtil.toJsonStr(beans)); - } else { - beans = JSONUtil.toList(jedisClient.get(NoteConstants.SYS_FILE_MYNOTE_LIST_MATION), null); - } - outputObject.setBeans(beans); - } else {//加载子文件夹 - Map user = inputObject.getLogParams(); - map.put("userId", user.get("id")); - List> beans = new ArrayList<>(); - beans = myNoteDao.queryTreeToMoveByUserId(map); - outputObject.setBeans(beans); - } - } - - /** - * 根据id获取分享笔记的内容 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void queryShareNoteById(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - Map bean = myNoteDao.queryShareNoteById(map.get("id").toString()); - if (bean == null) { - outputObject.setreturnMessage("该信息已被删除或不存在."); - return; - } - outputObject.setBean(bean); - } - - /** - * 根据id(文件夹或者笔记id)将笔记输出为压缩包 - * - * @param inputObject 入参以及用户信息等获取对象 - * @param outputObject 出参以及提示信息的返回值对象 - */ - @Override - public void outputNoteIsZipJob(InputObject inputObject, OutputObject outputObject) { - Map map = inputObject.getParams(); - String rowId = map.get("id").toString(); - // 类型1.文件夹2.笔记 - int type = Integer.parseInt(map.get("type").toString()); - Map mation; - if (type == 1) { - // 获取文件夹信息 - mation = myNoteDao.queryFolderMationById(rowId); - } else { - // 获取文件信息 - mation = myNoteDao.queryShareNoteById(rowId); - } - if (CollectionUtils.isEmpty(mation)) { - outputObject.setreturnMessage("该信息不存在."); - return; - } - String userId = inputObject.getLogParams().get("id").toString(); - Map json = new HashMap<>(); - json.put("title", mation.get("title").toString()); - json.put("noteType", type); - json.put("rowId", rowId); - json.put("userId", userId); - json.put("type", MqConstants.JobMateMationJobType.OUTPUT_NOTES_IS_ZIP.getJobType()); - // 启动任务 - jobMateMationService.sendMQProducer(JSONUtil.toJsonStr(json), userId); - } - -} diff --git a/skyeye-promote/skyeye-note/src/main/java/com/skyeye/mq/job/impl/OutputNotesIsZipServiceImpl.java b/skyeye-promote/skyeye-note/src/main/java/com/skyeye/mq/job/impl/OutputNotesIsZipServiceImpl.java deleted file mode 100644 index 24a470f3..00000000 --- a/skyeye-promote/skyeye-note/src/main/java/com/skyeye/mq/job/impl/OutputNotesIsZipServiceImpl.java +++ /dev/null @@ -1,193 +0,0 @@ -/******************************************************************************* - * Copyright 卫志强 QQ：598748873@qq.com Inc. All rights reserved. 开源地址：https://gitee.com/doc_wei01/skyeye - ******************************************************************************/ - -package com.skyeye.mq.job.impl; - -import cn.hutool.json.JSONUtil; -import com.skyeye.common.constans.MqConstants; -import com.skyeye.common.util.FileUtil; -import com.skyeye.common.util.ToolUtil; -import com.skyeye.eve.dao.MyNoteDao; -import com.skyeye.exception.CustomException; -import com.skyeye.mq.job.JobMateService; -import com.skyeye.service.JobMateMationService; -import com.youbenzi.md2.export.FileFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.zip.ZipOutputStream; - -/** - * @author 卫志强 - * @ClassName: OutputNotesIsZipServiceImpl - * @Description: 笔记输出为压缩包 - * @date 2020年8月23日 - */ -@Service("outputNotesIsZipService") -public class OutputNotesIsZipServiceImpl implements JobMateService { - - private static Logger LOGGER = LoggerFactory.getLogger(OutputNotesIsZipServiceImpl.class); - - @Autowired - private JobMateMationService jobMateMationService; - - @Value("${IMAGES_PATH}") - private String tPath; - - /** - * 系统水印 - */ - @Value("${system.sysWaterMark}") - private String sysWaterMark; - - /** - * 系统地址 - */ - @Value("${webroot.ndc}") - private String webRootNdc; - - @Autowired - private MyNoteDao myNoteDao; - - @Override - public void call(String data) { - Map map = JSONUtil.toBean(data, null); - String jobId = map.get("jobMateId").toString(); - Map mation = new HashMap<>(); - try { - LOGGER.info("start output job, jobId is {}", jobId); - // 任务开始 - jobMateMationService.comMQJobMation(jobId, MqConstants.JOB_TYPE_IS_PROCESSING, ""); - String rowId = map.get("rowId").toString(); - // 类型1.文件夹2.笔记 - int type = Integer.parseInt(map.get("noteType").toString()); - if (type == 1) { - String zipFile = outputFolder(rowId, map.get("userId").toString()); - mation.put("filePath", zipFile); - } else { - String zipFile = outPutFileContent(rowId, map.get("userId").toString()); - mation.put("filePath", zipFile); - } - - // 任务完成 - jobMateMationService.comMQJobMation(jobId, MqConstants.JOB_TYPE_IS_SUCCESS, JSONUtil.toJsonStr(mation)); - } catch (Exception e) { - LOGGER.info("job is fail, this message is {}", e); - // 任务失败 - mation.put("message", e); - jobMateMationService.comMQJobMation(jobId, MqConstants.JOB_TYPE_IS_FAIL, JSONUtil.toJsonStr(mation)); - } - } - - /** - * 文件夹(包含文件)输出为压缩包 - * - * @param parentId - * @param userId - * @return - */ - private String outputFolder(String parentId, String userId) { - // 1.获取该目录下的所有目录 - List> beans = myNoteDao.queryAllFolderListByFolderId(parentId); - // 2.获取所有目录下的所有文件 - List> files = myNoteDao.queryAllFileListByFolderList(beans); - // 文件存储基础路径 - String basePath = String.format("%s%s%s%s", tPath, "\\upload\\notes\\filezip\\", userId, "\\"); - ToolUtil.createFolder(basePath); - for (Map bean : files) { - String content = bean.containsKey("content") ? bean.get("content").toString() : ""; - bean.put("fileAddress", outPutFileContent(basePath, content, Integer.parseInt(bean.get("fileType").toString()), userId)); - bean.put("content", ""); - bean.put("fileName", bean.get("fileName").toString() + ".pdf"); - } - beans.addAll(files); - // 重置父id - for (Map folder : beans) { - String[] str = folder.get("parentId").toString().split(","); - folder.put("directParentId", str[str.length - 1]); - } - // 将数据转化为树的形式，方便进行父id重新赋值 - beans = ToolUtil.listToTree(beans, "id", "directParentId", "children"); - // 打包--压缩包文件名 - String fileName = String.valueOf(System.currentTimeMillis()); - String strZipPath = basePath + fileName + ".zip"; - ZipOutputStream out = null; - try { - out = new ZipOutputStream(new FileOutputStream(strZipPath)); - ToolUtil.recursionZip(out, beans, "", tPath.replace("images", ""), 2); - } catch (Exception ee) { - throw new CustomException(ee); - } finally { - // 删除临时文件 - for (Map bean : files) { - FileUtil.deleteFile(tPath.replace("images", "") + bean.get("fileAddress").toString()); - } - FileUtil.close(out); - } - return "/images/upload/notes/filezip/" + userId + "/" + fileName + ".zip"; - } - - /** - * 单个文件输出 - * - * @param basePath 基础路径 - * @param content 内容 - * @param type 类型 - * @param userId 用户id - * @return - */ - private String outPutFileContent(String basePath, String content, int type, String userId) { - String fileName = String.valueOf(System.currentTimeMillis()); - if (ToolUtil.isBlank(content)) { - content = "暂无内容"; - } - switch (type) { - case 1: - // 富文本编辑器 - - break; - case 2: - // markdown笔记 - FileFactory.produce(content, basePath + "/" + fileName + ".pdf", webRootNdc, sysWaterMark); - break; - case 3: - // word笔记 - - break; - case 4: - // ecxel笔记 - - break; - default: - break; - } - return "/images/upload/notes/filezip/" + userId + "/" + fileName + ".pdf"; - } - - /** - * 单个文件输出 - * - * @param fileId 文件id - * @param userId 用户id - * @return - */ - private String outPutFileContent(String fileId, String userId) { - Map mation = myNoteDao.queryShareNoteById(fileId); - mation.put("fileName", mation.get("title")); - mation.put("fileType", mation.get("type")); - // 文件存储基础路径 - String basePath = String.format("%s%s%s%s", tPath, "/upload/notes/filezip/", userId, "/"); - ToolUtil.createFolder(basePath); - return outPutFileContent(basePath, mation.get("content").toString(), Integer.parseInt(mation.get("fileType").toString()), userId); - } - -} diff --git a/skyeye-promote/skyeye-note/src/main/resources/mapper/note/MyNoteMapper.xml b/skyeye-promote/skyeye-note/src/main/resources/mapper/note/MyNoteMapper.xml deleted file mode 100644 index 26401274..00000000 --- a/skyeye-promote/skyeye-note/src/main/resources/mapper/note/MyNoteMapper.xml +++ /dev/null @@ -1,363 +0,0 @@ - - - - - - INSERT INTO note_folder - (id, name, state, parent_id, create_id, create_time, last_update_id, last_update_time) - VALUES - (#{id}, #{catalogName}, #{state}, #{parentId}, #{createId}, #{createTime}, #{createId}, #{createTime}) - - - - - - - - - - UPDATE note_folder - - state = 2, - last_update_id = #{userId}, - last_update_time = NOW(), - - WHERE id = #{id} - - - - UPDATE note_folder - - state = 2, - last_update_id = #{userId}, - last_update_time = NOW(), - - WHERE - INSTR(CONCAT(',', parent_id, ','), CONCAT(',', #{id}, ',')) - - - - UPDATE note_content - - state = 2, - last_update_id = #{userId}, - last_update_time = NOW(), - - WHERE - INSTR(CONCAT(',', parent_id, ','), CONCAT(',', #{id}, ',')) - - - - UPDATE note_content - - state = 2, - last_update_id = #{userId}, - last_update_time = NOW(), - - WHERE id = #{id} - - - - UPDATE note_folder - - - name = #{catalogName}, - - last_update_id = #{userId}, - last_update_time = NOW(), - - WHERE id = #{id} - AND create_id = #{userId} - - - - UPDATE note_content - - - title = #{catalogName}, - - last_update_id = #{userId}, - last_update_time = NOW(), - - WHERE id = #{id} - AND create_id = #{userId} - - - - - - INSERT INTO note_content - (id, title, state, parent_id, icon_logo, `desc`, content, type, create_id, create_time, last_update_id, last_update_time) - VALUES - (#{id}, #{title}, #{state}, #{parentId}, #{iconLogo}, #{desc}, #{content}, #{type}, #{createId}, #{createTime}, #{createId}, #{createTime}) - - - - - - - - UPDATE note_content - - - title = #{title}, - - content = #{content}, - `desc` = #{desc}, - last_update_id = #{userId}, - last_update_time = NOW(), - - WHERE id = #{id} - AND create_id = #{userId} - - - - - - DELETE - FROM - note_folder - WHERE - ( - - id = #{item.id} OR - - 1 = 0) - - - - - - DELETE - FROM - note_content - WHERE - ( - - id = #{item.id} OR - - 1 = 0) - - - - insert into note_folder - (id, name, parent_id, state, create_id, create_time, last_update_id, last_update_time) - values - - (#{item.newId}, #{item.name}, #{item.newParentId}, #{item.state}, #{item.createId}, #{item.createTime}, #{item.createId}, #{item.createTime}) - - - - - insert into note_content - (id, title, icon_logo, `desc`, content, type, parent_id, state, create_id, create_time, last_update_id, last_update_time) - values - - (#{item.newId}, #{item.fileName}, #{item.iconLogo}, #{item.desc}, #{item.content}, #{item.type}, - #{item.newParentId}, #{item.state}, #{item.createId}, #{item.createTime}, #{item.createId}, #{item.createTime}) - - - - - - - - - - - UPDATE note_content - - parent_id = #{parentId}, - last_update_id = #{userId}, - last_update_time = NOW(), - - WHERE id = #{fileId} - - - \ No newline at end of file diff --git a/skyeye-promote/skyeye-note/src/main/resources/reqmapping/mapping/note.xml b/skyeye-promote/skyeye-note/src/main/resources/reqmapping/mapping/note.xml deleted file mode 100644 index d0ddb614..00000000 --- a/skyeye-promote/skyeye-note/src/main/resources/reqmapping/mapping/note.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/skyeye-promote/skyeye-quartz/src/main/java/com/skyeye/quartz/consumer/impl/AllScheduleMationService.java b/skyeye-promote/skyeye-quartz/src/main/java/com/skyeye/quartz/consumer/impl/AllScheduleMationService.java index 9015a45c..7b3e0d94 100644 --- a/skyeye-promote/skyeye-quartz/src/main/java/com/skyeye/quartz/consumer/impl/AllScheduleMationService.java +++ b/skyeye-promote/skyeye-quartz/src/main/java/com/skyeye/quartz/consumer/impl/AllScheduleMationService.java @@ -7,7 +7,6 @@ package com.skyeye.quartz.consumer.impl; import cn.hutool.json.JSONUtil; import com.skyeye.common.constans.MqConstants; import com.skyeye.common.util.DataCommonUtil; -import com.skyeye.common.util.DateUtil; import com.skyeye.common.util.ToolUtil; import com.skyeye.eve.dao.SysQuartzDao; import com.skyeye.quartz.consumer.TaskMateService; diff --git a/skyeye-promote/skyeye-quartz/src/main/java/com/skyeye/quartz/consumer/impl/MyScheduleDayMationService.java b/skyeye-promote/skyeye-quartz/src/main/java/com/skyeye/quartz/consumer/impl/MyScheduleDayMationService.java index 2246950e..097c91a0 100644 --- a/skyeye-promote/skyeye-quartz/src/main/java/com/skyeye/quartz/consumer/impl/MyScheduleDayMationService.java +++ b/skyeye-promote/skyeye-quartz/src/main/java/com/skyeye/quartz/consumer/impl/MyScheduleDayMationService.java @@ -6,7 +6,6 @@ package com.skyeye.quartz.consumer.impl; import cn.hutool.json.JSONUtil; import com.skyeye.common.constans.MqConstants; import com.skyeye.common.util.DataCommonUtil; -import com.skyeye.common.util.DateUtil; import com.skyeye.common.util.ToolUtil; import com.skyeye.eve.dao.SysQuartzDao; import com.skyeye.quartz.consumer.TaskMateService; diff --git a/skyeye-promote/skyeye-quartz/src/main/java/com/skyeye/quartz/consumer/impl/MySysWorkMationService.java b/skyeye-promote/skyeye-quartz/src/main/java/com/skyeye/quartz/consumer/impl/MySysWorkMationService.java index d2fc40a5..fc9858c7 100644 --- a/skyeye-promote/skyeye-quartz/src/main/java/com/skyeye/quartz/consumer/impl/MySysWorkMationService.java +++ b/skyeye-promote/skyeye-quartz/src/main/java/com/skyeye/quartz/consumer/impl/MySysWorkMationService.java @@ -6,7 +6,6 @@ package com.skyeye.quartz.consumer.impl; import cn.hutool.json.JSONUtil; import com.skyeye.common.constans.MqConstants; import com.skyeye.common.util.DataCommonUtil; -import com.skyeye.common.util.DateUtil; import com.skyeye.common.util.ToolUtil; import com.skyeye.eve.dao.SysQuartzDao; import com.skyeye.quartz.consumer.TaskMateService; diff --git a/skyeye-promote/skyeye-web/pom.xml b/skyeye-promote/skyeye-web/pom.xml index 92f59fc8..a304494f 100644 --- a/skyeye-promote/skyeye-web/pom.xml +++ b/skyeye-promote/skyeye-web/pom.xml @@ -99,13 +99,6 @@ 0.0.1-SNAPSHOT - - - com.skyeye - skyeye-note - 0.0.1-SNAPSHOT - - com.skyeye