Commit ed28b05c authored by jichao's avatar jichao

返回设备开关状态的参数code

parent 6f661c44
......@@ -4,6 +4,7 @@ package org.rcisoft.business.mainte.adaptive.proenum;
* Created by JiChao on 2018/4/28.
*/
public enum ProEnum {
FLA, //电流百分比:判断设备是否开启的参数
sensor, //传感器
gswd, //供水温度
hswd, //回水温度
......
......@@ -20,7 +20,7 @@ public interface DeviceParamRepository {
* @param devNum
* @return
*/
@Select("<script>select d.PARAM,p.PARAM_NM,p.P_SOURCE,p.P_MIN,p.P_MAX,p.SYMBOL,p.FLAG,p.PARAM_UNIT " +
@Select("<script>select d.PARAM,p.PARAM_NM,p.P_SOURCE,p.P_MIN,p.P_MAX,p.SYMBOL,p.FLAG,p.PARAM_UNIT,d.PARAM_CODE " +
"from bus_device_param d,bus_devicetp_param p " +
"where d.PARAM_CODE=p.PARAM_CODE and d.DEV_NUM=#{devNum}</script>")
@ResultMap("BaseResultMap")
......
......@@ -24,5 +24,6 @@ public class DeviceParam {
private String symbol;
private String flag;
private String paramUnit;
private String paramCode;
}
......@@ -5,6 +5,7 @@ import org.rcisoft.business.system.entity.DeviceParam;
import org.rcisoft.business.system.vo.ClimateStatistics;
import java.util.List;
import java.util.Map;
/**
* Created by JiChao on 2018/5/2.
......@@ -44,7 +45,7 @@ public interface SystemService {
* @param devNum
* @return
*/
List<DeviceParam> selectDeviceParamList(String devNum);
Map<String, Object> selectDeviceParamList(String devNum);
/**
* 查询传感器code
......
......@@ -26,9 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Calendar;
import java.util.List;
import java.util.*;
/**
* Created by JiChao on 2018/5/2.
......@@ -146,8 +144,17 @@ public class SystemServiceImpl implements SystemService {
}
@Override
public List<DeviceParam> selectDeviceParamList(String devNum) {
return deviceParamRepository.selectDeviceParamList(devNum);
public Map<String, Object> selectDeviceParamList(String devNum) {
List<DeviceParam> list = deviceParamRepository.selectDeviceParamList(devNum);
String param = "";
for (DeviceParam deviceParam : list) {
if (StringUtils.equals(deviceParam.getParamCode(), ProEnum.FLA.toString()))
param = deviceParam.getParam();
}
Map<String, Object> result = new HashMap<>();
result.put("data", list);
result.put("param", param);
return result;
}
@Override
......
......@@ -10,6 +10,7 @@
<result column="SYMBOL" jdbcType="VARCHAR" property="symbol"/>
<result column="FLAG" jdbcType="VARCHAR" property="flag"/>
<result column="PARAM_UNIT" jdbcType="VARCHAR" property="paramUnit"/>
<result column="PARAM_CODE" jdbcType="VARCHAR" property="paramCode"/>
</resultMap>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment