home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-15 07:46:19 +10:00
Code Issues Packages Projects Releases Wiki Activity

[#762] add to update or delete rule when update or delete user Group

Browse Source
This commit is contained in:
Minwoo Jung
2015-11-17 11:30:24 +09:00
parent e220e66668
commit 74079792ea
7 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/main/java/com/navercorp/pinpoint/web/controller/UserGroupController.java
+9 -1
View File
@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.navercorp.pinpoint.web.service.AlarmService;
import com.navercorp.pinpoint.web.service.UserGroupService;
import com.navercorp.pinpoint.web.vo.UserGroup;
import com.navercorp.pinpoint.web.vo.UserGroupMember;
@@ -51,6 +52,9 @@ public class UserGroupController {
@Autowired
UserGroupService userGroupService;
@Autowired
AlarmService alarmService;
@RequestMapping(method = RequestMethod.POST)
@ResponseBody
public Map<String, String> createUserGroup(@RequestBody UserGroup userGroup) {
@@ -80,6 +84,9 @@ public class UserGroupController {
userGroupService.deleteUserGroup(userGroup);
userGroupService.deleteMemberByUserGroupId(userGroup.getId());
alarmService.deleteRuleByUserGroupId(userGroup.getId());
Map<String, String> result = new HashMap<String, String>();
result.put("result", "SUCCESS");
@@ -108,6 +115,7 @@ public class UserGroupController {
return result;
}
alarmService.updateUserGroupIdOfRule(userGroup);
userGroupService.updateUserGroupIdOfMember(userGroup);
userGroupService.updateUserGroup(userGroup);
@@ -155,7 +163,7 @@ public class UserGroupController {
@RequestMapping(value = "/member", method = RequestMethod.GET)
@ResponseBody
public List<UserGroupMember> getUserGroupMember(@RequestParam(USER_GROUP_ID) String userGroupId) {
//need param check and make respose message for exception
//need param check and make response message for exception
return userGroupService.selectMember(userGroupId);
}
web/src/main/java/com/navercorp/pinpoint/web/dao/AlarmDao.java
+3
View File
@@ -19,6 +19,7 @@ import java.util.List;
import com.navercorp.pinpoint.web.alarm.vo.CheckerResult;
import com.navercorp.pinpoint.web.alarm.vo.Rule;
import com.navercorp.pinpoint.web.vo.UserGroup;
/**
* @author minwoo.jung
@@ -42,4 +43,6 @@ public interface AlarmDao {
void deleteCheckerResult(CheckerResult checkerResult);
void insertCheckerResult(CheckerResult checkerResult);
void updateUserGroupIdOfRule(UserGroup userGroup);
}
web/src/main/java/com/navercorp/pinpoint/web/dao/memory/MemoryAlarmDao.java
+9
View File
@@ -23,11 +23,15 @@ import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jca.cci.connection.NotSupportedRecordFactory;
import org.springframework.stereotype.Repository;
import com.navercorp.pinpoint.web.alarm.vo.CheckerResult;
import com.navercorp.pinpoint.web.alarm.vo.Rule;
import com.navercorp.pinpoint.web.dao.AlarmDao;
import com.navercorp.pinpoint.web.dao.UserGroupDao;
import com.navercorp.pinpoint.web.vo.UserGroup;
/**
* @author minwoo.jung
@@ -91,6 +95,10 @@ public class MemoryAlarmDao implements AlarmDao {
alarmRule.put(rule.getRuleId(), rule);
}
@Override
public void updateUserGroupIdOfRule(UserGroup userGroup) {
}
@Override
public List<CheckerResult> selectBeforeCheckerResultList(String applicationId) {
return new ArrayList<CheckerResult>();
@@ -103,4 +111,5 @@ public class MemoryAlarmDao implements AlarmDao {
@Override
public void insertCheckerResult(CheckerResult checkerResult) {
}
}
web/src/main/java/com/navercorp/pinpoint/web/dao/mysql/MysqlAlarmDao.java
+7
View File
@@ -25,6 +25,7 @@ import org.springframework.stereotype.Repository;
import com.navercorp.pinpoint.web.alarm.vo.CheckerResult;
import com.navercorp.pinpoint.web.alarm.vo.Rule;
import com.navercorp.pinpoint.web.dao.AlarmDao;
import com.navercorp.pinpoint.web.vo.UserGroup;
/**
* @author minwoo.jung
@@ -69,6 +70,11 @@ public class MysqlAlarmDao implements AlarmDao {
sqlSessionTemplate.update(NAMESPACE + "updateRule", rule);
}
@Override
public void updateUserGroupIdOfRule(UserGroup userGroup) {
sqlSessionTemplate.update(NAMESPACE + "updateUserGroupIdOfRule", userGroup);
}
@Override
public List<CheckerResult> selectBeforeCheckerResultList(String applicationId) {
return sqlSessionTemplate.selectList(NAMESPACE + "selectBeforeCheckerResultList", applicationId);
@@ -83,4 +89,5 @@ public class MysqlAlarmDao implements AlarmDao {
public void insertCheckerResult(CheckerResult checkerResult) {
sqlSessionTemplate.insert(NAMESPACE + "insertCheckerResult", checkerResult);
}
}
web/src/main/java/com/navercorp/pinpoint/web/service/AlarmService.java
+3
View File
@@ -21,6 +21,7 @@ import java.util.Map;
import com.navercorp.pinpoint.web.alarm.checker.AlarmChecker;
import com.navercorp.pinpoint.web.alarm.vo.CheckerResult;
import com.navercorp.pinpoint.web.alarm.vo.Rule;
import com.navercorp.pinpoint.web.vo.UserGroup;
/**
* @author minwoo.jung
@@ -41,5 +42,7 @@ public interface AlarmService {
void updateBeforeCheckerResult(CheckerResult beforeCheckerResult, AlarmChecker checker);
void deleteRuleByUserGroupId(String groupId);
void updateUserGroupIdOfRule(UserGroup userGroup);
}
web/src/main/java/com/navercorp/pinpoint/web/service/AlarmServiceImpl.java
+11
View File
@@ -26,6 +26,7 @@ import com.navercorp.pinpoint.web.alarm.checker.AlarmChecker;
import com.navercorp.pinpoint.web.alarm.vo.CheckerResult;
import com.navercorp.pinpoint.web.alarm.vo.Rule;
import com.navercorp.pinpoint.web.dao.AlarmDao;
import com.navercorp.pinpoint.web.vo.UserGroup;
/**
* @author minwoo.jung
@@ -91,4 +92,14 @@ public class AlarmServiceImpl implements AlarmService {
}
@Override
public void deleteRuleByUserGroupId(String groupId) {
alarmDao.deleteRuleByUserGroupId(groupId);
}
@Override
public void updateUserGroupIdOfRule(UserGroup userGroup) {
alarmDao.updateUserGroupIdOfRule(userGroup);
}
}
web/src/main/resources/mapper/AlarmMapper.xml
+6
View File
@@ -39,6 +39,12 @@
WHERE rule_id = #{ruleId}
</update>
<update id="updateUserGroupIdOfRule" parameterType="UserGroup">
UPDATE alarm_rule
SET user_group_id = #{id}
WHERE user_group_id = (SELECT id FROM user_group WHERE number = #{number})
</update>
<select id="selectBeforeCheckerResultList" resultType="ChecherResult">
SELECT *
FROM alarm_history