diff --git a/manage/ad-platform-task/src/main/java/com/baiye/api/ReportController.java b/manage/ad-platform-task/src/main/java/com/baiye/api/ReportController.java deleted file mode 100644 index fe7590ec..00000000 --- a/manage/ad-platform-task/src/main/java/com/baiye/api/ReportController.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.baiye.api; - -import cn.hutool.json.JSONArray; -import cn.hutool.json.JSONObject; -import cn.hutool.json.JSONUtil; -import com.baiye.entity.vo.MemberInfoVO; -import com.baiye.feign.ConnectManageFeign; -import com.baiye.http.CommonResponse; -import com.baiye.service.ReportService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - -/** - * @author wjt - * @date 2021/12/14 - */ -@RestController -@RequestMapping("/api") -@Slf4j -public class ReportController { - @Resource - private ReportService reportService; - @Resource - ConnectManageFeign connectManageFeign; - - @GetMapping("/report/member") - public CommonResponse getMemberReport(Long memberId) { - MemberInfoVO memberReport = reportService.getMemberReport(memberId); - return CommonResponse.createBySuccess(memberReport); - } - - @GetMapping("/report/manager") - public CommonResponse autoTriggerReport() { - reportService.reportHour(); - return CommonResponse.createBySuccess(); - } - - @GetMapping("/report/test") - public CommonResponse getAdminInfo() { - List roleIds = new ArrayList<>(); - roleIds.add(1L); - roleIds.add(8L); - ResponseEntity adminInfo = connectManageFeign.getAdminInfo(roleIds); - JSONArray jsonArray = JSONUtil.parseArray(adminInfo.getBody()); - List longs = new ArrayList<>(); - for (Object o : jsonArray) { - JSONObject jsonObject = (JSONObject) o; - longs.add(jsonObject.getLong("id")); - } - return CommonResponse.createBySuccess(longs); - } -} diff --git a/manage/ad-platform-task/src/main/java/com/baiye/config/SimpleJobAutoConfig.java b/manage/ad-platform-task/src/main/java/com/baiye/config/SimpleJobAutoConfig.java index ddf18258..a49eac87 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/config/SimpleJobAutoConfig.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/config/SimpleJobAutoConfig.java @@ -1,6 +1,6 @@ package com.baiye.config; -import com.baiye.entity.jobInstance.ElasticSimpleJob; +import com.baiye.modules.elsaticjob.entity.jobInstance.ElasticSimpleJob; import com.dangdang.ddframe.job.config.JobCoreConfiguration; import com.dangdang.ddframe.job.config.JobTypeConfiguration; import com.dangdang.ddframe.job.config.simple.SimpleJobConfiguration; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/feign/ConnectManageFeign.java b/manage/ad-platform-task/src/main/java/com/baiye/feign/ConnectManageFeign.java index c4885649..80d0f256 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/feign/ConnectManageFeign.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/feign/ConnectManageFeign.java @@ -4,7 +4,6 @@ import com.baiye.model.dto.TaskQueryCriteria; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/job/StatisticsHourJob.java b/manage/ad-platform-task/src/main/java/com/baiye/job/StatisticsHourJob.java index aba37ed0..ed48afc2 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/job/StatisticsHourJob.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/job/StatisticsHourJob.java @@ -1,7 +1,7 @@ package com.baiye.job; -import com.baiye.entity.jobInstance.ElasticSimpleJob; -import com.baiye.service.ReportService; +import com.baiye.modules.elsaticjob.entity.jobInstance.ElasticSimpleJob; +import com.baiye.modules.report.service.ReportService; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; import lombok.extern.slf4j.Slf4j; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/job/WebSocketHeartbeat.java b/manage/ad-platform-task/src/main/java/com/baiye/job/WebSocketHeartbeat.java index 3d64e9b7..65d4cc6e 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/job/WebSocketHeartbeat.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/job/WebSocketHeartbeat.java @@ -3,7 +3,7 @@ package com.baiye.job; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baiye.constant.DefaultNumberConstants; -import com.baiye.entity.jobInstance.ElasticSimpleJob; +import com.baiye.modules.elsaticjob.entity.jobInstance.ElasticSimpleJob; import com.baiye.socket.WebSocketServer; import com.dangdang.ddframe.job.api.ShardingContext; import com.dangdang.ddframe.job.api.simple.SimpleJob; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/api/ElasticJobController.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/api/ElasticJobController.java similarity index 75% rename from manage/ad-platform-task/src/main/java/com/baiye/api/ElasticJobController.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/api/ElasticJobController.java index 38998c51..a91cba9c 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/api/ElasticJobController.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/api/ElasticJobController.java @@ -1,8 +1,10 @@ -package com.baiye.api; +package com.baiye.modules.elsaticjob.api; -import com.baiye.entity.Job; -import com.baiye.entity.JobBriefInfo; -import com.baiye.service.ElasticJobService; +import com.baiye.modules.elsaticjob.entity.Job; +import com.baiye.modules.elsaticjob.entity.JobBriefInfo; +import com.baiye.modules.elsaticjob.service.ElasticJobService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -16,6 +18,7 @@ import java.util.List; @Slf4j @RestController @RequestMapping("/api/job") +@Api(tags = "elastic job 操作 api ") public class ElasticJobController { @Resource private ElasticJobService jobService; @@ -26,6 +29,7 @@ public class ElasticJobController { * @param job */ @PostMapping("/add") + @ApiOperation("注册新任务") public void addJob(@RequestBody Job job) { log.info("++++++++++++++++++++++++++++++++++++++++++++++++注册定时任务：{}", job.toString()); jobService.addJob(job); @@ -37,6 +41,7 @@ public class ElasticJobController { * @param jobName */ @GetMapping("/remove") + @ApiOperation("移除任务") public void remove(String jobName) { log.info("=+++++++++++++++++++++++++++++++++++++++++++++++删除定时任务：{}", jobName); jobService.removeJob(jobName); @@ -49,6 +54,7 @@ public class ElasticJobController { * @return */ @GetMapping("/info") + @ApiOperation("获取单个任务信息") public Job getJobDetails(String jobName) { return jobService.getJobDetail(jobName); } @@ -59,13 +65,14 @@ public class ElasticJobController { * @return */ @GetMapping("/all") + @ApiOperation("获取所有任务信息") public List getAllJobsDetails() { return jobService.getAllJobsDetails(); } @PostMapping("/update") + @ApiOperation("修改任务") public void updateJob(@RequestBody Job job) { - log.info("++++++++++++++++++++++++++++++++++++++++++++++++修改任务：{}", job.toString()); jobService.updateJob(job); } @@ -75,6 +82,7 @@ public class ElasticJobController { * @param jobName */ @GetMapping("/trigger") + @ApiOperation("手动触发任务") public void trigger(String jobName) { jobService.trigger(jobName); } @@ -85,6 +93,7 @@ public class ElasticJobController { * @param jobName */ @GetMapping("/disable") + @ApiOperation("手动失效任务") public void disable(String jobName) { jobService.disable(jobName); } @@ -95,6 +104,7 @@ public class ElasticJobController { * @param jobName */ @GetMapping("/enable") + @ApiOperation("手动生效任务") public void enable(String jobName) { jobService.enable(jobName); } @@ -105,6 +115,7 @@ public class ElasticJobController { * @param jobName */ @GetMapping("/shutdown") + @ApiOperation("终止任务") public void shutdown(String jobName) { jobService.shutdown(jobName); } diff --git a/manage/ad-platform-task/src/main/java/com/baiye/entity/Job.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/entity/Job.java similarity index 98% rename from manage/ad-platform-task/src/main/java/com/baiye/entity/Job.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/entity/Job.java index c6153c08..8089643a 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/entity/Job.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/entity/Job.java @@ -1,4 +1,4 @@ -package com.baiye.entity; +package com.baiye.modules.elsaticjob.entity; import com.dangdang.ddframe.job.executor.handler.JobProperties; import lombok.Data; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/entity/JobBriefInfo.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/entity/JobBriefInfo.java similarity index 95% rename from manage/ad-platform-task/src/main/java/com/baiye/entity/JobBriefInfo.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/entity/JobBriefInfo.java index 51d4ac70..d8eb33d0 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/entity/JobBriefInfo.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/entity/JobBriefInfo.java @@ -1,4 +1,4 @@ -package com.baiye.entity; +package com.baiye.modules.elsaticjob.entity; import lombok.Data; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/entity/jobInstance/ElasticSimpleJob.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/entity/jobInstance/ElasticSimpleJob.java similarity index 97% rename from manage/ad-platform-task/src/main/java/com/baiye/entity/jobInstance/ElasticSimpleJob.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/entity/jobInstance/ElasticSimpleJob.java index e77f8bc7..5d538548 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/entity/jobInstance/ElasticSimpleJob.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/entity/jobInstance/ElasticSimpleJob.java @@ -1,4 +1,4 @@ -package com.baiye.entity.jobInstance; +package com.baiye.modules.elsaticjob.entity.jobInstance; import org.springframework.stereotype.Component; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/listener/JobListener.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/listener/JobListener.java similarity index 94% rename from manage/ad-platform-task/src/main/java/com/baiye/listener/JobListener.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/listener/JobListener.java index 673faf19..ede5370e 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/listener/JobListener.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/listener/JobListener.java @@ -1,4 +1,4 @@ -package com.baiye.listener; +package com.baiye.modules.elsaticjob.listener; import com.dangdang.ddframe.job.executor.ShardingContexts; import com.dangdang.ddframe.job.lite.api.listener.ElasticJobListener; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/service/ElasticJobService.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/service/ElasticJobService.java similarity index 87% rename from manage/ad-platform-task/src/main/java/com/baiye/service/ElasticJobService.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/service/ElasticJobService.java index 3433c7bc..eec2c623 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/service/ElasticJobService.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/service/ElasticJobService.java @@ -1,7 +1,7 @@ -package com.baiye.service; +package com.baiye.modules.elsaticjob.service; -import com.baiye.entity.Job; -import com.baiye.entity.JobBriefInfo; +import com.baiye.modules.elsaticjob.entity.Job; +import com.baiye.modules.elsaticjob.entity.JobBriefInfo; import java.util.List; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/service/impl/ElasticJobServiceImpl.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/service/impl/ElasticJobServiceImpl.java similarity index 97% rename from manage/ad-platform-task/src/main/java/com/baiye/service/impl/ElasticJobServiceImpl.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/service/impl/ElasticJobServiceImpl.java index b57b674c..bbc119a8 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/service/impl/ElasticJobServiceImpl.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/elsaticjob/service/impl/ElasticJobServiceImpl.java @@ -1,9 +1,9 @@ -package com.baiye.service.impl; +package com.baiye.modules.elsaticjob.service.impl; import cn.hutool.core.util.StrUtil; -import com.baiye.entity.Job; -import com.baiye.entity.JobBriefInfo; -import com.baiye.service.ElasticJobService; +import com.baiye.modules.elsaticjob.entity.Job; +import com.baiye.modules.elsaticjob.entity.JobBriefInfo; +import com.baiye.modules.elsaticjob.service.ElasticJobService; import com.dangdang.ddframe.job.config.JobCoreConfiguration; import com.dangdang.ddframe.job.config.simple.SimpleJobConfiguration; import com.dangdang.ddframe.job.executor.handler.JobProperties; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/modules/report/api/ReportController.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/api/ReportController.java new file mode 100644 index 00000000..417451b3 --- /dev/null +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/api/ReportController.java @@ -0,0 +1,41 @@ +package com.baiye.modules.report.api; + +import com.baiye.http.CommonResponse; +import com.baiye.modules.report.entity.vo.MemberInfoVO; +import com.baiye.modules.report.service.ReportService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + + +/** + * @author wjt + * @date 2021/12/14 + */ +@RestController +@RequestMapping("/api") +@Slf4j +@Api(tags = "获取统计信息") +public class ReportController { + @Resource + private ReportService reportService; + + @GetMapping("/report/member") + @ApiOperation("获取单个成员统计信息") + public CommonResponse getMemberReport(Long memberId) { + MemberInfoVO memberReport = reportService.getMemberReport(memberId); + return CommonResponse.createBySuccess(memberReport); + } + + @GetMapping("/report/manager") + @ApiOperation("手动触发websocket，发送管理员统计信息") + public CommonResponse autoTriggerReport() { + reportService.reportHour(); + return CommonResponse.createBySuccess(); + } +} diff --git a/manage/ad-platform-task/src/main/java/com/baiye/dao/CallClueRepository.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/dao/CallClueRepository.java similarity index 91% rename from manage/ad-platform-task/src/main/java/com/baiye/dao/CallClueRepository.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/report/dao/CallClueRepository.java index b33c8905..3979b345 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/dao/CallClueRepository.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/dao/CallClueRepository.java @@ -1,6 +1,6 @@ -package com.baiye.dao; +package com.baiye.modules.report.dao; -import com.baiye.entity.CallClueInfo; +import com.baiye.modules.report.entity.CallClueInfo; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/dao/ReportDayRepository.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/dao/ReportDayRepository.java similarity index 85% rename from manage/ad-platform-task/src/main/java/com/baiye/dao/ReportDayRepository.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/report/dao/ReportDayRepository.java index 65099396..d8f0e242 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/dao/ReportDayRepository.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/dao/ReportDayRepository.java @@ -1,6 +1,6 @@ -package com.baiye.dao; +package com.baiye.modules.report.dao; -import com.baiye.entity.ReportDay; +import com.baiye.modules.report.entity.ReportDay; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.stereotype.Repository; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/entity/CallClueInfo.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/entity/CallClueInfo.java similarity index 92% rename from manage/ad-platform-task/src/main/java/com/baiye/entity/CallClueInfo.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/report/entity/CallClueInfo.java index 89d1df88..3e9e4d0d 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/entity/CallClueInfo.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/entity/CallClueInfo.java @@ -1,9 +1,10 @@ -package com.baiye.entity; +package com.baiye.modules.report.entity; import cn.hutool.core.date.DatePattern; import com.baiye.model.entity.BaseCallClueInfo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/entity/ReportDay.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/entity/ReportDay.java similarity index 95% rename from manage/ad-platform-task/src/main/java/com/baiye/entity/ReportDay.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/report/entity/ReportDay.java index 7f48911e..17cb19fe 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/entity/ReportDay.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/entity/ReportDay.java @@ -1,4 +1,4 @@ -package com.baiye.entity; +package com.baiye.modules.report.entity; import lombok.Data; import org.springframework.data.annotation.CreatedDate; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/entity/vo/MemberInfoVO.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/entity/vo/MemberInfoVO.java similarity index 93% rename from manage/ad-platform-task/src/main/java/com/baiye/entity/vo/MemberInfoVO.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/report/entity/vo/MemberInfoVO.java index 38a338f6..822d1181 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/entity/vo/MemberInfoVO.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/entity/vo/MemberInfoVO.java @@ -1,4 +1,4 @@ -package com.baiye.entity.vo; +package com.baiye.modules.report.entity.vo; import cn.hutool.core.date.DatePattern; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/entity/vo/ReportMessageInfoVO.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/entity/vo/ReportMessageInfoVO.java similarity index 91% rename from manage/ad-platform-task/src/main/java/com/baiye/entity/vo/ReportMessageInfoVO.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/report/entity/vo/ReportMessageInfoVO.java index 6beb4f9e..aa24b8d4 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/entity/vo/ReportMessageInfoVO.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/entity/vo/ReportMessageInfoVO.java @@ -1,4 +1,4 @@ -package com.baiye.entity.vo; +package com.baiye.modules.report.entity.vo; import cn.hutool.json.JSONObject; import lombok.Data; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/entity/vo/TaskInfosVO.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/entity/vo/TaskInfosVO.java similarity index 78% rename from manage/ad-platform-task/src/main/java/com/baiye/entity/vo/TaskInfosVO.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/report/entity/vo/TaskInfosVO.java index 17b5676c..c595d2be 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/entity/vo/TaskInfosVO.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/entity/vo/TaskInfosVO.java @@ -1,6 +1,6 @@ -package com.baiye.entity.vo; +package com.baiye.modules.report.entity.vo; -import com.baiye.entity.ReportDay; +import com.baiye.modules.report.entity.ReportDay; import lombok.Data; import java.io.Serializable; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/service/ReportService.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/service/ReportService.java similarity index 75% rename from manage/ad-platform-task/src/main/java/com/baiye/service/ReportService.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/report/service/ReportService.java index da8f9764..6b361713 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/service/ReportService.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/service/ReportService.java @@ -1,6 +1,6 @@ -package com.baiye.service; +package com.baiye.modules.report.service; -import com.baiye.entity.vo.MemberInfoVO; +import com.baiye.modules.report.entity.vo.MemberInfoVO; /** * @author wjt diff --git a/manage/ad-platform-task/src/main/java/com/baiye/service/impl/ReportServiceImpl.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/service/impl/ReportServiceImpl.java similarity index 93% rename from manage/ad-platform-task/src/main/java/com/baiye/service/impl/ReportServiceImpl.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/report/service/impl/ReportServiceImpl.java index 18123c19..e88f0734 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/service/impl/ReportServiceImpl.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/report/service/impl/ReportServiceImpl.java @@ -1,4 +1,4 @@ -package com.baiye.service.impl; +package com.baiye.modules.report.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUnit; @@ -8,18 +8,18 @@ import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baiye.constant.DefaultNumberConstants; -import com.baiye.dao.CallClueRepository; -import com.baiye.dao.ReportDayRepository; -import com.baiye.entity.CallClueInfo; -import com.baiye.entity.ReportDay; -import com.baiye.entity.vo.MemberInfoVO; -import com.baiye.entity.vo.ReportMessageInfoVO; -import com.baiye.entity.vo.TaskInfosVO; import com.baiye.feign.ConnectManageFeign; import com.baiye.feign.ConnectSourceFeign; import com.baiye.model.dto.TaskQueryCriteria; import com.baiye.model.enums.CallStatusEnum; -import com.baiye.service.ReportService; +import com.baiye.modules.report.dao.CallClueRepository; +import com.baiye.modules.report.dao.ReportDayRepository; +import com.baiye.modules.report.entity.CallClueInfo; +import com.baiye.modules.report.entity.ReportDay; +import com.baiye.modules.report.entity.vo.MemberInfoVO; +import com.baiye.modules.report.entity.vo.ReportMessageInfoVO; +import com.baiye.modules.report.entity.vo.TaskInfosVO; +import com.baiye.modules.report.service.ReportService; import com.baiye.socket.WebSocketServer; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; @@ -103,7 +103,7 @@ public class ReportServiceImpl implements ReportService { public MemberInfoVO getMemberReport(Long memberId) { //查询此员工的所有线索 ResponseEntity objectResponseEntity = connectSourceFeign.queryMemberNum(memberId); - int total = objectResponseEntity.getStatusCodeValue(); + int total = (int) objectResponseEntity.getBody(); MemberInfoVO memberInfoVO = new MemberInfoVO(); memberInfoVO.setMemberId(memberId); memberInfoVO.setTotalNum(total); diff --git a/manage/ad-platform-task/src/main/java/com/baiye/api/WebSocketController.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/websocket/api/WebSocketController.java similarity index 90% rename from manage/ad-platform-task/src/main/java/com/baiye/api/WebSocketController.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/websocket/api/WebSocketController.java index 9fe67350..ab9f5515 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/api/WebSocketController.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/websocket/api/WebSocketController.java @@ -1,8 +1,8 @@ -package com.baiye.api; +package com.baiye.modules.websocket.api; import com.baiye.http.CommonResponse; import com.baiye.model.dto.SendWebSocketDTO; -import com.baiye.service.WebSocketService; +import com.baiye.modules.websocket.service.WebSocketService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/service/WebSocketService.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/websocket/service/WebSocketService.java similarity index 88% rename from manage/ad-platform-task/src/main/java/com/baiye/service/WebSocketService.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/websocket/service/WebSocketService.java index 135a2f69..9e3d4fe7 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/service/WebSocketService.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/websocket/service/WebSocketService.java @@ -1,4 +1,4 @@ -package com.baiye.service; +package com.baiye.modules.websocket.service; import com.baiye.http.CommonResponse; import com.baiye.model.dto.SendWebSocketDTO; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/service/impl/WebSocketServiceImpl.java b/manage/ad-platform-task/src/main/java/com/baiye/modules/websocket/service/impl/WebSocketServiceImpl.java similarity index 92% rename from manage/ad-platform-task/src/main/java/com/baiye/service/impl/WebSocketServiceImpl.java rename to manage/ad-platform-task/src/main/java/com/baiye/modules/websocket/service/impl/WebSocketServiceImpl.java index a11fe894..79bf25d5 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/service/impl/WebSocketServiceImpl.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/modules/websocket/service/impl/WebSocketServiceImpl.java @@ -1,11 +1,11 @@ -package com.baiye.service.impl; +package com.baiye.modules.websocket.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; import com.baiye.constant.DefaultNumberConstants; import com.baiye.http.CommonResponse; import com.baiye.model.dto.SendWebSocketDTO; -import com.baiye.service.WebSocketService; +import com.baiye.modules.websocket.service.WebSocketService; import com.baiye.socket.WebSocketServer; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/manage/ad-platform-task/src/main/java/com/baiye/socket/WebSocketServer.java b/manage/ad-platform-task/src/main/java/com/baiye/socket/WebSocketServer.java index b2422508..5c3c249d 100644 --- a/manage/ad-platform-task/src/main/java/com/baiye/socket/WebSocketServer.java +++ b/manage/ad-platform-task/src/main/java/com/baiye/socket/WebSocketServer.java @@ -3,9 +3,9 @@ package com.baiye.socket; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baiye.constant.DefaultNumberConstants; -import com.baiye.entity.vo.ReportMessageInfoVO; import com.baiye.model.dto.SendWebSocketDTO; -import com.baiye.service.impl.ReportServiceImpl; +import com.baiye.modules.report.entity.vo.ReportMessageInfoVO; +import com.baiye.modules.report.service.impl.ReportServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -17,7 +17,6 @@ import javax.websocket.server.ServerEndpoint; import java.io.IOException; import java.util.List; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.atomic.AtomicInteger; /** @@ -153,6 +152,7 @@ public class WebSocketServer { public void sendMessage(ReportMessageInfoVO reportMessageInfoVO) throws IOException { + log.info("发给webSocket信息 {}", reportMessageInfoVO); Session session = null; for (String key : SESSIONS.keySet()) { @@ -160,6 +160,7 @@ public class WebSocketServer { session = SESSIONS.get(key); break; } + } if (session != null) {