From f9abb9474b09cf37ac4bbd6a65ea6229ebc06214 Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Thu, 10 May 2018 14:20:43 +0800 Subject: [PATCH] 报警阀值 获取 --- src/main/resources/mapper/AlarmConfigMapper.xml | 9 ++++++++- src/main/resources/mapper/DeviceMapper.xml | 6 +++--- src/main/java/com/moral/service/AlarmConfigService.java | 2 ++ src/main/java/com/moral/service/impl/OperateUserServiceImpl.java | 9 +++++---- src/main/java/com/moral/controller/ScreenController.java | 24 +++++++++++++++++++++++- 5 files changed, 41 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index 3f7967d..4c54351 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -504,9 +504,31 @@ @GetMapping("getalevels") public ResultBean<Map<String,AlarmSensorLevel>> getAlarmLevelByMonitorPointId(int mpid){ AlarmConfig alarmConfig = alarmConfigService.queryByMonitorPointId(mpid).get(); + Map<String,AlarmSensorLevel> alarmSensorLevelMap = alarmConfig.getValue().getAlarmLevels(); + // ������������������������������������������������������ + if(alarmConfig.getId()!=null){ + AlarmConfigValue defaultAlarmValue = alarmConfigService.getDefaultAlarmConfigValue(); + Map<String,AlarmSensorLevel> defaultSensorLevelMap = defaultAlarmValue.getAlarmLevels(); + Map<String,AlarmSensorLevel> alarmSensorLevelMapNotZO = alarmSensorLevelMap.entrySet().stream().collect( + HashMap::new, + (map,entry) -> { + AlarmSensorLevel alarmSensorLevel = entry.getValue(); + if(alarmSensorLevel.isEnable()||alarmSensorLevel.isDegressEnable()){ + map.put(entry.getKey(),entry.getValue()); + } + }, + (oMap,nMap) -> { + oMap.putAll(nMap); + } + ); + // ������������������������������������ + defaultSensorLevelMap.putAll(alarmSensorLevelMapNotZO); + alarmSensorLevelMap = defaultSensorLevelMap; + } + ResultBean<Map<String,AlarmSensorLevel>> resultBean = new ResultBean(); resultBean.setCode(ResultBean.SUCCESS); - resultBean.setData(alarmConfig.getValue().getAlarmLevels()); + resultBean.setData(alarmSensorLevelMap); return resultBean; } } diff --git a/src/main/java/com/moral/service/AlarmConfigService.java b/src/main/java/com/moral/service/AlarmConfigService.java index edb5503..deab064 100644 --- a/src/main/java/com/moral/service/AlarmConfigService.java +++ b/src/main/java/com/moral/service/AlarmConfigService.java @@ -9,5 +9,7 @@ public Optional<AlarmConfigValue> queryValueByOrganizationId(int organizationId); public Optional<AlarmConfig> queryByOrganizationId(int organizationId); public Optional<AlarmConfig> queryByMonitorPointId(int mpId); + public AlarmConfigValue getDefaultAlarmConfigValue(); void addOrModify(AlarmConfig alarmConfig); + } diff --git a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java index 7fa8a29..81ebdcf 100644 --- a/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java +++ b/src/main/java/com/moral/service/impl/OperateUserServiceImpl.java @@ -6,7 +6,7 @@ import javax.annotation.Resource; -import com.moral.common.util.MyBatisBaseMapUtil; +import com.moral.common.util.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; @@ -15,9 +15,6 @@ import com.moral.common.bean.Constants; import com.moral.common.bean.PageBean; import com.moral.common.exception.BusinessException; -import com.moral.common.util.Crypto; -import com.moral.common.util.ResourceUtil; -import com.moral.common.util.ValidateUtil; import com.moral.entity.OperateUser; import com.moral.mapper.OperateUserMapper; import com.moral.service.OperateUserService; @@ -106,6 +103,10 @@ operateUser.setPassword(Crypto.md5(ResourceUtil.getValue("password"))); return operateUserMapper.insertSelective(operateUser); }else { + if(!StringUtils.isNullOrEmpty(operateUser.getPassword())){ + // ������������ + operateUser.setPassword(Crypto.md5(operateUser.getPassword())); + } return operateUserMapper.updateByPrimaryKeySelective(operateUser); } } diff --git a/src/main/resources/mapper/AlarmConfigMapper.xml b/src/main/resources/mapper/AlarmConfigMapper.xml index 9d0bbd4..32e25ad 100644 --- a/src/main/resources/mapper/AlarmConfigMapper.xml +++ b/src/main/resources/mapper/AlarmConfigMapper.xml @@ -12,7 +12,7 @@ id, organization_id, value, create_time, update_time </sql> <select id="selectByOrganizationId" parameterType="java.lang.Integer" resultMap="BaseResultMap"> - select + select <include refid="Base_Column_List" /> from alarm_config where organization_id = #{organizationId,jdbcType=INTEGER} @@ -97,4 +97,11 @@ update_time = #{updateTime,jdbcType=TIMESTAMP} where id = #{id,jdbcType=INTEGER} </update> + <select id="selectByMonitorPointId" parameterType="java.lang.Integer" resultMap="BaseResultMap"> + select + acg.* + from alarm_config acg + LEFT JOIN monitor_point mpt on acg.organization_id = mpt.organization_id + where mpt.id = #{mpId,jdbcType=INTEGER} + </select> </mapper> \ No newline at end of file diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml index 3fb35f3..795e325 100644 --- a/src/main/resources/mapper/DeviceMapper.xml +++ b/src/main/resources/mapper/DeviceMapper.xml @@ -131,7 +131,7 @@ ORDER BY s.id </select> - <select id="getDeviceVersionIdByMonitorPoint" resultType="map"> + <select id="getDeviceVersionIdByMonitorPoint" resultType="java.util.Map"> SELECT device_version_id deviceVersionId FROM @@ -141,7 +141,7 @@ GROUP BY device_version_id </select> - <select id="getDeviceVersionIdByAreaCode" resultType="int"> + <select id="getDeviceVersionIdByAreaCode" resultType="java.lang.Integer"> SELECT DISTINCT d.device_version_id FROM @@ -157,7 +157,7 @@ </foreach> </if> </select> - <select id="getDeviceMacByMonitorPointAndDeviceVersion" resultType="string"> + <select id="getDeviceMacByMonitorPointAndDeviceVersion" resultType="java.lang.String"> SELECT mac FROM -- Gitblit v1.8.0