From 9abccec290bc1a620a27011ffbaa3713d57e1acc Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 11 Feb 2022 14:20:36 +0800
Subject: [PATCH] screen-api 添加优良天气对比分析接口
---
screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
index 7a6d770..9f5cd2a 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
@@ -1,14 +1,18 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.Supervision;
+import com.moral.api.entity.SysArea;
import com.moral.api.mapper.SupervisionMapper;
import com.moral.api.service.SupervisionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.SysAreaService;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
+import com.moral.util.DateUtils;
import com.moral.util.FileUtils;
import lombok.extern.slf4j.Slf4j;
@@ -43,6 +47,9 @@
@Autowired
private SupervisionMapper supervisionMapper;
+
+ @Autowired
+ private SysAreaService sysAreaService;
@Override
@Transactional
@@ -114,13 +121,28 @@
supervisionMapper.selectPage(supervisionPage, queryWrapper);
List<Supervision> supervisions = supervisionPage.getRecords();
+ //������������������
+ List<Map<String, Object>> item = new ArrayList<>();
+ QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>();
+ sysAreaQueryWrapper.eq("area_code", cityCode);
+ SysArea one = sysAreaService.getOne(sysAreaQueryWrapper);
+ String cityName = one.getAreaName();
+ for (Supervision supervision : supervisions) {
+ Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(supervision), Map.class);
+ map.remove("isDelete");
+ map.remove("createTime");
+ map.remove("updateTime");
+ map.put("cityName", cityName);
+ map.put("time", DateUtils.getLongToStr((Long) map.remove("time"), DateUtils.yyyy_MM_dd_EN));
+ item.add(map);
+ }
Map<String, Object> result = new LinkedHashMap<>();
result.put("total", supervisionPage.getTotal());
result.put("totalPage", supervisionPage.getPages());
result.put("current", supervisionPage.getCurrent());
result.put("pageSize", supervisionPage.getSize());
- result.put("item", supervisions);
+ result.put("item", item);
return result;
}
--
Gitblit v1.8.0