diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwAlarmRuleController.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwAlarmRuleController.java new file mode 100644 index 0000000..08644c6 --- /dev/null +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/controller/HwAlarmRuleController.java @@ -0,0 +1,105 @@ +package com.ruoyi.business.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.business.domain.HwAlarmRule; +import com.ruoyi.business.service.IHwAlarmRuleService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 报警规则Controller + * + * @author xins + * @date 2023-09-16 + */ +@RestController +@RequestMapping("/alarmRule") +public class HwAlarmRuleController extends BaseController +{ + @Autowired + private IHwAlarmRuleService hwAlarmRuleService; + + /** + * 查询报警规则列表 + */ + @RequiresPermissions("business:alarmRule:list") + @GetMapping("/list") + public TableDataInfo list(HwAlarmRule hwAlarmRule) + { + startPage(); + List list = hwAlarmRuleService.selectHwAlarmRuleList(hwAlarmRule); + return getDataTable(list); + } + + /** + * 导出报警规则列表 + */ + @RequiresPermissions("business:alarmRule:export") + @Log(title = "报警规则", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, HwAlarmRule hwAlarmRule) + { + List list = hwAlarmRuleService.selectHwAlarmRuleList(hwAlarmRule); + ExcelUtil util = new ExcelUtil(HwAlarmRule.class); + util.exportExcel(response, list, "报警规则数据"); + } + + /** + * 获取报警规则详细信息 + */ + @RequiresPermissions("business:alarmRule:query") + @GetMapping(value = "/{alarmRuleId}") + public AjaxResult getInfo(@PathVariable("alarmRuleId") Long alarmRuleId) + { + return success(hwAlarmRuleService.selectHwAlarmRuleByAlarmRuleId(alarmRuleId)); + } + + /** + * 新增报警规则 + */ + @RequiresPermissions("business:alarmRule:add") + @Log(title = "报警规则", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody HwAlarmRule hwAlarmRule) + { + return toAjax(hwAlarmRuleService.insertHwAlarmRule(hwAlarmRule)); + } + + /** + * 修改报警规则 + */ + @RequiresPermissions("business:alarmRule:edit") + @Log(title = "报警规则", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody HwAlarmRule hwAlarmRule) + { + return toAjax(hwAlarmRuleService.updateHwAlarmRule(hwAlarmRule)); + } + + /** + * 删除报警规则 + */ + @RequiresPermissions("business:alarmRule:remove") + @Log(title = "报警规则", businessType = BusinessType.DELETE) + @DeleteMapping("/{alarmRuleIds}") + public AjaxResult remove(@PathVariable Long[] alarmRuleIds) + { + return toAjax(hwAlarmRuleService.deleteHwAlarmRuleByAlarmRuleIds(alarmRuleIds)); + } +} diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwAlarmRule.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwAlarmRule.java new file mode 100644 index 0000000..d9988d1 --- /dev/null +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/domain/HwAlarmRule.java @@ -0,0 +1,392 @@ +package com.ruoyi.business.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 报警规则对象 hw_alarm_rule + * + * @author xins + * @date 2023-09-16 + */ +public class HwAlarmRule extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 报警规则ID */ + private Long alarmRuleId; + + /** 规则名称 */ + @Excel(name = "规则名称") + private String alarmRuleName; + + /** 租户ID,关联hw_tenant的tenant_id */ + @Excel(name = "租户ID,关联hw_tenant的tenant_id") + private Long tenantId; + + /** 所属场景,关联hw_scene表的scene_id字段 */ + @Excel(name = "所属场景,关联hw_scene表的scene_id字段") + private Long sceneId; + + /** 报警级别,关联表hw_alarm_level字段alarm_level_id */ + @Excel(name = "报警级别,关联表hw_alarm_level字段alarm_level_id") + private Long alarmLevelId; + + /** 报警类型,关联表hw_alarm_type字段alarm_type_id */ + @Excel(name = "报警类型,关联表hw_alarm_type字段alarm_type_id") + private Long alarmTypeId; + + /** 规则类型(1、设备模型,2、设备) */ + @Excel(name = "规则类型", readConverterExp = "1=、设备模型,2、设备") + private String ruleType; + + /** 设备,关联表hw_device字段device_id */ + @Excel(name = "设备,关联表hw_device字段device_id") + private Long deviceId; + + /** 设备模型,关联表hw_device_mode字段device_mode_id */ + @Excel(name = "设备模型,关联表hw_device_mode字段device_mode_id") + private Long deviceModeId; + + /** 设备属性,关联表hw_device_mode_function字段mode_function_id */ + @Excel(name = "设备属性,关联表hw_device_mode_function字段mode_function_id") + private Long modeFunctionId; + + /** 触发条件(1、数值大于A,2、数值小于B,3、数值大于A且小于B,4、数值小于A或大于B,5、数值等于A) */ + @Excel(name = "触发条件", readConverterExp = "1=、数值大于A,2、数值小于B,3、数值大于A且小于B,4、数值小于A或大于B,5、数值等于A") + private String triggerCondition; + + /** 触发定义A值 */ + @Excel(name = "触发定义A值") + private String triggerDataA; + + /** 触发定义B值 */ + @Excel(name = "触发定义B值") + private String triggerDataB; + + /** 触发死区 */ + @Excel(name = "触发死区") + private String triggerDeadzone; + + /** 触发阈值次数 */ + @Excel(name = "触发阈值次数") + private Long triggerNumber; + + /** 时间范围(单位:分钟) */ + @Excel(name = "时间范围", readConverterExp = "单=位:分钟") + private Long triggerTimeFrame; + + /** 联动标识(1、是,0、否) */ + @Excel(name = "联动标识", readConverterExp = "1=、是,0、否") + private String linkFlag; + + /** 联动类型(1、控制,2、采集) */ + @Excel(name = "联动类型", readConverterExp = "1=、控制,2、采集") + private String linkType; + + /** 联动设备,关联表hw_device字段device_id */ + @Excel(name = "联动设备,关联表hw_device字段device_id") + private Long linkDeviceId; + + /** 联动设备功能,关联表hw_device_mode_function字段mode_function_id */ + @Excel(name = "联动设备功能,关联表hw_device_mode_function字段mode_function_id") + private Long linkDeviceFunctionId; + + /** 联动设备属性值 */ + @Excel(name = "联动设备属性值") + private String linkDeviceFunctionData; + + /** 报警启用状态(1、是,2、否) */ + @Excel(name = "报警启用状态(1、是,2、否)") + private String alarmRuleStatus; + + /** 报警推送标识(1、是,2、否) */ + @Excel(name = "报警推送标识(1、是,2、否)") + private String alarmPushFlag; + + /** 报警推送内容 */ + @Excel(name = "报警推送内容") + private String alarmPushContent; + + /** 恢复正常推送内容 */ + @Excel(name = "恢复正常推送内容") + private String alarmRecoverContent; + + /** 预留字段 */ + @Excel(name = "预留字段") + private String alarmRuleField; + + public void setAlarmRuleId(Long alarmRuleId) + { + this.alarmRuleId = alarmRuleId; + } + + public Long getAlarmRuleId() + { + return alarmRuleId; + } + public void setAlarmRuleName(String alarmRuleName) + { + this.alarmRuleName = alarmRuleName; + } + + public String getAlarmRuleName() + { + return alarmRuleName; + } + public void setTenantId(Long tenantId) + { + this.tenantId = tenantId; + } + + public Long getTenantId() + { + return tenantId; + } + public void setSceneId(Long sceneId) + { + this.sceneId = sceneId; + } + + public Long getSceneId() + { + return sceneId; + } + public void setAlarmLevelId(Long alarmLevelId) + { + this.alarmLevelId = alarmLevelId; + } + + public Long getAlarmLevelId() + { + return alarmLevelId; + } + public void setAlarmTypeId(Long alarmTypeId) + { + this.alarmTypeId = alarmTypeId; + } + + public Long getAlarmTypeId() + { + return alarmTypeId; + } + public void setRuleType(String ruleType) + { + this.ruleType = ruleType; + } + + public String getRuleType() + { + return ruleType; + } + public void setDeviceId(Long deviceId) + { + this.deviceId = deviceId; + } + + public Long getDeviceId() + { + return deviceId; + } + public void setDeviceModeId(Long deviceModeId) + { + this.deviceModeId = deviceModeId; + } + + public Long getDeviceModeId() + { + return deviceModeId; + } + public void setModeFunctionId(Long modeFunctionId) + { + this.modeFunctionId = modeFunctionId; + } + + public Long getModeFunctionId() + { + return modeFunctionId; + } + public void setTriggerCondition(String triggerCondition) + { + this.triggerCondition = triggerCondition; + } + + public String getTriggerCondition() + { + return triggerCondition; + } + public void setTriggerDataA(String triggerDataA) + { + this.triggerDataA = triggerDataA; + } + + public String getTriggerDataA() + { + return triggerDataA; + } + public void setTriggerDataB(String triggerDataB) + { + this.triggerDataB = triggerDataB; + } + + public String getTriggerDataB() + { + return triggerDataB; + } + public void setTriggerDeadzone(String triggerDeadzone) + { + this.triggerDeadzone = triggerDeadzone; + } + + public String getTriggerDeadzone() + { + return triggerDeadzone; + } + public void setTriggerNumber(Long triggerNumber) + { + this.triggerNumber = triggerNumber; + } + + public Long getTriggerNumber() + { + return triggerNumber; + } + public void setTriggerTimeFrame(Long triggerTimeFrame) + { + this.triggerTimeFrame = triggerTimeFrame; + } + + public Long getTriggerTimeFrame() + { + return triggerTimeFrame; + } + public void setLinkFlag(String linkFlag) + { + this.linkFlag = linkFlag; + } + + public String getLinkFlag() + { + return linkFlag; + } + public void setLinkType(String linkType) + { + this.linkType = linkType; + } + + public String getLinkType() + { + return linkType; + } + public void setLinkDeviceId(Long linkDeviceId) + { + this.linkDeviceId = linkDeviceId; + } + + public Long getLinkDeviceId() + { + return linkDeviceId; + } + public void setLinkDeviceFunctionId(Long linkDeviceFunctionId) + { + this.linkDeviceFunctionId = linkDeviceFunctionId; + } + + public Long getLinkDeviceFunctionId() + { + return linkDeviceFunctionId; + } + public void setLinkDeviceFunctionData(String linkDeviceFunctionData) + { + this.linkDeviceFunctionData = linkDeviceFunctionData; + } + + public String getLinkDeviceFunctionData() + { + return linkDeviceFunctionData; + } + public void setAlarmRuleStatus(String alarmRuleStatus) + { + this.alarmRuleStatus = alarmRuleStatus; + } + + public String getAlarmRuleStatus() + { + return alarmRuleStatus; + } + public void setAlarmPushFlag(String alarmPushFlag) + { + this.alarmPushFlag = alarmPushFlag; + } + + public String getAlarmPushFlag() + { + return alarmPushFlag; + } + public void setAlarmPushContent(String alarmPushContent) + { + this.alarmPushContent = alarmPushContent; + } + + public String getAlarmPushContent() + { + return alarmPushContent; + } + public void setAlarmRecoverContent(String alarmRecoverContent) + { + this.alarmRecoverContent = alarmRecoverContent; + } + + public String getAlarmRecoverContent() + { + return alarmRecoverContent; + } + public void setAlarmRuleField(String alarmRuleField) + { + this.alarmRuleField = alarmRuleField; + } + + public String getAlarmRuleField() + { + return alarmRuleField; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("alarmRuleId", getAlarmRuleId()) + .append("alarmRuleName", getAlarmRuleName()) + .append("tenantId", getTenantId()) + .append("sceneId", getSceneId()) + .append("alarmLevelId", getAlarmLevelId()) + .append("alarmTypeId", getAlarmTypeId()) + .append("ruleType", getRuleType()) + .append("deviceId", getDeviceId()) + .append("deviceModeId", getDeviceModeId()) + .append("modeFunctionId", getModeFunctionId()) + .append("triggerCondition", getTriggerCondition()) + .append("triggerDataA", getTriggerDataA()) + .append("triggerDataB", getTriggerDataB()) + .append("triggerDeadzone", getTriggerDeadzone()) + .append("triggerNumber", getTriggerNumber()) + .append("triggerTimeFrame", getTriggerTimeFrame()) + .append("linkFlag", getLinkFlag()) + .append("linkType", getLinkType()) + .append("linkDeviceId", getLinkDeviceId()) + .append("linkDeviceFunctionId", getLinkDeviceFunctionId()) + .append("linkDeviceFunctionData", getLinkDeviceFunctionData()) + .append("alarmRuleStatus", getAlarmRuleStatus()) + .append("alarmPushFlag", getAlarmPushFlag()) + .append("alarmPushContent", getAlarmPushContent()) + .append("alarmRecoverContent", getAlarmRecoverContent()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("alarmRuleField", getAlarmRuleField()) + .toString(); + } +} diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwAlarmRuleMapper.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwAlarmRuleMapper.java new file mode 100644 index 0000000..d805c36 --- /dev/null +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/mapper/HwAlarmRuleMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.business.mapper; + +import java.util.List; +import com.ruoyi.business.domain.HwAlarmRule; + +/** + * 报警规则Mapper接口 + * + * @author xins + * @date 2023-09-16 + */ +public interface HwAlarmRuleMapper +{ + /** + * 查询报警规则 + * + * @param alarmRuleId 报警规则主键 + * @return 报警规则 + */ + public HwAlarmRule selectHwAlarmRuleByAlarmRuleId(Long alarmRuleId); + + /** + * 查询报警规则列表 + * + * @param hwAlarmRule 报警规则 + * @return 报警规则集合 + */ + public List selectHwAlarmRuleList(HwAlarmRule hwAlarmRule); + + /** + * 新增报警规则 + * + * @param hwAlarmRule 报警规则 + * @return 结果 + */ + public int insertHwAlarmRule(HwAlarmRule hwAlarmRule); + + /** + * 修改报警规则 + * + * @param hwAlarmRule 报警规则 + * @return 结果 + */ + public int updateHwAlarmRule(HwAlarmRule hwAlarmRule); + + /** + * 删除报警规则 + * + * @param alarmRuleId 报警规则主键 + * @return 结果 + */ + public int deleteHwAlarmRuleByAlarmRuleId(Long alarmRuleId); + + /** + * 批量删除报警规则 + * + * @param alarmRuleIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteHwAlarmRuleByAlarmRuleIds(Long[] alarmRuleIds); +} diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwAlarmRuleService.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwAlarmRuleService.java new file mode 100644 index 0000000..73c42cc --- /dev/null +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwAlarmRuleService.java @@ -0,0 +1,61 @@ +package com.ruoyi.business.service; + +import java.util.List; +import com.ruoyi.business.domain.HwAlarmRule; + +/** + * 报警规则Service接口 + * + * @author xins + * @date 2023-09-16 + */ +public interface IHwAlarmRuleService +{ + /** + * 查询报警规则 + * + * @param alarmRuleId 报警规则主键 + * @return 报警规则 + */ + public HwAlarmRule selectHwAlarmRuleByAlarmRuleId(Long alarmRuleId); + + /** + * 查询报警规则列表 + * + * @param hwAlarmRule 报警规则 + * @return 报警规则集合 + */ + public List selectHwAlarmRuleList(HwAlarmRule hwAlarmRule); + + /** + * 新增报警规则 + * + * @param hwAlarmRule 报警规则 + * @return 结果 + */ + public int insertHwAlarmRule(HwAlarmRule hwAlarmRule); + + /** + * 修改报警规则 + * + * @param hwAlarmRule 报警规则 + * @return 结果 + */ + public int updateHwAlarmRule(HwAlarmRule hwAlarmRule); + + /** + * 批量删除报警规则 + * + * @param alarmRuleIds 需要删除的报警规则主键集合 + * @return 结果 + */ + public int deleteHwAlarmRuleByAlarmRuleIds(Long[] alarmRuleIds); + + /** + * 删除报警规则信息 + * + * @param alarmRuleId 报警规则主键 + * @return 结果 + */ + public int deleteHwAlarmRuleByAlarmRuleId(Long alarmRuleId); +} diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwSceneService.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwSceneService.java index f65da07..093021d 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwSceneService.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/IHwSceneService.java @@ -23,8 +23,6 @@ public interface IHwSceneService public List selectHwSceneBySceneModeId(Long sceneModeId); - //场景选择 - List selectHwSceneByTenantId(Long tenantId); /** * 查询场景信息列表 * diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwAlarmRuleServiceImpl.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwAlarmRuleServiceImpl.java new file mode 100644 index 0000000..bdf057d --- /dev/null +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwAlarmRuleServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.business.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.business.mapper.HwAlarmRuleMapper; +import com.ruoyi.business.domain.HwAlarmRule; +import com.ruoyi.business.service.IHwAlarmRuleService; + +/** + * 报警规则Service业务层处理 + * + * @author xins + * @date 2023-09-16 + */ +@Service +public class HwAlarmRuleServiceImpl implements IHwAlarmRuleService +{ + @Autowired + private HwAlarmRuleMapper hwAlarmRuleMapper; + + /** + * 查询报警规则 + * + * @param alarmRuleId 报警规则主键 + * @return 报警规则 + */ + @Override + public HwAlarmRule selectHwAlarmRuleByAlarmRuleId(Long alarmRuleId) + { + return hwAlarmRuleMapper.selectHwAlarmRuleByAlarmRuleId(alarmRuleId); + } + + /** + * 查询报警规则列表 + * + * @param hwAlarmRule 报警规则 + * @return 报警规则 + */ + @Override + public List selectHwAlarmRuleList(HwAlarmRule hwAlarmRule) + { + return hwAlarmRuleMapper.selectHwAlarmRuleList(hwAlarmRule); + } + + /** + * 新增报警规则 + * + * @param hwAlarmRule 报警规则 + * @return 结果 + */ + @Override + public int insertHwAlarmRule(HwAlarmRule hwAlarmRule) + { + hwAlarmRule.setCreateTime(DateUtils.getNowDate()); + return hwAlarmRuleMapper.insertHwAlarmRule(hwAlarmRule); + } + + /** + * 修改报警规则 + * + * @param hwAlarmRule 报警规则 + * @return 结果 + */ + @Override + public int updateHwAlarmRule(HwAlarmRule hwAlarmRule) + { + hwAlarmRule.setUpdateTime(DateUtils.getNowDate()); + return hwAlarmRuleMapper.updateHwAlarmRule(hwAlarmRule); + } + + /** + * 批量删除报警规则 + * + * @param alarmRuleIds 需要删除的报警规则主键 + * @return 结果 + */ + @Override + public int deleteHwAlarmRuleByAlarmRuleIds(Long[] alarmRuleIds) + { + return hwAlarmRuleMapper.deleteHwAlarmRuleByAlarmRuleIds(alarmRuleIds); + } + + /** + * 删除报警规则信息 + * + * @param alarmRuleId 报警规则主键 + * @return 结果 + */ + @Override + public int deleteHwAlarmRuleByAlarmRuleId(Long alarmRuleId) + { + return hwAlarmRuleMapper.deleteHwAlarmRuleByAlarmRuleId(alarmRuleId); + } +} diff --git a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwSceneServiceImpl.java b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwSceneServiceImpl.java index 28881c2..491dcbb 100644 --- a/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwSceneServiceImpl.java +++ b/ruoyi-modules/hw-business/src/main/java/com/ruoyi/business/service/impl/HwSceneServiceImpl.java @@ -7,6 +7,7 @@ import java.util.List; import com.ruoyi.business.domain.HwSceneMode; import com.ruoyi.business.domain.VO.HwSceneVo; +import com.ruoyi.common.core.constant.HwDictConstants; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.utils.SecurityUtils; @@ -26,8 +27,7 @@ import com.ruoyi.business.service.IHwSceneService; * @date 2023-08-23 */ @Service -public class HwSceneServiceImpl implements IHwSceneService -{ +public class HwSceneServiceImpl implements IHwSceneService { @Autowired private HwSceneMapper hwSceneMapper; @Autowired @@ -41,8 +41,7 @@ public class HwSceneServiceImpl implements IHwSceneService * @return 场景信息 */ @Override - public HwScene selectHwSceneBySceneId(Long sceneId) - { + public HwScene selectHwSceneBySceneId(Long sceneId) { return hwSceneMapper.selectHwSceneBySceneId(sceneId); } @@ -53,17 +52,6 @@ public class HwSceneServiceImpl implements IHwSceneService return hwScenes; } - @Override - public List selectHwSceneByTenantId(Long tenantId) { - if (tenantId == 0){ - return hwSceneMapper.selectHwSceneByTenantId0(tenantId); - } - else - return hwSceneMapper.selectHwSceneByTenantIdNot0(tenantId); - - } - - /** * 查询场景信息列表 * @@ -71,9 +59,26 @@ public class HwSceneServiceImpl implements IHwSceneService * @return 场景信息 */ @Override - public List selectHwSceneList(HwScene hwScene) - { - return hwSceneMapper.selectHwSceneList(hwScene); + public List selectHwSceneList(HwScene hwScene) { +// LoginUser loginUser = SecurityUtils.getLoginUser(); +// SysUser sysUser = loginUser.getSysUser(); +// Long tenantId = sysUser.getTenantId(); + Long tenantId = 1L; + if (tenantId != 0L) {//如果不是金瑞铭,则只能返回租户自己的场景 + hwScene.setTenantId(tenantId); + } + List scenes = hwSceneMapper.selectHwSceneList(hwScene); + boolean defaultFlag = false; + for (HwScene scene : scenes) { + if (defaultFlag) { + scene.setDefaultFlag(HwDictConstants.DEVICE_DEFAULT_FLAG_NO); + } else { + if (scene.getDefaultFlag().equalsIgnoreCase(HwDictConstants.DEVICE_DEFAULT_FLAG_YES)) { + defaultFlag = true; + } + } + } + return scenes; } @Override @@ -89,10 +94,9 @@ public class HwSceneServiceImpl implements IHwSceneService * @return 结果 */ @Override - public int insertHwScene(HwScene hwScene) - { - if(hwScene.getDefaultFlag() == "1"){ - hwSceneMapper.updateDefaultFlag(hwScene.getTenantId()); + public int insertHwScene(HwScene hwScene) { + if (hwScene.getDefaultFlag() == "1") { + hwSceneMapper.updateDefaultFlag(hwScene.getTenantId()); } hwScene.setDefaultFlag("1"); LoginUser loginUser = SecurityUtils.getLoginUser(); @@ -102,20 +106,20 @@ public class HwSceneServiceImpl implements IHwSceneService hwScene.setSceneId(lon); hwScene.setCreateBy(sysUser.getNickName()); - if (hwScene.getPreserveTime()==null){ + if (hwScene.getPreserveTime() == null) { hwScene.setPreserveTime(new BigDecimal(90)); } - if (hwScene.getTestPreserveTime()==null){ + if (hwScene.getTestPreserveTime() == null) { hwScene.setTestPreserveTime(new BigDecimal(30)); } String randomKey = RandomStringUtils.random(12, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789"); - String randomSecret = RandomStringUtils.random(16,"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789"); + String randomSecret = RandomStringUtils.random(16, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789"); hwScene.setModeKey(randomKey); hwScene.setModeSecret(randomSecret); hwScene.setCreateTime(DateUtils.getNowDate()); List list = new ArrayList(); list.add(hwScene); - redisService.setCacheList(hwScene.getSceneId()+"",list); + redisService.setCacheList(hwScene.getSceneId() + "", list); return hwSceneMapper.insertHwScene(hwScene); } @@ -127,16 +131,15 @@ public class HwSceneServiceImpl implements IHwSceneService * @return 结果 */ @Override - public int updateHwScene(HwScene hwScene) - { - if(hwScene.getDefaultFlag() == "1"){ + public int updateHwScene(HwScene hwScene) { + if (hwScene.getDefaultFlag() == "1") { hwSceneMapper.updateDefaultFlag(hwScene.getTenantId()); } hwScene.setDefaultFlag("1"); hwScene.setUpdateTime(DateUtils.getNowDate()); List list = new ArrayList(); list.add(hwScene); - redisService.setCacheList(hwScene.getSceneId()+"",list); + redisService.setCacheList(hwScene.getSceneId() + "", list); return hwSceneMapper.updateHwScene(hwScene); } @@ -147,13 +150,12 @@ public class HwSceneServiceImpl implements IHwSceneService * @return 结果 */ @Override - public int deleteHwSceneBySceneIds(Long[] sceneIds) - { + public int deleteHwSceneBySceneIds(Long[] sceneIds) { List list = new ArrayList<>(); - for (int i = 0; i < sceneIds.length;i++){ + for (int i = 0; i < sceneIds.length; i++) { list.add(sceneIds[i]); } - redisService.deleteObject(sceneIds+""); + redisService.deleteObject(sceneIds + ""); return hwSceneMapper.deleteHwSceneBySceneIds(sceneIds); } @@ -164,9 +166,8 @@ public class HwSceneServiceImpl implements IHwSceneService * @return 结果 */ @Override - public int deleteHwSceneBySceneId(Long sceneId) - { - redisService.deleteObject(sceneId+""); + public int deleteHwSceneBySceneId(Long sceneId) { + redisService.deleteObject(sceneId + ""); return hwSceneMapper.deleteHwSceneBySceneId(sceneId); } } diff --git a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwAlarmRuleMapper.xml b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwAlarmRuleMapper.xml new file mode 100644 index 0000000..5982648 --- /dev/null +++ b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwAlarmRuleMapper.xml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select alarm_rule_id, alarm_rule_name, tenant_id, scene_id, alarm_level_id, alarm_type_id, rule_type, device_id, device_mode_id, mode_function_id, trigger_condition, trigger_data_a, trigger_data_b, trigger_deadzone, trigger_number, trigger_time_frame, link_flag, link_type, link_device_id, link_device_function_id, link_device_function_data, alarm_rule_status, alarm_push_flag, alarm_push_content, alarm_recover_content, remark, create_by, create_time, update_by, update_time, alarm_rule_field from hw_alarm_rule + + + + + + + + insert into hw_alarm_rule + + alarm_rule_name, + tenant_id, + scene_id, + alarm_level_id, + alarm_type_id, + rule_type, + device_id, + device_mode_id, + mode_function_id, + trigger_condition, + trigger_data_a, + trigger_data_b, + trigger_deadzone, + trigger_number, + trigger_time_frame, + link_flag, + link_type, + link_device_id, + link_device_function_id, + link_device_function_data, + alarm_rule_status, + alarm_push_flag, + alarm_push_content, + alarm_recover_content, + remark, + create_by, + create_time, + update_by, + update_time, + alarm_rule_field, + + + #{alarmRuleName}, + #{tenantId}, + #{sceneId}, + #{alarmLevelId}, + #{alarmTypeId}, + #{ruleType}, + #{deviceId}, + #{deviceModeId}, + #{modeFunctionId}, + #{triggerCondition}, + #{triggerDataA}, + #{triggerDataB}, + #{triggerDeadzone}, + #{triggerNumber}, + #{triggerTimeFrame}, + #{linkFlag}, + #{linkType}, + #{linkDeviceId}, + #{linkDeviceFunctionId}, + #{linkDeviceFunctionData}, + #{alarmRuleStatus}, + #{alarmPushFlag}, + #{alarmPushContent}, + #{alarmRecoverContent}, + #{remark}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{alarmRuleField}, + + + + + update hw_alarm_rule + + alarm_rule_name = #{alarmRuleName}, + tenant_id = #{tenantId}, + scene_id = #{sceneId}, + alarm_level_id = #{alarmLevelId}, + alarm_type_id = #{alarmTypeId}, + rule_type = #{ruleType}, + device_id = #{deviceId}, + device_mode_id = #{deviceModeId}, + mode_function_id = #{modeFunctionId}, + trigger_condition = #{triggerCondition}, + trigger_data_a = #{triggerDataA}, + trigger_data_b = #{triggerDataB}, + trigger_deadzone = #{triggerDeadzone}, + trigger_number = #{triggerNumber}, + trigger_time_frame = #{triggerTimeFrame}, + link_flag = #{linkFlag}, + link_type = #{linkType}, + link_device_id = #{linkDeviceId}, + link_device_function_id = #{linkDeviceFunctionId}, + link_device_function_data = #{linkDeviceFunctionData}, + alarm_rule_status = #{alarmRuleStatus}, + alarm_push_flag = #{alarmPushFlag}, + alarm_push_content = #{alarmPushContent}, + alarm_recover_content = #{alarmRecoverContent}, + remark = #{remark}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + alarm_rule_field = #{alarmRuleField}, + + where alarm_rule_id = #{alarmRuleId} + + + + delete from hw_alarm_rule where alarm_rule_id = #{alarmRuleId} + + + + delete from hw_alarm_rule where alarm_rule_id in + + #{alarmRuleId} + + + \ No newline at end of file diff --git a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwSceneMapper.xml b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwSceneMapper.xml index 42593fa..4e42444 100644 --- a/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwSceneMapper.xml +++ b/ruoyi-modules/hw-business/src/main/resources/mapper/business/HwSceneMapper.xml @@ -88,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and scene_environment = #{sceneEnvironment} and scene_field = #{sceneField} + order by scene_id desc