fix:searchCode定义

src/main/java/net/vtstar/zhongtong/avi/equipment/controller/EquipmentController.java

@@ -4,13 +4,14 @@ import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import net.vtstar.user.search.controller.vo.SearchVo;
 import net.vtstar.utils.domain.Return;
 import net.vtstar.zhongtong.avi.equipment.service.EquipmentService;
 import net.vtstar.zhongtong.avi.stamping.domain.LaserCuttingMachine;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -24,9 +25,9 @@ public class EquipmentController {
     @Autowired
     private EquipmentService equipmentService;
 
-    @ApiOperation(value = "获取设备实时监控数据")
+    @ApiOperation(value = "获取设备实时监控数据(分页)")
     @GetMapping(value = "/realTime/data")
-    private Return getRealTimeData(@RequestParam("ShopCode") String ShopCode,@RequestParam("equipType") String equipType){
+    private Return getRealTimeData(@RequestBody SearchVo pageFilter){
         Object realTimeData = equipmentService.findRealTimeData();
         ArrayList<LaserCuttingMachine> data = (ArrayList<LaserCuttingMachine>) realTimeData;
         return Return.success(new PageInfo<>(data));

src/main/java/net/vtstar/zhongtong/avi/global/web/controller/ShowFieldController.java

@@ -32,7 +32,7 @@ public class ShowFieldController {
             "四轮定位:WHEEL_ALIGNMENT\r\n铆接设备: RIVETING_EQUIPMENT\r\n集中加注冷媒:FOCUS_ADDING_REFRIGERANT\r\n" +
             "润滑油集中加注:CENTRALIZED_FILLING_CLUTCH\r\n集中加注助力油: FOCUS_BOOSTER_OIL\r\n" +
             "地板革热熔胶涂布设备: FLOOR_LEATHER_HOT\r\n新能源在线检测点: NEW_ENERGY\r\n检测线: CHECK_LINE\r\n" +
-            "充电桩: CHARGING_PILE\r\n动静态测试: DYNAMIC_STATIC_TEST\r\n加氢站: HYDROGEN_STATION" +
+            "充电桩: CHARGING_PILE\r\n动静态测试: DYNAMIC_STATIC_TEST\r\n加氢站: HYDROGEN_STATION\r\n" +
             "Voc处理平台:VOC_PROCESSING_PLATFORM")
     @GetMapping("/showField")
     private Return findShowFieldBySearchCode(@RequestParam("searchCode") String searchCode) {

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

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

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

@@ -24,4 +24,4 @@ quartz.job.taskInfos[0].jobName=net.vtstar.zhongtong.avi.stamping.job.LaserCutti
 quartz.job.taskInfos[0].jobGroup=LaserCuttingMachineJob
 quartz.job.taskInfos[0].jobDescription=\u5C01\u88C5\u7EBF\u9884\u710A\u673A\u6570\u636E\u91C7\u96C6job
 quartz.job.taskInfos[0].cronExpression=0/10 * * * * ?
-quartz.job.taskInfos[0].start=true
\ No newline at end of file
+quartz.job.taskInfos[0].start=false
\ No newline at end of file