花型显示，价格

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

@@ -1,10 +1,28 @@
 package com.szwl.controller;
 
 
+import cn.com.crbank.ommo.bean.ResultMessage;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.szwl.model.bean.CommonParamVo;
+import com.szwl.model.entity.TEquipment;
+import com.szwl.model.entity.TParameters;
+import com.szwl.model.entity.TProduct;
+import com.szwl.model.utils.PushUtils;
+import com.szwl.service.TEquipmentService;
+import com.szwl.service.TParametersService;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * 机器参数表 前端控制器
@@ -13,9 +31,65 @@ import org.springframework.web.bind.annotation.RestController;
  * @author wuhs
  * @since 2022-04-23
  */
+@Api(value = "/tParameters", tags = {"参数"})
 @RestController
 @RequestMapping("/tParameters")
 public class TParametersController {
+    @Autowired
+    private TParametersService tParametersService;
+
+    @Autowired
+    private TEquipmentService tEquipmentService;
+
+    /**
+     * 获取设备参数
+     *
+     * @param
+     * @return
+     */
+    @PostMapping("/getParameters")
+    public ResponseEntity<?> getParameters(@RequestBody TParameters parameters) {
+        Long equipmentId = parameters.getId();
+        String status = parameters.getStatus();
+        String clientId = parameters.getClientId();
+        LambdaQueryWrapper<TParameters> query = Wrappers.lambdaQuery();
+        query.eq(TParameters::getEquipmentId,equipmentId);
+        query.eq(TParameters::getClientId,clientId);
+        query.eq(TParameters::getStatus,status);
+        List<TParameters> parametersList = tParametersService.list(query);
+        if(parametersList.size()==0){
+            return ResponseEntity
+                    .status(HttpStatus.OK)
+                    .body(new ResultMessage()
+                            .setCode(false)
+                            .setData(parametersList)
+                            .setMessage("暂无参数数据"));
+        }
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(new ResultMessage()
+                        .setCode(true)
+                        .setData(parametersList)
+                        .setMessage("SUCCESS"));
+    }
+    /**
+     * 推送设备共同以及/设备参数
+     *
+     * @param
+     * @return
+     */
+    @PostMapping("/updateParameters")
+    public ResponseEntity<?> updateCommonParam(@RequestBody CommonParamVo commonParamVo) {
+        String equipmentId = commonParamVo.getId();
+        TEquipment equipment = tEquipmentService.getById(Long.valueOf(equipmentId));
+        tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("Param", commonParamVo.getName() + ":" + commonParamVo.getVal()).toString());
 
+        return ResponseEntity
+                .status(HttpStatus.OK)
+                .body(new ResultMessage()
+                        .setCode(true)
+                        .setData("SUCCESS")
+                        .setMessage("SUCCESS"));
+    }
 }
 

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

@@ -2,10 +2,13 @@ package com.szwl.controller;
 
 
 import cn.com.crbank.ommo.bean.ResultMessage;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.gexin.fastjson.JSON;
 import com.szwl.model.entity.TEquipment;
 import com.szwl.model.entity.TProduct;
+import com.szwl.model.utils.PushUtils;
 import com.szwl.service.TEquipmentService;
 import com.szwl.service.TProductService;
 import io.swagger.annotations.Api;
@@ -14,11 +17,11 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -51,7 +54,88 @@ public class TProductController {
         return ResponseEntity.status(HttpStatus.OK)
                 .body(new ResultMessage().setCode(true).setData(list).setMessage("SUCCESS"));
     }
