haozq
/
jjsp_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' 

# Conflicts:
#	securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/AdmittedPersonController.java
#	securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/ResourceMonitorController.java
This commit is contained in:
haozq 2024-12-19 11:29:26 +08:00
parent b1befdc223 8d5856a2a8
commit 71104dd12c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/AdmittedPersonController.java
View File

@ -45,7 +45,7 @@ public class AdmittedPersonController {
* @date 2023-05-18 14:50
*/
@PostMapping(value = "getAdmittedPersonList")
@SysLog(title = "准入人员", model = "准入人员->准入人员列表", operaType = OperaType.QUERY, details = "查询准入人员列表")
@SysLog(title = "准入人员", model = "班组信息->准入人员", operaType = OperaType.QUERY, details = "查询准入人员数据",logType = 1)
public Map<String, Object> getAdmittedPersonList(AdmittedPersonEntity entity) {
PageHelper.startPage(Integer.parseInt(entity.getPage()), Integer.parseInt(entity.getLimit()));
Map<String, Object> map = new HashMap<String, Object>(16);

9
securityControl-modules/securityControl-proteam/src/main/java/com/sercurityControl/proteam/dutyTask/controller/ResourceMonitorController.java
View File

@ -54,7 +54,7 @@ public class ResourceMonitorController {
* @date 2023-05-30 17:36
*/
@PostMapping(value = "getDeviceStatusMonitorList")
@SysLog(title = "设备状态监测", model = "资源监测通知->设备状态监测", operaType = OperaType.QUERY, details = "设备状态监测")
@SysLog(title = "设备状态监测", model = "消息通知->资源检测通知->设备状态监测", operaType = OperaType.QUERY, details = "查询设备状态监测数据",logType = 1)
public Map<String, Object> getDeviceStatusMonitorList(ResourceMonitorEntity entity) {
PageHelper.startPage(Integer.parseInt(entity.getPage()), Integer.parseInt(entity.getLimit()));
Map<String, Object> map = new HashMap<String, Object>(16);
@ -87,7 +87,7 @@ public class ResourceMonitorController {
* @date 2023-05-31 15:19
*/
@PostMapping(value = "getServerMonitorList")
@SysLog(title = "服务器状态监测", model = "资源监测通知->设备状态监测", operaType = OperaType.QUERY, details = "服务器状态监测")
@SysLog(title = "服务器状态监测", model = "消息通知->资源检测通知->服务器状态监测", operaType = OperaType.QUERY, details = "查询服务器状态监测数据",logType = 1)
public Map<String, Object> getServerMonitorList(ServerMonitorEntity entity) {
try {
List<String> list = new ServerMonitorService().initSystemInfo();
@ -107,6 +107,7 @@ public class ResourceMonitorController {
* @date 2023-05-31 16:34
*/
@PostMapping(value = "addResourceData")
@SysLog(title = "设备状态监测", model = "消息通知->资源检测通知->设备状态监测", operaType = OperaType.INSERT, details = "新增设备状态监测",logType = 1)
public AjaxResult addResourceData(ResourceMonitorEntity entity) {
try {
if (StringUtils.isBlank(entity.getCreateDate())) {
@ -129,7 +130,7 @@ public class ResourceMonitorController {
* @date 2023-06-02 9:56
*/
@PostMapping(value = "getAlarmRecordList")
@SysLog(title = "告警记录", model = "告警记录->告警记录列表", operaType = OperaType.QUERY, details = "告警记录列表")
@SysLog(title = "告警记录", model = "消息通知->告警记录", operaType = OperaType.QUERY, details = "查询告警记录数据",logType = 1)
public Map<String, Object> getAlarmRecordList(ResourceMonitorEntity entity) {
if (StringUtils.isBlank(entity.getCreateDate())) {
entity.setCreateDate(DateTimeHelper.getNowDate());
@ -166,7 +167,7 @@ public class ResourceMonitorController {
* @date 2023-06-05 16:14
*/
@GetMapping(value = "exportData")
@SysLog(title = "告警记录", model = "告警记录->告警记录列表", operaType = OperaType.EXPORT, details = "告警记录列表导出")
@SysLog(title = "告警记录", model = "消息通知->告警记录", operaType = OperaType.EXPORT, details = "导出告警记录数据",logType = 1)
public void exportData(HttpServletRequest request, HttpServletResponse response, ResourceMonitorEntity entity) {
if (StringUtils.isBlank(entity.getCreateDate())) {
entity.setCreateDate(DateTimeHelper.getNowDate());