screen-api/src/main/java/com/moral/api/service/impl/AllocationServiceImpl.java
@@ -260,7 +260,7 @@ Object number1 = map.get("number"); String startTime=null; String endTime=null; if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("startTime"))){ if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("endTime"))){ startTime = map.get("startTime").toString(); endTime = map.get("endTime").toString(); @@ -394,35 +394,48 @@ public List<Map<String, Object>> unitExel(Map<String, Object> map) { QueryWrapper<Allocation> wrapper = new QueryWrapper<>(); //获取用户信息 Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo(); Object unitId = userInfo.get("unitId"); Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization"); Integer orgId = (Integer) orgInfo.get("id"); if (ObjectUtils.isEmpty(unitId)){ return null; } if (orgId!=24){ ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(Integer.parseInt(unitId.toString())); Integer areaCode = responsibilityUnit1.getAreaCode(); List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectUnit(areaCode); if (ObjectUtils.isEmpty(responsibilityUnits)){ List<ResponsibilityUnit> responsibilityUnits1 = responsibilityUnitService.selectAreaUnit(areaCode); Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits1.stream().collect(Collectors.groupingBy(o -> o.getUnitId())); List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList()); wrapper.in("unit_id",collect1); }else { Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId())); List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList()); wrapper.in("unit_id",collect1); List<Integer> list = this.unitResult(); if (!ObjectUtils.isEmpty(map.get("unitId"))){ wrapper.in("unit_id",map.get("unitId").toString()); }else { if (!ObjectUtils.isEmpty(list)){ Integer integer = list.get(0); if (integer==0){ return null; }else { wrapper.in("unit_id",list); } } } // Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo(); // Object unitId = userInfo.get("unitId"); // Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization"); // Integer orgId = (Integer) orgInfo.get("id"); // // if (ObjectUtils.isEmpty(unitId)){ // return null; // } // if (orgId!=24){ // ResponsibilityUnit responsibilityUnit1 = responsibilityUnitMapper.selectById(Integer.parseInt(unitId.toString())); // Integer areaCode = responsibilityUnit1.getAreaCode(); // List<ResponsibilityUnit> responsibilityUnits = responsibilityUnitService.selectUnit(areaCode); // if (ObjectUtils.isEmpty(responsibilityUnits)){ // List<ResponsibilityUnit> responsibilityUnits1 = responsibilityUnitService.selectAreaUnit(areaCode); // Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits1.stream().collect(Collectors.groupingBy(o -> o.getUnitId())); // List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList()); // wrapper.in("unit_id",collect1); // }else { // Map<Integer, List<ResponsibilityUnit>> collect = responsibilityUnits.stream().collect(Collectors.groupingBy(o -> o.getUnitId())); // List<Integer> collect1 = collect.keySet().stream().collect(Collectors.toList()); // wrapper.in("unit_id",collect1); // } // } ArrayList<Map<String, Object>> rsMap = new ArrayList<>(); Object number1 = map.get("number"); String startTime=null; String endTime=null; if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("startTime"))){ if (!ObjectUtils.isEmpty(map.get("startTime")) || !ObjectUtils.isEmpty(map.get("endTime"))){ startTime = map.get("startTime").toString(); endTime = map.get("endTime").toString();
@@ -291,7 +291,7 @@ } /** * 转化dateTimeStr为Date类型 * 转化dateTimeStr为Date类型 去除时间 * * @param dateTimeStr * @return screen-job/src/main/java/com/moral/api/controller/PubController.java
@@ -53,6 +53,19 @@ int i = 0; return new ResultMessage(); } @GetMapping("insertHistoryFiveMinutely") @ApiOperation(value = "5分钟数据", notes = "5分钟数据") public ResultMessage insertHistoryFiveMinutely() { String format = DateUtils.yyyy_MM_dd_HH_mm_EN; historyFiveMinutelyService.insertHistoryFiveMinutely(); String s ="2023-10-13 03:35"; String s1 ="2023-10-13 03:40"; Date start = DateUtils.getDate(s,format); Date end = DateUtils.getDate(s1,format); return new ResultMessage(); } @GetMapping("FiveMinutelyTest") @ApiOperation(value = "5分钟数据1", notes = "5分钟数据1") public ResultMessage FiveMinutelyTest(String yz,String mac) { screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
@@ -87,14 +87,13 @@ QueryWrapper<GovMonitorPoint> queryWrapper = new QueryWrapper<>(); queryWrapper.select("guid").eq("is_delete", Constants.NOT_DELETE); //获取所有国控，省控，县控站点 String time1 = StringUtils.isNotEmpty(dateTime)?dateTime:DateUtils.dateToDateString(new Date(),DateUtils.yyyy_MM_dd_EN); String time1 = StringUtils.isNotEmpty(dateTime)?dateTime:DateUtils.dateToDateString(new Date(),DateUtils.yyyy_MM_dd_HH_EN); List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.list(queryWrapper); Date time = DateUtils.dataToTimeStampTime(DateUtils.convertDate(time1), DateUtils.yyyy_MM_dd_HH_EN); Date time = DateUtils.dataToTimeStampTime(DateUtils.getDate(time1, DateUtils.yyyy_MM_dd_HH_EN),DateUtils.yyyy_MM_dd_HH_EN); //String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN); String timeStr = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyy_MM_dd_HH_mm_ss_EN); List<HistoryAqi> historyAqis = new ArrayList<>(); for (GovMonitorPoint govMonitorPoint : govMonitorPoints) { screen-job/src/main/resources/application-cjl.yml
@@ -18,9 +18,9 @@ application: name: screen-job redis: host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com host: r-bp1xdlb9wfc6zt0msppd18.redis.rds.aliyuncs.com port: 6379 password: QxPcRedis_moarl_2320 password: moral_123456 timeout: 30000 jedis: pool: @@ -35,9 +35,9 @@ max-wait: 30000 min-idle: 32 tokenRedis: host: r-bp1xdlb9wfc6zt0msppd13.redis.rds.aliyuncs.com host: r-bp1xdlb9wfc6zt0msppd18.redis.rds.aliyuncs.com port: 6379 password: QxPcRedis_moarl_2320 password: moral_123456 timeout: 30000 database: 14 pool: @@ -55,9 +55,9 @@ filters: stat type: com.alibaba.druid.pool.DruidDataSource max-wait: 60000 url: jdbc:mysql://rm-bp1pr3rx9m3fnkwskso.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai url: jdbc:mysql://rm-bp1pr3rx9m3fnkwskso01.mysql.rds.aliyuncs.com:3306/moral?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai username: root password: Qx_moralPc_2320 password: moral_123456 test-on-borrow: false sql-script-encoding: utf-8 pool-prepared-statements: true screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
@@ -6,6 +6,7 @@ import com.moral.constant.KafkaConstants; import com.moral.constant.RedisConstants; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.clients.consumer.CommitFailedException; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -162,14 +163,17 @@ data.remove("entryTime"); //数据校准 data = deviceService.adjustDeviceData(data,"0"); //data = deviceService.adjustDeviceData(data,"0"); //存入redis data.put("DataTime", time); redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data); //redisTemplate.opsForHash().put(RedisConstants.DATA_SECOND, mac, data); //判断并修改设备状态 data.put("mac", mac); deviceService.judgeDeviceState(data); ack.acknowledge(); deviceService.judgeDeviceState(data); }catch (CommitFailedException e){ log.error("param{}" + msg); } catch (Exception e) { log.error("param{}" + msg); ack.acknowledge();
