bmmx 1 год назад
Родитель
Сommit
36d7f5b4e6

+ 1 - 1
src/main/java/com/om/controller/admin/AppUserController.java

@@ -117,7 +117,7 @@ public class AppUserController {
     }
     @PostMapping("/bindingVci")
     @ApiOperation("绑定vci")
-    Result bindingVci(AppBindVO bindVO){
+    Result bindingVci(@RequestBody AppBindVO bindVO){
 
         return userService.bindingVci(bindVO);
     }

+ 5 - 1
src/main/java/com/om/service/impl/DiagnosisVersionInfoServiceImpl.java

@@ -17,6 +17,7 @@ import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -49,6 +50,7 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
     private JwtUtils jwtUtils;
 
     @Override
+    @Transactional
     public Result add(DiagnosisVersionVO diagnosisVersionVO) {
         DiagnosisVersionInfo info = new DiagnosisVersionInfo();
         //客户端编号,需要取id,后面在进行设置
@@ -73,8 +75,10 @@ public class DiagnosisVersionInfoServiceImpl extends ServiceImpl<DiagnosisVersio
         //保存
         this.save(info);
 
+
+
         LambdaQueryWrapper<DiagnosisVersionInfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(DiagnosisVersionInfo::getId, diagnosisVersionVO.getId());
+        queryWrapper.eq(DiagnosisVersionInfo::getId, info.getId());
         //保存后获取
         DiagnosisVersionInfo versionInfo = getOne(queryWrapper);
         log.info("==========={}=========", versionInfo);

+ 2 - 2
src/main/java/com/om/service/impl/UserServiceImpl.java

@@ -107,10 +107,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if (user.getState() == 0) {
             return Result.fail("用户被禁用").result(ResultCode.USER_DISABLED);
         }
-        //  绑定 客户端编号 和 设备 序列号  ( 判断type是登录(0)还是激活(1) )
+     /*   //  绑定 客户端编号 和 设备 序列号  ( 判断type是登录(0)还是激活(1) )
         if (!user.getDeviceSn().equals(dto.getDeviceSn())){
             return Result.error().message("账号尚未激活").result(ResultCode.USER_NO_ACTIVATE);
-        }
+        }*/
         if (type == 1) {
             user.setDeviceSn(deviceSn);
         }