From fa43ceac8cece374ce55d03909cd3196b3bb0d34 Mon Sep 17 00:00:00 2001
From: liuqingkun <LIUqk6666_>
Date: Tue, 14 Feb 2023 18:07:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ApmConfigController.java       |  6 +----
 .../business/mapper/ApmConfigMapper.java      |  4 +++-
 .../business/mapper/ApmConfigMapper.xml       | 22 +++++++++++++++----
 .../business/mapper/ApmRecordMapper.xml       |  8 +++++--
 .../service/impl/ApmConfigServiceImpl.java    | 12 ++--------
 src/main/resources/application-dev.yml        |  6 ++---
 6 files changed, 33 insertions(+), 25 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 ced1c2c..7d6a890 100644
--- a/src/main/java/org/springblade/modules/business/controller/ApmConfigController.java
+++ b/src/main/java/org/springblade/modules/business/controller/ApmConfigController.java
@@ -128,11 +128,7 @@ public class ApmConfigController extends BladeController {
 	 * @return
 	 */
 	@GetMapping("/page")
-	public R<IPage<ApmConfigListVO>> selectPage(Query query, @RequestParam Long createDept, String startTime, String endTime, String project) {
-		if (Func.isEmpty(createDept)) {
-			return R.fail(ErrorMsgEnum.PARAMS_NULL_CREATE_DEPT.getValue());
-		}
-
+	public R<IPage<ApmConfigListVO>> selectPage(Query query, Long createDept, String startTime, String endTime, String project) {
 		startTime = Func.isNotBlank(startTime) ? startTime + BusinessConstant.DATE_STR_DAY_START_HMS : startTime;
 		endTime = Func.isNotBlank(endTime) ? endTime + BusinessConstant.DATE_STR_DAY_END_HMS : endTime;
 
diff --git a/src/main/java/org/springblade/modules/business/mapper/ApmConfigMapper.java b/src/main/java/org/springblade/modules/business/mapper/ApmConfigMapper.java
index 112d534..ae3ce64 100644
--- a/src/main/java/org/springblade/modules/business/mapper/ApmConfigMapper.java
+++ b/src/main/java/org/springblade/modules/business/mapper/ApmConfigMapper.java
@@ -39,6 +39,8 @@ public interface ApmConfigMapper extends BaseMapper<ApmConfig> {
 
 	List<ApmConfig> selectConfigList(@Param("createDept") Long createDept, @Param("apmDay") String apmDay, @Param("project") String project);
 
-	void deleteConfig(@Param("createDept") Long createDept, @Param("apmDayListStr") String apmDayListStr, @Param("projectListStr") String projectListStr);
+	void deleteConfigA(@Param("createDept") Long createDept, @Param("apmDayListStr") String apmDayListStr, @Param("projectListStr") String projectListStr);
+
+	void deleteConfig(@Param("createDept") Long createDept, @Param("apmDayList") List<String> apmDayList, @Param("projectList") List<String> projectList);
 
 }
diff --git a/src/main/java/org/springblade/modules/business/mapper/ApmConfigMapper.xml b/src/main/java/org/springblade/modules/business/mapper/ApmConfigMapper.xml
index 2fa1c32..efc6bff 100644
--- a/src/main/java/org/springblade/modules/business/mapper/ApmConfigMapper.xml
+++ b/src/main/java/org/springblade/modules/business/mapper/ApmConfigMapper.xml
@@ -22,7 +22,10 @@
     <select id="selectConfigPage" resultMap="apmConfigResultMap">
         SELECT distinct ac.create_dept, ac.project, ac.apm_day
         FROM ca_apm_config ac
-        WHERE ac.is_deleted = 0 and ac.create_dept = #{createDept}
+        WHERE ac.is_deleted = 0
+        <if test="createDept != '' and createDept != null">
+            and ac.create_dept = #{createDept}
+        </if>
         <if test="startTime != '' and startTime != null">
             and ac.apm_day &gt;= #{startTime}
         </if>
@@ -57,8 +60,19 @@
     </select>
 
     <delete id="deleteConfig">
-        delete from ca_apm_config ac where ac.create_dept = #{createDept}
-        and ac.project in ${projectListStr}
-        and ac.apm_day in ${apmDayListStr}
+        delete from ca_apm_config where create_dept = #{createDept}
+        and project in
+        <foreach collection="projectList" item="project" index="index" open="(" close=")" separator=", ">
+            #{project}
+        </foreach>
+        and apm_day in
+        <foreach collection="apmDayList" item="dayStr" index="index" open="(" close=")" separator=", ">
+            #{dayStr}
+        </foreach>
+    </delete>
+    <delete id="deleteConfigA">
+        delete from ca_apm_config where create_dept = #{createDept}
+        and project in ${projectListStr}
+        and apm_day in ${apmDayListStr}
     </delete>
 </mapper>
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 6af2128..cbb950e 100644
--- a/src/main/java/org/springblade/modules/business/mapper/ApmRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/business/mapper/ApmRecordMapper.xml
@@ -63,8 +63,12 @@
     <select id="countAmpNumWithDays" resultMap="ApmRecordCountDTOResultMap">
         select DATE_FORMAT(apm_day, '%Y-%m-%d') apmDay, project, period, time_frame timeFrame, count(id) apmNum
         from ca_apm_record
-        where is_deleted = 0 and create_dept = #{createDept} and apm_day in
-        <foreach collection="list" item="dayStr" index="index" open="(" close=")" separator=", ">
+        where is_deleted = 0
+        <if test="createDept != '' and createDept != null">
+            and create_dept = #{createDept}
+        </if>
+        and apm_day in
+        <foreach collection="apmDayList" item="dayStr" index="index" open="(" close=")" separator=", ">
             #{apmDayList}
         </foreach>
         group by DATE_FORMAT(apm_day, '%Y-%m-%d'), project, period, time_frame
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 5676f5e..c8c18a4 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
@@ -205,7 +205,7 @@ public class ApmConfigServiceImpl extends BaseServiceImpl<ApmConfigMapper, ApmCo
 		if (Func.isNotEmpty(alreadyConfList)) {
 			for (ApmConfig config : alreadyConfList) {
 				String key = config.getProject() + config.getApmDay() + config.getProject() + config.getTimeFrame();
-				if (alreadyConfMap.containsKey(key)){
+				if (alreadyConfMap.containsKey(key)) {
 					continue;
 				}
 				alreadyConfMap.put(key, config);
@@ -238,10 +238,6 @@ public class ApmConfigServiceImpl extends BaseServiceImpl<ApmConfigMapper, ApmCo
 
 	@Override
 	public void saveApmConfig(Long createDept, List<String> dayList, List<ApmConfigListVO> configListVOS) {
-		String checkMsg = saveCheck(createDept, dayList, configListVOS);
-		if (Func.isNotBlank(checkMsg)) {
-			return;
-		}
 		List<ApmConfig> configList = new ArrayList<>();
 		List<String> daySearchList = new ArrayList<>();
 		List<String> projectList = new ArrayList<>();
@@ -274,11 +270,7 @@ public class ApmConfigServiceImpl extends BaseServiceImpl<ApmConfigMapper, ApmCo
 		String apmDayStr = "('" + String.join("', '", apmDayList) + "')";
 		String projectStr = "('" + String.join("', '", projectList) + "')";
 
-		System.out.println("==========================================");
-		System.out.println(apmDayStr);
-		System.out.println(projectStr);
-		System.out.println("==========================================");
-		baseMapper.deleteConfig(createDept, apmDayStr, projectStr);
+		baseMapper.deleteConfigA(createDept, apmDayStr, projectStr);
 	}
 
 }
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 04842df..d906a81 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -9,9 +9,9 @@ spring:
     ssl: false
   datasource:
     # MySql
-    url: jdbc:mysql://localhost:3306/checkup_apm?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-    username: root
-    password: 123456
+    url: jdbc:mysql://47.103.199.45:3306/checkup_apm?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    username: lab_ac
+    password: lab_ac@123
 
 #blade配置
 blade: