From 946603f8c7ad52c60f273a67497f94d2270659b0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 19 Apr 2021 18:00:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?okhttp=E6=97=B6=E9=97=B4=20=E7=BC=A9?= =?UTF-8?q?=E7=9F=AD=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/SysMonitorLogDTO.java | 32 ++++++++++++++ .../controller/SysMonitorLogController.java | 43 +++++++++++++++++++ .../commons/tools/utils/net/OkHttpUtil.java | 6 +-- 3 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMonitorLogDTO.java create mode 100644 epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMonitorLogController.java diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMonitorLogDTO.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMonitorLogDTO.java new file mode 100644 index 0000000000..4871719d02 --- /dev/null +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/dto/SysMonitorLogDTO.java @@ -0,0 +1,32 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 系统监控日志 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Data +public class SysMonitorLogDTO implements Serializable { + /** + * 访问路径 + */ + private String path; + /** + * 耗时 + */ + private Integer costTime; + +} diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMonitorLogController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMonitorLogController.java new file mode 100644 index 0000000000..0d415ca45a --- /dev/null +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMonitorLogController.java @@ -0,0 +1,43 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.epmet.controller; + +import com.alibaba.fastjson.JSON; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + + +/** + * 异常日志 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Slf4j +@RestController("monitorlog") +public class SysMonitorLogController { + + /** + * desc: 记录监控日志 + * + * @param params + * @return void + * @author LiuJanJun + * @date 2021/4/19 5:56 下午 + */ + @RequestMapping("info") + public void infoLevel(@RequestBody Map params) { + log.info("monitor log info:{}", JSON.toJSONString(params)); + } + +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/net/OkHttpUtil.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/net/OkHttpUtil.java index 27fd4c05ef..e329a1f7df 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/net/OkHttpUtil.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/net/OkHttpUtil.java @@ -24,9 +24,9 @@ public class OkHttpUtil { private static final Logger logger = LoggerFactory.getLogger(OkHttpUtil.class); - public final static int READ_TIMEOUT = 100; - public final static int CONNECT_TIMEOUT = 60; - public final static int WRITE_TIMEOUT = 60; + public final static int READ_TIMEOUT = 2; + public final static int CONNECT_TIMEOUT = 1; + public final static int WRITE_TIMEOUT = 5; public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8"); public static final String CONTENT_TYPE = "Content-Type"; From f4a0f1524400a317dcb614b9515d45c9b356e5b7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 20 Apr 2021 13:36:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/SysMonitorLogController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMonitorLogController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMonitorLogController.java index 0d415ca45a..1164bf72b3 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMonitorLogController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysMonitorLogController.java @@ -24,7 +24,8 @@ import java.util.Map; * @since 1.0.0 */ @Slf4j -@RestController("monitorlog") +@RestController +@RequestMapping("monitorlog") public class SysMonitorLogController { /** From ba9310e16fafa703f4368c5d88e21938af706ad4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 21 Apr 2021 09:18:52 +0800 Subject: [PATCH 3/4] category-analysis --- .../ScreenProjectCategoryOrgDailyDao.java | 2 +- .../screen/impl/ScreenProjectServiceImpl.java | 2 +- .../ScreenProjectCategoryOrgDailyDao.xml | 33 ++++++++++--------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java index c3b90ff1c7..3064505cf6 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java @@ -38,5 +38,5 @@ public interface ScreenProjectCategoryOrgDailyDao { * @param agencyId * @return java.util.List */ - List selectCategoryAnalysis(@Param("agencyId") String agencyId); + List selectCategoryAnalysis(@Param("agencyId") String agencyId,@Param("customerId")String customerId); } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index 97dafab068..c7a1e6cfc5 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -112,6 +112,6 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true) @Override public List categoryAnalysis(String customerId, CategoryAnalysisFormDTO formDTO) { - return screenProjectCategoryOrgDailyDao.selectCategoryAnalysis(formDTO.getAgencyId()); + return screenProjectCategoryOrgDailyDao.selectCategoryAnalysis(formDTO.getAgencyId(),customerId); } } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml index d2ac38a7f7..97a692ad07 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml @@ -9,22 +9,25 @@ M.PROJECT_TOTAL AS projectTotal FROM screen_project_category_org_daily m left join customer_project_category_dict d - on(m.CATEGORY_CODE=D.CATEGORY_CODE AND D.DEL_FLAG='0') + on(m.CATEGORY_CODE=D.CATEGORY_CODE + AND D.DEL_FLAG='0' + and d.CUSTOMER_ID=#{customerId}) WHERE M.DEL_FLAG = '0' - AND M.ORG_ID = #{agencyId} - AND M.DATE_ID = ( - select - date_id - from - screen_project_category_org_daily - where - del_flag = '0' - and ORG_ID = #{agencyId} - order by - date_id desc, - created_time desc - limit 1 - ) + AND M.ORG_ID = #{agencyId} + AND M.DATE_ID = ( + select + date_id + from + screen_project_category_org_daily + where + del_flag = '0' + and ORG_ID = #{agencyId} + and CUSTOMER_ID=#{customerId} + order by + date_id desc, + created_time desc + limit 1 + ) ORDER BY M.CATEGORY_CODE ASC \ No newline at end of file From c51284a963c9c127c46363aef69292a95e1fea11 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 21 Apr 2021 09:22:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?category-analysis,=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=80=BB=E6=95=B0=EF=BC=8C=E5=85=88=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=89=8D20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/screen/ScreenProjectCategoryOrgDailyDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml index 97a692ad07..2e207479c1 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml @@ -28,6 +28,7 @@ created_time desc limit 1 ) - ORDER BY M.CATEGORY_CODE ASC + ORDER BY M.PROJECT_TOTAL desc,D.CATEGORY_NAME asc + limit 20 \ No newline at end of file