[培训] 测试修改数据添加两条数据的bug

dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java

 package com.tykj.dev.device.train.controller;
 
 import com.tykj.dev.blockcha.subject.entity.BcHash;
-import com.tykj.dev.blockcha.subject.entity.BcText;
 import com.tykj.dev.blockcha.subject.service.BlockChainUtil;
 import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.file.service.FilesUtil;
@@ -33,11 +32,9 @@ import com.tykj.dev.misc.base.BusinessEnum;
 import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.misc.utils.TaskDisposeUtil;
-import com.tykj.dev.socket.MyWebSocket;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -113,10 +110,19 @@ public class TrainJobController {
         userList.forEach(
                 user -> {
             if (user.getTrainStatus()==1 || user.getTrainStatus()==2){
-                needTrain.add(user.getUserId());
+                TrainUser trainUser= userToTrainUser(user);
+                trainUser.setIsSignUp(2);
+                trainUser.setIsNotJoinUserId(1);
+                trainUser.setTrainId(trainTheme.getTrainId());
+                saveTrainUser(trainUser);
             }else {
-                normal.add(user.getUserId());
-            } }
+                TrainUser trainUser= userToTrainUser(user);
+                trainUser.setIsSignUp(2);
+                trainUser.setIsNotJoinUserId(0);
+                trainUser.setTrainId(trainTheme.getTrainId());
+                saveTrainUser(trainUser);
+            }
+          }
         );
         List<TrainUnit> trainUnits=new ArrayList<>();
         trainThemeAddVo.getUnitsIds().forEach(
@@ -163,7 +169,6 @@ public class TrainJobController {
                     taskBto=taskService.start(taskBto);
                     taskBto.setCreateUserId(null);
                     taskService.update(taskBto);
-
                 }
         );
         if (securityUser.getCurrentUserInfo().getUnits().getLevel()==1){
@@ -443,14 +448,12 @@ public class TrainJobController {
        return mapper.map(user,TrainUser.class);
    }
 
-    private TrainUser saveTrainUser(TrainUser trainUser){
+    private void saveTrainUser(TrainUser trainUser){
             TrainUser trainUser1 = trainUserDao.save(trainUser);
             //异步线程
-        CompletableFuture.runAsync(()-> {
+            CompletableFuture.runAsync(()-> {
             BcHash bcHash = blockChainUtil.sendHash(1000, JacksonUtil.toJSon(trainUser1));
-            trainUser1.setRecordId(bcHash.getData().getRecordID());
-            trainUserDao.save(trainUser1);
-          });
-            return trainUser1;
+            trainUserDao.upDate(bcHash.getData().getRecordID(),trainUser1.getId());
+            });
     }
 }

dev-train/src/main/java/com/tykj/dev/device/train/dao/TrainUserDao.java

@@ -4,7 +4,11 @@ import com.tykj.dev.device.train.entity.TrainTheme;
 import com.tykj.dev.device.train.entity.TrainUser;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
 /**
@@ -23,4 +27,10 @@ public interface TrainUserDao extends JpaRepository<TrainUser, Integer>, JpaSpec
     List<TrainUser> findAllByTrainId(Integer trainId);
 
     List<TrainUser> findAllByUnitsIdAndTrainId(Integer unitId,Integer trainId);
+
+    @Transactional
+    @Modifying
+    @Query("update TrainUser o set o.recordId = :recordId  where o.id =:id")
+    int upDate(String recordId,Integer id);
+
 }

dev-user/src/main/java/com/tykj/dev/device/user/subject/entity/Groups.java

@@ -41,6 +41,7 @@ public class Groups {
     /**
      * 对应的组成员id ，分割
      */
+    @Column(name = "member_id",columnDefinition = "TEXT")
     private String memberId;
 
     /**

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UserServiceImpl.java

@@ -455,7 +455,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public List<User> findUnitsIdInUsers(List<Integer> units) {
-        return userDao.findAllByUnitsIdIn(units);
+        return userDao.findAllByUnitsIdIn(units).stream().filter(user -> user.getTrainStatus()!=5).collect(Collectors.toList());
     }
 
     @Override