Merge remote-tracking branch 'origin/test' into test

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

@@ -2137,7 +2137,7 @@ public class IndexController {
      * @param clientId 个推
      * @return
      */
-    @RequestMapping(value = "/flowerNumber", method = RequestMethod.POST, produces = "text/html;charset=utf-8")
+    @RequestMapping(value = "/flowerNumber", method = RequestMethod.GET, produces = "text/html;charset=utf-8")
     @ResponseBody
     public String flowerNumber(String clientId, String flowerNumber) {
         if (!StringUtils.isEmpty(flowerNumber)) {
@@ -2151,5 +2151,31 @@ public class IndexController {
         return "fail";
     }
 
+
+    /**
+     * 设备语言 开机时上传
+     *
+     * @param clientId  个推
+
+     * @return
+     */
+    @RequestMapping(value = "/upLoadLanguage", method = RequestMethod.GET, produces = "text/html;charset=utf-8")
+    @ResponseBody
+    public String upLoadLanguage(String clientId, String language){
+        if(!StringUtils.isEmpty(language)){
+            LambdaQueryWrapper<TEquipment> query = Wrappers.lambdaQuery();
+            query.eq(TEquipment::getClientId,clientId);
+            TEquipment equipment = equipmentService.getOne(query);
+            if (equipment == null) {
+                return "fail";
+            }
+            TEquipmentDesc equipmentDesc = equipmentDescService.getById(equipment.getId());
+            equipmentDesc.setLanguage(language);
+            equipmentDescService.updateById(equipmentDesc);
+            return "success";
+        }
+        return "fail";
+    }
+
 }
 

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

@@ -1695,5 +1695,16 @@ public class TEquipmentController {
         List<TDiyFlower> list = tDiyFlowerService.list(query);
         return R.ok(list);
     }
+
+    @ApiOperation(value = "远程修改锁机状态，锁机：1，解锁：0")
+    @GetMapping("/updateLockStatus")
+    public ResponseModel<?> updateLockStatus(String equipmentId, String status){
+        if (StringUtils.isEmpty(equipmentId) || StringUtils.isEmpty(status)) {
+            return R.fail(ResponseCodesEnum.A0001, "参数有空");
+        }
+        TEquipment equipment = tEquipmentService.getById(equipmentId);
+        tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("block", status).toString());
+        return R.ok();
+    }
 }
 

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

@@ -29,11 +29,12 @@
         <result column="outside_tm" property="outsideTm" />
         <result column="outside_hd" property="outsideHd" />
         <result column="diy_flower_status" property="diyFlowerStatus" />
+        <result column="language" property="language" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        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, number_one, candy_generator_tm, outside_tm, outside_hd, diy_flower_status
+        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, number_one, candy_generator_tm, outside_tm, outside_hd, diy_flower_status, language
     </sql>
 
 </mapper>

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

@@ -98,5 +98,8 @@ public class TEquipmentDesc implements Serializable {
     @ApiModelProperty(value = "DIY花型功能开关，0：关闭，1：开启")
     private String diyFlowerStatus;
 
+    @ApiModelProperty(value = "设备当前设置语言")
+    private String language;
+
 
 }