|
@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
@@ -39,7 +40,7 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
|
|
|
@Override
|
|
|
public void variableListAdd(DeviceAnalogVariableList deviceAnalogVariableList) {
|
|
|
SysUser user = SecurityUtils.getLoginUser().getUser();
|
|
|
- deviceAnalogVariableList.setCreateTime(LocalDateTime.now());
|
|
|
+ deviceAnalogVariableList.setCreateTime(new Date());
|
|
|
deviceAnalogVariableList.setCreator(user.getUserName());
|
|
|
deviceAnalogVariableList.setStatus(1);
|
|
|
this.save(deviceAnalogVariableList);
|
|
@@ -79,13 +80,13 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
|
|
|
public CommonPage<DeviceAnalogVariableList> variableListone(DeviceAnalogVariableListVo deviceAnalogVariableListVo){
|
|
|
int start_current=(deviceAnalogVariableListVo.getSize()-1)*deviceAnalogVariableListVo.getCurrent();
|
|
|
List<DeviceAnalogVariableList> deviceAnalogVariableListOne = baseMapper.variableList(deviceAnalogVariableListVo.getSiteId(),deviceAnalogVariableListVo.getId(),
|
|
|
- deviceAnalogVariableListVo.getVariableName(), null, null);
|
|
|
+ deviceAnalogVariableListVo.getVariableName(), null, null,deviceAnalogVariableListVo.getDataArea());
|
|
|
int total=0;
|
|
|
if (deviceAnalogVariableListOne.size()>0){
|
|
|
total= deviceAnalogVariableListOne.size();
|
|
|
}
|
|
|
List<DeviceAnalogVariableList> deviceAnalogVariableList = baseMapper.variableList(deviceAnalogVariableListVo.getSiteId(),deviceAnalogVariableListVo.getId(),
|
|
|
- deviceAnalogVariableListVo.getVariableName(), start_current, deviceAnalogVariableListVo.getCurrent());
|
|
|
+ deviceAnalogVariableListVo.getVariableName(), start_current, deviceAnalogVariableListVo.getCurrent(),deviceAnalogVariableListVo.getDataArea());
|
|
|
return new CommonPage<>(deviceAnalogVariableList, total, deviceAnalogVariableListVo.getCurrent(), deviceAnalogVariableListVo.getSize());
|
|
|
}
|
|
|
|