diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfig.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfig.java index d6bfe52..01e2a01 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfig.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfig.java @@ -46,7 +46,7 @@ public class MqttConfig { // private String mqtt_system_topname; @PostConstruct public void registerMqtt(){ -try { + try{ com.hnac.hzinfo.subscribe.MqttConfig mqttConfig = new com.hnac.hzinfo.subscribe.MqttConfig(); mqttConfig.setUrl(mqtt_fdp_url); mqttConfig.setGroup(mqtt_fdp_group); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java index 8b728ee..8023b6f 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/controller/WorkTicketInfoController.java @@ -262,5 +262,13 @@ public class WorkTicketInfoController { return R.data(workTicketInfoService.work(Condition.getPage(query),work)); } + @ApiLog + @PostMapping("/cancel") + @ApiOperationSupport(order = 50) + @ApiOperation(value = "线下工作票作废") + public R cancel(WorkTicketInfoEntity entity) { + return R.status(workTicketInfoService.cancel(entity)); + } + } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java index 54bf7f9..0e1603b 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java @@ -185,4 +185,6 @@ public interface IWorkTicketInfoService extends BaseService work(IPage page, WorkVO work); List exportWorkTicket(WorkTicketInfoDto req); + + Boolean cancel(WorkTicketInfoEntity entity); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java index f1d0032..acaca81 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java @@ -1272,4 +1272,10 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl