添加爆米花相关信息

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

@@ -143,6 +143,15 @@ public class IndexController { ;
             if(StringUtils.isNotEmpty(equipmentVo.getStick())){
                 equipmentDesc.setStick(equipmentVo.getStick());
             }
+            if(equipmentVo.getCupQuantity() != null){
+                equipmentDesc.setCupQuantity(equipmentVo.getCupQuantity());
+            }
+            if(StringUtils.isNotEmpty(equipmentVo.getStirTm())){
+                equipmentDesc.setStirTm(equipmentVo.getStirTm());
+            }
+            if(StringUtils.isNotEmpty(equipmentVo.getCornGeneratorTm())){
+                equipmentDesc.setCornGeneratorTm(equipmentVo.getCornGeneratorTm());
+            }
             equipmentDescService.updateById(equipmentDesc);
 //            return JsonMessage.success("心跳成功");
             return "心跳成功";
@@ -219,6 +228,9 @@ public class IndexController { ;
         equipmentApply.setAdminId(adminId);
         equipmentApply.setAdminUserName(username);
         equipmentApply.setEquimentType(equimentType);
+        if(equimentType.equals("POP320")) {
+            machineType = "1";
+        }
         equipmentApply.setMachineType(machineType);
         equipmentApply.setCreateDate(new Date());
         equipmentApply.setModifyDate(new Date());
@@ -307,6 +319,9 @@ public class IndexController { ;
                             if(equipmentApply.getEquimentType().equals("MG330")){
                                 equipment.setEquimentType("MG330");
                             }
+                            if(equipmentApply.getEquimentType().equals("POP320")) {
+                                equipment.setEquimentType(equipmentApply.getEquimentType());
+                            }
                             equipmentService.updateById(equipment);
                             LambdaQueryWrapper<TProportion> queryProportion = Wrappers.lambdaQuery();
                             queryProportion.eq(TProportion::getEquipmentId,equipment.getId());
@@ -325,8 +340,13 @@ public class IndexController { ;
                             }catch (Exception e) {
                                 e.printStackTrace();
                             }
-                            equipmentService.sentMessage(clientId,PushUtils.buildJson("statusType", "agreed" + old).toString());
-                            PushUtils.push(equipmentApply.getGtClientId(), "【棉花糖】设备初始化申请", "同意", PushUtils.buildJson("statusType", "agreed" + old).toString());
+                            if(StringUtils.isEmpty(machineType) || machineType.equals("0")) {
+                                equipmentService.sentMessage(clientId,PushUtils.buildJson("statusType", "agreed" + old).toString());
+                                PushUtils.push(equipmentApply.getGtClientId(), "【棉花糖】设备初始化申请", "同意", PushUtils.buildJson("statusType", "agreed" + old).toString());
+                            } else {
+                                equipmentService.sentMessage(clientId,PushUtils.buildJson("statusType", "agreed" + old).toString());
+                                PushUtils.push(equipmentApply.getGtClientId(), "【爆米花】设备初始化申请", "同意", PushUtils.buildJson("statusType", "agreed" + old).toString());
+                            }
                             if(equipment.getEquimentType().equals("280")){
                                 equipmentService.sentMessage(clientId,PushUtils.buildJson("endDate",String.valueOf(equipment.getEndDate().getTime()) ).toString());
                                 PushUtils.push(equipmentApply.getGtClientId(), "", "", PushUtils.buildJson("endDate",String.valueOf(equipment.getEndDate().getTime()) ).toString());
@@ -357,12 +377,15 @@ public class IndexController { ;
                             }else {
                                 equipment.setEquimentType(equimentType);
                             }
-                            if(equipmentApply.getEquimentType().equals("MG330")){
-                                equipment.setEquimentType("MG330");
-                            }
+//                            if(equimentType.equals("MG330")){
+//                                equipment.setEquimentType("MG330");
+//                            }
+//                            if(equimentType.equals("POP320")){
+//                                equipment.setEquimentType(equimentType);
+//                            }
                             if(!StringUtils.isEmpty(equimentType)&&equimentType.equals("MG280")){
                                 Long monthBegin = getMonthBegin(new Date());
-                                long time = new Date().getTime();
+                                long time = System.currentTimeMillis();
                                 if(time<monthBegin){
                                     equipment.setEndDate(new Date(monthBegin));
                                 }else{
@@ -372,43 +395,58 @@ public class IndexController { ;
                                 equipmentService.sentMessage(clientId,PushUtils.buildJson("endDate",String.valueOf(equipment.getEndDate().getTime()) ).toString());
                                 PushUtils.push(equipmentApply.getGtClientId(), "", "", PushUtils.buildJson("endDate",String.valueOf(equipment.getEndDate().getTime()) ).toString());
                             }
+
                             equipmentService.save(equipment);
-                            equipmentService.sentMessage(clientId,PushUtils.buildJson("statusType", "agreed" + old).toString());
-                            PushUtils.push(equipmentApply.getGtClientId(), "【棉花糖】设备初始化申请", "同意", PushUtils.buildJson("statusType", "agreed" + old).toString());
+                            if(StringUtils.isEmpty(machineType) || machineType.equals("0")) {
+                                equipmentService.sentMessage(clientId,PushUtils.buildJson("statusType", "agreed" + old).toString());
+                                PushUtils.push(equipmentApply.getGtClientId(), "【棉花糖】设备初始化申请", "同意", PushUtils.buildJson("statusType", "agreed" + old).toString());
+                            } else {
+                                equipmentService.sentMessage(clientId,PushUtils.buildJson("statusType", "agreed" + old).toString());
+                                PushUtils.push(equipmentApply.getGtClientId(), "【爆米花】设备初始化申请", "同意", PushUtils.buildJson("statusType", "agreed" + old).toString());
+                            }
 //                            Equipment byClientId = equipmentService.findByClientId(equipment.getClientId());
 //                            String data = com.alibaba.fastjson.JSON.toJSONString(byClientId);
                             LambdaQueryWrapper<TEquipment> query3 = Wrappers.lambdaQuery();
                             query3.eq(TEquipment::getClientId,clientId);
-                            List<TEquipment> list1 = equipmentService.list(query3);
+                            TEquipment tEquipment = equipmentService.getOne(query3);
+//                            List<TEquipment> list1 = equipmentService.list(query3);
                             try {
-                                if(list1.size()>0){
-                                    TEquipment tEquipment = list1.get(0);
+//                                if(list1.size()>0){
+//                                    TEquipment tEquipment = list1.get(0);
+//                                    esTEquipmentService.insertData(tEquipment);
+//                                }
+                                if(tEquipment != null) {
                                     esTEquipmentService.insertData(tEquipment);
                                 }
                             }catch (Exception e) {
                                 e.printStackTrace();
                             }
                             TEquipmentDesc equipmentDesc = new TEquipmentDesc();
-                            equipmentDesc.setEquipmentId(list1.get(0).getId());
+                            equipmentDesc.setEquipmentId(tEquipment.getId());
                             equipmentDescService.save(equipmentDesc);
                         }
                         //获取设备的id
 //                        Long equipmentId = equipmentService.findByClientId(clientId).getId();
                         LambdaQueryWrapper<TEquipment> query1 = Wrappers.lambdaQuery();
                         query1.eq(TEquipment::getClientId,clientId);
-                        List<TEquipment> list1 = equipmentService.list(query1);
-                        Long equipmentId = list1.get(0).getId();
+//                        List<TEquipment> list1 = equipmentService.list(query1);
+                        TEquipment equipment = equipmentService.getOne(query1);
+                        Long equipmentId = equipment.getId();
 //                        if (!productService.exists(Filter.eq("equipmentId", equipmentId))) {
-                        if (true) {
+                        if(StringUtils.isEmpty(machineType) || machineType.equals("0")) {
                             if(equipmentApply.getEquimentType()!=null&&equipmentApply.getEquimentType().equals("MG280")){
                                 saveProductMG280(equipmentId);
-                            }else if(equipmentApply.getEquimentType()!=null&&equipmentApply.getEquimentType().equals("MG320-1")){
+                            } else if (equipmentApply.getEquimentType()!=null&&equipmentApply.getEquimentType().equals("MG320-1")){
                                 saveProductMG1(equipmentId);
                             } else{
                                 saveProduct(equipmentId);
                             }
-
+                        } else {
+                            if(equimentType.equals("POP320")) {
+                                saveProductPOP320(equipmentId);
+                            }
                         }
+
                         if(String.valueOf(adminId).equals("3")||String.valueOf(adminId).equals("31")||String.valueOf(adminId).equals("506")||String.valueOf(adminId).equals("1090")){
                             //自动设置分销
                             setProportion(adminId,equipmentId,clientId);
@@ -497,8 +535,7 @@ public class IndexController { ;
     }
 
     /**
-     * 添加产品
-     *
+     * 添加棉花糖产品
      * @param id
      */
     private void saveProduct(Long id) {
@@ -608,11 +645,6 @@ public class IndexController { ;
         }
 
     }
-
-    /**
-     * 42种花型
-     * @param id
-     */
     private void saveProductMG42(Long id) {
         String[] str = {"玫瑰精灵-A01", "童心未泯-A02", "五彩缤纷-A03", "天雪恋舞-A04", "水中芙蓉-A05", "烈焰红唇-A06", "美梦成真-A07", "一见钟情-A08", "幽兰爱恋-A09",
                 "心之守护-A10", "夏日爱恋-A11", "冰美人-A12", "国色天香-A13", "赤子之心-A14", "海洋之心-A15", "水晶之恋-A16", "彩色精灵-A17", "小棉袄-A18",
@@ -635,6 +667,28 @@ public class IndexController { ;
     }
 
     /**
+     * 添加爆米花产品
+     * @param id
+     */
+    private void saveProductPOP320(Long id) {
+        String[] str = {"活力爆米花(正常糖)-B01", "活力爆米花(无糖)-B02", "活力爆米花(巧克力)-B03", "活力爆米花(焦糖)-B04", "活力爆米花(水蜜桃)-B05", "活力爆米花(蓝莓)-B06"};
+
+        for (int i = 0; i < str.length; i++) {
+            TProduct product = new TProduct();
+            product.setCreateDate(new Date());
+            product.setModifyDate(new Date());
+            product.setEquipmentId(id);
+            String[] split = str[i].split("-");
+            product.setProductName(split[0]);
+            product.setNo(split[1]);
+            product.setRmbPrice(BigDecimal.ZERO);
+            product.setCodePrice(BigDecimal.ZERO);
+            productService.save(product);
+        }
+
+    }
+
+    /**
      * 获取指定日期所在月份开始的时间戳
      * @param date 指定日期
      * @return

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

@@ -210,6 +210,9 @@ public class TEquipmentController {
                 equipmentDTO.setSleepDesc(equipmentDesc.getSleepDesc());
                 equipmentDTO.setOutDoor(equipmentDesc.getOutDoor());
                 equipmentDTO.setInDoor(equipmentDesc.getInDoor());
+                equipmentDTO.setCupQuantity(equipmentDesc.getCupQuantity());
+                equipmentDTO.setStirTm(equipmentDesc.getStirTm());
+                equipmentDTO.setCornGeneratorTm(equipmentDesc.getCornGeneratorTm());
             }
 
         }
@@ -855,26 +858,26 @@ public class TEquipmentController {
     }
 
     //远程开门
-//    @ApiOperation(value = "远程开门")
-//    @PostMapping("/openDoor")
-//    public ResponseEntity<?> openDoor(@RequestBody StatisticsParam param) {
-//        String equipmentId = param.getEquipmentId();
-//        Long id = Long.valueOf(equipmentId);
-//        TEquipment equipment = tEquipmentService.getById(id);
-//        tEquipmentService.sentMessage(equipment.getClientId(),PushUtils.buildJson("openDoor", "0").toString());
-////        PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("openDoor", "0").toString());
-//        return ResponseEntity
-//                .status(HttpStatus.OK)
-//                .body(new ResultMessage()
-//                        .setCode(true)
-//                        .setData("SUCCESS")
-//                        .setMessage("SUCCESS"));
-//    }
+    @ApiOperation(value = "远程开门")
+    @PostMapping("/openDoor")
+    public ResponseEntity<?> openDoor(@RequestBody StatisticsParam param) {
+        String equipmentId = param.getEquipmentId();
+        Long id = Long.valueOf(equipmentId);
+        TEquipment equipment = tEquipmentService.getById(id);
+        tEquipmentService.sentMessage(equipment.getClientId(),PushUtils.buildJson("openDoor", "0").toString());
+//        PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("openDoor", "0").toString());
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(new ResultMessage()
+                        .setCode(true)
+                        .setData("SUCCESS")
+                        .setMessage("SUCCESS"));
+    }
 
     //修改机器状态  type（类型，0：外门，1：内门）,
     //            status（状态：0：关闭，1：开启）
     @ApiOperation(value = "远程开门")
-    @GetMapping("/openDoor")
+    @GetMapping("/openDoors")
     public ResponseModel<?> openDoor(String equipmentId, String type, String status) {
         if (StringUtils.isEmpty(equipmentId) || StringUtils.isEmpty(type) || StringUtils.isEmpty(status)) {
             return R.fail(ResponseCodesEnum.A0001, "参数有空");

src/main/java/com/szwl/mapper/xml/TEquipmentDescMapper.xml

@@ -15,11 +15,20 @@
         <result column="waste_water" property="wasteWater" />
         <result column="is_material_use" property="isMaterialUse" />
         <result column="pay_type" property="payType" />
+        <result column="note" property="note" />
+        <result column="status" property="status" />
+        <result column="coupon_status" property="couponStatus" />
+        <result column="out_door" property="outDoor" />
+        <result column="in_door" property="inDoor" />
+        <result column="sleep_desc" property="sleepDesc" />
+        <result column="cup_quantity" property="cupQuantity" />
+        <result column="stir_tm" property="stirTm" />
+        <result column="corn_generator_tm" property="cornGeneratorTm" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        equipment_id, flowers,red_sugar, yellow_sugar, blue_sugar, stick, water, waste_water, is_material_use,pay_type
+        equipment_id, flowers, white_sugar, red_sugar, yellow_sugar, blue_sugar, stick, water, waste_water, is_material_use, pay_type, note, status, coupon_status, out_door, in_door, sleep_desc, cup_quantity, stir_tm, corn_generator_tm
     </sql>
 
 </mapper>

src/main/java/com/szwl/model/bean/EquipmentVo.java

@@ -1,9 +1,12 @@
 package com.szwl.model.bean;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.Date;
 
+@Data
 public class EquipmentVo {
 
     /**
@@ -121,179 +124,13 @@ public class EquipmentVo {
      */
     private String isMaterialUse;
 
-    public String getClientId() {
-        return clientId;
-    }
+    @ApiModelProperty(value = "杯子数量")
+    private Long cupQuantity;
 
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
+    @ApiModelProperty(value = "搅拌温度")
+    private String stirTm;
 
-    public Boolean getIs_sleep() {
-        return is_sleep;
-    }
+    @ApiModelProperty(value = "玉米发生器温度")
+    private String cornGeneratorTm;
 
-    public void setIs_sleep(Boolean is_sleep) {
-        this.is_sleep = is_sleep;
-    }
-
-    public Integer getEqeStatus() {
-        return eqeStatus;
-    }
-
-    public void setEqeStatus(Integer eqeStatus) {
-        this.eqeStatus = eqeStatus;
-    }
-
-    public String getVolume() {
-        return volume;
-    }
-
-    public void setVolume(String volume) {
-        this.volume = volume;
-    }
-
-    public String getManagerId() {
-        return managerId;
-    }
-
-    public void setManagerId(String managerId) {
-        this.managerId = managerId;
-    }
-
-    public String getCabinetTm() {
-        return cabinetTm;
-    }
-
-    public void setCabinetTm(String cabinetTm) {
-        this.cabinetTm = cabinetTm;
-    }
-
-    public String getCabinetHd() {
-        return cabinetHd;
-    }
-
-    public void setCabinetHd(String cabinetHd) {
-        this.cabinetHd = cabinetHd;
-    }
-
-    public String getFurnaceTm() {
-        return furnaceTm;
-    }
-
-    public void setFurnaceTm(String furnaceTm) {
-        this.furnaceTm = furnaceTm;
-    }
-
-    public String getFurnaceSp() {
-        return furnaceSp;
-    }
-
-    public void setFurnaceSp(String furnaceSp) {
-        this.furnaceSp = furnaceSp;
-    }
-
-    public String getNetWorkingMode() {
-        return netWorkingMode;
-    }
-
-    public void setNetWorkingMode(String netWorkingMode) {
-        this.netWorkingMode = netWorkingMode;
-    }
-
-    public Date getLastUpdateTime() {
-        return lastUpdateTime;
-    }
-
-    public void setLastUpdateTime(Date lastUpdateTime) {
-        this.lastUpdateTime = lastUpdateTime;
-    }
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(Double longitude) {
-        this.longitude = longitude;
-    }
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(Double latitude) {
-        this.latitude = latitude;
-    }
-
-    public String getGtClientId() {
-        return gtClientId;
-    }
-
-    public void setGtClientId(String gtClientId) {
-        this.gtClientId = gtClientId;
-    }
-
-    public String getWhiteSugar() {
-        return whiteSugar;
-    }
-
-    public void setWhiteSugar(String whiteSugar) {
-        this.whiteSugar = whiteSugar;
-    }
-
-    public String getRedSugar() {
-        return redSugar;
-    }
-
-    public void setRedSugar(String redSugar) {
-        this.redSugar = redSugar;
-    }
-
-    public String getYellowSugar() {
-        return yellowSugar;
-    }
-
-    public void setYellowSugar(String yellowSugar) {
-        this.yellowSugar = yellowSugar;
-    }
-
-    public String getBlueSugar() {
-        return blueSugar;
-    }
-
-    public void setBlueSugar(String blueSugar) {
-        this.blueSugar = blueSugar;
-    }
-
-    public String getStick() {
-        return stick;
-    }
-
-    public void setStick(String stick) {
-        this.stick = stick;
-    }
-
-    public String getWater() {
-        return water;
-    }
-
-    public void setWater(String water) {
-        this.water = water;
-    }
-
-    public String getWasteWater() {
-        return wasteWater;
-    }
-
-    public void setWasteWater(String wasteWater) {
-        this.wasteWater = wasteWater;
-    }
-
-    public String getIsMaterialUse() {
-        return isMaterialUse;
-    }
-
-    public void setIsMaterialUse(String isMaterialUse) {
-        this.isMaterialUse = isMaterialUse;
-    }
 }

src/main/java/com/szwl/model/bean/TEquipmentDTO.java

@@ -101,6 +101,39 @@ public class TEquipmentDTO extends TEquipment {
     @ApiModelProperty(value = "外门状态：0：关闭，1：开启")
     private String outDoor;
 
+    @ApiModelProperty(value = "杯子数量")
+    private Long cupQuantity;
+
+    @ApiModelProperty(value = "搅拌温度")
+    private String stirTm;
+
+    @ApiModelProperty(value = "玉米发生器温度")
+    private String cornGeneratorTm;
+
+    public Long getCupQuantity() {
+        return cupQuantity;
+    }
+
+    public void setCupQuantity(Long cupQuantity) {
+        this.cupQuantity = cupQuantity;
+    }
+
+    public String getStirTm() {
+        return stirTm;
+    }
+
+    public void setStirTm(String stirTm) {
+        this.stirTm = stirTm;
+    }
+
+    public String getCornGeneratorTm() {
+        return cornGeneratorTm;
+    }
+
+    public void setCornGeneratorTm(String cornGeneratorTm) {
+        this.cornGeneratorTm = cornGeneratorTm;
+    }
+
     public String getInDoor() {
         return inDoor;
     }

src/main/java/com/szwl/model/entity/TEquipmentDesc.java

@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2022-04-23
+ * @since 2023-08-17
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -29,88 +29,58 @@ public class TEquipmentDesc implements Serializable {
     @ApiModelProperty(value = "花型数量;")
     private String flowers;
 
-    /**
-     *白糖
-     */
-    @ApiModelProperty(value = "白糖;")
+    @ApiModelProperty(value = "白糖")
     private String whiteSugar;
 
-    /**
-     *红糖
-     */
-    @ApiModelProperty(value = "红糖;")
+    @ApiModelProperty(value = "红糖")
     private String redSugar;
 
-    /**
-     黄糖
-     blueSugar：蓝糖
-     stick：棍
-     water：水
-     wasteWater：废水
-     */
-    @ApiModelProperty(value = "黄糖;")
+    @ApiModelProperty(value = "黄糖")
     private String yellowSugar;
 
-    /**
-     * 蓝糖
-     */
-    @ApiModelProperty(value = "蓝糖;")
+    @ApiModelProperty(value = "蓝糖")
     private String blueSugar;
 
-    /**
-     * 棍
-     */
-    @ApiModelProperty(value = "棍;")
+    @ApiModelProperty(value = "棍")
     private String stick;
 
-    /**
-     * 水
-     */
-    @ApiModelProperty(value = "水;")
+    @ApiModelProperty(value = "水")
     private String water;
 
-    /**
-     * 废水
-     */
-    @ApiModelProperty(value = "废水;")
+    @ApiModelProperty(value = "废水")
     private String wasteWater;
 
-    /**
-     * 是否启用物料监控功能，0：不启用，1：启用
-     */
-    @ApiModelProperty(value = "是否启用物料监控功能;")
+    @ApiModelProperty(value = "是否启用物料监控功能，0：不启用，1：启用")
     private String isMaterialUse;
 
-    /**
-     * 当前机器购物车模式，0：原始模式，1：第二件半价
-     */
-    @ApiModelProperty(value = "当前机器购物车模式;")
+    @ApiModelProperty(value = "当前机器购物车模式，0：原始模式，1：第二件半价")
     private String payType;
 
-    /**
-     * 机器状态；0：空闲，1：在做糖
-     */
-    @ApiModelProperty(value = "机器状态；0：空闲，1：在做糖;")
+    private String note;
+
+    @ApiModelProperty(value = "机器状态；0：空闲，1：在做糖")
     private String status;
 
     @ApiModelProperty(value = "优惠券开关，0：关闭，1：开启")
     private String couponStatus;
 
-    /**
-     * 内门状态：0：关闭，1：开启
-     */
-    @ApiModelProperty(value = "内门状态：0：关闭，1：开启")
-    private String inDoor;
-
-    /**
-     * 外门状态：0：关闭，1：开启
-     */
     @ApiModelProperty(value = "外门状态：0：关闭，1：开启")
     private String outDoor;
 
-    /**
-     * 睡眠描述
-     */
-    @ApiModelProperty(value = "睡眠描述")
-    private String sleepDesc = "暂停营业";
+    @ApiModelProperty(value = "外门状态：0：关闭，1：开启")
+    private String inDoor;
+
+    @ApiModelProperty(value = "休眠描述")
+    private String sleepDesc  = "暂停营业";
+
+    @ApiModelProperty(value = "杯子数量")
+    private Long cupQuantity;
+
+    @ApiModelProperty(value = "搅拌温度")
+    private String stirTm;
+
+    @ApiModelProperty(value = "玉米发生器温度")
+    private String cornGeneratorTm;
+
+
 }

src/main/java/com/szwl/service/TEquipmentDescService.java

@@ -1,7 +1,7 @@
 package com.szwl.service;
 
 import com.szwl.model.entity.TEquipmentDesc;
-import com.szwl.service.base.MyIService;
+import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
@@ -9,8 +9,8 @@ import com.szwl.service.base.MyIService;
  * </p>
  *
  * @author wuhs
- * @since 2022-04-23
+ * @since 2023-08-17
  */
-public interface TEquipmentDescService extends MyIService<TEquipmentDesc> {
+public interface TEquipmentDescService extends IService<TEquipmentDesc> {
 
 }