|
@@ -186,13 +186,12 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
|
|
|
|
|
|
@Override
|
|
|
public List<CommonIcoVO> getDemandIco(Integer siteId) {
|
|
|
- Integer userId = SessionLocal.getUserId();
|
|
|
Date date = new Date();
|
|
|
List<Object> maxList = new ArrayList<>();
|
|
|
List<Object> minList = new ArrayList<>();
|
|
|
List<Object> avgList = new ArrayList<>();
|
|
|
List<Object> dateList = new ArrayList<>();
|
|
|
- List<HadSiteStatic> hadSiteStatics = hadSiteStaticService.list(userId, DateUtils.getFirstDayOfMonth(date), date);
|
|
|
+ List<HadSiteStatic> hadSiteStatics = hadSiteStaticService.list(siteId, DateUtils.getFirstDayOfMonth(date), date);
|
|
|
for (int i = 1; i <= Integer.parseInt(DateUtils.getDay(date)); i++) {
|
|
|
Date setDays = DateUtils.setDays(date, i);
|
|
|
Date dayStartTime = DateUtils.getDayStartTime(setDays);
|