parent
a086b22aba
commit
008ceba7de
|
@ -146,9 +146,9 @@ public interface DeviceTaskManager {
|
||||||
boolean deviceTaskCreated(Long taskId, Long devId);
|
boolean deviceTaskCreated(Long taskId, Long devId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets peng xin task.
|
* Get peng xin task status is not the final value task info list.
|
||||||
*
|
*
|
||||||
* @return the peng xin task
|
* @return the task info list
|
||||||
*/
|
*/
|
||||||
List<DeviceTask> getPengXinTask();
|
List<DeviceTask> getTransitionStatusTask();
|
||||||
}
|
}
|
||||||
|
|
|
@ -309,12 +309,12 @@ public class DeviceTaskManagerImpl implements DeviceTaskManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get peng xin task list.
|
* Get peng xin task status is not the final value task info list.
|
||||||
*
|
*
|
||||||
* @return the list
|
* @return the task info list
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public List<DeviceTask> getPengXinTask(){
|
public List<DeviceTask> getTransitionStatusTask(){
|
||||||
return deviceTaskMapper.getPengXinTask();
|
return deviceTaskMapper.getTransitionStatusTaskInfos();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -156,9 +156,9 @@ public interface DeviceTaskMapper {
|
||||||
@Param("externId") String externId);
|
@Param("externId") String externId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets PengXin device task info.
|
* Gets peng xin device task status is not the final value task info.
|
||||||
*
|
*
|
||||||
* @return PengXin device task info
|
* @return peng xin device task info
|
||||||
*/
|
*/
|
||||||
List<DeviceTask> getPengXinTask();
|
List<DeviceTask> getTransitionStatusTaskInfos();
|
||||||
}
|
}
|
||||||
|
|
|
@ -695,7 +695,7 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
|
||||||
*/
|
*/
|
||||||
public void deviceTaskStatusSchedule() {
|
public void deviceTaskStatusSchedule() {
|
||||||
//处置任务设备类型为鹏信设备,特定任务状态不会发生变更
|
//处置任务设备类型为鹏信设备,特定任务状态不会发生变更
|
||||||
for (DeviceTask v : deviceTaskManager.getPengXinTask()) {
|
for (DeviceTask v : deviceTaskManager.getTransitionStatusTask()) {
|
||||||
// 获取设备
|
// 获取设备
|
||||||
AbilityInfo ai = disposeAbilityRouterService.getAbilityDevice(v.getDeviceId());
|
AbilityInfo ai = disposeAbilityRouterService.getAbilityDevice(v.getDeviceId());
|
||||||
|
|
||||||
|
|
|
@ -146,7 +146,7 @@
|
||||||
WHERE id = #{id}
|
WHERE id = #{id}
|
||||||
</update>
|
</update>
|
||||||
|
|
||||||
<select id="getPengXinTask" resultType="com.dispose.pojo.entity.DeviceTask">
|
<select id="getTransitionStatusTaskInfos" resultType="com.dispose.pojo.entity.DeviceTask">
|
||||||
SELECT dt.*, dd.*
|
SELECT dt.*, dd.*
|
||||||
FROM device_task dt
|
FROM device_task dt
|
||||||
LEFT JOIN dispose_device dd ON dt.deviceId = dd.id
|
LEFT JOIN dispose_device dd ON dt.deviceId = dd.id
|
||||||
|
|
Loading…
Reference in New Issue