chore:补充提交

jinpengyong

2023-11-01 77fb7786036fd4c7dd16b9b15c6569cdf2d8ba19

 screen-api/src/main/java/com/moral/api/service/impl/AlarmInfoServiceImpl.java

@@ -143,7 +143,7 @@
    public Map<String, Object> getDataByConditionWithoutPage(Map<String, Object> parameters) {
        Map<String, Object> resultMap = new HashMap<>();
        int orgId = Integer.parseInt(parameters.get("organization_id").toString());
        //定义一个集合，存放所有id
       /* //定义一个集合，存放所有id
        List<Integer> allOrgId = new ArrayList<>();
        allOrgId.add(orgId);
        //循环集合
@@ -172,7 +172,8 @@
            }else {
                continue;
            }
        }
        }*/
        List<Integer> deviceIdList = deviceMapper.deviceIdList(orgId);
        if (deviceIdList.size()>0){
            Map<String, Object> map = new HashMap<>();
            QueryWrapper<AlarmInfo> alarmInfoQueryWrapper = new QueryWrapper<>();
@@ -230,7 +231,7 @@
    public Map<String, Object> alarmReminder(Map<String, Object> parameters) {
        Map<String,Object> resultMap = new HashMap<>();
        int orgId = Integer.parseInt(parameters.get("organization_id").toString());
        //定义一个集合，存放所有id
        /*//定义一个集合，存放所有id
        List<Integer> allOrgId = new ArrayList<>();
        allOrgId.add(orgId);
        //循环集合
@@ -259,12 +260,13 @@
            }else {
                continue;
            }
        }
        if (deviceIdList.size()>0){
        }*/
      //  if (deviceIdList.size()>0){
            Map<String, Object> map = new HashMap<>();
            map.put("deviceIds",deviceIdList);
            //map.put("deviceIds",deviceIdList);
            int size = Integer.parseInt(parameters.get("size").toString());
            map.put("size",size);
            map.put("orgId",orgId);
            List<Map<String, Object>> resultList = alarmInfoMapper.selectNewestData(map);
            SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            for (Map<String, Object> alarmInfo:resultList) {
@@ -272,13 +274,14 @@
                alarmInfo.put("alarm_time",alarm_time);
            }
            resultMap.put("alarmInfors",resultList);
            QueryWrapper<AlarmInfo> alarmInfoQueryWrapper = new QueryWrapper<>();
            Integer totalNumber = alarmInfoMapper.numNews(orgId);
            /*QueryWrapper<AlarmInfo> alarmInfoQueryWrapper = new QueryWrapper<>();
            alarmInfoQueryWrapper.in("device_id",deviceIdList);
            Integer totalNumber = alarmInfoMapper.selectCount(alarmInfoQueryWrapper);
            Integer totalNumber = alarmInfoMapper.selectCount(alarmInfoQueryWrapper);*/
            resultMap.put("totalNumber",totalNumber);
            return resultMap;
        }
        return null;
       // }
       // return null;
    }

    @Override