jfpt-BladeX.git

			@@ -31,6 +31,7 @@
			import org.springblade.system.cache.SysCache;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;

			import java.text.ParseException;
			import java.text.SimpleDateFormat;
			@@ -66,13 +67,13 @@
			@Override
			public IPage<EquipmentVO> selectDeptPages(IPage<EquipmentVO> page, EquipmentVO equipment,String pid,String dxdype) {

			List deptIdList;
			if (pid != null && !pid.equals("")){
			deptIdList = SysCache.getDeptChildIds(Long.valueOf(pid));
			}else{
			deptIdList = SysCache.getDeptChildIds(null);
			}
			return page.setRecords(baseMapper.selectDeptPages(page,equipment,deptIdList,dxdype));
			// List deptIdList;
			// if (pid != null && !pid.equals("")){
			// deptIdList = SysCache.getDeptChildIds(Long.valueOf(pid));
			// }else{
			// deptIdList = SysCache.getDeptChildIds(null);
			// }
			return page.setRecords(baseMapper.selectDeptPages(page,equipment,pid,dxdype));
			}


			@@ -83,13 +84,18 @@
			}

			@Override
			public List<EquipmentVO> listAll() {
			return baseMapper.listAll();
			public List<EquipmentVO> listAll(EquipmentVO equipment) {
			return baseMapper.listAll(equipment);
			}

			@Override
			public void updateOne(Equipment equipment) {
			baseMapper.updateOne(equipment);
			}

			@Override
			public void saveImg(EquipmentVO equipment) {
			baseMapper.saveImg(equipment);
			}

			@Override
			@@ -148,7 +154,7 @@
			@Override
			public Integer selectEquipmentCount(ConditionVo conditionVo) {
			//先查询所有的设备
			List<EquipmentVO> equipmentVOS = baseMapper.listAll();
			List<EquipmentVO> equipmentVOS = baseMapper.listAlls();
			long time = new Date().getTime();
			int equipmentCount = 0;
			long hearbeat = 0;
			@@ -178,9 +184,23 @@
			baseMapper.updateexpireTime(expireTime,deviceNumber);
			}

			/**
			* 修改设备状态 2021-5-6 arsn修改
			* @param state 设备状态
			* @param reason 原因
			* @param deviceNumber 设备编号
			*/
			@Override
			@Transactional(rollbackFor = Exception.class)
			public void updateExstate(String state, String reason, String deviceNumber) {
			baseMapper.updateExstate(state, reason, deviceNumber);
			if(state.equals("系统故障")){
			String dType = "3";
			baseMapper.updateExstate(dType, reason, deviceNumber);
			}
			if(state.equals("处理完成")){
			String dType = "1";
			baseMapper.updateExstate(dType, reason, deviceNumber);
			}
			}

			@Override