From 448167dbcf8c56ba9e37ac4eb51b01b3072e7cd8 Mon Sep 17 00:00:00 2001
From: liuqingkun <LIUqk6666_>
Date: Thu, 16 Feb 2023 22:23:50 +0800
Subject: [PATCH] bug fix

---
 .../controller/ApmConfigController.java        |  2 +-
 .../business/mapper/ApmRecordMapper.xml        |  6 +++---
 .../business/service/IApmConfigService.java    |  2 +-
 .../service/impl/ApmConfigServiceImpl.java     | 18 +++++++++++-------
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/controller/ApmConfigController.java b/src/main/java/org/springblade/modules/business/controller/ApmConfigController.java
index fff9054..5314281 100644
--- a/src/main/java/org/springblade/modules/business/controller/ApmConfigController.java
+++ b/src/main/java/org/springblade/modules/business/controller/ApmConfigController.java
@@ -62,7 +62,7 @@ public class ApmConfigController extends BladeController {
 			return R.fail(ErrorMsgEnum.PARAMS_NULL_CREATE_DEPT.getValue());
 		}
 
-		Map<String, Map<String, Object>> res = apmConfigService.alreadyConfigDay(createDept, startTime, endTime);
+		Map<String, List<Map<String, Object>>> res = apmConfigService.alreadyConfigDay(createDept, startTime, endTime);
 
 		return R.data(res);
 	}
diff --git a/src/main/java/org/springblade/modules/business/mapper/ApmRecordMapper.xml b/src/main/java/org/springblade/modules/business/mapper/ApmRecordMapper.xml
index 66203ab..832351a 100644
--- a/src/main/java/org/springblade/modules/business/mapper/ApmRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/business/mapper/ApmRecordMapper.xml
@@ -79,12 +79,12 @@
         from ca_apm_record
         where is_deleted = 0 and create_dept = #{createDept}
         <if test="startTime != '' and startTime != null">
-            and ar.apm_day &gt;= #{startTime}
+            and apm_day &gt;= #{startTime}
         </if>
         <if test="endTime != '' and endTime != null">
-            and ar.apm_day &lt;= #{endTime}
+            and apm_day &lt;= #{endTime}
         </if>
-        group by DATE_FORMAT(apm_day, '%Y-%m-%d'), project, period, time_frame
+        group by DATE_FORMAT(apm_day, '%Y-%m-%d')
     </select>
 
     <select id="countAmpNumWithDays" resultMap="ApmRecordCountDTOResultMap">
diff --git a/src/main/java/org/springblade/modules/business/service/IApmConfigService.java b/src/main/java/org/springblade/modules/business/service/IApmConfigService.java
index 39dcd03..66c1e20 100644
--- a/src/main/java/org/springblade/modules/business/service/IApmConfigService.java
+++ b/src/main/java/org/springblade/modules/business/service/IApmConfigService.java
@@ -23,7 +23,7 @@ public interface IApmConfigService extends BaseService<ApmConfig> {
 	 * @param endTime
 	 * @return 格式: {mon:1, days:{1, 2, 3}},{mon:2, days:{1, 2, 3}}
 	 */
-	Map<String, Map<String, Object>> alreadyConfigDay(Long createDept, String startTime, String endTime);
+	Map<String, List<Map<String, Object>>> alreadyConfigDay(Long createDept, String startTime, String endTime);
 
 	/**
 	 * 自定义分页
diff --git a/src/main/java/org/springblade/modules/business/service/impl/ApmConfigServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/ApmConfigServiceImpl.java
index d9f23b6..f367ee4 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/ApmConfigServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/ApmConfigServiceImpl.java
@@ -43,7 +43,7 @@ public class ApmConfigServiceImpl extends BaseServiceImpl<ApmConfigMapper, ApmCo
 	private final ApmRecordMapper recordMapper;
 
 	@Override
-	public Map<String, Map<String, Object>> alreadyConfigDay(Long createDept, String startTime, String endTime) {
+	public Map<String, List<Map<String, Object>>> alreadyConfigDay(Long createDept, String startTime, String endTime) {
 		// 获取已配置的放号天列表
 		List<Map<String, Object>> days = baseMapper.alreadyConfigDayList(createDept, startTime, endTime);
 
@@ -51,19 +51,23 @@ public class ApmConfigServiceImpl extends BaseServiceImpl<ApmConfigMapper, ApmCo
 		List<ApmRecordCountDTO> apmRecords = recordMapper.countAllAmpNumByDept(createDept, startTime, endTime);
 		Map<String, Integer> apmRecordsMap = apmRecords.stream().collect(Collectors.toMap(e -> e.getApmDay(), e -> e.getApmNum()));
 
-		Map<String, Map<String, Object>> monDaysMap = new HashMap<>();
+		Map<String, List<Map<String, Object>>> monMap = new HashMap<>();
 		for (Map<String, Object> day : days) {
-			String mon = ((String) day.get("apmDay")).split("-")[1];
-			int allNum = (Integer) day.get("allNum");
+			String dayStr = (String) day.get("apmDay");
+			String mon = dayStr.split("-")[1];
+			int allNum = Integer.parseInt(day.get("allNum").toString());
 			Map<String, Object> daysItemMap = new ArrayMap<>();
 
 			int apmCount = apmRecordsMap.containsKey(day) ? apmRecordsMap.get(day) : 0;
-			daysItemMap.put("date", day);
+			daysItemMap.put("date", dayStr);
 			daysItemMap.put("enableApm", apmCount < allNum ? BusinessConstant.BOOLEAN_STR_TRUE : BusinessConstant.BOOLEAN_STR_FALSE);
-			monDaysMap.put(mon, daysItemMap);
+
+			List<Map<String, Object>> dayList = monMap.containsKey(mon) ? monMap.get(mon) : new ArrayList<>();
+			dayList.add(daysItemMap);
+			monMap.put(mon, dayList);
 		}
 
-		return monDaysMap;
+		return monMap;
 	}
 
 	@Override