blame | history | patch | commit | commitdiff | show whitespace
jinpengyong
2022-01-17 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 
 screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java


@@ -1,5 +1,6 @@


package com.moral.api.service.impl;




import com.alibaba.fastjson.JSON;


import com.alibaba.fastjson.JSONObject;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;


@@ -35,11 +36,7 @@


import java.beans.PropertyDescriptor;


import java.lang.reflect.Field;


import java.lang.reflect.Method;


import java.util.ArrayList;


import java.util.LinkedHashMap;


import java.util.List;


import java.util.Map;


import java.util.Objects;


import java.util.*;


import java.util.stream.Collectors;




import javax.servlet.http.HttpServletRequest;


@@ -522,6 +519,28 @@


        deviceMapper.update(null, updateWrapper);


    }




    @Override


    public List<Map<String, Object>> selectMonitorPiontAndDeviceByOrgId(int orgId) {


        QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();


        monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);


        monitorPointQueryWrapper.eq("organization_id",orgId);


        List<MonitorPoint> monitorPointList = monitorPointMapper.selectList(monitorPointQueryWrapper);


        List<Map<String, Object>> resultList = new ArrayList<>();


        for (MonitorPoint monitorPoint:monitorPointList) {


            Map<String,Object> resultMap = new HashMap<>();


            resultMap = JSON.parseObject(JSON.toJSONString(monitorPoint), Map.class);


            int mp_id = monitorPoint.getId();


            QueryWrapper<Device> deviceQueryWrapper = new QueryWrapper<>();


            deviceQueryWrapper.eq("is_delete", Constants.NOT_DELETE);


            deviceQueryWrapper.eq("monitor_point_id",mp_id);


            List<Device> devices = new ArrayList<>();


            devices = deviceMapper.selectList(deviceQueryWrapper);


            resultMap.put("devices",devices);


            resultList.add(resultMap);


        }


        return resultList;


    }




    //根据因子值判断状态


    private int judgeState(List<Object> levels, Double data) {


        int state = 1;