设备安装流程优化20231115FX

admin

2023-11-15 991958ef0adc1562e510ac7f5dc73c63e941a24c

 wumei-smart-master/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceOrderController.java

@@ -7,11 +7,14 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.iot.domain.Device;
import com.ruoyi.iot.domain.DeviceOrder;
import com.ruoyi.iot.service.IDeviceOrderService;
import com.ruoyi.iot.service.IDeviceService;
import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +22,8 @@

import javax.annotation.Resource;
import java.util.List;

import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;

/**
 * @author wmz
@@ -37,6 +42,9 @@
    @Resource
    private ISysUserService userService;

    @Autowired
    private IDeviceService deviceService;

    /**
     * 查询全部设备订单信息
     *
@@ -48,10 +56,12 @@
    @ApiOperation(value = "获取设备订单分页列表")
    public TableDataInfo list(DeviceOrder deviceOrder) throws Exception {
        startPage();
        if (deviceOrder.getState() == -1) {
            List<DeviceOrder> list1 = iDeviceOrderService.selectDeviceOrderAll();
            return getDataTable(list1);
        }
        //if (deviceOrder.getState() == -1) {
            //List<DeviceOrder> list1 = iDeviceOrderService.selectDeviceOrderAll(deviceOrder);
            //return getDataTable(list1);
        //}
        SysUser sysUser = getLoginUser().getUser();
        deviceOrder.setCreateUserId(sysUser.getUserId());
        List<DeviceOrder> list = iDeviceOrderService.selectDeviceOrderList(deviceOrder);
        return getDataTable(list);
    }
@@ -68,12 +78,26 @@
    @Log(title = "添加安装单信息", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@Validated @RequestBody DeviceOrder deviceOrder) throws Exception {
        //更新订单的初始化状态
        if ("未指派".equals(deviceOrder.getErectoName())) {
            deviceOrder.setState(0);
        } else {
            deviceOrder.setState(1);
        }
        return AjaxResult.success(iDeviceOrderService.insertDeviceOrder(deviceOrder));
        //更新订单的用户信息
        SysUser sysUser = getLoginUser().getUser();
        deviceOrder.setCreateUserId(sysUser.getUserId());
        //插入安装订单
        int rows =iDeviceOrderService.insertDeviceOrder(deviceOrder);
        if(rows>0)
        {
            //更新当前设备状态信息--安装中
            Device device = new Device();
            device.setDeviceId(deviceOrder.getDeviceId());
            device.setStatus(5);
            deviceService.updateDevice(device);
        }
        return toAjax(rows);
    }

    /**