|
@@ -6,6 +6,7 @@ import com.bizmatics.persistence.mapper.AlarmPowerMapper;
|
|
import com.bizmatics.persistence.mapper.RtSwitchDataMapper;
|
|
import com.bizmatics.persistence.mapper.RtSwitchDataMapper;
|
|
import com.bizmatics.service.RtSwitchDataService;
|
|
import com.bizmatics.service.RtSwitchDataService;
|
|
import com.bizmatics.common.mvc.base.AbstractCrudService;
|
|
import com.bizmatics.common.mvc.base.AbstractCrudService;
|
|
|
|
+import com.bizmatics.service.util.SecurityUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -25,8 +26,9 @@ public class RtSwitchDataServiceImpl extends AbstractCrudService<RtSwitchDataMap
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public List<Map<String, Object>> getOne(Integer siteId) {
|
|
public List<Map<String, Object>> getOne(Integer siteId) {
|
|
|
|
+ Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
|
|
List<Map<String, Object>> list = new ArrayList<>();
|
|
List<Map<String, Object>> list = new ArrayList<>();
|
|
- Map<String, Object> rsdMap = baseMapper.getOneMap(siteId);
|
|
|
|
|
|
+ Map<String, Object> rsdMap = baseMapper.getOneMap(userId,siteId);
|
|
Optional.ofNullable(rsdMap).ifPresent(rad -> {
|
|
Optional.ofNullable(rsdMap).ifPresent(rad -> {
|
|
for (String name:rad.keySet()) {
|
|
for (String name:rad.keySet()) {
|
|
Map<String,Object> map = new HashMap<>();
|
|
Map<String,Object> map = new HashMap<>();
|