changes

liuhaonan

2022-08-18 c8faa15c88cff7b5d75afcb6469c5b1b7e1a670f

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/RemoteUpdateController.java

@@ -2,7 +2,6 @@

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.RemoteFileDto;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
@@ -10,15 +9,10 @@
import com.sandu.ximon.admin.param.RemoteUpdateParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.RemoteUpdateService;
import com.sandu.ximon.admin.utils.HexUtils;
import com.sandu.ximon.admin.utils.StringUtil;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;

/**
 * 固件升级Controller
@@ -34,22 +28,46 @@
    private PermissionConfig permissionConfig;


    @AnonymousAccess
    @PostMapping("/add")
    public ResponseVO<Object> addRemoteUpdateFile(@RequestBody @Validated RemoteUpdateParam param) {
        if (!permissionConfig.check(MenuEnum.REMOTE_UPDATE_FILE_ADD.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean flag = remoteUpdateService.addRemoteUpdateFile(param.getFilename(), param.getFileType()
                , param.getSoftwareVersion(), param.getHardwareVersion(), param.getAliAddress(), param.getFileLength());
        return ResponseUtil.success(flag);
    }

    @AnonymousAccess
    /**
     * 修改固件升级文件名称
     *
     * @param remoteFileId
     * @param remoteFileName
     * @return
     */
    @GetMapping("/updateRemoteFileName")
    public ResponseVO<Object> updateRemoteFileName(@RequestParam(required = false, value = "remoteFileId") String remoteFileId,
                                                   @RequestParam(required = false, value = "remoteFileName") String remoteFileName) {
        if (!permissionConfig.check(MenuEnum.REMOTE_UPDATE_FILE_UPDATE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        String result = remoteUpdateService.updateRemoteFileName(remoteFileId, remoteFileName);
        return ResponseUtil.success(result);
    }

    @GetMapping("/getRemoteFileList")
    public ResponseVO<Object> getRemoteFileList() {
        if (!permissionConfig.check(MenuEnum.REMOTE_UPDATE_FILE_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(remoteUpdateService.getRemoteFileList());
    }

    @GetMapping("/getRemoteUpdateTypeList")
    public ResponseVO<Object> getRemoteUpdateTypeList() {
        if (!permissionConfig.check(MenuEnum.REMOTE_UPDATE_TYPE_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(remoteUpdateService.getRemoteUpdateTypeList());
    }

@@ -58,13 +76,11 @@
     *
     * @return
     */
    //TODO
    @AnonymousAccess
    @PostMapping("/StartRemoteUpdate")
    public ResponseVO<Object> startRemoteUpdate(@RequestBody @Validated RemotePrarm remotePrarm) {
//        if (!permissionConfig.check(MenuEnum.MENU_LIST.getCode())) {
//            return ResponseUtil.fail("缺少对应用户权限");
//        }
        if (!permissionConfig.check(MenuEnum.REMOTE_UPDATE_START.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        String orderType;
        boolean UpdateFlag = false;

@@ -125,9 +141,11 @@
     * @param remotePrarm
     * @return
     */
    @AnonymousAccess
    @PostMapping("/searchUpdateResult")
    public ResponseVO<Object> searchUpdateResult(@RequestBody RemotePrarm remotePrarm) {
        if (!permissionConfig.check(MenuEnum.REMOTE_UPDATE_VERSION.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        if (remotePrarm.getMac() == null || remotePrarm.getDeviceType() == null) {
            throw new BusinessException("缺少相关参数！");
        }
@@ -161,9 +179,11 @@
     * @param remotePrarm
     * @return
     */
    @AnonymousAccess
    @PostMapping("/stopUpdate")
    public ResponseVO<Object> stopUpdate(@RequestBody RemotePrarm remotePrarm) {
        if (!permissionConfig.check(MenuEnum.REMOTE_UPDATE_STOP.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        if (remotePrarm.getMac() == null || remotePrarm.getDeviceType() == null) {
            throw new BusinessException("缺少相关参数！");
        }