+    //修改花型是否显示
+    @ApiOperation(value = "修改花型是否显示")
+    @PostMapping("/updateProductsShow")
+    public ResponseEntity<?> updateProductsShow(@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 ResponseEntity.status(HttpStatus.OK)
+                        .body(new ResultMessage().setCode(false).setData("").setMessage("请退出重试"));
+            }
+        }
+        TEquipment equipment = tEquipmentService.getById(products.get(0).getEquipmentId());
+        if(equipment==null){
+            return ResponseEntity.status(HttpStatus.OK)
+                    .body(new ResultMessage().setCode(false).setData("").setMessage("请退出重试"));
+        }
+        List<TProduct> list = new ArrayList<>();
+        for(TProduct product:products){
+            if(product!=null&&product.getId()!=null){
+//                tProductService.updateById(product);
+                if(StringUtils.isEmpty(product.getShowType())){
+                    product.setShowType("0");
+                }
+                product.setModifyDate(null);
+                product.setCreateDate(null);
+                product.setCodePrice(null);
+                product.setRmbPrice(null);
+                list.add(product);
+//                tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("updateProductsShow", product.toString()).toString());
+            }
+        }
+        tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("updateProductsShow", JSON.toJSONString(list)).toString());
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(new ResultMessage().setCode(true).setData("").setMessage("修改成功"));
+    }
+    @ApiOperation(value = "/多个花型价格")
+    @GetMapping("/updateProduct")
+    public ResponseEntity<?> updateProduct(String no,String price,String equipmentId,String type) {
+        if(StringUtils.isEmpty(no)||StringUtils.isEmpty(price)||StringUtils.isEmpty(equipmentId)){
+            return ResponseEntity.status(HttpStatus.OK)
+                    .body(new ResultMessage().setCode(false).setData("").setMessage("数据有空"));
+        }
+        TEquipment equipment = tEquipmentService.getById(equipmentId);
+        if(equipment==null){
+            return ResponseEntity.status(HttpStatus.OK)
+                    .body(new ResultMessage().setCode(false).setData("").setMessage("请退出重试"));
+        }
+        //修改单个
+        if(type.equals("0")){
+            LambdaQueryWrapper<TProduct> query = Wrappers.lambdaQuery();
+            query.eq(TProduct::getEquipmentId,Long.valueOf(equipmentId));
+            query.eq(TProduct::getNo,no);
+            List<TProduct> list = tProductService.list(query);
+            if(list.size()>0){
+                TProduct product = list.get(0);
+                product.setModifyDate(new Date());
+                product.setCodePrice(new BigDecimal(price));
+                product.setRmbPrice(new BigDecimal(price));
+                tProductService.updateById(product);
+            }
+        }
+        //修改多个
+        if(type.equals("1")){
+            LambdaQueryWrapper<TProduct> query = Wrappers.lambdaQuery();
+            query.eq(TProduct::getEquipmentId,Long.valueOf(equipmentId));
+            List<TProduct> list = tProductService.list(query);
+            if(list.size()>0){
+                for(TProduct product:list){
+                    product.setModifyDate(new Date());
+                    product.setCodePrice(new BigDecimal(price) );
+                    product.setRmbPrice(new BigDecimal(price) );
+                    tProductService.updateById(product);
+                }
+            }
+        }
+        tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("updateProductsPrice", "0").toString());
+        return ResponseEntity.status(HttpStatus.OK)
+                .body(new ResultMessage().setCode(true).setData("").setMessage("修改成功"));
+    }
 }
 

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

@@ -13,11 +13,12 @@
         <result column="rmb_price" property="rmbPrice" />
         <result column="sell_status" property="sellStatus" />
         <result column="show_type" property="showType" />
+        <result column="no" property="no" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, create_date, modify_date, code_price, equipment_id, product_name, rmb_price, sell_status, show_type
+        id, create_date, modify_date, code_price, equipment_id, product_name, rmb_price, sell_status, show_type, no
     </sql>
 
 </mapper>

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

@@ -43,7 +43,7 @@ public class TParameters implements Serializable {
     @ApiModelProperty(value = "参数值;")
     private String val;
 
-    @ApiModelProperty(value = "参数类型;")
+    @ApiModelProperty(value = "参数类型;0：通用参数；1：进阶参数；2：调试页参数；3：湿度参数")
     private String status;
 
 

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

@@ -50,5 +50,8 @@ public class TProduct implements Serializable {
     @ApiModelProperty(value = "是否显示")
     private String showType;
 
+    @ApiModelProperty(value = "编号")
+    private String no;
+
 
 }