Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-20 91d11cc2c3b7a85494cd4ad0029310a1ae061d34

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

@@ -34,22 +34,29 @@
    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
    @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 +65,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 +130,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 +168,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("缺少相关参数！");
        }