From 77847fe500de2519cba82d1a5ef03d055739f0d7 Mon Sep 17 00:00:00 2001
From: chenzx <m15572880737@163.com>
Date: 星期二, 20 二月 2024 11:58:45 +0800
Subject: [PATCH] 滤芯故障接口20240220CZX
---
wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceOrderController.java | 62 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceOrderController.java b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceOrderController.java
index ebf2f20..2748be4 100644
--- a/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceOrderController.java
+++ b/wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceOrderController.java
@@ -1,39 +1,26 @@
package com.ruoyi.iot.controller;
-
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.iot.domain.Device;
import com.ruoyi.iot.domain.DeviceOrder;
import com.ruoyi.iot.domain.DeviceOrderTime;
import com.ruoyi.iot.service.IDeviceOrderService;
import com.ruoyi.iot.service.IDeviceOrderTimeService;
-import com.ruoyi.iot.service.IDeviceService;
-import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.checkerframework.checker.units.qual.A;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.parameters.P;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-
import javax.annotation.Resource;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import java.util.List;
/**
@@ -129,7 +116,7 @@
@ApiOperation(value = "鑾峰彇鏈淳鍗�/宸叉淳鍗�/宸叉帴鍗�/宸插畬鎴愮殑瀹夎鍗�/缁翠慨鍗曟暟閲�")
public AjaxResult selectDeviceOrderCount(DeviceOrder deviceOrder) throws Exception {
if (deviceOrder != null) {
- return iDeviceOrderService.selectDeviceOrderCountByUndeliveredorders(deviceOrder);
+ return iDeviceOrderService.selectDeviceOrderCountByUndeliveredOrders(deviceOrder);
} else {
return AjaxResult.error("鏈煡璇㈠埌鏈夊叧淇℃伅");
}
@@ -142,9 +129,9 @@
* @return
* @throws Exception
*/
- @ApiOperation("娣诲姞瀹夎鍗�")
+ @ApiOperation("娣诲姞瀹夎鍗�/缁翠慨鍗�")
@PreAuthorize("@ss.hasPermi('iot:device:add')")
- @Log(title = "娣诲姞瀹夎鍗曚俊鎭�", businessType = BusinessType.INSERT)
+ @Log(title = "娣诲姞瀹夎鍗�/缁翠慨鍗曚俊鎭�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@Validated @RequestBody DeviceOrder deviceOrder) throws Exception {
return iDeviceOrderService.insertDeviceOrder(deviceOrder);
@@ -174,29 +161,52 @@
*/
@PreAuthorize("@ss.hasPermi('iot:device:remove')")
@Log(title = "鍒犻櫎璁惧璁㈠崟淇℃伅", businessType = BusinessType.DELETE)
- @DeleteMapping("/{deviceId}")
- @ApiOperation("鍒犻櫎璁㈠崟淇℃伅")
- public AjaxResult remove(@PathVariable("deviceId") Integer deviceId) throws Exception {
- return iDeviceOrderService.deleteDeviceOrderById(deviceId);
+ @DeleteMapping("/{id}/{deviceId}")
+ @ApiOperation("鍒犻櫎璁惧璁㈠崟淇℃伅")
+ public AjaxResult remove(@PathVariable("id") Long id, @PathVariable("deviceId") Long deviceId) throws Exception {
+ return iDeviceOrderService.deleteDeviceOrderById(id, deviceId);
}
/**
- * 瀹夎鍗�/缁翠慨鍗曞浘鐗囦笂浼�
+ * 瀹夎鍗曞浘鐗囦笂浼�
*
* @param file
* @return
* @throws Exception
*/
- @Log(title = "瀹夎鍗�/缁翠慨鍗曞浘鐗囦笂浼�", businessType = BusinessType.INSERT)
- @PostMapping("/profile/avatar")
- @ApiOperation("瀹夎鍗�/缁翠慨鍗曞浘鐗囦笂浼�")
- public AjaxResult imgurl(@RequestParam("avatarfile") MultipartFile file) throws Exception {
+ @Log(title = "瀹夎鍗曞浘鐗囦笂浼�", businessType = BusinessType.INSERT)
+ @PostMapping("/Install/profile/avatar")
+ @ApiOperation("瀹夎鍗曞浘鐗囦笂浼�")
+ public AjaxResult deviceOrderinstallImgUrl(@RequestParam("avatarfile") MultipartFile file) throws Exception {
// 鍒ゆ柇澶村儚鏂囦欢涓嶄负绌�
if (!file.isEmpty()) {
// 閫氳繃Security鑾峰彇鍒扮櫥褰曠殑鐢ㄦ埛淇℃伅
LoginUser loginUser = getLoginUser();
- String avatar = FileUploadUtils.upload(RuoYiConfig.getDeviceOrderPath(), file);
+ String avatar = FileUploadUtils.upload(RuoYiConfig.getDeviceOrderInstallPath(), file);
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("imgUrl", avatar);
+ return ajax;
+ }
+ return AjaxResult.error("鍥剧墖涓婁紶澶辫触");
+ }
+
+ /**
+ * 缁翠慨鍗曞浘鐗囦笂浼�
+ *
+ * @param file
+ * @return
+ * @throws Exception
+ */
+ @Log(title = "缁翠慨鍗曞浘鐗囦笂浼�", businessType = BusinessType.INSERT)
+ @PostMapping("/Repair/profile/avatar")
+ @ApiOperation("缁翠慨鍗曞浘鐗囦笂浼�")
+ public AjaxResult deviceOrderRepairImgUrl(@RequestParam("avatarfile") MultipartFile file) throws Exception {
+ // 鍒ゆ柇澶村儚鏂囦欢涓嶄负绌�
+ if (!file.isEmpty()) {
+ // 閫氳繃Security鑾峰彇鍒扮櫥褰曠殑鐢ㄦ埛淇℃伅
+ LoginUser loginUser = getLoginUser();
+ String avatar = FileUploadUtils.upload(RuoYiConfig.getDeviceOrderRepairPath(), file);
AjaxResult ajax = AjaxResult.success();
ajax.put("imgUrl", avatar);
return ajax;
--
Gitblit v1.8.0