xiewenjie 3 gadi atpakaļ
vecāks
revīzija
b7a0e730c1

+ 1 - 1
sxz-core/src/main/java/com/fdkk/sxz/other/listener/RunBuild.java

@@ -589,7 +589,7 @@ public class RunBuild {
         //上锁保证只有一个在消费,加锁一个钟,成功消费就解锁了
         String token = RedisUtil.tryLock(taskId, 60 * 60 * 1000);
         if (token != null) {
-            SceneStyleEntity entity = sceneStyleService.findById(taskId);
+            SceneStyleEntity entity = sceneStyleService.findStyleNum(vrNum);
             if (entity == null) {
                 RunBuild.log.info("场景不存在,出现异常");
                 return;

+ 1 - 1
sxz-core/src/main/java/com/fdkk/sxz/webApi/controller/ImportDataController.java

@@ -340,7 +340,7 @@ public class ImportDataController extends BaseController {
                 return Result.failure(CodeConstant.FAILURE_CODE_3001, CodeConstant.FAILURE_MSG_3001);
             }
 
-            SceneStyleEntity entity = sceneStyleService.findSceneNum(styleNum);
+            SceneStyleEntity entity = sceneStyleService.findStyleNum(styleNum);
 
             if (StringUtils.isEmpty(buildType) || "all".equals(buildType)) {
                 if (entity != null) {

+ 2 - 2
sxz-core/src/main/java/com/fdkk/sxz/webApi/service/ISceneStyleService.java

@@ -11,7 +11,7 @@ public interface ISceneStyleService extends IBaseService<SceneStyleEntity> {
 
     Integer findLastNum(String sceneNum);
 
-    SceneStyleEntity findSceneNum(String sceneNum);
-    
+    SceneStyleEntity findStyleNum(String sceneNum);
+
     int addVersion(RequestSceneLight style);
 }

+ 1 - 1
sxz-core/src/main/java/com/fdkk/sxz/webApi/service/impl/SceneStyleServiceImpl.java

@@ -21,7 +21,7 @@ public class SceneStyleServiceImpl extends BaseServiceImpl<ISceneStyleMapper, Sc
 
 
     @Override
-    public SceneStyleEntity findSceneNum(String sceneNum) {
+    public SceneStyleEntity findStyleNum(String sceneNum) {
         LambdaQueryWrapper<SceneStyleEntity> wrapper = Wrappers.lambdaQuery();
         wrapper.eq(SceneStyleEntity::getStyleNum, sceneNum);
         wrapper.orderByDesc(SceneStyleEntity::getNum);