Commit 04e10a09 authored by zhangsen's avatar zhangsen

修改 td信息

parent 8130ca01
...@@ -127,14 +127,18 @@ public class TDBigScreenAnalyseController extends BaseController { ...@@ -127,14 +127,18 @@ public class TDBigScreenAnalyseController extends BaseController {
StationBasic stationBasic = stationBasicMapper.selectById(stationCode); StationBasic stationBasic = stationBasicMapper.selectById(stationCode);
stationCode = stationBasic.getFanGatewayId(); stationCode = stationBasic.getFanGatewayId();
} }
if (StrUtil.isNotEmpty(areaCode)) {
areaCode = "%" + areaCode + "%";
}
HashMap<String, Object> resultMap = new HashMap<>(); HashMap<String, Object> resultMap = new HashMap<>();
List<Map<String, String>> dateInfoBy15 = idxBizFanHealthIndexMapper.getDateInfoBy15(); List<Map<String, String>> dateInfoBy15 = idxBizFanHealthIndexMapper.getDateInfoBy15();
List<String> valueList = new ArrayList<>(); List<String> valueList = new ArrayList<>();
String finalStationCode = stationCode; String finalStationCode = stationCode;
List<String> dateList = new ArrayList<>(); List<String> dateList = new ArrayList<>();
String finalAreaCode = areaCode;
dateInfoBy15.forEach(item -> { dateInfoBy15.forEach(item -> {
String healthListInfo = fanHealthIndexMapper.getInfoByDate(areaCode, finalStationCode, item.get("date")); String healthListInfo = fanHealthIndexMapper.getInfoByDate(finalAreaCode, finalStationCode, item.get("date"));
valueList.add(CharSequenceUtil.isNotEmpty(healthListInfo) ? healthListInfo.replace(".0", "") : "100"); valueList.add(CharSequenceUtil.isNotEmpty(healthListInfo) ? healthListInfo.replace(".0", "") : "100");
String date = item.get("date"); String date = item.get("date");
Date date1 = DateUtils.dateAddDays(DateUtil.parse(date, DateUtils.DATE_PATTERN), -1); Date date1 = DateUtils.dateAddDays(DateUtil.parse(date, DateUtils.DATE_PATTERN), -1);
......
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
<where> <where>
rec_date = concat(#{date}, ' 00:00:00') rec_date = concat(#{date}, ' 00:00:00')
<if test="areaCode != null and areaCode != ''"> <if test="areaCode != null and areaCode != ''">
AND area = concat(#{areaCode}, '区域') AND area like #{areaCode}
AND analysis_obj_type = '片区' AND analysis_obj_type = '片区'
</if> </if>
<if test="stationCode != null and stationCode != ''"> <if test="stationCode != null and stationCode != ''">
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
<where> <where>
rec_date = concat(#{date}, ' 00:00:00') rec_date = concat(#{date}, ' 00:00:00')
<if test="areaCode != null and areaCode != ''"> <if test="areaCode != null and areaCode != ''">
AND area = concat(#{areaCode}, '区域') AND area like #{areaCode}
AND analysis_obj_type = '片区' AND analysis_obj_type = '片区'
</if> </if>
<if test="stationCode != null and stationCode != ''"> <if test="stationCode != null and stationCode != ''">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment