‘liusuyi’
2023-08-07 17d950682cc0c09c3ae3681459253c9e1d4d7794
优化
已修改6个文件
已删除1个文件
49 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/rongcloud/service/RongCloudService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/utils/forest/RongCloudClient.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/logback.xml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AppTask.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java
@@ -583,7 +583,7 @@
                        // ç»“束时间
                        long etime = System.currentTimeMillis();
                        // è®¡ç®—执行时间
                        log.info("雷达报警处理时长:" + (etime - stime) + "毫秒");
                        log.debug("雷达报警处理时长:" + (etime - stime) + "毫秒");
                    }
                    //endregion
ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java
@@ -201,7 +201,7 @@
    @ApiOperation("上传文件")
    public AjaxResult uploadFile(MultipartFile file,String type)
    {
        String url = MinioUtils.putObjectAndGetUrl("app1",type, file);
        String url = MinioUtils.putObjectAndGetUrl("app",type, file);
        return AjaxResult.success(url);
    }
}
ard-work/src/main/java/com/ruoyi/rongcloud/service/Impl/RongCloudServiceImpl.java
@@ -46,7 +46,7 @@
            RongCloudParam param = new RongCloudParam();
            param.setUserId(userId);
            param.setName(name);
            Map map = rongCloudClient.getToken(getRongCloudHead(), param);
            Map<String,Object>  map = rongCloudClient.getToken(getRongCloudHead(), param);
            token = (String) map.get("token");
            log.debug("用户" + userId + "获取到融云token:" + token);
        } catch (Exception ex) {
@@ -56,12 +56,12 @@
    }
    @Override
    public Map checkOnline(List<String> userIds) {
    public Map<String,Object>  checkOnline(List<String> userIds) {
        Map<String, Object> onlineMap = new HashMap<>();
        for (String userId : userIds) {
            RongCloudParam param = new RongCloudParam();
            param.setUserId(userId);
            Map isOnline = rongCloudClient.checkOnline(getRongCloudHead(), param);
            Map<String,Object>  isOnline = rongCloudClient.checkOnline(getRongCloudHead(), param);
            onlineMap.put(userId, isOnline.get("status"));
        }
        return onlineMap;
@@ -71,12 +71,8 @@
    public Boolean checkOnline(String userId) {
        RongCloudParam param = new RongCloudParam();
        param.setUserId(userId);
        Map isOnline = rongCloudClient.checkOnline(getRongCloudHead(), param);
        if (isOnline.get("status").equals("1")) {
            return true;
        } else {
            return false;
        }
        Map<String,Object>  isOnline = rongCloudClient.checkOnline(getRongCloudHead(), param);
        return isOnline.get("status").equals("1");
    }
    /**
ard-work/src/main/java/com/ruoyi/rongcloud/service/RongCloudService.java
@@ -13,6 +13,6 @@
public interface RongCloudService {
    String getToken(String userId,String name);
    Map checkOnline(List<String>userIds);
    Map<String,Object>  checkOnline(List<String>userIds);
    Boolean checkOnline(String userId);
}
ard-work/src/main/java/com/ruoyi/utils/forest/RongCloudClient.java
@@ -13,8 +13,8 @@
public interface RongCloudClient {
    @Post(url = "/user/getToken.json")
    Map getToken(@Header Map<String, Object> headerMap, @Body RongCloudParam param);
    Map<String,Object> getToken(@Header Map<String, Object> headerMap, @Body RongCloudParam param);
    @Post(url = "user/checkOnline.json")
    Map checkOnline(@Header Map<String, Object> headerMap, @Body RongCloudParam param);
    Map<String,Object> checkOnline(@Header Map<String, Object> headerMap, @Body RongCloudParam param);
}
ruoyi-admin/src/main/resources/logback.xml
@@ -214,7 +214,7 @@
    <logger name="com.ruoyi" level="info"/>
    <!-- Spring日志级别控制  -->
    <logger name="org.springframework" level="warn"/>
    <!--控制台日志级别控制-->
    <root level="debug">
        <appender-ref ref="console"/>
    </root>
@@ -245,11 +245,11 @@
        <appender-ref ref="stealAlarm"/>
    </logger>
    <!--websocket日志打印等级-->
    <logger name="websocket" level="DEBUG">
    <logger name="websocket" level="INFO">
        <appender-ref ref="websocket"/>
    </logger>
    <!--光电巡检日志打印等级-->
    <logger name="PatrolInspectionTask" level="DEBUG">
    <logger name="PatrolInspectionTask" level="INFO">
        <appender-ref ref="PatrolInspectionTask"/>
    </logger>
    <!--mqtt日志打印等级-->
@@ -257,7 +257,7 @@
        <appender-ref ref="mqtt"/>
    </logger>
    <!--guideQueue日志打印等级-->
    <logger name="guideQueue" level="DEBUG">
    <logger name="guideQueue" level="INFO">
        <appender-ref ref="guideQueue"/>
    </logger>
    <!--rongCloud日志打印等级-->
@@ -265,10 +265,10 @@
        <appender-ref ref="rongCloud"/>
    </logger>
    <!--cmd日志打印等级-->
    <logger name="cmd" level="DEBUG">
    <logger name="cmd" level="INFO">
        <appender-ref ref="cmd"/>
    </logger>
    <logger name="uav" level="DEBUG">
    <logger name="uav" level="INFO">
        <appender-ref ref="uav"/>
    </logger>
</configuration> 
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/AppTask.java
ÎļþÒÑɾ³ý