|
@ -2,13 +2,34 @@ package com.yihu.jw.hospital.module.health.service;
|
|
|
|
|
|
import com.yihu.jw.device.dao.DeviceCategoryDao;
|
|
|
import com.yihu.jw.device.dao.DeviceDao;
|
|
|
import com.yihu.jw.device.dao.DeviceDetailDao;
|
|
|
import com.yihu.jw.device.dao.PatientDeviceDao;
|
|
|
import com.yihu.jw.entity.base.device.PatientHealthStandard;
|
|
|
import com.yihu.jw.entity.care.device.Device;
|
|
|
import com.yihu.jw.entity.care.device.DeviceCategory;
|
|
|
import com.yihu.jw.entity.care.device.DeviceDetail;
|
|
|
import com.yihu.jw.hospital.utils.ExcelData;
|
|
|
import com.yihu.jw.hospital.utils.QrcodeUtil;
|
|
|
import com.yihu.jw.hospital.utils.ReadExcelUtil;
|
|
|
import com.yihu.jw.restmodel.iot.device.DeviceHealthIndexVO;
|
|
|
import com.yihu.jw.restmodel.iot.device.WlyyPatientDeviceVO;
|
|
|
import com.yihu.jw.restmodel.web.PageEnvelop;
|
|
|
import com.yihu.jw.util.date.DateTimeUtil;
|
|
|
import com.yihu.jw.util.date.DateUtil;
|
|
|
import jxl.Sheet;
|
|
|
import jxl.Workbook;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.json.JSONObject;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.jpa.domain.Specification;
|
|
|
import org.springframework.jdbc.core.BeanPropertyRowMapper;
|
|
|
import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springside.modules.persistence.DynamicSpecifications;
|
|
|
import org.springside.modules.persistence.SearchFilter;
|
|
|
|
|
|
import java.util.List;
|
|
|
import java.util.*;
|
|
|
|
|
|
/**
|
|
|
* 设备管理
|
|
@ -17,13 +38,441 @@ import java.util.List;
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public class DeviceService {
|
|
|
|
|
|
// 血糖餐前最小值
|
|
|
public static final double HEALTH_STANDARD_ST_MIN_BEFORE = 4;//3.9
|
|
|
// 血糖餐前最大值
|
|
|
public static final double HEALTH_STANDARD_ST_MAX_BEFORE = 7;//6.1
|
|
|
// 血糖餐后最小值
|
|
|
public static final double HEALTH_STANDARD_ST_MIN_AFTER = 4;//4.4
|
|
|
// 血糖餐后最大值
|
|
|
public static final double HEALTH_STANDARD_ST_MAX_AFTER = 11.1;//7.8
|
|
|
|
|
|
// 舒张压最小值
|
|
|
public static final double HEALTH_STANDARD_SZY_MIN = 60;//60
|
|
|
// 舒张压最大值
|
|
|
public static final double HEALTH_STANDARD_SZY_MAX = 90;//89
|
|
|
// 收缩压最小值
|
|
|
public static final double HEALTH_STANDARD_SSY_MIN = 90;//90
|
|
|
// 收缩压最大值
|
|
|
public static final double HEALTH_STANDARD_SSY_MAX = 140;//139
|
|
|
|
|
|
@Autowired
|
|
|
private DeviceCategoryDao deviceCategoryDao;
|
|
|
|
|
|
@Autowired
|
|
|
private DeviceDao deviceDao;
|
|
|
@Autowired
|
|
|
private JdbcTemplate jdbcTemplate;
|
|
|
@Autowired
|
|
|
private PatientDeviceDao wlyyPatientDeviceDao;
|
|
|
@Autowired
|
|
|
private DeviceDetailDao deviceDetailDao;
|
|
|
@Autowired
|
|
|
private QrcodeUtil qrcodeUtil;
|
|
|
|
|
|
public boolean importData(Workbook workbook) {
|
|
|
Sheet[] sheets = workbook.getSheets();
|
|
|
Sheet sheet = sheets[0];
|
|
|
int rows = ReadExcelUtil.getRightRows(sheet);
|
|
|
|
|
|
List<DeviceDetail> deviceList = new ArrayList<>();
|
|
|
for (int row = 1; row < rows; row++) { //索引从0开始,第一行为标题
|
|
|
DeviceDetail device = new DeviceDetail();
|
|
|
Map<Integer, ExcelData> mapping = mappingDevice(device);
|
|
|
int finalRow = row;
|
|
|
mapping.forEach((index, excelData) -> {
|
|
|
String value = sheet.getCell(index, finalRow).getContents().trim();
|
|
|
excelData.transform(value);
|
|
|
});
|
|
|
device.setIsGrant(0);
|
|
|
device.setIsBinding(0);
|
|
|
//判断设备是否导入
|
|
|
List<DeviceDetail> wlyyDevice = deviceDetailDao.findByDeviceCode(device.getDeviceCode());
|
|
|
if(wlyyDevice.size()>0) {
|
|
|
device.setId(wlyyDevice.get(0).getId());
|
|
|
}
|
|
|
qrcodeUtil.makeDeviceXcxQrcode(device,null,false);
|
|
|
deviceList.add(device);
|
|
|
}
|
|
|
deviceDetailDao.saveAll(deviceList);
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
private Map<Integer, ExcelData> mappingDevice(DeviceDetail device) {
|
|
|
Map<Integer, ExcelData> dataMap = new HashMap<>();
|
|
|
//设备名称
|
|
|
dataMap.put(0, new ExcelData() {
|
|
|
@Override
|
|
|
public void transform(String data) {
|
|
|
device.setDeviceName(data);
|
|
|
}
|
|
|
});
|
|
|
//设备型号
|
|
|
dataMap.put(1, new ExcelData() {
|
|
|
@Override
|
|
|
public void transform(String data) {
|
|
|
device.setDeviceModel(data);
|
|
|
Device dmDevice = deviceDao.findByModel(device.getDeviceModel());
|
|
|
if(dmDevice != null) {
|
|
|
if(dmDevice.getIsMultiUser().equals("1")) {
|
|
|
device.setBindingCount("{\"1\":\"0\", \"2\":\"0\"}");
|
|
|
}else if(dmDevice.getIsMultiUser().equals("0")) {
|
|
|
device.setBindingCount("{\"1\":\"0\"}");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
//设备唯一标识 sn
|
|
|
dataMap.put(2, new ExcelData() {
|
|
|
@Override
|
|
|
public void transform(String data) {
|
|
|
device.setDeviceCode(data);
|
|
|
}
|
|
|
});
|
|
|
//SIM卡号
|
|
|
dataMap.put(3, new ExcelData() {
|
|
|
@Override
|
|
|
public void transform(String data) {
|
|
|
device.setSim(data);
|
|
|
}
|
|
|
});
|
|
|
//厂商名称
|
|
|
dataMap.put(4, new ExcelData() {
|
|
|
@Override
|
|
|
public void transform(String data) {
|
|
|
device.setManufacturer(data);
|
|
|
}
|
|
|
});
|
|
|
//厂商地址
|
|
|
dataMap.put(5, new ExcelData() {
|
|
|
@Override
|
|
|
public void transform(String data) {
|
|
|
device.setAddress(data);
|
|
|
}
|
|
|
});
|
|
|
//法人代表
|
|
|
dataMap.put(6, new ExcelData() {
|
|
|
@Override
|
|
|
public void transform(String data) {
|
|
|
device.setRepresentative(data);
|
|
|
}
|
|
|
});
|
|
|
//联系人
|
|
|
dataMap.put(7, new ExcelData() {
|
|
|
@Override
|
|
|
public void transform(String data) {
|
|
|
device.setLinkman(data);
|
|
|
}
|
|
|
});
|
|
|
//联系电话
|
|
|
dataMap.put(8, new ExcelData() {
|
|
|
@Override
|
|
|
public void transform(String data) {
|
|
|
device.setTel(data);
|
|
|
}
|
|
|
});
|
|
|
|
|
|
return dataMap;
|
|
|
}
|
|
|
|
|
|
public List<DeviceDetail> exporthDeviceList(String deviceName, String deviceCode, String linkman){
|
|
|
|
|
|
Map<String,SearchFilter> filter = new HashMap<>();
|
|
|
|
|
|
if(!StringUtils.isEmpty(deviceCode)){
|
|
|
filter.put("deviceCode",new SearchFilter("deviceCode",SearchFilter.Operator.LIKE,deviceCode));
|
|
|
}
|
|
|
if(!StringUtils.isEmpty(deviceName)){
|
|
|
filter.put("deviceName",new SearchFilter("deviceName",SearchFilter.Operator.LIKE,deviceName));
|
|
|
}
|
|
|
if(!StringUtils.isEmpty(linkman)){
|
|
|
filter.put("linkman",new SearchFilter("linkman",SearchFilter.Operator.LIKE,linkman));
|
|
|
}
|
|
|
Specification<DeviceDetail> spec = DynamicSpecifications.bySearchFilter(filter.values(), DeviceDetail.class);
|
|
|
return deviceDetailDao.findAll(spec);
|
|
|
}
|
|
|
|
|
|
public PageEnvelop searchDeviceList(String deviceName,String deviceCode,String linkman,Integer page,Integer pageSize){
|
|
|
if(page == null){
|
|
|
page = 1;
|
|
|
}
|
|
|
if(pageSize == null){
|
|
|
pageSize = 15;
|
|
|
}
|
|
|
String sql = "select * ";
|
|
|
String countSql = "select count(*) ";
|
|
|
String filter = "from wlyy_devices where 1=1 ";
|
|
|
if(StringUtils.isNotBlank(deviceCode)){
|
|
|
filter += " and device_code like '%"+deviceCode+"%'";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(deviceName)){
|
|
|
filter += " and device_name like '%"+deviceName+"%'";
|
|
|
}
|
|
|
if(StringUtils.isNotBlank(linkman)){
|
|
|
filter += " and linkman like '%"+linkman+"%'";
|
|
|
}
|
|
|
String orderBy = " limit "+(page-1)*pageSize+","+pageSize;
|
|
|
List<DeviceDetail> list = jdbcTemplate.query(sql+filter+orderBy,new BeanPropertyRowMapper<>(DeviceDetail.class));
|
|
|
Long count = jdbcTemplate.queryForObject(countSql+filter,Long.class);
|
|
|
return PageEnvelop.getSuccessListWithPage("查询成功",list,page,pageSize,count);
|
|
|
}
|
|
|
|
|
|
@Transactional
|
|
|
public DeviceDetail createDevice(DeviceDetail device){
|
|
|
device.setApplyDate(DateUtil.getStringDate());
|
|
|
// String manufacturerCode = deviceManufacturerDao.getManufacturerCodeByCode(device.getManufacturerId());
|
|
|
// device.setManufacturerCode(manufacturerCode);
|
|
|
//根据型号设置绑定次数形式
|
|
|
if(device.getDeviceModel() != null) {
|
|
|
Device dmDevice = deviceDao.findByModel(device.getDeviceModel());
|
|
|
if(dmDevice == null) {
|
|
|
if(device.getDeviceName().contains("血糖")) {
|
|
|
device.setBindingCount("{\"1\":\"0\"}");
|
|
|
}else if(device.getDeviceName().contains("血压")) {
|
|
|
device.setBindingCount("{\"1\":\"0\", \"2\":\"0\"}");
|
|
|
}
|
|
|
}else {
|
|
|
if(dmDevice.getIsMultiUser().equals("1")) {
|
|
|
device.setBindingCount("{\"1\":\"0\", \"2\":\"0\"}");
|
|
|
}else if(dmDevice.getIsMultiUser().equals("0")) {
|
|
|
device.setBindingCount("{\"1\":\"0\"}");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
qrcodeUtil.makeDeviceXcxQrcode(device,null,false);
|
|
|
device.setIsGrant(0);
|
|
|
device.setIsBinding(0);
|
|
|
DeviceDetail deviceNew = deviceDetailDao.save(device);
|
|
|
return deviceNew;
|
|
|
}
|
|
|
|
|
|
@Transactional
|
|
|
public DeviceDetail updateDevice(DeviceDetail device){
|
|
|
DeviceDetail deviceNew = deviceDetailDao.findById(device.getId()).orElse(null);
|
|
|
if(deviceNew == null){
|
|
|
return null;
|
|
|
}
|
|
|
// deviceNew.setManufacturerCode(manufacturerCode);
|
|
|
deviceNew.setOrgName(device.getOrgName());
|
|
|
deviceNew.setLinkman(device.getLinkman());
|
|
|
deviceNew.setTel(device.getTel());
|
|
|
deviceNew.setServerIp(device.getServerIp());
|
|
|
deviceNew.setDeviceName(device.getDeviceName());
|
|
|
deviceNew.setDeviceModel(device.getDeviceModel());
|
|
|
deviceNew.setDeviceCode(device.getDeviceCode());
|
|
|
deviceNew.setManufacturerId(device.getManufacturerId());
|
|
|
deviceNew.setManufacturer(device.getManufacturer());
|
|
|
deviceNew.setAddress(device.getAddress());
|
|
|
deviceNew.setRepresentative(device.getRepresentative());
|
|
|
deviceNew.setApplicantName(device.getApplicantName());
|
|
|
deviceNew.setApplicantIdentity(device.getApplicantIdentity());
|
|
|
deviceNew.setApplicantTel(device.getApplicantTel());
|
|
|
deviceNew.setApplicantMail(device.getApplicantMail());
|
|
|
deviceNew.setSim(device.getSim());
|
|
|
return deviceDetailDao.save(deviceNew);
|
|
|
}
|
|
|
|
|
|
@Transactional
|
|
|
public boolean deleteDevice(Long id){
|
|
|
deviceDetailDao.deleteById(id);
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
public boolean existDeviceCode(String deviceCode){
|
|
|
List<DeviceDetail> device = deviceDetailDao.findByDeviceCode(deviceCode);
|
|
|
return device.size()>0;
|
|
|
}
|
|
|
|
|
|
/*=
|
|
|
* 根据社区或者医生名称查找居民设备绑定详情
|
|
|
*/
|
|
|
public List<WlyyPatientDeviceVO> patientDeviceList(String deviceName,
|
|
|
String categoryCode,
|
|
|
String deviceSn,
|
|
|
String userName,
|
|
|
Integer page, Integer pageSize) {
|
|
|
List<WlyyPatientDeviceVO> list = new ArrayList<>();
|
|
|
String sql = "SELECT d.id as id,d.device_id as deviceId,d.user as user,p.name as userName,d.category_code as categoryCode,d.device_name as deviceName," +
|
|
|
"d.device_sn as deviceSn,d.sim as sim,d.user_type as userType,p.mobile," +
|
|
|
"CONCAT(LEFT (p.idcard,6),'**********',RIGHT (p.idcard,2)) userIdcard,d.czrq as czrq " +
|
|
|
"FROM wlyy_patient_device d,base_patient p " +
|
|
|
"WHERE d.`user`=p.id ";
|
|
|
if(StringUtils.isNotBlank(userName)){
|
|
|
sql = sql + "AND p.name like '%"+userName+"%' ";
|
|
|
}
|
|
|
|
|
|
if(StringUtils.isNotBlank(deviceSn)){
|
|
|
sql = sql + "AND d.device_sn like '%"+deviceSn+"%' ";
|
|
|
}
|
|
|
|
|
|
if(StringUtils.isNotBlank(categoryCode)){
|
|
|
sql = sql + "AND d.category_code like '%"+categoryCode+"%' ";
|
|
|
}
|
|
|
|
|
|
if(StringUtils.isNotBlank(deviceName)){
|
|
|
sql = sql + "AND d.device_name like '%"+deviceName+"%' ";
|
|
|
}
|
|
|
|
|
|
sql = sql+"ORDER BY czrq DESC limit " + (page-1)*pageSize+", "+pageSize;
|
|
|
list = jdbcTemplate.query(sql,new BeanPropertyRowMapper(WlyyPatientDeviceVO.class));
|
|
|
return list ;
|
|
|
}
|
|
|
|
|
|
public Long patientDeviceListCount(String deviceName, String categoryCode, String deviceSn, String userName) {
|
|
|
|
|
|
String sql = "SELECT count(d.id) " +
|
|
|
"FROM " +
|
|
|
" wlyy_patient_device d," +
|
|
|
" base_patient p " +
|
|
|
"WHERE d.`user`=p.id ";
|
|
|
if(StringUtils.isNotBlank(userName)){
|
|
|
sql = sql + "AND p.name like '%"+userName+"%' ";
|
|
|
}
|
|
|
|
|
|
if(StringUtils.isNotBlank(deviceSn)){
|
|
|
sql = sql + "AND d.device_sn like '%"+deviceSn+"%' ";
|
|
|
}
|
|
|
|
|
|
if(StringUtils.isNotBlank(categoryCode)){
|
|
|
sql = sql + "AND d.category_code like '%"+categoryCode+"%' ";
|
|
|
}
|
|
|
|
|
|
if(StringUtils.isNotBlank(deviceName)){
|
|
|
sql = sql + "AND d.device_name like '%"+deviceName+"%' ";
|
|
|
}
|
|
|
Long total = jdbcTemplate.queryForObject(sql, Long.class);
|
|
|
|
|
|
return total ;
|
|
|
}
|
|
|
|
|
|
public PageEnvelop healthIndexlist(String deviceSn, String date, String idcard, String userName, String indexType, Integer page, Integer pageSize,
|
|
|
Double indexTypeMin1, Double indexTypeMax1, Double indexTypeMin2, Double indexTypeMax2)throws Exception{
|
|
|
if (page == null){
|
|
|
page = 1;
|
|
|
}
|
|
|
if(pageSize == null){
|
|
|
pageSize = 15;
|
|
|
}
|
|
|
StringBuilder filter = new StringBuilder();
|
|
|
|
|
|
String sql =" SELECT i.* ,s.name userName FROM wlyy_patient_health_index i JOIN base_patient s ON i.user=s.id ";
|
|
|
String countSql =" SELECT count(1) as num FROM wlyy_patient_health_index i JOIN base_patient s ON i.user=s.id ";
|
|
|
|
|
|
sql += " WHERE 1=1 ";
|
|
|
countSql += " WHERE 1=1 ";
|
|
|
|
|
|
//根据患者名称过滤
|
|
|
if(!StringUtils.isEmpty(userName)){
|
|
|
filter.append(" AND s.name LIKE '%"+userName+"%' ");
|
|
|
}
|
|
|
|
|
|
if(!StringUtils.isEmpty(deviceSn)){
|
|
|
filter.append(" and i.device_sn like '%"+deviceSn+"%' ");
|
|
|
}
|
|
|
if(!StringUtils.isEmpty(idcard)){
|
|
|
filter.append(" and i.idcard like '%"+idcard+"%' ");
|
|
|
}
|
|
|
//体征数据创建时间
|
|
|
if(!StringUtils.isEmpty(date)){
|
|
|
Date startTimeTemp = DateTimeUtil.simpleDateParse(date);
|
|
|
Calendar calendar = new GregorianCalendar();
|
|
|
calendar.setTime(startTimeTemp);
|
|
|
calendar.set(Calendar.HOUR,23);
|
|
|
calendar.set(Calendar.MINUTE,59);
|
|
|
calendar.set(Calendar.SECOND,59);
|
|
|
calendar.set(Calendar.MILLISECOND,999);
|
|
|
Date endTimeTemp = calendar.getTime();
|
|
|
filter.append(" and i.czrq>='" + DateTimeUtil.simpleDateTimeFormat(startTimeTemp)+"'");
|
|
|
filter.append(" and i.czrq<='" + DateTimeUtil.simpleDateTimeFormat(endTimeTemp)+"'");
|
|
|
}
|
|
|
//指标类型
|
|
|
if(!StringUtils.isEmpty(indexType)){
|
|
|
filter.append(" and i.type="+indexType);
|
|
|
}
|
|
|
//体征数据
|
|
|
if(indexTypeMin1!=null){
|
|
|
filter.append(" and value1>="+indexTypeMin1);
|
|
|
}
|
|
|
if(indexTypeMax1!=null){
|
|
|
filter.append(" and value1<="+indexTypeMax1);
|
|
|
}
|
|
|
if(indexTypeMin2!=null){
|
|
|
filter.append(" and value2>="+indexTypeMin2);
|
|
|
}
|
|
|
if(indexTypeMax2!=null){
|
|
|
filter.append(" and value2<="+indexTypeMax2);
|
|
|
}
|
|
|
String f = filter.toString();
|
|
|
List<DeviceHealthIndexVO> resultList = jdbcTemplate.query(sql+f+" order by i.czrq desc "+" limit "+(page-1)*pageSize+","+pageSize,new BeanPropertyRowMapper<>(DeviceHealthIndexVO.class));
|
|
|
if(resultList.size()<=0){
|
|
|
return PageEnvelop.getSuccessListWithPage("",resultList,page,pageSize,0L);
|
|
|
}
|
|
|
for (DeviceHealthIndexVO indexVO:resultList){
|
|
|
indexVO.setHealthStandard(gethealthStandard(indexVO.getType(),indexVO.getUser()).toString());
|
|
|
}
|
|
|
|
|
|
long count = jdbcTemplate.queryForObject(countSql+filter.toString(),Long.class);
|
|
|
String regex = "(\\w{3})(\\w+)(\\w{3})";
|
|
|
return PageEnvelop.getSuccessListWithPage("",resultList,page,pageSize,count);
|
|
|
}
|
|
|
public JSONObject gethealthStandard(Integer type, String patientCode) {
|
|
|
//血糖校验
|
|
|
JSONObject json = new JSONObject();
|
|
|
if (type == 1) {
|
|
|
// 血糖记录,查询患者血糖预警值
|
|
|
PatientHealthStandard standard = wlyyPatientDeviceDao.findByPatientType(patientCode, 1);
|
|
|
Double maxValueBefore = HEALTH_STANDARD_ST_MAX_BEFORE;
|
|
|
Double minValueBefore = HEALTH_STANDARD_ST_MIN_BEFORE;
|
|
|
Double maxValueAfter = HEALTH_STANDARD_ST_MAX_AFTER;
|
|
|
Double minValueAfter = HEALTH_STANDARD_ST_MIN_AFTER;
|
|
|
if (standard != null) {
|
|
|
if (standard.getMaxValue1() > 0) {
|
|
|
maxValueBefore = standard.getMaxValue1();
|
|
|
}
|
|
|
if (standard.getMinValue1() > 0) {
|
|
|
minValueBefore = standard.getMinValue1();
|
|
|
}
|
|
|
if (standard.getMaxValue2() > 0) {
|
|
|
maxValueAfter = standard.getMaxValue2();
|
|
|
}
|
|
|
if (standard.getMinValue2() > 0) {
|
|
|
minValueAfter = standard.getMinValue2();
|
|
|
}
|
|
|
}
|
|
|
json.put("maxValueAfter", maxValueAfter);
|
|
|
json.put("maxValueBefore", maxValueBefore);
|
|
|
json.put("minValueBefore", minValueBefore);
|
|
|
json.put("minValueAfter", minValueAfter);
|
|
|
}
|
|
|
//血压校验
|
|
|
else if (type == 2) {
|
|
|
// 血压记录,查询患者血压预警值
|
|
|
PatientHealthStandard standard = wlyyPatientDeviceDao.findByPatientType(patientCode, 2);
|
|
|
Double maxValueSSY = HEALTH_STANDARD_SSY_MAX;
|
|
|
Double minValueSSY = HEALTH_STANDARD_SSY_MIN;
|
|
|
Double maxValueSZY = HEALTH_STANDARD_SZY_MAX;
|
|
|
Double minValueSZY = HEALTH_STANDARD_SZY_MIN;
|
|
|
if (standard != null) {
|
|
|
if (standard.getMaxValue1() > 0) {
|
|
|
maxValueSSY = standard.getMaxValue1();
|
|
|
}
|
|
|
if (standard.getMinValue1() > 0) {
|
|
|
minValueSSY = standard.getMinValue1();
|
|
|
}
|
|
|
if (standard.getMaxValue2() > 0) {
|
|
|
maxValueSZY = standard.getMaxValue2();
|
|
|
}
|
|
|
if (standard.getMinValue2() > 0) {
|
|
|
minValueSZY = standard.getMinValue2();
|
|
|
}
|
|
|
}
|
|
|
json.put("minValueSZY", minValueSZY);
|
|
|
json.put("maxValueSZY", maxValueSZY);
|
|
|
json.put("minValueSSY", minValueSSY);
|
|
|
json.put("maxValueSSY", maxValueSSY);
|
|
|
}
|
|
|
return json;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 查询所有的设备类型
|
|
@ -41,6 +490,11 @@ public class DeviceService {
|
|
|
return deviceDao.findByCategoryCode(categoryCode);
|
|
|
}
|
|
|
|
|
|
public List<Device> findAll(){
|
|
|
List<Device> deviceList = deviceDao.findAll();
|
|
|
return deviceList;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 获取设备信息
|
|
|
*/
|