feat:后台打印

pjcloud-mqtt/pjcloud-mqtt-api/src/main/java/com/bsd/pjcloud/mqtt/api/feign/RemoteMqttEventService.java

@@ -4,8 +4,10 @@ import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.feign.annotation.NoToken;
 import com.bsd.pjcloud.mqtt.dto.MqttBaseDto;
+import com.bsd.pjcloud.mqtt.dto.hard.HardPrintMsg;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -23,35 +25,35 @@ public interface RemoteMqttEventService {
      */
     @NoToken
     @GetMapping("/mqtt/send-config-change-msg")
-    R<Boolean> sendConfigChangeMsg(@RequestParam Long mchDeptId);
+    R<Boolean> sendConfigChangeMsg(@RequestParam Long deptId);
 
     /**
      * 食堂商品变化
      */
     @NoToken
     @GetMapping("/mqtt/send-canteen-product-change-msg")
-    R<Boolean> sendCanteenProductChangeMsg(@RequestParam(required = false) Long mchDeptId);
+    R<Boolean> sendCanteenProductChangeMsg(@RequestParam Long deptId);
 
     /**
      * 食堂分类变化
      */
     @NoToken
     @GetMapping("/mqtt/send-canteen-classify-change-msg")
-    R<Boolean> sendCanteenClassifyChangeMsg(@RequestParam(required = false) Long mchDeptId);
+    R<Boolean> sendCanteenClassifyChangeMsg(@RequestParam Long deptId);
 
     /**
      * 超市商品变化
      */
     @NoToken
     @GetMapping("/mqtt/send-supermarket-product-change-msg")
-    R<Boolean> sendSupermarketProductChangeMsg(@RequestParam(required = false) Long mchDeptId);
+    R<Boolean> sendSupermarketProductChangeMsg(@RequestParam Long deptId);
 
     /**
      * 超市分类变化
      */
     @NoToken
     @GetMapping("/mqtt/send-supermarket-classify-change-msg")
-    R<Boolean> sendSupermarketClassifyChangeMsg(@RequestParam(required = false) Long mchDeptId);
+    R<Boolean> sendSupermarketClassifyChangeMsg(@RequestParam Long deptId);
 
     /**
      * 人脸变化
@@ -59,4 +61,11 @@ public interface RemoteMqttEventService {
     @NoToken
     @GetMapping("/mqtt/send-face-change-msg")
     R<Boolean> sendFaceChangeMsg(@RequestParam Long userDeptId, @RequestParam Long userId, @RequestParam(required = false) Boolean isGlobalFace);
+
+    /**
+     * 人脸变化
+     */
+    @NoToken
+    @PostMapping("/mqtt/send-print")
+    R<Boolean> sendPrint(@RequestBody HardPrintMsg dto);
 }

pjcloud-mqtt/pjcloud-mqtt-api/src/main/java/com/bsd/pjcloud/mqtt/dto/MqttBaseDto.java

@@ -26,7 +26,7 @@ public class MqttBaseDto<T extends MqttHardBaseMsg> {
             return String.format("topic/android/%s/%s/%s", hardGroupId, merchantDeptId, hardwareId);
         }
         if (ObjectUtil.isAllNotEmpty(hardGroupId, merchantDeptId)) {
-            return String.format("topic/android/%s/%s", merchantDeptId, hardwareId);
+            return String.format("topic/android/%s/%s", hardGroupId, merchantDeptId);
         }
         if (ObjectUtil.isAllNotEmpty(hardGroupId)) {
             return String.format("topic/android/%s", hardGroupId);

pjcloud-mqtt/pjcloud-mqtt-api/src/main/java/com/bsd/pjcloud/mqtt/dto/hard/HardPrintMsg.java

@@ -0,0 +1,28 @@
+package com.bsd.pjcloud.mqtt.dto.hard;
+
+import com.bsd.pjcloud.mqtt.dto.MqttHardBaseMsg;
+import lombok.Data;
+
+@Data
+public class HardPrintMsg extends MqttHardBaseMsg {
+    // 用户id
+    private Long userId;
+
+    // 设备id
+    private Long hardId;
+
+    // 设备部门id
+    private Long mchDeptId;
+
+    // 打印记录id
+    private Long historyId;
+
+    // 订单id
+    private Long orderId;
+
+    // 安卓订单id
+    private String androidOrderCode;
+
+    // 图片地址
+    private String pic;
+}