瀏覽代碼

rm mappingState

AE86 5 年之前
父節點
當前提交
aa7bbbd6fd

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/mapping/MappingChecker.java

@@ -149,7 +149,7 @@ public class MappingChecker extends AbstractChecker implements ApplicationContex
         AtomicInteger success = new AtomicInteger(0);
         AtomicInteger fail = new AtomicInteger(0);
         Map<String, String> map = new ConcurrentHashMap<>();
-        Meta meta = new Meta(mappingId, MetaEnum.RUNNING.getCode(), total, success, fail, map);
+        Meta meta = new Meta(mappingId, MetaEnum.READY.getCode(), total, success, fail, map);
         meta.setType(ConfigConstant.META);
         meta.setName(ConfigConstant.META);
 

+ 1 - 2
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MappingServiceImpl.java

@@ -150,8 +150,7 @@ public class MappingServiceImpl implements MappingService {
         Mapping mapping = manager.getMapping(meta.getMappingId());
         Assert.notNull(mapping, "驱动不存在.");
         ModelEnum modelEnum = ModelEnum.getModelEnum(mapping.getModel());
-        MetaEnum metaEnum = MetaEnum.getMetaEnum(meta.getState());
-        MetaVo metaVo = new MetaVo(mapping.getName(), modelEnum.getMessage(), metaEnum.getMessage());
+        MetaVo metaVo = new MetaVo(mapping.getName(), modelEnum.getMessage());
         BeanUtils.copyProperties(meta, metaVo);
         return metaVo;
     }

+ 1 - 12
dbsyncer-biz/src/main/java/org/dbsyncer/biz/vo/MetaVo.java

@@ -13,13 +13,10 @@ public class MetaVo extends Meta {
     private String mappingName;
     // 同步方式
     private String model;
-    // 状态
-    private String mappingState;
 
-    public MetaVo(String mappingName, String model, String mappingState) {
+    public MetaVo(String mappingName, String model) {
         this.mappingName = mappingName;
         this.model = model;
-        this.mappingState = mappingState;
     }
 
     public String getMappingName() {
@@ -37,12 +34,4 @@ public class MetaVo extends Meta {
     public void setModel(String model) {
         this.model = model;
     }
-
-    public String getMappingState() {
-        return mappingState;
-    }
-
-    public void setMappingState(String mappingState) {
-        this.mappingState = mappingState;
-    }
 }

+ 5 - 1
dbsyncer-web/src/main/resources/templates/index/index.html

@@ -165,7 +165,11 @@
                         成功:[[${m?.success}]]
                         <span th:if="${m?.fail gt 0}">,失败:[[${m?.fail}]] <a href="javascript:;" class="label label-danger">日志</a></span>
                     </td>
-                    <td><span class="label label-success">[[${m?.mappingState}]]</span></td>
+                    <td>
+                        <span th:if="${m?.state eq 0}" class="label label-info">未运行</span>
+                        <span th:if="${m?.state eq 1}" class="label label-success">运行中</span>
+                        <span th:if="${m?.state eq 2}" class="label label-warning">停止中</span>
+                    </td>
                     <td th:text="${#dates.format(m?.updateTime, 'yyyy-MM-dd HH:mm:ss')}"></td>
                 </tr>
                 </tbody>