商家端更新设备

src/main/java/org/springblade/modules/api/controller/ApiFacilityController.java

@@ -21,6 +21,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.api.request.AddFacilityReq;
+import org.springblade.modules.api.request.UpdateFacilityReq;
 import org.springblade.modules.business.entity.Facility;
 import org.springblade.modules.business.entity.FacilityModel;
 import org.springblade.modules.business.service.IFacilityModelService;
@@ -63,7 +64,7 @@ public class ApiFacilityController extends BaseController {
     @PostMapping("/appAdd")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "添加设备", notes = "传入facility")
-    public R<Void> save(@Valid @RequestBody AddFacilityReq req) {
+    public R<Void> appAdd(@Valid @RequestBody AddFacilityReq req) {
         Facility facility = new Facility();
         BeanUtil.copyProperties(req, facility);
         facility.setUseStatus(1);
@@ -77,6 +78,19 @@ public class ApiFacilityController extends BaseController {
         return R.status(iFacilityService.add(facility));
     }
 
+    @PostMapping("/appUpdate")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "更新设备", notes = "传入facility")
+    public R<Void> appUpdate(@Valid @RequestBody UpdateFacilityReq req) {
+        if (!isMerchant()) {//所属商家
+            throw new ServiceException("非法操作！");
+        }
+
+        Facility facility = iFacilityService.getById(req.getId());
+        BeanUtil.copyProperties(req, facility);
+        return R.status(iFacilityService.updateById(facility));
+    }
+
     @GetMapping("/list")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "查询设备列表", notes = "传入facility")
@@ -159,7 +173,8 @@ public class ApiFacilityController extends BaseController {
     @GetMapping("/allMerchantFacility")
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "获取商家所有未绑定设备", notes = "获取商家所有未绑定设备")
-    public R<List<FacilityVO>> allMerchantFacility(@ApiParam(value = "门店id，编辑门店时必传") @RequestParam(required = false) Long shopId) {
+    public R<List<FacilityVO>> allMerchantFacility
+    (@ApiParam(value = "门店id，编辑门店时必传") @RequestParam(required = false) Long shopId) {
         List<Facility> list = iFacilityService.lambdaQuery()
                 .eq(Facility::getMerchantId, AuthUtil.getUserId())
                 .and((item) -> item.eq(shopId != null, Facility::getShopId, shopId)

src/main/java/org/springblade/modules/api/request/AddFacilityReq.java

@@ -7,10 +7,10 @@ import lombok.Data;
 public class AddFacilityReq {
 
     /**
-     * 设备编号
+     * 设备id
      */
-    @ApiModelProperty(value = "设备编号", required = true)
-    private String facilityNo;
+    @ApiModelProperty(value = "设备ID，有则更新，无则新增")
+    private String id;
     /**
      * 门店id
      */

src/main/java/org/springblade/modules/api/request/UpdateFacilityReq.java

@@ -0,0 +1,51 @@
+package org.springblade.modules.api.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UpdateFacilityReq {
+
+    /**
+     * 设备id
+     */
+    @ApiModelProperty(value = "设备ID", required = true)
+    private String id;
+    /**
+     * 设备编号
+     */
+    @ApiModelProperty(value = "设备编号", required = true)
+    private String facilityNo;
+    /**
+     * 门店id
+     */
+    @ApiModelProperty(value = "门店id", required = true)
+    private Long shopId;
+    /**
+     * 设备地址
+     */
+    @ApiModelProperty(value = "设备地址", required = true)
+    private String address;
+    /**
+     * 设备经度
+     */
+    @ApiModelProperty(value = "设备经度", required = true)
+    private String longitude;
+    /**
+     * 设备纬度
+     */
+    @ApiModelProperty(value = "设备纬度", required = true)
+    private String latitude;
+
+    /**
+     * 使用状态
+     */
+    @ApiModelProperty(value = "使用状态StatusEnum，1启用，0禁用", required = true)
+    private Integer useStatus;
+    /**
+     * 设备状态
+     */
+    @ApiModelProperty(value = "设备状态FacilityStatusEnum，1在线，2离线，3故障", required = true)
+    private Integer facilityStatus;
+
+}