fix："优化远程做糖接口"

src/main/java/com/szwl/controller/IndexController.java

@@ -385,7 +385,7 @@ public class IndexController {
         equipmentApply.setAdminUserName(username);
         equipmentApply.setEquimentType(equimentType);
         // 如果是爆米花
-        if (equimentType.equals("P10") || equimentType.equals("P20") || equimentType.equals("P30")) {
+        if (equimentType.equals("P10") || equimentType.equals("P20") || equimentType.equals("P30") || equimentType.equals("SBM10")) {
             machineType = "1";
         }
         // 如果是冰淇淋

src/main/java/com/szwl/controller/TSugarDoController.java

@@ -9,13 +9,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.szwl.model.bo.JsonMessage;
+import com.szwl.constant.ResponseCodesEnum;
 import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
-import com.szwl.model.dto.PromoCodeTargetEn;
 import com.szwl.model.dto.SugarDoTarget;
 import com.szwl.model.dto.SugarDoTargetEn;
 import com.szwl.model.entity.*;
+import com.szwl.model.param.DoSugarParam;
 import com.szwl.model.param.SugarDoParam;
 import com.szwl.model.utils.PushUtils;
 import com.szwl.service.*;
@@ -64,8 +64,11 @@ public class TSugarDoController {
     TProductService productService;
 
     @ApiOperation(value = "远程做糖")
-    @GetMapping("/doSugar")
-    public ResponseEntity<?> doSugar(Long equipmentId, String productName, String makeCodes) {
+    @PostMapping("/doSugar")
+    public ResponseModel<?> doSugar(@RequestBody DoSugarParam param) {
+        Long equipmentId = param.getEquipmentId();
+        String productName = param.getProductName();
+        String makeCodes = param.getMakeCodes();
         if (equipmentId != null) {
             TEquipment equipment = tEquipmentService.getById(equipmentId);
             Long equipmentAdminId = equipment.getAdminId();
@@ -87,8 +90,7 @@ public class TSugarDoController {
             query.eq(TSugarDo::getStatus, "1");
             List<TSugarDo> sugarDoList = tSugarDoService.list(query);
             if (sugarDoList.size() > 20) {
-                return ResponseEntity.status(HttpStatus.OK)
-                        .body(new ResultMessage().setCode(false).setData("").setMessage("做糖数量已满"));
+                return R.fail(ResponseCodesEnum.A0001, "做糖数量已满");
             }
             StringBuilder number = new StringBuilder();
             Random random = new Random();
@@ -130,11 +132,9 @@ public class TSugarDoController {
                 kindData.put("no", sugarDo.getNo());
                 tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("dosugar", kindData.toString()).toString());
             }
-            return ResponseEntity.status(HttpStatus.OK)
-                    .body(new ResultMessage().setCode(true).setData(sugarDo).setMessage("SUCCESS"));
+            return R.ok();
         }
-        return ResponseEntity.status(HttpStatus.OK)
-                .body(new ResultMessage().setCode(false).setData("").setMessage("ERROR"));
+        return R.fail(ResponseCodesEnum.A0001);
     }
 
     @ApiOperation(value = "查询远程做糖状态")

src/main/java/com/szwl/model/param/DoSugarParam.java

@@ -0,0 +1,12 @@
+package com.szwl.model.param;
+
+import lombok.Data;
+
+@Data
+public class DoSugarParam {
+    private Long equipmentId;
+
+    private String productName;
+
+    private String makeCodes;
+}