解决冲突

yun-zuoyi
yunhao.wang 6 years ago
parent 8b0a955f86
commit fa8622b3ee

@ -271,7 +271,7 @@ public class TestController {
return ResultBean.success("调用完成-耗时:" + (System.currentTimeMillis() - time) + ",新增数据量:" + insertAffect
+ ",修改影响量" + updateAffect + ",删除影响量:" + deleteAffect)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(new TestInfo(time));
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
@ -299,7 +299,7 @@ public class TestController {
}
return ResultBean.success("调用完成-耗时:" + (System.currentTimeMillis() - time) + ",数据量:" + num)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(new TestInfo(time));
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
@ -379,7 +379,7 @@ public class TestController {
}
return ResultBean.success("调用完成-耗时:" + (System.currentTimeMillis() - time) + ",数据量:" + list.size())
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(new TestInfo(time));
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
@ -432,7 +432,7 @@ public class TestController {
}
return ResultBean.success("调用完成 耗时:" + (System.currentTimeMillis() - time) + ",数据量:" + list.size())
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(new TestInfo(time));
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
@ -555,7 +555,7 @@ public class TestController {
}
return ResultBean.success("调用完成-耗时:" + (System.currentTimeMillis() - time) + ",数量:" + list.size())
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(new TestInfo(time)).setResultList(list);
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list);
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
@ -588,7 +588,7 @@ public class TestController {
}
return ResultBean.success("调用完成-耗时:" + (System.currentTimeMillis() - time))
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(new TestInfo(time));
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
@ -625,7 +625,7 @@ public class TestController {
}
return ResultBean.success("调用完成-耗时:" + (System.currentTimeMillis() - time) + ",数量:" + list.size())
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(new TestInfo(time));
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {

Loading…
Cancel
Save