111

src/main/java/com/fdkankan/contro/mq/listener/BuildSceneProcessLogListener.java

@@ -76,8 +76,8 @@ public class BuildSceneProcessLogListener{
                 try {
                     JyUser jyUser = scenePlusService.getJyUserByNum(num);
                     ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
-                    param.put("event_type", "计算中");
-                    param.put("event_content", "scene");
+                    param.put("event_type", "scene");
+                    param.put("event_content", "计算中");
                     param.put("scene_num", num);
                     param.put("event_time", new Date());
                     if(Objects.nonNull(scenePlus)){

src/main/java/com/fdkankan/contro/mq/service/impl/BuildObjServiceImpl.java

@@ -148,8 +148,8 @@ public class BuildObjServiceImpl implements IBuildSceneService {
             try {
                 JyUser jyUser = scenePlusService.getJyUserByNum(num);
                 ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
-                param.put("event_type", "排队中");
-                param.put("event_content", "scene");
+                param.put("event_type", "scene");
+                param.put("event_content", "排队中");
                 param.put("scene_num", num);
                 param.put("event_time", new Date());
                 if(Objects.nonNull(scenePlus)){
@@ -177,8 +177,8 @@ public class BuildObjServiceImpl implements IBuildSceneService {
             try {
                 JyUser jyUser = scenePlusService.getJyUserByNum(num);
                 ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
-                param.put("event_type", "计算失败");
-                param.put("event_content", "scene");
+                param.put("event_type", "scene");
+                param.put("event_content", "计算失败");
                 param.put("scene_num", num);
                 param.put("event_time", new Date());
                 if(Objects.nonNull(scenePlus)){
@@ -234,8 +234,8 @@ public class BuildObjServiceImpl implements IBuildSceneService {
                 try {
                     ScenePlus scenePlus = scenePlusService.getScenePlusByNum(projectNum);
                     JyUser jyUser = scenePlusService.getJyUserByNum(projectNum);
-                    param.put("event_type", "计算失败");
-                    param.put("event_content", "scene");
+                    param.put("event_type", "scene");
+                    param.put("event_content", "计算失败");
                     param.put("scene_num", projectNum);
                     param.put("event_time", new Date());
                     if(Objects.nonNull(scenePlus)){
@@ -371,8 +371,8 @@ public class BuildObjServiceImpl implements IBuildSceneService {
             Map<String, Object> param = new HashMap<>();
             try {
                 JyUser jyUser = scenePlusService.getJyUserByNum(projectNum);
-                param.put("event_type", "计算成功");
-                param.put("event_content", "scene");
+                param.put("event_type", "scene");
+                param.put("event_content", "计算成功");
                 param.put("scene_num", projectNum);
                 param.put("event_time", new Date());
                 if(Objects.nonNull(scenePlus)){
@@ -406,8 +406,8 @@ public class BuildObjServiceImpl implements IBuildSceneService {
             try {
                 ScenePlus scenePlus = scenePlusService.getScenePlusByNum(projectNum);
                 JyUser jyUser = scenePlusService.getJyUserByNum(projectNum);
-                param.put("event_type", "计算失败");
-                param.put("event_content", "scene");
+                param.put("event_type", "scene");
+                param.put("event_content", "计算失败");
                 param.put("scene_num", projectNum);
                 param.put("event_time", new Date());
                 if(Objects.nonNull(scenePlus)){

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -250,8 +250,8 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             try {
                 ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
                 JyUser jyUser = scenePlusService.getJyUserByNum(num);
-                param.put("event_type", "排队中");
-                param.put("event_content", "scene");
+                param.put("event_type", "scene");
+                param.put("event_content", "排队中");
                 param.put("scene_num", num);
                 param.put("event_time", new Date());
                 if(Objects.nonNull(scenePlus)){
@@ -297,8 +297,8 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             try {
                 ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
                 JyUser jyUser = scenePlusService.getJyUserByNum(num);
-                param.put("event_type", "计算失败");
-                param.put("event_content", "scene");
+                param.put("event_type", "scene");
+                param.put("event_content", "计算失败");
                 param.put("scene_num", num);
                 param.put("event_time", new Date());
                 if(Objects.nonNull(scenePlus)){
@@ -453,8 +453,8 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
                     Map<String, Object> param = new HashMap<>();
                     try {
                         JyUser jyUser = scenePlusService.getJyUserByNum(sceneCode);
-                        param.put("event_type", "计算失败");
-                        param.put("event_content", "scene");
+                        param.put("event_type", "scene");
+                        param.put("event_content", "计算失败");
                         param.put("scene_num", sceneCode);
                         param.put("event_time", new Date());
                         if(Objects.nonNull(scenePlus)){
@@ -636,8 +636,8 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             Map<String, Object> param = new HashMap<>();
             try {
                 JyUser jyUser = scenePlusService.getJyUserByNum(sceneCode);
-                param.put("event_type", "计算成功");
-                param.put("event_content", "scene");
+                param.put("event_type", "scene");
+                param.put("event_content", "计算成功");
                 param.put("scene_num", sceneCode);
                 param.put("event_time", new Date());
                 if(Objects.nonNull(scenePlus)){
@@ -664,8 +664,8 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             Map<String, Object> param = new HashMap<>();
             try {
                 JyUser jyUser = scenePlusService.getJyUserByNum(sceneCode);
-                param.put("event_type", "计算失败");
-                param.put("event_content", "scene");
+                param.put("event_type", "scene");
+                param.put("event_content", "计算失败");
                 param.put("scene_num", sceneCode);
                 if(Objects.nonNull(scenePlus)){
                     param.put("scene_title", scenePlus.getTitle());

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -1724,8 +1724,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         Map<String, Object> param = new HashMap<>();
         try {
             JyUser jyUser = scenePlusService.getJyUserByNum(sceneNum);
-            param.put("event_type", "上传完毕");
-            param.put("event_content", "scene");
+            param.put("event_type", "scene");
+            param.put("event_content", "上传完毕");
             param.put("scene_num", sceneNum);
             param.put("event_time", new Date());
             if(Objects.nonNull(scenePlus)){
@@ -2526,8 +2526,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 try {
                     JyUser jyUser = scenePlusService.getJyUserByNum(sceneNum);
                     ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneNum);
-                    param.put("event_type", "通知计算失败");
-                    param.put("event_content", "scene");
+                    param.put("event_type", "scene");
+                    param.put("event_content", "通知计算失败");
                     param.put("scene_num", sceneNum);
                     param.put("event_time", new Date());
                     if(Objects.nonNull(scenePlus)){