Skip to content

N
notes2.0
提交 bcf00ac4 authored 作者: zjm's avatar zjm
浏览文件
操作

修改了job的状态模块

上级 e59e6093
流水线 #125 已失败 于阶段
          隐藏空白字符变更
          内嵌 并排
          正在显示 包含 1056 行增加 和 372 行删除
          notes-job/src/main/java/com/zjty/tynotes/job/basic/controller/ScController.java
          浏览文件 @ bcf00ac4
          ...@@ -43,31 +43,25 @@ public class ScController { ...@@ -43,31 +43,25 @@ public class ScController {
          public ResponseEntity<JobResponse> add(@RequestBody ScRo scRo public ResponseEntity<JobResponse> add(@RequestBody ScRo scRo
          ) { ) {
          String saveId = scoreCoefficientService.add(scRo.toDb()); String saveId = scoreCoefficientService.add(scRo.toDb());
          businessTreeManagement.saveAction(scRo.getUserId(),scRo.getWorkId(),Action.APPRAISAL_WORD,new Date()," 自我评价"); businessTreeManagement.saveAction(scRo.getUserId(),scRo.getWorkId(),Action.APPRAISAL_WORD,new Date(),"自我评价");
          return ok(new JobResponse(saveId)); return ok(new JobResponse(saveId));
          } }
          @PostMapping("/select") @PostMapping("/select")
          @ApiOperation(value = "新增考评信息.", notes = "新增不可在数据中附带id.成功时返回新增数据保存的id.") @ApiOperation(value = "查看考评信息.", notes = "查看考评信息")
          public ResponseEntity<ScoreCoefficient> add1(@RequestParam String workId public ResponseEntity<ScoreCoefficient> add1(@RequestParam String workId
          ) { ) {
          return ok(scoreCoefficientService.findById(workId)); return ok(scoreCoefficientService.findById(workId));
          } }
          @PutMapping("/upDate") @PutMapping("/upDate")
          @ApiOperation(value = "考评信息修改.", notes = "修改必须在数据中附带id.") @ApiOperation(value = "考评信息修改.", notes = "修改必须在数据中附带id.")
          public ResponseEntity<JobResponse> modify(@RequestBody ScoreCoefficient scoreCoefficient, public ResponseEntity<JobResponse> modify(@RequestBody ScoreCoefficient scoreCoefficient,
          @RequestParam String userId) { @RequestParam String userId,
          ScoreCoefficient scoreCoefficient1= scoreCoefficientService.findById(scoreCoefficient.getId()); @RequestParam String msg) {
          String saveId = scoreCoefficientService.modify(scoreCoefficient); String saveId = scoreCoefficientService.modify(scoreCoefficient);
          if (scoreCoefficient1.getScore2()==null || "".equals(scoreCoefficient1.getScore2())){ businessTreeManagement.saveAction(userId,scoreCoefficient.getWordId(),Action.APPRAISAL_WORD,new Date(),msg);
          businessTreeManagement.saveAction(userId,scoreCoefficient.getWordId(),Action.APPRAISAL_WORD,new Date()," 发布者评价");
          }else {
          businessTreeManagement.saveAction(userId, scoreCoefficient.getWordId(), Action.APPRAISAL_WORD, new Date(), " 修改发布者评价");
          }
          return ok(new JobResponse(saveId)); return ok(new JobResponse(saveId));
          } }
          ......
          notes-job/src/main/java/com/zjty/tynotes/job/basic/controller/WorkController.java
          浏览文件 @ bcf00ac4
          ...@@ -50,7 +50,6 @@ public class WorkController { ...@@ -50,7 +50,6 @@ public class WorkController {
          @GetMapping(value = "/{workId}") @GetMapping(value = "/{workId}")
          @ApiOperation(value = "根据id查询工作.", notes = "在路径中指定要查询的工作id.") @ApiOperation(value = "根据id查询工作.", notes = "在路径中指定要查询的工作id.")
          public ResponseEntity<WorkVo> findById(@PathVariable String workId) { public ResponseEntity<WorkVo> findById(@PathVariable String workId) {
          ...@@ -199,4 +198,11 @@ public class WorkController { ...@@ -199,4 +198,11 @@ public class WorkController {
          return ok(workService.selectUserIdsWork(userId)); return ok(workService.selectUserIdsWork(userId));
          } }
          @GetMapping(value = "/select/work/workId/{workId}")
          @ApiModelProperty(value = "根据任务id查询这个任务所在任务组里面",notes = "查看任务的所有相关任务")
          public ResponseEntity<WorkMpping> selectWorkMappingWorkId(@PathVariable("workId") String workId){
          return ok(workService.selectWorkMapperWorkId(workId));
          }
          } }
          notes-job/src/main/java/com/zjty/tynotes/job/basic/entity/database/ScoreCoefficient.java
          浏览文件 @ bcf00ac4
          ...@@ -32,20 +32,26 @@ public class ScoreCoefficient { ...@@ -32,20 +32,26 @@ public class ScoreCoefficient {
          private String score1; private String score1;
          /** /**
          * 自评评语 * 组长评分
          */ */
          @ApiModelProperty(value = "自评评语", example = "comments1") @ApiModelProperty(value = "组长评分", example = "groupLeaderScore2")
          private String comments1; private String groupLeaderScore2;
          /** /**
          * 发布者评价 * 总监评分
          */ */
          @ApiModelProperty(value = "发布者评价", example = "score2") @ApiModelProperty(value = "总监评分", example = "directorScore2")
          private String score2; private String directorScore2;
          /** /**
          * 发布者评语 * 副总经理评分
          */ */
          @ApiModelProperty(value = "发布者评语", example = "comments2") @ApiModelProperty(value = "副总经理评分", example = "viceScore2")
          private String comments2; private String viceScore3;
          /**
          * 总经理评分
          */
          @ApiModelProperty(value = "正总经理评分", example = "justScore4")
          private String justScore4;
          /** /**
          * 最终工作量 * 最终工作量
          */ */
          ......
          notes-job/src/main/java/com/zjty/tynotes/job/basic/entity/database/Work.java
          浏览文件 @ bcf00ac4
          ...@@ -103,9 +103,15 @@ public class Work { ...@@ -103,9 +103,15 @@ public class Work {
          * 执行者id * 执行者id
          */ */
          @NotNull @NotNull
          @ApiModelProperty(value = "组长id.", example = "id") @ApiModelProperty(value = "组长id.", example = "executor")
          private String executor; private String executor;
          /**
          * 审核者id
          */
          @ApiModelProperty(value = "审核者.", example = "audit")
          private String audit;
          /** /**
          * 组员id集合 * 组员id集合
          */ */
          ...@@ -166,5 +172,22 @@ public class Work { ...@@ -166,5 +172,22 @@ public class Work {
          @NotNull @NotNull
          private int workloadCount=1; private int workloadCount=1;
          /**
          * 总监
          */
          @ApiModelProperty(value = "总监id集合",example = "[1,2,3]")
          private List<String> majordomos;
          /**
          * 总经理id集合
          */
          @ApiModelProperty(value = "总经理id集合",example = "[1,2,3]")
          private List<String> generalManagers;
          /**
          * 副经理id集合
          */
          @ApiModelProperty(value = "副经理id集合",example = "[1,2,3]")
          private List<String> assistantManagers;
          } }
          notes-job/src/main/java/com/zjty/tynotes/job/basic/entity/request/ScRo.java
          浏览文件 @ bcf00ac4
          ...@@ -31,30 +31,35 @@ public class ScRo { ...@@ -31,30 +31,35 @@ public class ScRo {
          private String score1; private String score1;
          /** /**
          * 自评评语 * 组长评分
          */ */
          @ApiModelProperty(value = "自评评语", example = "comments1") @ApiModelProperty(value = "组长评分", example = "groupLeaderScore2")
          private String comments1; private String groupLeaderScore2;
          /** /**
          * 发布者评价 * 总监评分
          */ */
          @ApiModelProperty(value = "发布者评价", example = "score2") @ApiModelProperty(value = "总监评分", example = "directorScore2")
          private String score2; private String directorScore2;
          /** /**
          * 发布者评语 * 副总经理评分
          */ */
          @ApiModelProperty(value = "发布者评语", example = "comments2") @ApiModelProperty(value = "副总经理评分", example = "viceScore2")
          private String comments2; private String viceScore3;
          /**
          * 总经理评分
          */
          @ApiModelProperty(value = "正总经理评分", example = "justScore4")
          private String justScore4;
          /** /**
          * 最终工作量 * 最终工作量
          */ */
          @ApiModelProperty(value = "最终工作量", example = "endWorkLoad") @ApiModelProperty(value = "最终工作量", example = "endWorkLoad")
          private Double endWorkLoad; private Double endWorkLoad;
          @ApiModelProperty(value = "用户id", example = "userId") @ApiModelProperty(value = "用户id", example = "userId")
          private String userId; private String userId;
          public ScoreCoefficient toDb(){ public ScoreCoefficient toDb(){
          return new ScoreCoefficient(id,workId,score1,comments1,score2,comments2,endWorkLoad); return new ScoreCoefficient(id,workId,score1,groupLeaderScore2,directorScore2,viceScore3,justScore4,endWorkLoad);
          } }
          } }
          notes-job/src/main/java/com/zjty/tynotes/job/basic/entity/response/WorkVo.java
          浏览文件 @ bcf00ac4
          ...@@ -147,9 +147,29 @@ public class WorkVo { ...@@ -147,9 +147,29 @@ public class WorkVo {
          private int workloadCount=1; private int workloadCount=1;
          /**
          * 审核者id
          */
          @ApiModelProperty(value = "审核者.", example = "audit")
          private User audit;
          /**
          * 总监
          */
          @ApiModelProperty(value = "总监id集合",example = "[1,2,3]")
          private List<User> majordomos;
          /**
          * 总经理id集合
          */
          @ApiModelProperty(value = "总经理id集合",example = "[1,2,3]")
          private List<User> generalManagers;
          /** /**
          * 主任务对象 * 副经理id集合
          */ */
          @ApiModelProperty(value = "主任务对象") @ApiModelProperty(value = "副经理id集合",example = "[1,2,3]")
          private Work workVos; private List<User> assistantManagers;
          } }
          notes-job/src/main/java/com/zjty/tynotes/job/basic/repository/ScoreCoefficientRepository.java
          浏览文件 @ bcf00ac4
          ...@@ -10,6 +10,6 @@ import java.util.List; ...@@ -10,6 +10,6 @@ import java.util.List;
          public interface ScoreCoefficientRepository extends MongoRepository<ScoreCoefficient, String> { public interface ScoreCoefficientRepository extends MongoRepository<ScoreCoefficient, String> {
          List<ScoreCoefficient> findByWordId(String workId); List<ScoreCoefficient> findByWordId(String workId);
          List<ScoreCoefficient> findByScore2IsNot(); // List<ScoreCoefficient> findByScore2IsNot();
          } }
          notes-job/src/main/java/com/zjty/tynotes/job/basic/service/WorkService.java
          浏览文件 @ bcf00ac4
          ...@@ -148,6 +148,11 @@ public interface WorkService { ...@@ -148,6 +148,11 @@ public interface WorkService {
          List<WorkMpping> selectUserIdsWork(String userId); List<WorkMpping> selectUserIdsWork(String userId);
          /**
          * 根据任务id查看其所有相关的任务
          * @param workId 任务id
          * @return 返回所有任务
          */
          WorkMpping selectWorkMapperWorkId(String workId);
          } }
          notes-job/src/main/java/com/zjty/tynotes/job/basic/service/impl/ConversionServiceImpl.java
          浏览文件 @ bcf00ac4
          ...@@ -34,6 +34,7 @@ public class ConversionServiceImpl implements ConversionService { ...@@ -34,6 +34,7 @@ public class ConversionServiceImpl implements ConversionService {
          User pUser=iUserService.findUserById(work.getPublisher()); User pUser=iUserService.findUserById(work.getPublisher());
          User eUser=iUserService.findUserById(work.getExecutor()); User eUser=iUserService.findUserById(work.getExecutor());
          User aUser=iUserService.findUserById(work.getAudit());
          List<User> users=new ArrayList<>(); List<User> users=new ArrayList<>();
          List<String> uid=work.getCrewList(); List<String> uid=work.getCrewList();
          List<Attachment> attachments=new ArrayList<>(); List<Attachment> attachments=new ArrayList<>();
          ...@@ -77,7 +78,10 @@ public class ConversionServiceImpl implements ConversionService { ...@@ -77,7 +78,10 @@ public class ConversionServiceImpl implements ConversionService {
          work.getWorkCoefficient(), work.getWorkCoefficient(),
          work.getPWorkload(), work.getPWorkload(),
          work.getWorkloadCount(), work.getWorkloadCount(),
          null aUser,
          selectUserIdAll(work.getMajordomos()),
          selectUserIdAll(work.getGeneralManagers()),
          selectUserIdAll(work.getAssistantManagers())
          ); );
          }else { }else {
          return new WorkVo( return new WorkVo(
          ...@@ -101,8 +105,15 @@ public class ConversionServiceImpl implements ConversionService { ...@@ -101,8 +105,15 @@ public class ConversionServiceImpl implements ConversionService {
          work.getWorkCoefficient(), work.getWorkCoefficient(),
          work.getPWorkload(), work.getPWorkload(),
          work.getWorkloadCount(), work.getWorkloadCount(),
          priviceService.findByWorkIdWorkVo(work.getSuperiorId())); aUser,
          selectUserIdAll(work.getMajordomos()),
          selectUserIdAll(work.getGeneralManagers()),
          selectUserIdAll(work.getAssistantManagers()));
          } }
          } }
          private List<User> selectUserIdAll(List<String> list){
          return iUserService.findUserByIds(list);
          }
          } }
          notes-job/src/main/java/com/zjty/tynotes/job/basic/service/impl/ScoreCoefficientServiceImpl.java
          浏览文件 @ bcf00ac4
          ...@@ -73,7 +73,7 @@ public class ScoreCoefficientServiceImpl implements ScoreCoefficientService { ...@@ -73,7 +73,7 @@ public class ScoreCoefficientServiceImpl implements ScoreCoefficientService {
          @Override @Override
          public List<ScoreCoefficient> selectSorct2IsNull() { public List<ScoreCoefficient> selectSorct2IsNull() {
          // scoreCoefficientRepository.findByScore2IsNot()
          return scoreCoefficientRepository.findByScore2IsNot(); return null;
          } }
          } }
          notes-job/src/main/java/com/zjty/tynotes/job/basic/service/impl/WorkServiceImpl.java
          浏览文件 @ bcf00ac4
          ...@@ -16,6 +16,7 @@ import com.zjty.tynotes.job.common.constant.WorkStatus; ...@@ -16,6 +16,7 @@ import com.zjty.tynotes.job.common.constant.WorkStatus;
          import com.zjty.tynotes.job.common.exception.BadRequestException; import com.zjty.tynotes.job.common.exception.BadRequestException;
          import com.zjty.tynotes.job.common.exception.NotFoundException; import com.zjty.tynotes.job.common.exception.NotFoundException;
          import com.zjty.tynotes.pas.entity.vo.HolidayRequest; import com.zjty.tynotes.pas.entity.vo.HolidayRequest;
          import com.zjty.tynotes.pas.entity.vo.JobLeads;
          import com.zjty.tynotes.pas.service.ConfigService; import com.zjty.tynotes.pas.service.ConfigService;
          import com.zjty.tynotes.pas.service.IUserService; import com.zjty.tynotes.pas.service.IUserService;
          import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
          ...@@ -71,8 +72,16 @@ public class WorkServiceImpl implements WorkService { ...@@ -71,8 +72,16 @@ public class WorkServiceImpl implements WorkService {
          //新增数据不可附带id. //新增数据不可附带id.
          Boolean idMustNull = isNull(work.getId()); Boolean idMustNull = isNull(work.getId());
          if (idMustNull) { if (idMustNull) {
          // if (work.getSuperiorId()==null ||work.getSuperiorId().equals("")){
          // }else {
          // work.setAudit(selectGroupId(work.getSuperiorId()));
          // }
          work.setCreateTime(new Date()); work.setCreateTime(new Date());
          work.setUpdateTime(new Date()); work.setUpdateTime(new Date());
          JobLeads jobLeads=iUserService.findJobLeads(work.getExecutor());
          work.setMajordomos(jobLeads.getMajordomos());
          work.setAssistantManagers(jobLeads.getAssistantManagers());
          work.setGeneralManagers(jobLeads.getGeneralManagers());
          String saveId = workRepository.save(work).getId(); String saveId = workRepository.save(work).getId();
          log.info(String.format("[job] 新增了id为 %s 的数据.", saveId)); log.info(String.format("[job] 新增了id为 %s 的数据.", saveId));
          return saveId; return saveId;
          ...@@ -83,6 +92,14 @@ public class WorkServiceImpl implements WorkService { ...@@ -83,6 +92,14 @@ public class WorkServiceImpl implements WorkService {
          } }
          } }
          private String selectGroupId(String id){
          Work work=workRepository.findById(id).get();
          String workId=work.getSuperiorId();
          if (workId==null || "".equals(workId)){
          return work.getExecutor();
          }
          return selectGroupId(workId);
          }
          @Override @Override
          public String modify(Work work) { public String modify(Work work) {
          //更新数据必须指定id且指定id的数据存在. //更新数据必须指定id且指定id的数据存在.
          ...@@ -194,7 +211,7 @@ public class WorkServiceImpl implements WorkService { ...@@ -194,7 +211,7 @@ public class WorkServiceImpl implements WorkService {
          ScoreCoefficient scoreCoefficient= scoreCoefficientService.findById(workId); ScoreCoefficient scoreCoefficient= scoreCoefficientService.findById(workId);
          int workLoad= findBySuperoirIdCount(workId); int workLoad= findBySuperoirIdCount(workId);
          DecimalFormat df=new DecimalFormat("#.##"); DecimalFormat df=new DecimalFormat("#.##");
          double coefficient= (Double.parseDouble(scoreCoefficient.getScore1())+Double.parseDouble(scoreCoefficient.getScore2()))/2.0/100.0; double coefficient= Double.parseDouble(scoreCoefficient.getJustScore4());
          double getWorkLoad=workLoad*coefficient; double getWorkLoad=workLoad*coefficient;
          scoreCoefficient.setEndWorkLoad(Double.valueOf(df.format(getWorkLoad))); scoreCoefficient.setEndWorkLoad(Double.valueOf(df.format(getWorkLoad)));
          scoreCoefficientService.modify(scoreCoefficient); scoreCoefficientService.modify(scoreCoefficient);
          ...@@ -331,6 +348,35 @@ return 0.0f; ...@@ -331,6 +348,35 @@ return 0.0f;
          return workMppings; return workMppings;
          } }
          @Override
          public WorkMpping selectWorkMapperWorkId(String workId) {
          Work work= workRepository.findById(sumWorkId(workId)).get();
          return new WorkMpping(work.getId(),work.getTitle(),work.getStatus(),iUserService.findUserById(work.getPublisher()).getUsername(),iUserService.findUserById(work.getExecutor()).getUsername(),selectWorkMapper(work.getId()));
          }
          private List<WorkMpping> selectWorkMapper(String workId){
          List<WorkMpping> workMppings=new ArrayList<>();
          List<Work> works= workRepository.findBySuperiorId(workId);
          if (works.size()==0){
          return workMppings;
          }
          for (Work work:works){
          if (work.getSuperiorId()!=null || work.getSuperiorId().equals("")){
          workMppings.add(new WorkMpping(work.getId(),work.getTitle(),work.getStatus(),iUserService.findUserById(work.getPublisher()).getUsername(),iUserService.findUserById(work.getExecutor()).getUsername(),selectWorkMapper(work.getId())));
          }
          }
          return workMppings;
          }
          private String sumWorkId(String workId){
          Work work= workRepository.findById(workId).get();
          if (work.getSuperiorId()==null ||work.getSuperiorId().equals("")){
          return workId;
          }
          return sumWorkId(work.getSuperiorId());
          }
          private List<WorkMpping> workMppingList(Work work,List<Work> workList){ private List<WorkMpping> workMppingList(Work work,List<Work> workList){
          List<WorkMpping> workMppings=new ArrayList<>(); List<WorkMpping> workMppings=new ArrayList<>();
          ......
          notes-job/src/main/java/com/zjty/tynotes/job/status/service/TestService.java
          浏览文件 @ bcf00ac4
          ...@@ -42,7 +42,7 @@ public interface TestService { ...@@ -42,7 +42,7 @@ public interface TestService {
          /** /**
          * *
          */ */
          void appraisal(String executorId, String latestNews, Work work); void appraisal(String executorId, String latestNews, Work work,int count);
          /** /**
          * 修改任务状态 * 修改任务状态
          * @param executorId 操作人id * @param executorId 操作人id
          ......
          notes-job/src/main/java/com/zjty/tynotes/job/status/service/impl/BusinessTreeManagementImpl.java
          浏览文件 @ bcf00ac4
          ...@@ -180,11 +180,31 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement { ...@@ -180,11 +180,31 @@ public class BusinessTreeManagementImpl implements BusinessTreeManagement {
          break; break;
          case 9: case 9:
          String actionMsg = name +msg; String actionMsg = name +" "+msg;
          actionHistory.setActionMsg(actionMsg); actionHistory.setActionMsg(actionMsg);
          actionHistoryRepository.save(actionHistory); actionHistoryRepository.save(actionHistory);
          testService.appraisal(noteResource.getId(),actionMsg,work); int count=1;
          switch (msg){
          case "自我评价":
          break;
          case "组长评价":
          count=2;
          break;
          case "总监评价":
          count=3;
          break;
          case "副总经理评价":
          count=4;
          break;
          case "总经理评价":
          count=5;
          break;
          case "修改评价":
          count=6;
          break;
          }
          testService.appraisal(noteResource.getId(),actionMsg,work,count);
          log.info("[TREE] {}对任务评价了", name); log.info("[TREE] {}对任务评价了", name);
          break; break;
          ......
          notes-job/src/main/java/com/zjty/tynotes/job/status/service/impl/TestServiceImpl.java
          浏览文件 @ bcf00ac4
          package com.zjty.tynotes.job.status.service.impl; package com.zjty.tynotes.job.status.service.impl;
          import com.zjty.tynotes.job.basic.entity.database.ScoreCoefficient;
          import com.zjty.tynotes.job.basic.entity.database.Work; import com.zjty.tynotes.job.basic.entity.database.Work;
          import com.zjty.tynotes.job.basic.repository.ScoreCoefficientRepository;
          import com.zjty.tynotes.job.basic.service.WorkService; import com.zjty.tynotes.job.basic.service.WorkService;
          import com.zjty.tynotes.job.common.Constants; import com.zjty.tynotes.job.common.Constants;
          import com.zjty.tynotes.job.common.constant.WorkStatus; import com.zjty.tynotes.job.common.constant.WorkStatus;
          ...@@ -10,6 +12,7 @@ import com.zjty.tynotes.job.status.entity.RedisPersonalWork; ...@@ -10,6 +12,7 @@ import com.zjty.tynotes.job.status.entity.RedisPersonalWork;
          import com.zjty.tynotes.job.status.entity.RoleSum1; import com.zjty.tynotes.job.status.entity.RoleSum1;
          import com.zjty.tynotes.job.status.service.TestService; import com.zjty.tynotes.job.status.service.TestService;
          import com.zjty.tynotes.job.status.utils.JacksonUtil; import com.zjty.tynotes.job.status.utils.JacksonUtil;
          import com.zjty.tynotes.pas.entity.vo.JobLeads;
          import com.zjty.tynotes.pas.service.IUserService; import com.zjty.tynotes.pas.service.IUserService;
          import com.zjty.tynotes.search.subject.entity.EsSource; import com.zjty.tynotes.search.subject.entity.EsSource;
          import com.zjty.tynotes.search.subject.service.EsUtil; import com.zjty.tynotes.search.subject.service.EsUtil;
          ...@@ -27,6 +30,7 @@ import java.util.concurrent.CompletableFuture; ...@@ -27,6 +30,7 @@ import java.util.concurrent.CompletableFuture;
          */ */
          @Service @Service
          @Slf4j @Slf4j
          @SuppressWarnings("ALL")
          public class TestServiceImpl implements TestService { public class TestServiceImpl implements TestService {
          @Autowired @Autowired
          private RedisTemplate<String,Object> redisTemplate; private RedisTemplate<String,Object> redisTemplate;
          ...@@ -43,64 +47,44 @@ public class TestServiceImpl implements TestService { ...@@ -43,64 +47,44 @@ public class TestServiceImpl implements TestService {
          @Autowired @Autowired
          IUserService iUserService; IUserService iUserService;
          @Autowired
          ScoreCoefficientRepository scoreCoefficientRepository;
          private List<String> tests(String id,List<String> list){
          Work work=workService.findById(id);
          String workId=work.getSuperiorId();
          list.add(work.getPublisher());
          if (workId==null || "".equals(workId)){
          return list;
          }
          return tests(workId,list);
          }
          @Override @Override
          public void saveTakePushWork(String executorId, String latestNews, Work work) { public void saveTakePushWork(String executorId, String latestNews, Work work) {
          List<String> uIds=new ArrayList<>(); List<String> uIds=new ArrayList<>();
          Long time=new Date().getTime(); Long time=new Date().getTime();
          List<String> majordomos = work.getMajordomos();
          List<String> generalManagers = work.getGeneralManagers();
          List<String> assistantManagers = work.getAssistantManagers();
          String releaseName= iUserService.findUserById(work.getPublisher()).getUsername(); String releaseName= iUserService.findUserById(work.getPublisher()).getUsername();
          String executorName= iUserService.findUserById(work.getExecutor()).getUsername(); String executorName= iUserService.findUserById(work.getExecutor()).getUsername();
          String auditName=iUserService.findUserById(work.getAudit()).getUsername();
          RedisPersonalWork personalWork=new RedisPersonalWork(work.getId(),time,work.getTitle(),work.getStatus(),releaseName,executorName,1,WorkAttribution.ME_WORK,latestNews,work.getSuperiorId(),new ArrayList<>(),0,0); RedisPersonalWork personalWork=new RedisPersonalWork(work.getId(),time,work.getTitle(),work.getStatus(),releaseName,executorName,1,WorkAttribution.ME_WORK,latestNews,work.getSuperiorId(),new ArrayList<>(),0,0);
          if (releaseName.equals(executorName)){ boolean flagZ=true;
          if (work.getSuperiorId() == null){ boolean flagS=true;
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELEASE_WORK);
          personalWork.setExecutorEqualRelease(1);
          personalWork.setReadState(0);
          personalWork.setIsNotCommission(1);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getPublisher(), personalWork);
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1);
          assert list != null;
          pushData(work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          log.info("{}这里发送{}", work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          }else {
          uIds = tests(work.getSuperiorId(), uIds);
          uIds.remove(work.getPublisher());
          uIds.remove(work.getExecutor());
          personalWork.setWorkAttribution(WorkAttribution1.ME_RESOLVE_WORK);
          personalWork.setExecutorEqualRelease(1);
          personalWork.setReadState(0);
          personalWork.setIsNotCommission(1);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getPublisher(), personalWork);
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1);
          assert list != null;
          pushData(work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          log.info("{}这里发送{}", work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }else {
          //发布人 //发布人
          if (work.getSuperiorId() == null) { if (work.getSuperiorId() == null) {
          if (releaseName.equals(auditName)){
          personalWork.setExecutorEqualRelease(1);
          personalWork.setIsNotCommission(0);
          flagS=false;
          }
          if (releaseName.equals(executorName)){
          personalWork.setExecutorEqualRelease(1);
          personalWork.setIsNotCommission(1);
          flagZ=false;
          }
          if (releaseName.equals(executorName)&&releaseName.equals(auditName)){
          personalWork.setExecutorEqualRelease(1);
          personalWork.setIsNotCommission(1);
          }
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELEASE_WORK); personalWork.setWorkAttribution(WorkAttribution1.ME_RELEASE_WORK);
          personalWork.setReadState(0); personalWork.setReadState(0);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), personalWork); redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getPublisher(), personalWork); asynchronousAddEs(Constants.REDIS_EVENT + work.getPublisher(), personalWork);
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1); List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1);
          assert list != null; assert list != null;
          ...@@ -108,9 +92,26 @@ public class TestServiceImpl implements TestService { ...@@ -108,9 +92,26 @@ public class TestServiceImpl implements TestService {
          log.info("{}这里发送{}", work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list))); log.info("{}这里发送{}", work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          } else { } else {
          uIds = tests(work.getSuperiorId(), uIds); if (releaseName.equals(auditName)){
          uIds.remove(work.getPublisher()); personalWork.setExecutorEqualRelease(1);
          uIds.remove(work.getExecutor()); personalWork.setIsNotCommission(0);
          flagS=false;
          }else {
          personalWork.setExecutorEqualRelease(0);
          personalWork.setIsNotCommission(0);
          }
          if (releaseName.equals(executorName)){
          personalWork.setExecutorEqualRelease(1);
          personalWork.setIsNotCommission(1);
          flagZ=false;
          }else {
          personalWork.setExecutorEqualRelease(1);
          personalWork.setIsNotCommission(0);
          }
          if (releaseName.equals(executorName)&&releaseName.equals(auditName)){
          personalWork.setExecutorEqualRelease(1);
          personalWork.setIsNotCommission(1);
          }
          personalWork.setWorkAttribution(WorkAttribution1.ME_RESOLVE_WORK); personalWork.setWorkAttribution(WorkAttribution1.ME_RESOLVE_WORK);
          personalWork.setReadState(0); personalWork.setReadState(0);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), personalWork); redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), personalWork);
          ...@@ -122,36 +123,78 @@ public class TestServiceImpl implements TestService { ...@@ -122,36 +123,78 @@ public class TestServiceImpl implements TestService {
          subWork(list, work, work.getPublisher()); subWork(list, work, work.getPublisher());
          log.info("{}这里发送{}", work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list))); log.info("{}这里发送{}", work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          } }
          //执行人 判断执行人是否有分解权限 if (flagS && flagZ) {
          if (executorName.equals(auditName)) {
          personalWork.setWorkAttribution(WorkAttribution1.ME_RECEIVE_WORK); personalWork.setWorkAttribution(WorkAttribution1.ME_RECEIVE_WORK);
          personalWork.setReadState(1); personalWork.setReadState(1);
          personalWork.setIsNotCommission(1); personalWork.setIsNotCommission(1);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getExecutor(), personalWork); redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getAudit(), personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getAudit(), personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getExecutor(), personalWork); List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getAudit(), 0, -1);
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getExecutor(), 0, -1); assert list != null;
          assert list != null; pushData(work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          pushData(work.getExecutor(), JacksonUtil.toJSon(statisticalRoleCount(list))); log.info("{}这里发送{}", work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          subWork(list, work, work.getExecutor()); flagS = false;
          log.info("{}这里发送{}", work.getExecutor(), JacksonUtil.toJSon(statisticalRoleCount(list))); flagZ = false;
          }
          } }
          //有待修改 //执行人 判断执行人是否有分解权限
          if (uIds.size()!=0) { if (flagZ) {
          for (String id : uIds) { personalWork.setWorkAttribution(WorkAttribution1.ME_RECEIVE_WORK);
          personalWork.setReadState(1);
          personalWork.setIsNotCommission(1);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getExecutor(), personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getExecutor(), personalWork);
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getExecutor(), 0, -1);
          assert list != null;
          pushData(work.getExecutor(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          subWork(list, work, work.getExecutor());
          log.info("{}这里发送{}", work.getExecutor(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          if (flagS){
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELATED_WORK); personalWork.setWorkAttribution(WorkAttribution1.ME_RELATED_WORK);
          personalWork.setReadState(1); personalWork.setReadState(1);
          personalWork.setIsNotCommission(0); personalWork.setIsNotCommission(0);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + id, personalWork); redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getAudit(), personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getAudit(), personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + id, personalWork); List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getAudit(), 0, -1);
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + id, 0, -1);
          assert list != null; assert list != null;
          pushData(id, JacksonUtil.toJSon(statisticalRoleCount(list))); pushData(work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          subWork(list, work, id); subWork(list, work, work.getAudit());
          log.info("{}这里发送{}", id, JacksonUtil.toJSon(statisticalRoleCount(list))); log.info("{}这里发送{}", work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          } }
          if (!work.getAudit().equals(work.getExecutor()) && !work.getAudit().equals(work.getPublisher())){
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELATED_WORK);
          personalWork.setReadState(1);
          personalWork.setIsNotCommission(0);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getAudit(), personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getAudit(), personalWork);
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getAudit(), 0, -1);
          assert list != null;
          pushData(work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          subWork(list, work, work.getAudit());
          log.info("{}这里发送{}", work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          majordomos.addAll(generalManagers);
          majordomos.addAll(assistantManagers);
          majordomos.remove(work.getExecutor());
          majordomos.remove(work.getPublisher());
          majordomos.remove(work.getAudit());
          for (String id : majordomos) {
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELATED_WORK);
          personalWork.setReadState(1);
          personalWork.setIsNotCommission(0);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + id, personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + id, personalWork);
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + id, 0, -1);
          assert list != null;
          pushData(id, JacksonUtil.toJSon(statisticalRoleCount(list)));
          subWork(list, work, id);
          log.info("{}这里发送{}", id, JacksonUtil.toJSon(statisticalRoleCount(list)));
          } }
          } }
          ...@@ -162,38 +205,28 @@ public class TestServiceImpl implements TestService { ...@@ -162,38 +205,28 @@ public class TestServiceImpl implements TestService {
          String releaseName= iUserService.findUserById(work.getPublisher()).getUsername(); String releaseName= iUserService.findUserById(work.getPublisher()).getUsername();
          String executorName= iUserService.findUserById(work.getExecutor()).getUsername(); String executorName= iUserService.findUserById(work.getExecutor()).getUsername();
          String audit=iUserService.findUserById(work.getAudit()).getUsername();
          RedisPersonalWork personalWork=new RedisPersonalWork(work.getId(),time,work.getTitle(),work.getStatus(),releaseName,executorName,1,WorkAttribution.ME_WORK,latestNews,work.getSuperiorId(),new ArrayList<>(),0,0); RedisPersonalWork personalWork=new RedisPersonalWork(work.getId(),time,work.getTitle(),work.getStatus(),releaseName,executorName,1,WorkAttribution.ME_WORK,latestNews,work.getSuperiorId(),new ArrayList<>(),0,0);
          if (releaseName.equals(executorName)){ //发布人
          if (work.getSuperiorId() == null){
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELEASE_WORK);
          personalWork.setExecutorEqualRelease(1);
          personalWork.setReadState(0);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getPublisher(), personalWork);
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1);
          assert list != null;
          pushData(work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          log.info("{}这里发送{}", work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          }else {
          personalWork.setWorkAttribution(WorkAttribution1.ME_RESOLVE_WORK);
          personalWork.setExecutorEqualRelease(1);
          personalWork.setReadState(0);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getPublisher(), personalWork);
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1);
          assert list != null;
          pushData(work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          log.info("{}这里发送{}", work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }else {
          //发布人
          if (work.getSuperiorId() == null) { if (work.getSuperiorId() == null) {
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELEASE_WORK); if (releaseName.equals(audit)){
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELEASE_WORK);
          personalWork.setExecutorEqualRelease(1);
          personalWork.setIsNotCommission(0);
          }else {
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELEASE_WORK);
          personalWork.setExecutorEqualRelease(0);
          personalWork.setIsNotCommission(0);
          }
          if (releaseName.equals(executorName)){
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELEASE_WORK);
          personalWork.setExecutorEqualRelease(1);
          personalWork.setIsNotCommission(1);
          }else {
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELEASE_WORK);
          personalWork.setExecutorEqualRelease(1);
          personalWork.setIsNotCommission(0);
          }
          personalWork.setReadState(0); personalWork.setReadState(0);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), personalWork); redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), personalWork);
          ...@@ -204,7 +237,24 @@ public class TestServiceImpl implements TestService { ...@@ -204,7 +237,24 @@ public class TestServiceImpl implements TestService {
          log.info("{}这里发送{}", work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list))); log.info("{}这里发送{}", work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          } else { } else {
          personalWork.setWorkAttribution(WorkAttribution1.ME_RESOLVE_WORK); if (releaseName.equals(audit)){
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELEASE_WORK);
          personalWork.setExecutorEqualRelease(1);
          personalWork.setIsNotCommission(0);
          }else {
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELEASE_WORK);
          personalWork.setExecutorEqualRelease(0);
          personalWork.setIsNotCommission(0);
          }
          if (releaseName.equals(executorName)){
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELEASE_WORK);
          personalWork.setExecutorEqualRelease(1);
          personalWork.setIsNotCommission(1);
          }else {
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELEASE_WORK);
          personalWork.setExecutorEqualRelease(1);
          personalWork.setIsNotCommission(0);
          }
          personalWork.setReadState(0); personalWork.setReadState(0);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), personalWork); redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), personalWork);
          ...@@ -215,45 +265,48 @@ public class TestServiceImpl implements TestService { ...@@ -215,45 +265,48 @@ public class TestServiceImpl implements TestService {
          subWork(list, work, work.getPublisher()); subWork(list, work, work.getPublisher());
          log.info("{}这里发送{}", work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list))); log.info("{}这里发送{}", work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          } }
          }
          } }
          @Override @Override
          public void unpublishedToOngoing(String executorId, String latestNews, Work work) { public void unpublishedToOngoing(String executorId, String latestNews, Work work) {
          Long time=new Date().getTime(); Long time=new Date().getTime();
          List<String> uIds=new ArrayList<>(); List<String> uIds=new ArrayList<>();
          if (work.getSuperiorId()!=null) {
          uIds = tests(work.getSuperiorId(), uIds); List<String> majordomos = work.getMajordomos();
          uIds.remove(work.getPublisher()); List<String> generalManagers = work.getGeneralManagers();
          uIds.remove(work.getExecutor()); List<String> assistantManagers = work.getAssistantManagers();
          }
          String releaseName= iUserService.findUserById(work.getPublisher()).getUsername(); String releaseName= iUserService.findUserById(work.getPublisher()).getUsername();
          String executorName= iUserService.findUserById(work.getExecutor()).getUsername(); String executorName= iUserService.findUserById(work.getExecutor()).getUsername();
          String auditName=iUserService.findUserById(work.getAudit()).getUsername();
          boolean flagZ=true;
          boolean flagS=true;
          RedisPersonalWork personalWork=new RedisPersonalWork(work.getId(),time,work.getTitle(),work.getStatus(),releaseName,executorName,1,WorkAttribution.ME_WORK,latestNews,work.getSuperiorId(),new ArrayList<>(),0,0); RedisPersonalWork personalWork=new RedisPersonalWork(work.getId(),time,work.getTitle(),work.getStatus(),releaseName,executorName,1,WorkAttribution.ME_WORK,latestNews,work.getSuperiorId(),new ArrayList<>(),0,0);
          if (releaseName.equals(executorName)){
          List<Object> objects = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1);
          for (Object object : objects) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (work.getId().equals(redisPersonalWork.getWorkId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getPublisher(), 1, redisPersonalWork);
          redisPersonalWork.setStatus(work.getStatus());
          redisPersonalWork.setTime(time);
          redisPersonalWork.setIsNotCommission(1);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getPublisher(), personalWork);
          }
          }
          pushData(work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(objects)));
          subWork(objects, work, work.getPublisher());
          log.info("{}这里发送{}", work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(objects)));
          }else {
          //发布人 //发布人
          List<Object> objects = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1); List<Object> objects = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1);
          for (Object object : objects) { for (Object object : objects) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object; RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (work.getId().equals(redisPersonalWork.getWorkId())) { if (work.getId().equals(redisPersonalWork.getWorkId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getPublisher(), 1, redisPersonalWork); redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getPublisher(), 1, redisPersonalWork);
          if (releaseName.equals(auditName)){
          personalWork.setExecutorEqualRelease(1);
          personalWork.setIsNotCommission(0);
          flagS=false;
          }else {
          personalWork.setExecutorEqualRelease(0);
          personalWork.setIsNotCommission(0);
          }
          if (releaseName.equals(executorName)){
          personalWork.setExecutorEqualRelease(1);
          personalWork.setIsNotCommission(1);
          flagZ=false;
          }else {
          personalWork.setExecutorEqualRelease(1);
          personalWork.setIsNotCommission(0);
          }
          redisPersonalWork.setStatus(work.getStatus()); redisPersonalWork.setStatus(work.getStatus());
          redisPersonalWork.setTime(time); redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews); redisPersonalWork.setLatestNews(latestNews);
          ...@@ -264,8 +317,23 @@ public class TestServiceImpl implements TestService { ...@@ -264,8 +317,23 @@ public class TestServiceImpl implements TestService {
          pushData(work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(objects))); pushData(work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(objects)));
          subWork(objects, work, work.getPublisher()); subWork(objects, work, work.getPublisher());
          log.info("{}这里发送{}", work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(objects))); log.info("{}这里发送{}", work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(objects)));
          if (flagS && flagZ) {
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELATED_WORK); if (executorName.equals(auditName)) {
          personalWork.setWorkAttribution(WorkAttribution1.ME_RECEIVE_WORK);
          personalWork.setReadState(1);
          personalWork.setIsNotCommission(1);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getAudit(), personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getAudit(), personalWork);
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getAudit(), 0, -1);
          assert list != null;
          pushData(work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          log.info("{}这里发送{}", work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          flagS = false;
          flagZ = false;
          }
          }
          if (flagZ) {
          personalWork.setWorkAttribution(WorkAttribution1.ME_RECEIVE_WORK);
          personalWork.setReadState(1); personalWork.setReadState(1);
          personalWork.setIsNotCommission(1); personalWork.setIsNotCommission(1);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getExecutor(), personalWork); redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getExecutor(), personalWork);
          ...@@ -277,19 +345,49 @@ public class TestServiceImpl implements TestService { ...@@ -277,19 +345,49 @@ public class TestServiceImpl implements TestService {
          subWork(list, work, work.getExecutor()); subWork(list, work, work.getExecutor());
          log.info("{}这里发送{}", work.getExecutor(), JacksonUtil.toJSon(statisticalRoleCount(list))); log.info("{}这里发送{}", work.getExecutor(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          } }
          //有待修改 if (flagS){
          for (String id:uIds){
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELATED_WORK); personalWork.setWorkAttribution(WorkAttribution1.ME_RELATED_WORK);
          personalWork.setReadState(1); personalWork.setReadState(1);
          personalWork.setIsNotCommission(0); personalWork.setIsNotCommission(0);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT+id,personalWork); redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getAudit(), personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getAudit(), personalWork);
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getAudit(), 0, -1);
          assert list != null;
          pushData(work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          subWork(list, work, work.getAudit());
          log.info("{}这里发送{}", work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          asynchronousAddEs(Constants.REDIS_EVENT+id,personalWork); if (!work.getAudit().equals(work.getExecutor()) && !work.getAudit().equals(work.getPublisher()) ){
          List<Object> list=redisTemplate.opsForList().range(Constants.REDIS_EVENT+id,0,-1); personalWork.setWorkAttribution(WorkAttribution1.ME_RELATED_WORK);
          personalWork.setReadState(1);
          personalWork.setIsNotCommission(0);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getAudit(), personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getAudit(), personalWork);
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getAudit(), 0, -1);
          assert list != null; assert list != null;
          pushData(id,JacksonUtil.toJSon(statisticalRoleCount(list))); pushData(work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          subWork(list,work,id); subWork(list, work, work.getAudit());
          log.info("{}这里发送{}",id, JacksonUtil.toJSon(statisticalRoleCount(list))); log.info("{}这里发送{}", work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          majordomos.addAll(generalManagers);
          majordomos.addAll(assistantManagers);
          majordomos.remove(work.getExecutor());
          majordomos.remove(work.getPublisher());
          majordomos.remove(work.getAudit());
          for (String id : majordomos) {
          personalWork.setWorkAttribution(WorkAttribution1.ME_RELATED_WORK);
          personalWork.setReadState(1);
          personalWork.setIsNotCommission(0);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + id, personalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + id, personalWork);
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + id, 0, -1);
          assert list != null;
          pushData(id, JacksonUtil.toJSon(statisticalRoleCount(list)));
          subWork(list, work, id);
          log.info("{}这里发送{}", id, JacksonUtil.toJSon(statisticalRoleCount(list)));
          } }
          } }
          ...@@ -297,12 +395,17 @@ public class TestServiceImpl implements TestService { ...@@ -297,12 +395,17 @@ public class TestServiceImpl implements TestService {
          public void updateWorkStatus(String executorId, String latestNews, String status, Work work) { public void updateWorkStatus(String executorId, String latestNews, String status, Work work) {
          List<String> uIds=new ArrayList<>(); List<String> uIds=new ArrayList<>();
          Long time=new Date().getTime(); Long time=new Date().getTime();
          if (work.getSuperiorId()!=null) {
          uIds = tests(work.getSuperiorId(), uIds); String releaseName= iUserService.findUserById(work.getPublisher()).getUsername();
          uIds.remove(work.getPublisher()); String executorName= iUserService.findUserById(work.getExecutor()).getUsername();
          uIds.remove(work.getExecutor()); String auditName=iUserService.findUserById(work.getAudit()).getUsername();
          } List<String> majordomos = work.getMajordomos();
          if (work.getExecutor().equals(work.getPublisher())){ List<String> generalManagers = work.getGeneralManagers();
          List<String> assistantManagers = work.getAssistantManagers();
          boolean flagZ=true;
          boolean flagS=true;
          //发布者
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1); List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1);
          for (Object object : list) { for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object; RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          ...@@ -315,20 +418,73 @@ public class TestServiceImpl implements TestService { ...@@ -315,20 +418,73 @@ public class TestServiceImpl implements TestService {
          } else { } else {
          redisPersonalWork.setReadState(1); redisPersonalWork.setReadState(1);
          } }
          switch (status) {
          case WorkStatus.ONGOING: if (releaseName.equals(auditName)){
          redisPersonalWork.setIsNotCommission(1); switch (status) {
          break; case WorkStatus.ONGOING:
          case WorkStatus.AUDIT: redisPersonalWork.setIsNotCommission(0);
          redisPersonalWork.setIsNotCommission(1); break;
          break; case WorkStatus.AUDIT:
          case WorkStatus.REVIEW: redisPersonalWork.setIsNotCommission(1);
          redisPersonalWork.setIsNotCommission(1); break;
          break; case WorkStatus.REVIEW:
          default: redisPersonalWork.setIsNotCommission(0);
          redisPersonalWork.setIsNotCommission(0); break;
          break; default:
          redisPersonalWork.setIsNotCommission(0);
          break;
          }
          flagS=false;
          }else if (releaseName.equals(executorName)){
          switch (status) {
          case WorkStatus.ONGOING:
          redisPersonalWork.setIsNotCommission(1);
          break;
          case WorkStatus.AUDIT:
          redisPersonalWork.setIsNotCommission(0);
          break;
          case WorkStatus.REVIEW:
          redisPersonalWork.setIsNotCommission(1);
          break;
          default:
          redisPersonalWork.setIsNotCommission(0);
          break;
          }
          flagZ=false;
          } else if (releaseName.equals(auditName) && releaseName.equals(executorName)){
          switch (status) {
          case WorkStatus.ONGOING:
          redisPersonalWork.setIsNotCommission(1);
          break;
          case WorkStatus.AUDIT:
          redisPersonalWork.setIsNotCommission(1);
          break;
          case WorkStatus.REVIEW:
          redisPersonalWork.setIsNotCommission(1);
          break;
          default:
          redisPersonalWork.setIsNotCommission(0);
          break;
          }
          flagS=false;
          flagZ=false;
          }else {
          switch (status) {
          case WorkStatus.ONGOING:
          redisPersonalWork.setIsNotCommission(0);
          break;
          case WorkStatus.AUDIT:
          redisPersonalWork.setIsNotCommission(0);
          break;
          case WorkStatus.REVIEW:
          redisPersonalWork.setIsNotCommission(0);
          break;
          default:
          redisPersonalWork.setIsNotCommission(0);
          break;
          }
          } }
          redisPersonalWork.setLatestNews(latestNews); redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork); redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork); asynchronousAddEs(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork);
          ...@@ -336,51 +492,89 @@ public class TestServiceImpl implements TestService { ...@@ -336,51 +492,89 @@ public class TestServiceImpl implements TestService {
          } }
          pushData(work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list))); pushData(work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          if (flagS && flagZ) {
          }else { if (auditName.equals(executorName)) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getAudit(), 0, -1);
          //发布者 for (Object object : list) {
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1); RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getAudit(), 1, redisPersonalWork);
          redisPersonalWork.setStatus(status);
          if (work.getAudit().equals(executorId)) {
          redisPersonalWork.setReadState(0);
          } else {
          redisPersonalWork.setReadState(1);
          }
          redisPersonalWork.setTime(time);
          switch (status) {
          case WorkStatus.ONGOING:
          redisPersonalWork.setIsNotCommission(1);
          break;
          case WorkStatus.AUDIT:
          redisPersonalWork.setIsNotCommission(1);
          break;
          case WorkStatus.REVIEW:
          redisPersonalWork.setIsNotCommission(1);
          break;
          default:
          redisPersonalWork.setIsNotCommission(0);
          break;
          }
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getExecutor(), redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getExecutor(), redisPersonalWork);
          }
          }
          flagS = false;
          flagZ = false;
          }
          }
          //执行者
          if (flagZ) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getExecutor(), 0, -1);
          for (Object object : list) { for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object; RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) { if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getPublisher(), 1, redisPersonalWork); redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getExecutor(), 1, redisPersonalWork);
          redisPersonalWork.setStatus(status); redisPersonalWork.setStatus(status);
          redisPersonalWork.setTime(time); if (work.getExecutor().equals(executorId)) {
          if (work.getPublisher().equals(executorId)) {
          redisPersonalWork.setReadState(0); redisPersonalWork.setReadState(0);
          } else { } else {
          redisPersonalWork.setReadState(1); redisPersonalWork.setReadState(1);
          } }
          redisPersonalWork.setTime(time);
          switch (status) { switch (status) {
          case WorkStatus.ONGOING: case WorkStatus.ONGOING:
          redisPersonalWork.setIsNotCommission(0); redisPersonalWork.setIsNotCommission(1);
          break; break;
          case WorkStatus.AUDIT: case WorkStatus.AUDIT:
          redisPersonalWork.setIsNotCommission(1); redisPersonalWork.setIsNotCommission(0);
          break; break;
          case WorkStatus.REVIEW: case WorkStatus.REVIEW:
          redisPersonalWork.setIsNotCommission(0); redisPersonalWork.setIsNotCommission(1);
          break; break;
          default: default:
          redisPersonalWork.setIsNotCommission(0); redisPersonalWork.setIsNotCommission(0);
          break; break;
          } }
          redisPersonalWork.setLatestNews(latestNews); redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork); redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getExecutor(), redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork); asynchronousAddEs(Constants.REDIS_EVENT + work.getExecutor(), redisPersonalWork);
          } }
          } }
          pushData(work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list))); pushData(work.getExecutor(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          //执行者
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getExecutor(), 0, -1); }
          if (flagS) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getAudit(), 0, -1);
          for (Object object : list) { for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object; RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) { if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getExecutor(), 1, redisPersonalWork); redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getAudit(), 1, redisPersonalWork);
          redisPersonalWork.setStatus(status); redisPersonalWork.setStatus(status);
          if (work.getExecutor().equals(executorId)) { if (work.getAudit().equals(executorId)) {
          redisPersonalWork.setReadState(0); redisPersonalWork.setReadState(0);
          } else { } else {
          redisPersonalWork.setReadState(1); redisPersonalWork.setReadState(1);
          ...@@ -388,28 +582,36 @@ public class TestServiceImpl implements TestService { ...@@ -388,28 +582,36 @@ public class TestServiceImpl implements TestService {
          redisPersonalWork.setTime(time); redisPersonalWork.setTime(time);
          switch (status) { switch (status) {
          case WorkStatus.ONGOING: case WorkStatus.ONGOING:
          redisPersonalWork.setIsNotCommission(1); redisPersonalWork.setIsNotCommission(0);
          break; break;
          case WorkStatus.AUDIT: case WorkStatus.AUDIT:
          redisPersonalWork.setIsNotCommission(0); redisPersonalWork.setIsNotCommission(1);
          break; break;
          case WorkStatus.REVIEW: case WorkStatus.REVIEW:
          redisPersonalWork.setIsNotCommission(1); redisPersonalWork.setIsNotCommission(0);
          break; break;
          default: default:
          redisPersonalWork.setIsNotCommission(0); redisPersonalWork.setIsNotCommission(0);
          break; break;
          } }
          redisPersonalWork.setLatestNews(latestNews); redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getExecutor(), redisPersonalWork); redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getAudit(), redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getExecutor(), redisPersonalWork); asynchronousAddEs(Constants.REDIS_EVENT + work.getAudit(), redisPersonalWork);
          } }
          } }
          pushData(work.getExecutor(), JacksonUtil.toJSon(statisticalRoleCount(list))); pushData(work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          } }
          if (uIds.size()!=0) {
          for (String uId:uIds) {
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1); majordomos.addAll(generalManagers);
          majordomos.addAll(assistantManagers);
          majordomos.remove(work.getExecutor());
          majordomos.remove(work.getPublisher());
          majordomos.remove(work.getAudit());
          if (majordomos.size()!=0) {
          for (String uId:majordomos) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1);
          for (Object object : list) { for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object; RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) { if (redisPersonalWork.getWorkId().equals(work.getId())) {
          ...@@ -432,28 +634,17 @@ public class TestServiceImpl implements TestService { ...@@ -432,28 +634,17 @@ public class TestServiceImpl implements TestService {
          @Override @Override
          public void upDateWork(String executorId, String latestNews, Work work) { public void upDateWork(String executorId, String latestNews, Work work) {
          List<String> uIds=new ArrayList<>(); List<String> uIds=new ArrayList<>();
          if (work.getSuperiorId()!=null) {
          uIds = tests(work.getSuperiorId(), uIds);
          uIds.remove(work.getPublisher());
          uIds.remove(work.getExecutor());
          }
          Long time=new Date().getTime();
          if (work.getExecutor().equals(work.getPublisher())){
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1);
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getPublisher(), 1, redisPersonalWork);
          redisPersonalWork.setReadState(0);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork);
          }
          }
          pushData(work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          }else { String releaseName= iUserService.findUserById(work.getPublisher()).getUsername();
          String executorName= iUserService.findUserById(work.getExecutor()).getUsername();
          String auditName=iUserService.findUserById(work.getAudit()).getUsername();
          List<String> majordomos = work.getMajordomos();
          List<String> generalManagers = work.getGeneralManagers();
          List<String> assistantManagers = work.getAssistantManagers();
          boolean flagZ=true;
          boolean flagS=true;
          Long time=new Date().getTime();
          //发布者 //发布者
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1); List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1);
          ...@@ -466,6 +657,12 @@ public class TestServiceImpl implements TestService { ...@@ -466,6 +657,12 @@ public class TestServiceImpl implements TestService {
          }else { }else {
          redisPersonalWork.setReadState(1); redisPersonalWork.setReadState(1);
          } }
          if (releaseName.equals(auditName)){
          flagS=false;
          }
          if (releaseName.equals(executorName)){
          flagZ=false;
          }
          redisPersonalWork.setTime(time); redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews); redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork); redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork);
          ...@@ -473,7 +670,28 @@ public class TestServiceImpl implements TestService { ...@@ -473,7 +670,28 @@ public class TestServiceImpl implements TestService {
          } }
          } }
          pushData(work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list))); pushData(work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          if (flagS && flagZ) {
          if (auditName.equals(executorName)) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getExecutor(), 0, -1);
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getExecutor(), 1, redisPersonalWork);
          redisPersonalWork.setReadState(1);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getExecutor(), redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getExecutor(), redisPersonalWork);
          }
          }
          pushData(work.getExecutor(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          flagS = false;
          flagZ = false;
          }
          }
          //执行者 //执行者
          if (flagZ) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getExecutor(), 0, -1); list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getExecutor(), 0, -1);
          for (Object object : list) { for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object; RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          ...@@ -488,9 +706,34 @@ public class TestServiceImpl implements TestService { ...@@ -488,9 +706,34 @@ public class TestServiceImpl implements TestService {
          } }
          pushData(work.getExecutor(), JacksonUtil.toJSon(statisticalRoleCount(list))); pushData(work.getExecutor(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          } }
          if (uIds.size()!=0) {
          for (String uId:uIds) { if (flagS){
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1); list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getAudit(), 0, -1);
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getAudit(), 1, redisPersonalWork);
          if (executorId.equals(work.getAudit())) {
          redisPersonalWork.setReadState(0);
          }else {
          redisPersonalWork.setReadState(1);
          }
          redisPersonalWork.setReadState(1);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getAudit(), redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getAudit(), redisPersonalWork);
          }
          }
          pushData(work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          majordomos.addAll(generalManagers);
          majordomos.addAll(assistantManagers);
          majordomos.remove(work.getExecutor());
          majordomos.remove(work.getPublisher());
          if (majordomos.size()!=0) {
          for (String uId:majordomos) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1);
          for (Object object : list) { for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object; RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) { if (redisPersonalWork.getWorkId().equals(work.getId())) {
          ...@@ -508,89 +751,394 @@ public class TestServiceImpl implements TestService { ...@@ -508,89 +751,394 @@ public class TestServiceImpl implements TestService {
          } }
          @Override @Override
          public void appraisal(String executorId, String latestNews, Work work){ public void appraisal(String executorId, String latestNews, Work work,int count){
          List<String> uIds=new ArrayList<>(); List<String> uIds=new ArrayList<>();
          if (work.getSuperiorId()!=null) { List<String> strings=new ArrayList<>();
          uIds = tests(work.getSuperiorId(), uIds); strings.add(work.getAudit());
          uIds.remove(work.getPublisher()); strings.add(work.getExecutor());
          uIds.remove(work.getExecutor()); List<String> majordomos = work.getMajordomos();
          } List<String> generalManagers = work.getGeneralManagers();
          List<String> assistantManagers = work.getAssistantManagers();
          List<String> sumIds=new ArrayList<>();
          sumIds.addAll(strings);
          sumIds.addAll(majordomos);
          sumIds.addAll(generalManagers);
          sumIds.addAll(assistantManagers);
          Long time=new Date().getTime(); Long time=new Date().getTime();
          if (work.getExecutor().equals(work.getPublisher())){
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1);
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getPublisher(), 1, redisPersonalWork);
          redisPersonalWork.setIsNotCommission(1);
          redisPersonalWork.setReadState(0);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork);
          }
          }
          pushData(work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          }else { switch (count){
          //发布者 case 1:
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getPublisher(), 0, -1); List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getExecutor(), 0, -1);
          for (Object object : list) { for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object; RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) { if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getPublisher(), 1, redisPersonalWork); redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getExecutor(), 1, redisPersonalWork);
          if (work.getPublisher().equals(executorId)) {
          redisPersonalWork.setReadState(0); redisPersonalWork.setReadState(0);
          redisPersonalWork.setIsNotCommission(0); redisPersonalWork.setIsNotCommission(0);
          } else { redisPersonalWork.setTime(time);
          redisPersonalWork.setReadState(1); redisPersonalWork.setLatestNews(latestNews);
          redisPersonalWork.setIsNotCommission(1); redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getExecutor(), redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getExecutor(), redisPersonalWork);
          } }
          redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getPublisher(), redisPersonalWork);
          } }
          } pushData(work.getExecutor(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          pushData(work.getPublisher(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          //执行者 majordomos.addAll(new ArrayList<>(Collections.singleton(work.getAudit())));
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getExecutor(), 0, -1); if (majordomos.size()!=0) {
          for (Object object : list) { for (String uId:sumIds) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object; list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1);
          if (redisPersonalWork.getWorkId().equals(work.getId())) { for (Object object : list) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getExecutor(), 1, redisPersonalWork); RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (work.getExecutor().equals(executorId)) { if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork);
          redisPersonalWork.setReadState(1);
          redisPersonalWork.setIsNotCommission(1);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork);
          }
          }
          pushData(uId,JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }
          sumIds.remove(work.getExecutor());
          sumIds.removeAll(majordomos);
          if (sumIds.size()!=0) {
          for (String uId:sumIds) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1);
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork);
          redisPersonalWork.setReadState(1);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setIsNotCommission(0);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork);
          }
          }
          pushData(uId, JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }
          break;
          case 2:
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getAudit(), 0, -1);
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getAudit(), 1, redisPersonalWork);
          redisPersonalWork.setReadState(0); redisPersonalWork.setReadState(0);
          redisPersonalWork.setIsNotCommission(0); redisPersonalWork.setIsNotCommission(0);
          } else { redisPersonalWork.setTime(time);
          redisPersonalWork.setReadState(1); redisPersonalWork.setLatestNews(latestNews);
          redisPersonalWork.setIsNotCommission(0); redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getAudit(), redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getAudit(), redisPersonalWork);
          } }
          redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getExecutor(), redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + work.getExecutor(), redisPersonalWork);
          } }
          } pushData(work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          pushData(work.getExecutor(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          } if (majordomos.size()!=0) {
          if (uIds.size()!=0) { for (String uId:sumIds) {
          for (String uId:uIds) { list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1);
          List<Object> list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1); for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork);
          redisPersonalWork.setReadState(1);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews);
          }
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork);
          }
          pushData(uId,JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }
          ScoreCoefficient scoreCoefficient= scoreCoefficientRepository.findById(work.getId()).get();
          if (scoreCoefficient.getDirectorScore2()!=null && scoreCoefficient.getGroupLeaderScore2()!=null){
          for (String id:assistantManagers){
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + id, 0, -1);
          assert list != null;
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + id, 1, redisPersonalWork);
          redisPersonalWork.setReadState(1);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setIsNotCommission(1);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + id, redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + id, redisPersonalWork);
          }
          }
          pushData(id, JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }
          sumIds.remove(work.getAudit());
          sumIds.removeAll(majordomos);
          if (sumIds.size()!=0) {
          for (String uId:sumIds) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1);
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork);
          redisPersonalWork.setReadState(1);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setIsNotCommission(0);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork);
          }
          }
          pushData(uId, JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }
          break;
          case 3:
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + work.getAudit(), 0, -1);
          assert list != null;
          for (Object object : list) { for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object; RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) { if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork); redisTemplate.opsForList().remove(Constants.REDIS_EVENT + work.getAudit(), 1, redisPersonalWork);
          redisPersonalWork.setReadState(1); redisPersonalWork.setReadState(1);
          redisPersonalWork.setTime(time); redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews); redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork); redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + work.getAudit(), redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork); asynchronousAddEs(Constants.REDIS_EVENT + work.getAudit(), redisPersonalWork);
          } }
          } }
          pushData(uId, JacksonUtil.toJSon(statisticalRoleCount(list))); pushData(work.getAudit(), JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          if (majordomos.size()!=0) {
          for (String uId:majordomos) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1);
          assert list != null;
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork);
          if (uId.equals(executorId)){
          redisPersonalWork.setReadState(0);
          }else {
          redisPersonalWork.setReadState(1);
          }
          redisPersonalWork.setIsNotCommission(0);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews);
          }
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork);
          }
          pushData(uId,JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }
          scoreCoefficient= scoreCoefficientRepository.findById(work.getId()).get();
          if (scoreCoefficient.getDirectorScore2()!=null && scoreCoefficient.getGroupLeaderScore2()!=null){
          for (String id:assistantManagers){
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + id, 0, -1);
          assert list != null;
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + id, 1, redisPersonalWork);
          redisPersonalWork.setReadState(1);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setIsNotCommission(1);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + id, redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + id, redisPersonalWork);
          }
          }
          pushData(id, JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }
          sumIds.remove(work.getAudit());
          sumIds.removeAll(assistantManagers);
          sumIds.removeAll(majordomos);
          if (sumIds.size()!=0) {
          for (String uId:sumIds) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1);
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork);
          redisPersonalWork.setReadState(1);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setIsNotCommission(0);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork);
          }
          }
          pushData(uId, JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }
          break;
          case 4:
          if (assistantManagers.size()!=0) {
          for (String uId:assistantManagers) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1);
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork);
          if (uId.equals(executorId)){
          redisPersonalWork.setReadState(0);
          }else {
          redisPersonalWork.setReadState(1);
          }
          redisPersonalWork.setIsNotCommission(0);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews);
          }
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork);
          }
          pushData(uId,JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }
          if (generalManagers.size()!=0) {
          for (String uId:generalManagers) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1);
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork);
          redisPersonalWork.setReadState(1);
          redisPersonalWork.setIsNotCommission(1);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews);
          }
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork);
          }
          pushData(uId,JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }
          sumIds.removeAll(assistantManagers);
          sumIds.removeAll(generalManagers);
          if (sumIds.size()!=0) {
          for (String uId:sumIds) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1);
          assert list != null;
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork);
          redisPersonalWork.setReadState(1);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setIsNotCommission(0);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork);
          }
          }
          pushData(uId, JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }
          break;
          case 5:
          if (generalManagers.size()!=0) {
          for (String uId:generalManagers) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1);
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork);
          if (uId.equals(executorId)){
          redisPersonalWork.setReadState(0);
          }else {
          redisPersonalWork.setReadState(1);
          }
          redisPersonalWork.setIsNotCommission(0);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews);
          }
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork);
          }
          pushData(uId,JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }
          sumIds.removeAll(generalManagers);
          if (sumIds.size()!=0) {
          for (String uId:sumIds) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1);
          assert list != null;
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork);
          redisPersonalWork.setReadState(1);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setIsNotCommission(0);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork);
          }
          }
          pushData(uId, JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }
          break;
          default:
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + executorId, 0, -1);
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + executorId, 1, redisPersonalWork);
          redisPersonalWork.setReadState(0);
          redisPersonalWork.setIsNotCommission(0);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT +executorId, redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + executorId, redisPersonalWork);
          }
          }
          pushData(executorId, JacksonUtil.toJSon(statisticalRoleCount(list)));
          sumIds.remove(executorId);
          if (sumIds.size()!=0) {
          for (String uId:sumIds) {
          list = redisTemplate.opsForList().range(Constants.REDIS_EVENT + uId, 0, -1);
          for (Object object : list) {
          RedisPersonalWork redisPersonalWork = (RedisPersonalWork) object;
          if (redisPersonalWork.getWorkId().equals(work.getId())) {
          redisTemplate.opsForList().remove(Constants.REDIS_EVENT + uId, 1, redisPersonalWork);
          redisPersonalWork.setReadState(1);
          redisPersonalWork.setTime(time);
          redisPersonalWork.setIsNotCommission(0);
          redisPersonalWork.setLatestNews(latestNews);
          redisTemplate.opsForList().leftPush(Constants.REDIS_EVENT + uId, redisPersonalWork);
          asynchronousAddEs(Constants.REDIS_EVENT + uId, redisPersonalWork);
          }
          }
          pushData(uId, JacksonUtil.toJSon(statisticalRoleCount(list)));
          }
          }
          break;
          } }
          } }
          ......
          notes-job/src/main/java/com/zjty/tynotes/job/task/Task.java
          浏览文件 @ bcf00ac4
          package com.zjty.tynotes.job.task; //package com.zjty.tynotes.job.task;
          //
          import com.zjty.tynotes.job.basic.entity.database.Work; //import com.zjty.tynotes.job.basic.entity.database.Work;
          import com.zjty.tynotes.job.basic.service.ScoreCoefficientService; //import com.zjty.tynotes.job.basic.service.ScoreCoefficientService;
          import com.zjty.tynotes.job.basic.service.WorkService; //import com.zjty.tynotes.job.basic.service.WorkService;
          import com.zjty.tynotes.job.common.Action; //import com.zjty.tynotes.job.common.Action;
          import com.zjty.tynotes.job.common.constant.WorkStatus; //import com.zjty.tynotes.job.common.constant.WorkStatus;
          import com.zjty.tynotes.job.status.service.BusinessTreeManagement; //import com.zjty.tynotes.job.status.service.BusinessTreeManagement;
          import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
          import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
          import org.springframework.scheduling.annotation.Scheduled; //import org.springframework.scheduling.annotation.Scheduled;
          import org.springframework.stereotype.Service; //import org.springframework.stereotype.Service;
          //
          import java.time.LocalDateTime; //import java.time.LocalDateTime;
          import java.time.ZoneOffset; //import java.time.ZoneOffset;
          import java.util.Date; //import java.util.Date;
          //
          @Slf4j //@Slf4j
          @Service //@Service
          public class Task { //public class Task {
          @Autowired // @Autowired
          ScoreCoefficientService scoreCoefficientService; // ScoreCoefficientService scoreCoefficientService;
          @Autowired // @Autowired
          WorkService workService; // WorkService workService;
          @Autowired // @Autowired
          BusinessTreeManagement businessTreeManagement; // BusinessTreeManagement businessTreeManagement;
          //
          @Scheduled(cron ="0 0 0 * * ?") // @Scheduled(cron ="0 0 0 * * ?")
          public void task() { // public void task() {
          //
          long time=LocalDateTime.now().minusDays(7) // long time=LocalDateTime.now().minusDays(7)
          .withHour(0) // .withHour(0)
          .withMinute(0) // .withMinute(0)
          .withSecond(0) // .withSecond(0)
          .withNano(0) // .withNano(0)
          .atOffset(ZoneOffset.ofHours(8)) // .atOffset(ZoneOffset.ofHours(8))
          .toEpochSecond(); // .toEpochSecond();
          //
          //
          scoreCoefficientService.selectSorct2IsNull() // scoreCoefficientService.selectSorct2IsNull()
          .forEach( // .forEach(
          sc->{ // sc->{
          Work work= workService.findById(sc.getWordId()); // Work work= workService.findById(sc.getWordId());
          if (work.getAuditTime().getTime()<time){ // if (work.getAuditTime().getTime()<time){
          sc.setScore2(sc.getScore1()); //// sc.setScore2(sc.getScore1());
          scoreCoefficientService.modify(sc); // scoreCoefficientService.modify(sc);
          businessTreeManagement.saveAction(work.getPublisher(),sc.getWordId(),Action.APPRAISAL_WORD,new Date(),""); // businessTreeManagement.saveAction(work.getPublisher(),sc.getWordId(),Action.APPRAISAL_WORD,new Date(),"");
          workService.alterTaskStatus(sc.getWordId(),WorkStatus.FINISHED,work.getPublisher()); // workService.alterTaskStatus(sc.getWordId(),WorkStatus.FINISHED,work.getPublisher());
          businessTreeManagement.saveAction(work.getPublisher(), sc.getWordId(), Action.FINISHED_WORK, new Date(), ""); // businessTreeManagement.saveAction(work.getPublisher(), sc.getWordId(), Action.FINISHED_WORK, new Date(), "");
          } // }
          //
          } // }
          ); // );
          } // }
          } //}
          Markdown 格式
          0% 或
          您添加了 0 人 到此讨论。请谨慎行事。
          请先完成此评论的编辑！
          请 注册 或者 后发表评论