更新

dev-task/src/main/java/com/tykj/dev/device/task/controller/TaskController.java

@@ -90,11 +90,12 @@ public class TaskController {
     @RequestMapping(method = RequestMethod.POST, value = "/getNewTaskList", produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity getNewTaskList(@RequestBody TaskSelectVo taskSelectVo) {
         Integer userId = userUtils.getCurrentUserId();
-        UserRecord userRecord = userRecordDao.findByUserId(userId);
-        if (userRecord==null){
+        List<UserRecord> userRecords = userRecordDao.findAllByUserId(userId);
+        if (userRecords.isEmpty()){
             return ResponseEntity.ok(Collections.EMPTY_LIST);
         }
         else {
+            UserRecord userRecord = userRecords.get(0);
             List<Integer> newTaskIds;
             if (taskSelectVo.getType()==1) {
                 newTaskIds = StringSplitUtil.userIdSplit(userRecord.getNewTaskIds());
@@ -119,16 +120,17 @@ public class TaskController {
         List<TaskUserVo> taskUserVos = taskService.getList(taskSelectVo);
         if (!hasCondition){
             List<Integer> taskIds = taskUserVos.stream().map(TaskUserVo::getId).collect(Collectors.toList());
+            List<UserRecord> userRecords = userRecordDao.findAllByUserId(userId);
             if (taskSelectVo.getSelectNum()==2) {
                 if (taskSelectVo.getType() == 1) {
-                    if (userRecordDao.findByUserId(userId) == null) {
+                    if (userRecords.isEmpty()) {
                         UserRecord userRecord = new UserRecord();
                         userRecord.setUserId(userId);
                         userRecord.setTaskIds(StringSplitUtil.idListToString(taskIds));
                         userRecord.setNewTaskIds(userRecord.getTaskIds());
                         userRecordService.save(userRecord);
                     } else {
-                        UserRecord userRecord = userRecordDao.findByUserId(userId);
+                        UserRecord userRecord = userRecords.get(0);
                         if (userRecord.getTaskIds() == null) {
                             userRecord.setTaskIds(StringSplitUtil.idListToString(taskIds));
                             userRecord.setNewTaskIds(userRecord.getTaskIds());
@@ -142,14 +144,14 @@ public class TaskController {
                         }
                     }
                 } else {
-                    if (userRecordDao.findByUserId(userId) == null) {
+                    if (userRecords.isEmpty()) {
                         UserRecord userRecord = new UserRecord();
                         userRecord.setUserId(userId);
                         userRecord.setCountryTaskIds(StringSplitUtil.idListToString(taskIds));
                         userRecord.setNewCountryTaskIds(userRecord.getCountryTaskIds());
                         userRecordService.save(userRecord);
                     } else {
-                        UserRecord userRecord = userRecordDao.findByUserId(userId);
+                        UserRecord userRecord = userRecords.get(0);
                         if (userRecord.getCountryTaskIds() == null) {
                             userRecord.setCountryTaskIds(StringSplitUtil.idListToString(taskIds));
                             userRecord.setNewCountryTaskIds(userRecord.getCountryTaskIds());

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -82,7 +82,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToNext(TaskBto taskBto) {
-        confirmUser(taskBto);
+//        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(GlobalMap.getStatusEnumMap().getOrDefault(taskBto.getBillStatus() + 1, StatusEnum.END).id);
         //list add 0,point++
@@ -105,7 +105,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToNext(TaskBto taskBto, String customInfo) {
-        confirmUser(taskBto);
+//        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(GlobalMap.getStatusEnumMap().getOrDefault(taskBto.getBillStatus() + 1, StatusEnum.END).id);
         //list add 0,point++
@@ -129,7 +129,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToNext(TaskBto taskBto, Integer userId) {
-        confirmUser(taskBto);
+//        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(GlobalMap.getStatusEnumMap().getOrDefault(taskBto.getBillStatus() + 1, StatusEnum.END).id);
         //list add userId,point++
@@ -153,7 +153,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToNext(TaskBto taskBto, Integer userId, String customInfo) {
-        confirmUser(taskBto);
+//        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(GlobalMap.getStatusEnumMap().getOrDefault(taskBto.getBillStatus() + 1, StatusEnum.END).id);
         //list add userId,point++
@@ -177,7 +177,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToSpecial(TaskBto taskBto, StatusEnum statusEnum) {
-        confirmUser(taskBto);
+//        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(statusEnum.id);
         //list add 0,point++
@@ -201,7 +201,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToSpecial(TaskBto taskBto, StatusEnum statusEnum, String customInfo) {
-        confirmUser(taskBto);
+//        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(statusEnum.id);
         //list add 0,point++
@@ -226,7 +226,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToSpecial(TaskBto taskBto, StatusEnum statusEnum, Integer userId) {
-        confirmUser(taskBto);
+//        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(statusEnum.id);
         //list add userId,point++
@@ -251,7 +251,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToSpecial(TaskBto taskBto, StatusEnum statusEnum, Integer userId, String customInfo) {
-        confirmUser(taskBto);
+//        confirmUser(taskBto);
         //status++
         taskBto.setBillStatus(statusEnum.id);
         //list add userId,point++
@@ -272,7 +272,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToEnd(TaskBto taskBto) {
-        confirmUser(taskBto);
+//        confirmUser(taskBto);
         //set status end
         taskBto.setBillStatus(StatusEnum.END.id);
         update(taskBto);
@@ -286,7 +286,7 @@ public class TaskServiceImpl implements TaskService {
     @Override
     @Log
     public TaskBto moveToArchive(TaskBto taskBto) {
-        confirmUser(taskBto);
+//        confirmUser(taskBto);
         //set status archive
         taskBto.setBillStatus(StatusEnum.ARCHIVE.id);
         update(taskBto);
@@ -681,7 +681,7 @@ public class TaskServiceImpl implements TaskService {
      */
     @Override
     public TaskBto addInvolveUser(TaskBto taskBto, Integer userId) {
-        confirmUser(taskBto);
+//        confirmUser(taskBto);
         List<Integer> list = taskBto.getInvolveUserIdList();
         //添加涉及用户Id
         list.add(userId);

dev-user/src/main/java/com/tykj/dev/device/user/read/service/impl/MessageServiceImpl.java

@@ -97,14 +97,15 @@ public class MessageServiceImpl implements MessageService {
                 .sorted(Comparator.comparing(MessageUserVo::getCreateTime,Comparator.nullsLast(Date::compareTo)).reversed())
                 .collect(Collectors.toList());
         List<Integer> ids = messageUserVos.stream().map(MessageUserVo::getId).collect(Collectors.toList());
-        UserRecord userRecord = userRecordDao.findByUserId(userId);
-        if (userRecord == null) {
+        List<UserRecord> userRecords = userRecordDao.findAllByUserId(userId);
+        if (userRecords.isEmpty()) {
             UserRecord userRecord2 = new UserRecord();
             userRecord2.setUserId(userId);
             userRecord2.setReadIds(StringSplitUtil.idListToString(ids));
             userRecord2.setNewReadIds(userRecord2.getReadIds());
             userRecordService.save(userRecord2);
         } else {
+            UserRecord userRecord = userRecords.get(0);
             if (userRecord.getReadIds() == null) {
                 //更新阅知id
                 userRecord.setReadIds(StringSplitUtil.idListToString(ids));

dev-user/src/main/java/com/tykj/dev/device/user/subject/dao/UserRecordDao.java

@@ -4,6 +4,9 @@ import com.tykj.dev.device.user.subject.entity.UserRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.util.List;
+
 public interface UserRecordDao extends JpaRepository<UserRecord, Integer>, JpaSpecificationExecutor<UserRecord> {
     UserRecord findByUserId(Integer userId);
+    List<UserRecord> findAllByUserId(Integer userId);
 }