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

OCT 

REM:
1. 增加浩瀚取消清洗任务接口
This commit is contained in:
chenlinghy 2020-07-01 16:20:59 +08:00
parent 32cdcbbac4
commit 5b7f390e73
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/com/dispose/dispose/impl/HaoHanImpl.java
View File

@ -10,6 +10,8 @@ import com.dispose.pojo.po.DisposeDeviceCapacity;
import com.dispose.pojo.po.MulReturnType;
import com.dispose.pojo.vo.haohan.CleanReq;
import com.dispose.pojo.vo.haohan.CleanRsp;
import com.dispose.pojo.vo.haohan.CommonRsp;
import com.dispose.pojo.vo.haohan.StopCleanReq;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.extern.slf4j.Slf4j;
@ -102,7 +104,36 @@ public class HaoHanImpl implements DisposeEntryManager {
*/
@Override
public MulReturnType<ErrorCode, Long> stopDispose(String ipAddr, DeviceCapacity type, Long devTaskId) {
return new MulReturnType<>(ErrorCode.ERR_OK, null);
StopCleanReq req = StopCleanReq.builder()
.cleanTaskId(devTaskId)
.orderFrom("China Mobile")
.build();
log.info("++++Begging Haohan Stop Cleanup Task: {}", devTaskId);
try{
String ret = Http.postJson(deviceAddress + "/delTow",
null,
objectMapper.writeValueAsString(req));
CommonRsp rsp = objectMapper.readValue(ret, CommonRsp.class);
if (rsp == null) {
log.error("----Error Haohan stop task{} server return error", devTaskId);
return new MulReturnType<>(ErrorCode.ERR_HAOHAN_ERROR, null);
}
if (rsp.getState() != ErrorCode.ERR_OK.getCode()) {
log.error("----Error Haohan stop task {} return error: {}, {}", devTaskId, rsp.getState(), rsp.getMsg());
return new MulReturnType<>(ErrorCode.ERR_HAOHAN_ERROR, null);
}
log.info("----Finish Haohan Stop Cleanup Task: {}", devTaskId);
return new MulReturnType<>(ErrorCode.ERR_OK, null);
}catch (JsonProcessingException e) {
log.error("----Error Haohan Stop Cleanup Task: {}", devTaskId);
return new MulReturnType<>(ErrorCode.ERR_SYSTEMEXCEPTION, null);
}
}
/**

1
src/test/java/com/dispose/test/mapper/TaskInfoMapperTest.java
View File

@ -171,7 +171,6 @@ public class TaskInfoMapperTest extends InitTestEnvironment {
taskInfo.getId(), taskInfo.getStatus(), changeStatus);
taskInfoMapper.changeTaskInfoStatus(taskInfo.getId(), changeStatus);
Assert.assertNotEquals(beforeStatus, new Long((long) taskInfoMapper.getTaskInfoCurrentStatus(taskInfo.getId())));
}
}