Authored by zhengyouwei

app fix

... ... @@ -7,10 +7,10 @@ import lombok.Data;
*/
@Data
public class HandleWorkJob extends AppBaseReq {
private int id;
private String id;
private String type;
private int handleType;
private String handleType;
}
... ...
... ... @@ -14,6 +14,7 @@ import com.ui.project.Project;
import com.ui.project.ProjectEnvironment;
import com.ui.project.ProjectOnline;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.web.bind.annotation.RequestBody;
... ... @@ -58,7 +59,9 @@ public class AppWorkSystemCtrl {
workSystemReq.setPageSize(20);
BaseResponse<PageResponse<PendingJob>> result = httpRestClient.exchangeForpost(HttpUriContants.GET_PENDING_JOBS, new ParameterizedTypeReference<BaseResponse<PageResponse<PendingJob>>>() {
}, workSystemReq);
baseResponse.setData(result.getData().getRows());
if (result != null && result.getData() != null){
baseResponse.setData(result.getData().getRows());
}
return baseResponse;
}
... ... @@ -112,7 +115,14 @@ public class AppWorkSystemCtrl {
public BaseResponse handleworkjob(@RequestBody HandleWorkJob handleWorkJob) {
BaseResponse baseResponse = new BaseResponse();
String type = handleWorkJob.getType();
if (StringUtils.isBlank(type) || handleWorkJob.getId() == 0 || handleWorkJob.getHandleType() == 0) {
if (!NumberUtils.isNumber(handleWorkJob.getId())){
baseResponse.setCode(ErrorCode.PARAM_ERROR);
baseResponse.setMessage(ErrorCode.PARAM_ERROR_MESSAGE);
return baseResponse;
}
int id = Integer.valueOf(handleWorkJob.getId());
int handleType = Integer.valueOf(handleWorkJob.getHandleType());
if (StringUtils.isBlank(type) || id == 0 || handleType == 0) {
baseResponse.setCode(ErrorCode.PARAM_ERROR);
baseResponse.setMessage(ErrorCode.PARAM_ERROR_MESSAGE);
return baseResponse;
... ... @@ -121,9 +131,9 @@ public class AppWorkSystemCtrl {
handledJob.setHandler(handleWorkJob.getAccountname());
User user = userAuthLocal.getUserByname(handleWorkJob.getAccountname());
handledJob.setHandlerRole(user.getRole());
handledJob.setHandleType(handleWorkJob.getHandleType());
handledJob.setHandleType(handleType);
handledJob.setType(type);
handledJob.setId(handleWorkJob.getId());
handledJob.setId(id);
httpRestClient.defaultPost(HttpUriContants.HANDLE_JOB, handledJob, BaseResponse.class);
return baseResponse;
}
... ...