|
@@ -14,11 +14,13 @@ import io.swagger.annotations.ApiParam;
|
|
import lombok.AllArgsConstructor;
|
|
import lombok.AllArgsConstructor;
|
|
import org.springblade.common.constant.CommonConstant;
|
|
import org.springblade.common.constant.CommonConstant;
|
|
import org.springblade.common.utils.DistanceUtils;
|
|
import org.springblade.common.utils.DistanceUtils;
|
|
|
|
+import org.springblade.core.log.exception.ServiceException;
|
|
import org.springblade.core.mp.support.Condition;
|
|
import org.springblade.core.mp.support.Condition;
|
|
import org.springblade.core.mp.support.Query;
|
|
import org.springblade.core.mp.support.Query;
|
|
import org.springblade.core.secure.utils.AuthUtil;
|
|
import org.springblade.core.secure.utils.AuthUtil;
|
|
import org.springblade.core.tool.api.R;
|
|
import org.springblade.core.tool.api.R;
|
|
import org.springblade.core.tool.utils.Func;
|
|
import org.springblade.core.tool.utils.Func;
|
|
|
|
+import org.springblade.modules.api.request.AddFacilityReq;
|
|
import org.springblade.modules.business.entity.Facility;
|
|
import org.springblade.modules.business.entity.Facility;
|
|
import org.springblade.modules.business.entity.FacilityModel;
|
|
import org.springblade.modules.business.entity.FacilityModel;
|
|
import org.springblade.modules.business.service.IFacilityModelService;
|
|
import org.springblade.modules.business.service.IFacilityModelService;
|
|
@@ -52,6 +54,27 @@ public class ApiFacilityController extends BaseController {
|
|
return R.status(iFacilityService.add(facility));
|
|
return R.status(iFacilityService.add(facility));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 添加设备-商家端
|
|
|
|
+ *
|
|
|
|
+ * @param req
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ @PostMapping("/appAdd")
|
|
|
|
+ @ApiOperationSupport(order = 1)
|
|
|
|
+ @ApiOperation(value = "添加设备", notes = "传入facility")
|
|
|
|
+ public R<Void> save(@Valid @RequestBody AddFacilityReq req) {
|
|
|
|
+ Facility facility = new Facility();
|
|
|
|
+ BeanUtil.copyProperties(req, facility);
|
|
|
|
+
|
|
|
|
+ if (isMerchant()) {//所属商家
|
|
|
|
+ facility.setMerchantId(AuthUtil.getUserId());
|
|
|
|
+ } else {
|
|
|
|
+ throw new ServiceException("非法操作!");
|
|
|
|
+ }
|
|
|
|
+ return R.status(iFacilityService.add(facility));
|
|
|
|
+ }
|
|
|
|
+
|
|
@GetMapping("/list")
|
|
@GetMapping("/list")
|
|
@ApiOperationSupport(order = 2)
|
|
@ApiOperationSupport(order = 2)
|
|
@ApiOperation(value = "查询设备列表", notes = "传入facility")
|
|
@ApiOperation(value = "查询设备列表", notes = "传入facility")
|