|
@@ -3,10 +3,7 @@ package com.fdkankan.fusion.mq.consumer;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
-import com.fdkankan.fusion.entity.CaseEntity;
|
|
|
-import com.fdkankan.fusion.entity.ScenePlus;
|
|
|
-import com.fdkankan.fusion.entity.ScenePlusExt;
|
|
|
-import com.fdkankan.fusion.entity.User;
|
|
|
+import com.fdkankan.fusion.entity.*;
|
|
|
import com.fdkankan.fusion.mq.vo.LaserSceneGpsVo;
|
|
|
import com.fdkankan.fusion.request.CaseParam;
|
|
|
import com.fdkankan.fusion.request.SceneNumParam;
|
|
@@ -39,6 +36,8 @@ public class CaseAddSceneConsumer {
|
|
|
ICaseService caseService;
|
|
|
@Autowired
|
|
|
IUserService userService;
|
|
|
+ @Autowired
|
|
|
+ IJyUserService jyUserService;
|
|
|
|
|
|
@RabbitListener(
|
|
|
queuesToDeclare = @Queue("${queue.fusion.case-add:queue-aj-add-scene}")
|
|
@@ -63,10 +62,19 @@ public class CaseAddSceneConsumer {
|
|
|
CaseEntity caseEntity = caseService.getKnumber(kNumber);
|
|
|
if(caseEntity == null){
|
|
|
User user = userService.getById(scenePlus.getUserId());
|
|
|
+ if(user == null){
|
|
|
+ log.info("queue-aj-add-scene------user为空:{},{}",num,kNumber);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ JyUser jyUser = jyUserService.getByUserId(user.getId());
|
|
|
+ if(jyUser == null){
|
|
|
+ log.info("queue-aj-add-scene------jyUser为空:{},{}",num,kNumber);
|
|
|
+ return;
|
|
|
+ }
|
|
|
caseEntity = new CaseEntity();
|
|
|
caseEntity.setCaseTitle(kNumber);
|
|
|
caseEntity.setUserName(user.getUserName());
|
|
|
- caseEntity.setSysUserId(user.getSysUserId());
|
|
|
+ caseEntity.setSysUserId(jyUser.getSysUserId());
|
|
|
caseService.save(caseEntity);
|
|
|
}
|
|
|
|