告警规则代码修改,增加页面显示机构名称与主机名称

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/mediator/domain/IotAlarmRule.java

@@ -38,6 +38,10 @@ public class IotAlarmRule implements Serializable {
     @TableField("iot_code")
     private String iotCode;
 
+    @ApiModelProperty(value = "主机名称")
+    @TableField("server_name")
+    private String serverName;
+
     @ApiModelProperty(value = "规则名称")
     @TableField("name")
     private String name;
@@ -74,5 +78,6 @@ public class IotAlarmRule implements Serializable {
     @TableField("update_time")
     private LocalDateTime updateTime;
 
-
+    @TableField(exist = false)
+    private String orgName;
 }

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/dto/alarm/IotAlarmRuleDto.java

@@ -31,6 +31,9 @@ public class IotAlarmRuleDto implements Serializable {
     @ApiModelProperty(value = "所属主机")
     private String iotCode;
 
+    @ApiModelProperty(value = "主机名称")
+    private String serverName;
+
     @ApiModelProperty(value = "是否启用")
     private Integer enabled;
 

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotAlarmRuleServiceImpl.java

@@ -130,9 +130,10 @@ public class IotAlarmRuleServiceImpl extends ServiceImpl<IotAlarmRuleMapper, Iot
     public IotInitAlarmRuleVo getAlarmRuleData(Long ruleId) throws Exception {
         IotInitAlarmRuleVo ruleVo = getAddInitAlarmRuleData();
         IotAlarmRule appAlarmRule = this.baseMapper.selectById(ruleId);
-
+        final SysOrg sysOrg = orgService.selectOrgById(appAlarmRule.getOrgId(), SecurityConstants.INNER);
         IotAlarmRuleEditVo ruleEditVo = new IotAlarmRuleEditVo();
         BeanHelper.copyProperties(ruleEditVo, appAlarmRule);
+        appAlarmRule.setOrgName(sysOrg.getShortName());
         ruleVo.setIotAlarmRule(appAlarmRule);
 
         List<IotAlarmRuleExpress> appAlarmRuleExpressList = iotAlarmRuleExpressService.list(new LambdaQueryWrapper<IotAlarmRuleExpress>().eq(IotAlarmRuleExpress::getRuleId, ruleId));

soc-modules/soc-modules-iot/src/main/resources/mapper/IotAlarmRuleMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.xunmei.iot.mapper.IotAlarmRuleMapper">
 
     <select id="selectPageData" resultType="com.xunmei.common.core.domain.mediator.domain.IotAlarmRule">
-        select * from iot_alarm_rule r inner join sys_org so on r.org_id=so.id
+        select *,so.short_name as orgName from iot_alarm_rule r inner join sys_org so on r.org_id=so.id
         <where>
             <if test="req.ruleName != null and req.ruleName != ''">
                 and r.name like concat('%', #{req.ruleName}, '%')