diff --git a/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmResourceRegistrationRemote.java b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmResourceRegistrationRemote.java index bc34781..c8705b3 100644 --- a/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmResourceRegistrationRemote.java +++ b/tongran-api/tongran-api-system/src/main/java/com/tongran/system/api/domain/RmResourceRegistrationRemote.java @@ -191,5 +191,9 @@ public class RmResourceRegistrationRemote extends BaseEntity private BigDecimal outboundRate; /** 公网ip */ private String ip1PublicIp; + /** 负责人手机号 */ + private String phone; + /** 负责人名称 */ + private String owner; } diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java index dc73a08..bbf4a05 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java @@ -305,4 +305,13 @@ public class RmResourceRegistrationController extends BaseController { return toAjax(rmResourceRegistrationService.bindSwitch(rmResourceRegistration)); } + /** + * 绑定负责人 + */ + @Log(title = "绑定负责人", businessType = BusinessType.UPDATE) + @PostMapping("/bindOwner") + public AjaxResult bindOwner(@RequestBody RmResourceRegistration rmResourceRegistration) + { + return toAjax(rmResourceRegistrationService.bindOwner(rmResourceRegistration)); + } } diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysUserController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysUserController.java index eab2474..34b407b 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysUserController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysUserController.java @@ -1,23 +1,5 @@ package com.tongran.system.controller; -import java.io.IOException; -import java.util.Date; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang3.ArrayUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; import com.tongran.common.core.domain.R; import com.tongran.common.core.text.Convert; import com.tongran.common.core.utils.DateUtils; @@ -36,12 +18,19 @@ import com.tongran.system.api.domain.SysDept; import com.tongran.system.api.domain.SysRole; import com.tongran.system.api.domain.SysUser; import com.tongran.system.api.model.LoginUser; -import com.tongran.system.service.ISysConfigService; -import com.tongran.system.service.ISysDeptService; -import com.tongran.system.service.ISysPermissionService; -import com.tongran.system.service.ISysPostService; -import com.tongran.system.service.ISysRoleService; -import com.tongran.system.service.ISysUserService; +import com.tongran.system.service.*; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Date; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; /** * 用户信息 @@ -84,6 +73,16 @@ public class SysUserController extends BaseController List list = userService.selectUserList(user); return getDataTable(list); } + /** + * 获取所有用户列表 + */ + @RequiresPermissions("system:user:list") + @PostMapping("/getAllUserList") + public AjaxResult getAllUserList(@RequestBody SysUser user) + { + List list = userService.selectUserList(user); + return success(list); + } @Log(title = "用户管理", businessType = BusinessType.EXPORT) @RequiresPermissions("system:user:export") diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmResourceRegistration.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmResourceRegistration.java index 29f509e..d8d6ed8 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmResourceRegistration.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmResourceRegistration.java @@ -293,4 +293,10 @@ public class RmResourceRegistration extends BaseEntity private Long[] ids; /** 批量查询 */ private String clientIds; + /** 负责人手机号 */ + @Excel(name = "负责人手机号") + private String phone; + /** 负责人名称 */ + @Excel(name = "负责人名称") + private String owner; } \ No newline at end of file diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmResourceRegistrationMapper.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmResourceRegistrationMapper.java index 02522aa..ec0bc89 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmResourceRegistrationMapper.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/mapper/RmResourceRegistrationMapper.java @@ -75,6 +75,8 @@ public interface RmResourceRegistrationMapper * @return */ Integer updateStatusByResource(RmResourceRegistration rmResourceRegistration); + Integer bindSwitchMsg(RmResourceRegistration rmResourceRegistration); + Integer bindOwnerMsg(RmResourceRegistration rmResourceRegistration); List getRegistrationByIds(String[] ids); diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmResourceRegistrationService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmResourceRegistrationService.java index 878896e..6651348 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmResourceRegistrationService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmResourceRegistrationService.java @@ -159,4 +159,6 @@ public interface IRmResourceRegistrationService RmResourceRegistration selectRmResourceRegistrationByClientId(RmResourceRegistration rmResourceRegistration); int bindSwitch(RmResourceRegistration rmResourceRegistration); + + int bindOwner(RmResourceRegistration rmResourceRegistration); } diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java index e1ab396..9f5c55f 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java @@ -1486,7 +1486,21 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio updateData.setClientId(clientId); updateData.setSwitchName(rmResourceRegistration.getSwitchName()); updateData.setSwitchClientId(rmResourceRegistration.getSwitchClientId()); - rmResourceRegistrationMapper.updateStatusByResource(updateData); + rmResourceRegistrationMapper.bindSwitchMsg(updateData); + } + return 1; + } + + @Override + public int bindOwner(RmResourceRegistration rmResourceRegistration) { + String clientIds = rmResourceRegistration.getDeployDevice(); + String[] clientIdArr = clientIds.split("\n"); + for (String clientId : clientIdArr) { + RmResourceRegistration updateData = new RmResourceRegistration(); + updateData.setClientId(clientId); + updateData.setPhone(rmResourceRegistration.getPhone()); + updateData.setOwner(rmResourceRegistration.getOwner()); + rmResourceRegistrationMapper.bindOwnerMsg(updateData); } return 1; } diff --git a/tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml index 3484ba2..d023c0b 100644 --- a/tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml @@ -1,7 +1,7 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> @@ -31,10 +31,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - select id, client_id, hardware_sn, business_name, logical_node_id, multi_public_ip_status, registration_status, online_status, resource_type, agent_version, create_time, update_time, heartbeat_count, heartbeat_interval, onboard_time, remark, create_by, update_by, reported_bandwidth, del_alarm_time, outbound_rate,switch_client_id, switch_name from rm_resource_registration + select id, client_id, hardware_sn, business_name, logical_node_id, multi_public_ip_status, registration_status, online_status, resource_type, agent_version, create_time, update_time, heartbeat_count, heartbeat_interval, onboard_time, remark, create_by, update_by, reported_bandwidth, del_alarm_time, outbound_rate, switch_client_id, switch_name, phone, owner from rm_resource_registration @@ -80,6 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.outbound_rate as outboundRate, a.switch_client_id as switchClientId, a.switch_name as switchName, + a.phone as phone, + a.owner as owner, b.machine_code as machineCode, (select bandwidth_result from eps_node_bandwidth where client_id=a.client_id and calculation_mode='1000' and bandwidth_type=1 @@ -111,6 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.outbound_rate as outboundRate, a.switch_client_id as switchClientId, a.switch_name as switchName, + a.phone as phone, + a.owner as owner, b.machine_code as machineCode, (select bandwidth_result from eps_node_bandwidth where client_id=a.client_id and calculation_mode='1000' and bandwidth_type=1 @@ -118,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from rm_resource_registration a left join rm_registration_machine b on a.client_id = b.client_id where a.client_id = #{clientId} - limit 1 + limit 1 @@ -146,6 +156,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" outbound_rate, switch_client_id, switch_name, + + phone, + owner, #{clientId}, @@ -170,6 +183,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{outboundRate}, #{switchClientId}, #{switchName}, + + #{phone}, + #{owner}, @@ -198,6 +214,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" outbound_rate = #{outboundRate}, switch_client_id = #{switchClientId}, switch_name = #{switchName}, + + phone = #{phone}, + owner = #{owner}, where id = #{id} @@ -212,10 +231,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + update rm_resource_registration @@ -240,6 +261,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" outbound_rate = #{outboundRate}, switch_client_id = #{switchClientId}, switch_name = #{switchName}, + phone = #{phone}, + owner = #{owner}, @@ -255,6 +278,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + update rm_resource_registration + + switch_client_id = #{switchClientId}, + switch_name = #{switchName}, + + + and client_id = #{clientId} + + + + update rm_resource_registration + + phone = #{phone}, + owner = #{owner}, + + + and client_id = #{clientId} + + + + + update rm_resource_registration set remark = #{remark} where client_id in @@ -336,6 +386,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{clientId} + update rm_resource_registration set remark = CASE @@ -347,14 +398,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{clientId} + update rm_resource_registration set reported_bandwidth = #{reportedBandwidth} where id =#{id} + + + + update rm_resource_registration set del_alarm_time = now() where id =#{id} + update rm_resource_registration set del_flag=1 where id in #{id} + \ No newline at end of file diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/SendAlarmPushUtil.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/SendAlarmPushUtil.java index 01480db..9b4974a 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/SendAlarmPushUtil.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/SendAlarmPushUtil.java @@ -2,6 +2,7 @@ package com.tongran.rocketmq.utils; import com.tongran.common.core.constant.SecurityConstants; import com.tongran.common.core.domain.R; +import com.tongran.common.core.utils.StringUtils; import com.tongran.rocketmq.domain.RmAlarmLog; import com.tongran.rocketmq.domain.RmAlarmPushConfig; import com.tongran.rocketmq.enums.AlarmTypeEnum; @@ -44,6 +45,7 @@ public class SendAlarmPushUtil { RmAlarmLog updateData = new RmAlarmLog(); updateData.setId(rmAlarmLog.getId()); if (alarmConfigList != null && !alarmConfigList.isEmpty()) { + String phone = ""; try { if(!AlarmTypeEnum.ping丢包率过高.getCode().equals(rmAlarmLog.getAlarmType())){ // 查询服务器信息 @@ -55,6 +57,7 @@ public class SendAlarmPushUtil { rmAlarmLog.setMgmPublicIp(serverMsg.getIp1PublicIp()); rmAlarmLog.setBusinessName(serverMsg.getBusinessName()); rmAlarmLog.setRemark(serverMsg.getRemark()); + phone = serverMsg.getPhone(); } } Map alarmMap = new HashMap<>(); @@ -66,6 +69,9 @@ public class SendAlarmPushUtil { alarmMap.put("标签", rmAlarmLog.getRemark()); alarmMap.put("业务名称", rmAlarmLog.getBusinessName()); for (RmAlarmPushConfig alarmPushConfig : alarmConfigList) { + if(StringUtils.isNoneBlank(phone)){ + alarmPushConfig.setContactPhones(phone); + } if(PushMethodEnum.企业微信.getCode().equals(alarmPushConfig.getPushMethod())){ updateData.setPushFlag(processWeComPush(alarmPushConfig, alarmMap)); }else if(PushMethodEnum.手机短信.getCode().equals(alarmPushConfig.getPushMethod())){