feat："增加冰淇淋果酱抽取功能，优化冰淇淋屏蔽显示商品"

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

@@ -1,8 +1,6 @@
 package com.szwl.controller;
 
 
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.com.crbank.ommo.bean.ResultMessage;
 import cn.com.crbank.ommo.esUtil.BeanUtils;
 import cn.hutool.core.util.NumberUtil;
@@ -31,8 +29,8 @@ import com.szwl.model.bo.R;
 import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.bo.UserDetailBO;
 import com.szwl.model.entity.*;
-import com.szwl.model.param.EquipmentParam;
 import com.szwl.model.param.PasswordParam;
+import com.szwl.model.param.SmokeJamParm;
 import com.szwl.model.query.StatisticsParam;
 import com.szwl.model.utils.DateUtils;
 import com.szwl.model.utils.PushUtils;
@@ -42,7 +40,6 @@ import com.szwl.util.DownloadUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
-import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -50,10 +47,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.OutputStream;
 import java.net.URL;
 import java.net.URLConnection;
-import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
@@ -1880,6 +1875,22 @@ public class TEquipmentController {
         }
     }
 
+    @ApiOperation("冰淇淋：果酱抽取")
+    @PostMapping("/smokeJam")
+    public ResponseModel<?> smokeJam(@RequestBody SmokeJamParm smokeJamParm) {
+        Long equipmentId = smokeJamParm.getEquipmentId();
+        String productNo = smokeJamParm.getProductNo();
+        Integer status = smokeJamParm.getStatus();
+        String kindData = productNo + "-" + status;
+        TEquipment equipment = tEquipmentService.getById(equipmentId);
+        if (equipment != null) {
+            tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("smokeJam", kindData).toString());
+            return R.ok();
+        } else {
+            return R.fail(ResponseCodesEnum.A0001, "设备不存在");
+        }
+    }
+
     @ApiOperation("修改税费开关状态")
     @PostMapping("/updateTaxSwitch")
     public ResponseModel<?> updateTaxSwitch(@RequestBody TEquipmentDesc equipmentDesc) {

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

@@ -118,6 +118,42 @@ public class TProductController {
         return R.ok(null,"修改成功");
     }
 
+    @ApiOperation(value = "修改花型是否显示")
+    @PostMapping("/newUpdateProductsShow")
+    public ResponseModel<?> newUpdateProductsShow(@RequestBody String productList) {
+
+        List<TProduct> products = new ArrayList<>();
+        JSONObject jsonObject = JSONObject.parseObject(productList);
+        products = JSONObject.parseArray(jsonObject.get("productList").toString(), TProduct.class);
+        if(products.size()>0){
+            TProduct tProduct = products.get(0);
+            if(tProduct==null&&tProduct.getEquipmentId()==null){
+                return R.fail(ResponseCodesEnum.A0001,"找不到当前设备");
+            }
+        }
+        TEquipment equipment = tEquipmentService.getById(products.get(0).getEquipmentId());
+        if(equipment==null){
+            return R.fail(ResponseCodesEnum.A0001,"请退出重试");
+        }
+        List<TProductBean> list = new ArrayList<>();
+        for(TProduct product:products){
+            TProductBean productBean = new TProductBean();
+            if(product!=null&&product.getId()!=null){
+                productBean.setShowType(product.getShowType());
+                if(StringUtils.isEmpty(product.getShowType())){
+                    productBean.setShowType("0");
+                }
+                if (StringUtils.isNotEmpty(product.getNo())) {
+                    productBean.setNo(product.getNo());
+                }
+                list.add(productBean);
+            }
+        }
+        tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("updateProductsShow", JSON.toJSONString(list)).toString());
+        tProductService.updateBatchById(products);
+        return R.ok(null,"修改成功");
+    }
+
     @ApiOperation(value = "多个花型价格")
     @GetMapping("/updateProduct")
     public ResponseModel<?> updateProduct(String no,String price,String equipmentId,String type) {

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

@@ -0,0 +1,21 @@
+package com.szwl.model.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 抽果酱参数
+ */
+@Data
+public class SmokeJamParm {
+
+    @ApiModelProperty(value = "设备ID")
+    private Long equipmentId;
+
+    @ApiModelProperty(value = "商品编号")
+    private String productNo;
+
+    @ApiModelProperty(value = "状态，0：停止，1：正抽，2：反抽")
+    private Integer status;
+
+}