重构minio和mqtt配置信息获取 重构minio工具类 区分生产环境和开发环境配置信息

‘liusuyi’

2023-08-23 aea81128444acb8ca9a90bc7ef04758bf2cd284d

 ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java

@@ -1,28 +1,19 @@
package com.ruoyi.app.position.controller;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

import com.ruoyi.app.position.domain.ArdAppPosition;
import com.ruoyi.app.position.service.IArdAppPositionService;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.device.hiksdk.util.minio.MinioUtils;
import com.ruoyi.storage.minio.utils.MinioUtils;
import com.ruoyi.rongcloud.service.RongCloudService;
import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserOnlineService;
import com.ruoyi.system.service.ISysUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -56,7 +47,7 @@
    @Autowired
    private ISysUserService sysUserService;
    @Autowired
    private RongCloudService rongCloudService;
    private MinioUtils minioUtil;

    /**
     * 查询app位置列表
@@ -139,18 +130,7 @@
        List<SysUser> list = sysUserService.selectUserList(user);
        return AjaxResult.success(list);
    }
    /**
     * 获取所有app用户
     */
    @ApiOperation("获取所有app用户")
    @GetMapping("/getAppUserlist")
    public AjaxResult getAppUserlist(Long deptId)
    {
        SysUser user=new SysUser();
        user.setDeptId(deptId);
        List<SysUser> list = sysUserService.selectAppUserList(user);
        return AjaxResult.success(list);
    }


    /**
     * 获取所有app用户
@@ -161,20 +141,36 @@
    {
        SysUser user=new SysUser();
        user.setDeptId(deptId);
        List<SysUser> list = sysUserService.selectAppUserList(user);
        List<SysUser> list = sysUserService.selectAllAppUserList(user);
        List<SysUser> onLineList=new ArrayList<>();
        List<SysUser> offLineList=new ArrayList<>();
        for(SysUser sysUser:list)
        {
            Boolean online = rongCloudService.checkOnline(sysUser.getUserId());
            if(online)
            ArdAppPosition ardAppPosition = ardAppPositionService.selectLastArdAppPositionByUserId(sysUser.getUserId());
            if(ardAppPosition!=null) {
                Map<String, Object> params =new HashMap<>();
                params.put("longitude", ardAppPosition.getLongitude());
                params.put("latitude", ardAppPosition.getLatitude());
                params.put("altitude", ardAppPosition.getAltitude());
                params.put("bearing", ardAppPosition.getBearing());
                sysUser.setParams(params);
            }
            if(StringUtils.isNotNull(sysUser.getAppOnlineState()))
            {
                onLineList.add(sysUser);
                if(sysUser.getAppOnlineState().equals("1"))
                {
                    onLineList.add(sysUser);
                }
                else
                {
                    offLineList.add(sysUser);
                }
            }
            else
            {
                offLineList.add(sysUser);
            }

        }
        Map<String,Object> onlineMap=new HashMap<>();
        onlineMap.put("children",onLineList);
@@ -205,7 +201,7 @@
    @ApiOperation("上传文件")
    public AjaxResult uploadFile(MultipartFile file,String type)
    {
        String url = MinioUtils.putObjectAndGetUrl("app",type, file);
        String url = minioUtil.putObjectAndGetUrl("app",type, file);
        return AjaxResult.success(url);
    }
}