moral.git - Gitblit

			@@ -4,6 +4,7 @@
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

			import com.moral.api.config.Interceptor.UserHelper;
			import com.moral.api.entity.*;
			import com.moral.api.mapper.DailyMapper;
			import com.moral.api.mapper.HistorySecondCruiserMapper;
			@@ -14,7 +15,9 @@
			import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultCountDTO;
			import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultDTO;
			import com.moral.api.pojo.enums.SysDictTypeEnum;
			import com.moral.api.pojo.vo.device.AppDeviceVo;
			import com.moral.api.pojo.vo.excel.DailyVo;
			import com.moral.api.pojo.vo.user.QxUser;
			import com.moral.api.service.OrganizationService;
			import com.moral.api.service.SpecialDeviceHistoryService;
			import com.moral.api.service.SpecialDeviceService;
			@@ -507,6 +510,20 @@
			return excelBOS;
			}

			@Override
			public List<AppDeviceVo> selectSpecialDevice() {
			QxUser user = UserHelper.getCurrentUser();
			Integer organizationId = user.getOrganizationId();
			// Integer organizationId=71;
			List<AppDeviceVo> appDeviceVos;
			if (organizationId!=24){
			appDeviceVos = specialDeviceMapper.selectSpecialDevice(organizationId);
			}else {
			appDeviceVos = specialDeviceMapper.selectSpecialDevice(null);
			}
			return appDeviceVos;
			}

			//计算平均值和最大值
			private HashMap<String, Object> getStringObjectHashMap(List<Map<String, Object>> maps) {
			HashMap<String, Object> rsMap = new HashMap<>();