cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 

REM:
1.修改数据库查询判断条件
2.修改浩瀚设备启动、停止接口
This commit is contained in:
chenlinghy 2020-11-30 17:34:08 +08:00
parent 69a4031034
commit 1d50a3c069
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java
View File

@ -224,7 +224,7 @@ public class PengXinAbilityImpl implements DisposeAbility {
} }
try { try {
log.debug("++++Begging PengXin Stop Cleanup Task: {}", taskId); log.info("++++Begging PengXin Stop Cleanup Task: {}", taskId);
if (capType != DisposeCapacityType.BLACKHOOL) { if (capType != DisposeCapacityType.BLACKHOOL) {
log.error("----Error PengXin don't support dispose capacity type: {}", capType); log.error("----Error PengXin don't support dispose capacity type: {}", capType);

4
src/main/java/com/dispose/service/impl/DeviceTaskManagerServiceImpl.java
View File

@ -808,7 +808,7 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
break; break;
case HAOHAN_PLATFORM: case HAOHAN_PLATFORM:
haoHanDeviceTaskRun(ai, v, task); restfulDeviceTaskRun(ai, v, task, DisposeDeviceType.HAOHAN_PLATFORM);
break; break;
case VIRTUAL_DISPOSE: case VIRTUAL_DISPOSE:
@ -884,7 +884,7 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
break; break;
case HAOHAN_PLATFORM: case HAOHAN_PLATFORM:
haoHanDeviceTaskStop(ai, v, task); restfulDeviceTaskStop(ai, v, task, DisposeDeviceType.HAOHAN_PLATFORM);
break; break;
case VIRTUAL_DISPOSE: case VIRTUAL_DISPOSE:

8
src/main/resources/mappers/DeviceTask.xml
View File

@ -150,9 +150,9 @@
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
WHERE dd.deviceType = 2 WHERE dd.deviceType = ${@com.dispose.common.DisposeDeviceType@PENGXIN_PLATFORM.getValue()}
AND dt.devStatus != 2 AND dt.devStatus != ${@com.pengxin.dispose.common.PengXinTaskStatus@TASK_FINISHED_USER.getValue()}
AND dt.devStatus != 3 AND dt.devStatus != ${@com.pengxin.dispose.common.PengXinTaskStatus@TASK_FINISHED_TIME.getValue()}
AND dt.devStatus != 6 AND dt.devStatus != ${@com.pengxin.dispose.common.PengXinTaskStatus@TASK_REVIEWED_FAILED.getValue()}
</select> </select>
</mapper> </mapper>