|
@@ -2,18 +2,17 @@ package com.usky.issue.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
-
|
|
|
-import com.usky.common.core.exception.BusinessException;
|
|
|
import com.usky.issue.domain.SpHj2017;
|
|
|
-import com.usky.issue.domain.SpRtu2017;
|
|
|
+import com.usky.issue.domain.SpOwner;
|
|
|
import com.usky.issue.mapper.SpHj2017Mapper;
|
|
|
import com.usky.issue.service.SpHj2017Service;
|
|
|
import com.usky.common.mybatis.core.AbstractCrudService;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
+import com.usky.issue.service.SpOwnerService;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import java.time.LocalDateTime;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
@@ -27,6 +26,9 @@ import java.util.Map;
|
|
|
*/
|
|
|
@Service
|
|
|
public class SpHj2017ServiceImpl extends AbstractCrudService<SpHj2017Mapper, SpHj2017> implements SpHj2017Service {
|
|
|
+ @Autowired
|
|
|
+ private SpOwnerService spOwnerService;
|
|
|
+
|
|
|
@Override
|
|
|
public List<Map<String, Object>> statusCount(String requestBody) {
|
|
|
JSONObject requestVO = JSONObject.parseObject(requestBody);
|
|
@@ -40,7 +42,23 @@ public class SpHj2017ServiceImpl extends AbstractCrudService<SpHj2017Mapper, SpH
|
|
|
queryWrapper.last("LIMIT " + pageSize + " OFFSET " + startIndex)
|
|
|
.orderByDesc("id");
|
|
|
List<Map<String, Object>> deviceStatusList = this.listMaps(queryWrapper);
|
|
|
-
|
|
|
+ QueryWrapper<SpOwner> queryWrapper1 = Wrappers.query();
|
|
|
+ queryWrapper1.select("owner_code","unitinfo")
|
|
|
+ .eq("company",companyCode)
|
|
|
+ .in("dwtype",1,3);
|
|
|
+ List<Map<String, Object>> deviceInfoList = spOwnerService.listMaps(queryWrapper1);
|
|
|
+ if(CollectionUtils.isNotEmpty(deviceStatusList)){
|
|
|
+ for (int i=0;i<deviceStatusList.size();i++){
|
|
|
+ if(CollectionUtils.isNotEmpty(deviceInfoList)){
|
|
|
+ for (int j=0;j<deviceInfoList.size();j++){
|
|
|
+ if(deviceStatusList.get(i).get("device_code").equals(deviceInfoList.get(j).get("owner_code"))){
|
|
|
+ deviceStatusList.get(i).put("device_address",deviceInfoList.get(j).get("unitinfo"));
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return deviceStatusList;
|
|
|
}
|
|
|
|