Commit a6f07db4 authored by 喻训浩's avatar 喻训浩

fix: avi修改

parent c543bd77
package net.vtstar.zhongtong.avi.monitoring.controller;
import com.alibaba.fastjson.JSONObject;
import io.jsonwebtoken.lang.Assert;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import net.vtstar.utils.asserts.ParamAssert;
import net.vtstar.utils.domain.Return;
import net.vtstar.zhongtong.avi.monitoring.service.PDAService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
@Slf4j
@Api(description = "PDA相关操作模块")
......@@ -22,22 +22,27 @@ public class PDAController {
@ApiOperation(value = "焊装车间钣金上撬请求")
@PostMapping("/hanzhuang/bound")
private Return hanZhuangBound(@RequestParam("vehicleNo") String vehicleNo, @RequestParam("busNo") String busNo) {
private Return hanZhuangBound(@RequestBody JSONObject json) {
ParamAssert.notNull(json.get("vehicleNo"),"param is null");
ParamAssert.notNull(json.get("busNo"),"param is null");
return Return.success();
}
@ApiOperation(value = "换撬请求")
@PostMapping("/change/skid")
private Return changeSkid(@RequestParam("sourceStation") String sourceStation, @RequestParam("targetStation") String targetStation) {
private Return changeSkid(@RequestBody JSONObject json) {
ParamAssert.notNull(json.get("sourceStation"),"param is null");
ParamAssert.notNull(json.get("sourceStation"),"param is null");
return Return.success();
}
@ApiOperation(value = "返修车请求")
@PostMapping("/repair")
private Return repair(@RequestParam("busNo") String busNo) {
private Return repair(@RequestBody JSONObject json) {
ParamAssert.notNull(json.get("busNo"),"param is null");
return Return.success();
}
}
......@@ -21,7 +21,7 @@ public class RfidMessageHandler extends AbstractTesterMessageHandler {
private ValueOperations valueOperations;
public RfidMessageHandler() {
super("translation", "data/all");
super("skid", "data/all");
}
@Override
......
......@@ -9,7 +9,7 @@ mqtt.password=public
mqtt.subscribe.completion-timeout=5000
mqtt.subscribe.qos=2
mqtt.subscribe.topic-prefix=iot
mqtt.subscribe.equipment-name=+
mqtt.subscribe.equipment-name=+
mqtt.subscribe.equipment-number=+
mqtt.subscribe.data-topic-key=data
mqtt.subscribe.data-system-topic-suffix=system
......
......@@ -31,7 +31,7 @@ quartz.job.taskInfos[1].jobGroup=CleanStatusDataJob
quartz.job.taskInfos[1].jobDescription=\u6E05\u6D17\u8BBE\u5907\u72B6\u6001Job
#quartz.job.taskInfos[1].cronExpression=0 0 0 * * ?
quartz.job.taskInfos[1].cronExpression=0/15 * * * * ?
quartz.job.taskInfos[1].start=true
quartz.job.taskInfos[1].start=false
quartz.job.taskInfos[2].jobName=net.vtstar.zhongtong.avi.equipment.job.StatisticsTimeJob
quartz.job.taskInfos[2].jobGroup=StatisticsTimeJob
......
......@@ -9,7 +9,7 @@ spring.aop.auto=true
spring.main.allow-bean-definition-overriding=true
# server
server.port=8080
server.port=8086
spring.servlet.multipart.max-file-size=1000MB
spring.servlet.multipart.max-request-size=2000MB
spring.servlet.multipart.enabled=true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment