fix:搜索修改

src/main/java/net/vtstar/zhongtong/avi/global/listener/WebFiledListener.java

@@ -6,6 +6,7 @@ import net.vtstar.user.search.Search;
 import net.vtstar.user.util.ReadAnnotationUtils;
 import net.vtstar.zhongtong.avi.global.web.Show;
 import net.vtstar.zhongtong.avi.global.web.domain.ShowField;
+import net.vtstar.zhongtong.avi.global.web.domain.enums.FieldType;
 import org.springframework.cache.Cache;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
@@ -57,9 +58,14 @@ public class WebFiledListener implements ApplicationListener<ContextRefreshedEve
                     log.error("{} 类{} 字段 @show 注解 label 属性未赋值", clazz, field.getName());
                 }
                 showFiled.setLabel(label);
+                FieldType fieldType = annotation.dataType();
+                if (null == fieldType) {
+                    fieldType = FieldType.STRING;
+                }
+                showFiled.setDateType(fieldType.toString());
                 showFileds.add(showFiled);
             }
-            showFieldCache.put(clazzAnnotation.code(),showFileds);
+            showFieldCache.put(clazzAnnotation.code(), showFileds);
         }
     }
 }

src/main/java/net/vtstar/zhongtong/avi/global/web/Show.java

 package net.vtstar.zhongtong.avi.global.web;
 
+import net.vtstar.zhongtong.avi.global.web.domain.enums.FieldType;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -23,4 +25,9 @@ public @interface Show {
      * 是否排序
      */
     boolean sortable() default false;
+
+    /**
+     * 数据类型
+     */
+    FieldType dataType() default FieldType.STRING;
 }

src/main/java/net/vtstar/zhongtong/avi/global/web/domain/ShowField.java

@@ -16,4 +16,7 @@ public class ShowField {
 
     @ApiModelProperty("是否排序")
     private boolean sortable;
+
+    @ApiModelProperty("数据类型")
+    private String dateType;
 }

src/main/java/net/vtstar/zhongtong/avi/global/web/domain/enums/FieldType.java

+package net.vtstar.zhongtong.avi.global.web.domain.enums;
+
+public enum  FieldType {
+
+    STRING,
+
+    NUMBER,
+
+    DATETIME,
+
+    ENUMS;
+}

src/main/java/net/vtstar/zhongtong/avi/stamping/domain/LaserCuttingMachine.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import net.vtstar.scada.base.gather.domain.EquipmentData;
 import net.vtstar.user.search.Search;
 import net.vtstar.zhongtong.avi.global.web.Show;
+import net.vtstar.zhongtong.avi.global.web.domain.enums.FieldType;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -31,11 +32,9 @@ public class LaserCuttingMachine extends EquipmentData {
     private BigDecimal gasPressure;
 
     @Search
-    @Show(label = "时间")
-    @ApiModelProperty("气体压力")
+    @Show(label = "时间",dataType = FieldType.DATETIME)
+    @ApiModelProperty("时间")
     private Date createTime;
 
-
-
-    private String state;
+    private Integer state;
 }

src/main/java/net/vtstar/zhongtong/avi/stamping/job/LaserCuttingMachineJob.java

 package net.vtstar.zhongtong.avi.stamping.job;
 
 import lombok.extern.slf4j.Slf4j;
+import net.vtstar.scada.base.equipmgt.domain.Enum.EquipStatusEnum;
 import net.vtstar.scada.base.gather.domain.EquipmentData;
 import net.vtstar.scada.base.gather.job.GatherJob;
 import net.vtstar.zhongtong.avi.stamping.domain.LaserCuttingMachine;
@@ -27,7 +28,22 @@ public class LaserCuttingMachineJob extends GatherJob {
     }
 
     protected boolean handleObject(EquipmentData equipmentData) {
+
         LaserCuttingMachine data = (LaserCuttingMachine) equipmentData;
-        return false;
+        Integer state = data.getState();
+        if (state == null) {
+            return false;
+        }
+        switch (state) {
+            case 0:
+                equipmentData.setEquipStatus(EquipStatusEnum.SHUTDOWN);
+                break;
+            case 1:
+                equipmentData.setEquipStatus(EquipStatusEnum.RUN);
+                break;
+            default:
+                return false;
+        }
+        return true;
     }
 }

src/main/resources/config/application-dev.properties

@@ -4,4 +4,9 @@ spring.profiles.include=mybatis,quartz,swagger,security
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://10.100.172.135:3306/zhongtong_dev?useSSL=false&useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
 spring.datasource.username=zhongtongdev
-spring.datasource.password=123456
\ No newline at end of file
+spring.datasource.password=123456
+
+# redis
+#spring.redis.host=172.16.0.252
+#spring.redis.port=6379
+#spring.redis.password=)OKM1qaz
\ No newline at end of file

src/main/resources/config/application-quartz.properties

 # scheduler(Quartz)
 spring.quartz.job-store-type=jdbc
-spring.quartz.jdbc.initialize-schema=always
+spring.quartz.jdbc.initialize-schema=ALWAYS
 spring.quartz.jdbc.comment-prefix=--
 spring.quartz.startupDelay=2s
 spring.quartz.auto-startup=true