Commit 43693b1b authored by kongfm's avatar kongfm

接口测试修正

parent 2f554c53
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController; import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
import com.yeejoin.amos.boot.biz.common.utils.NameUtils; import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto; import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorNewDto; import com.yeejoin.amos.boot.module.tzs.api.dto.ElevatorNewDto;
...@@ -11,6 +12,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator; ...@@ -11,6 +12,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.Elevator;
import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorService; import com.yeejoin.amos.boot.module.tzs.api.service.IElevatorService;
import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ElevatorServiceImpl; import com.yeejoin.amos.boot.module.tzs.biz.service.impl.ElevatorServiceImpl;
import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils; import com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils;
import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -51,6 +53,9 @@ public class ElevatorController extends BaseController { ...@@ -51,6 +53,9 @@ public class ElevatorController extends BaseController {
@Autowired @Autowired
ElevatorServiceImpl elevatorService; ElevatorServiceImpl elevatorService;
@Autowired
private AmosFeignService amosFeignService;
/** /**
* 新增电梯 * 新增电梯
* *
...@@ -248,5 +253,23 @@ public class ElevatorController extends BaseController { ...@@ -248,5 +253,23 @@ public class ElevatorController extends BaseController {
IPage<ElevatorDto> elevatorDtoIPage = BeanDtoVoUtils.elevatorIPageDto(page); IPage<ElevatorDto> elevatorDtoIPage = BeanDtoVoUtils.elevatorIPageDto(page);
return ResponseHelper.buildResponse(elevatorDtoIPage); return ResponseHelper.buildResponse(elevatorDtoIPage);
} }
/**
* 获取电梯使用单位
* @return
*/
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@RequestMapping(value = "/usesiteCategory", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "获取电梯使用单位", notes = "获取电梯使用单位")
public ResponseModel<List<DictionarieValueModel>> selectUsesiteCategory() {
List<DictionarieValueModel> elevatorUseSiteCategory = null;
try {
elevatorUseSiteCategory = amosFeignService.listDictionaryByDictCode("ELEVATOR_USE_SITE_CATEGORY");
} catch (Exception e) {
e.printStackTrace();
}
return ResponseHelper.buildResponse(elevatorUseSiteCategory);
}
} }
...@@ -148,6 +148,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa ...@@ -148,6 +148,7 @@ public class DispatchPaperServiceImpl extends BaseService<DispatchPaperDto,Dispa
} }
@Transactional
@Override @Override
public DispatchPaperFormDto createDispatchPaper(Long alertId, String alertCode, AgencyUserModel sendUser) { public DispatchPaperFormDto createDispatchPaper(Long alertId, String alertCode, AgencyUserModel sendUser) {
DispatchPaperFormDto dispatchPaperFormDto = new DispatchPaperFormDto(); DispatchPaperFormDto dispatchPaperFormDto = new DispatchPaperFormDto();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment