|
@@ -1,16 +1,22 @@
|
|
|
package cn.com.ty.lift.business.library.controller;
|
|
|
|
|
|
+import cn.com.ty.lift.business.framework.util.MessageUtils;
|
|
|
import cn.com.ty.lift.business.library.dao.entity.Lift;
|
|
|
+import cn.com.ty.lift.business.library.dao.entity.LiftBrand;
|
|
|
import cn.com.ty.lift.business.library.dao.entity.ProjectLiftRelevance;
|
|
|
import cn.com.ty.lift.business.library.dao.entity.model.*;
|
|
|
import cn.com.ty.lift.business.library.service.LiftService;
|
|
|
import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
|
|
|
import cn.com.ty.lift.business.library.service.ProjectLiftRelevanceService;
|
|
|
import cn.com.ty.lift.common.base.ExportRequest;
|
|
|
+import cn.com.ty.lift.common.constants.ApiConstants;
|
|
|
+import cn.com.ty.lift.common.utils.StringUtils;
|
|
|
import cn.com.xwy.boot.web.dto.RestResponse;
|
|
|
+import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
+import java.util.List;
|
|
|
|
|
|
/**
|
|
|
* @author bieao
|
|
@@ -38,7 +44,11 @@ public class LiftController {
|
|
|
*/
|
|
|
@PostMapping("list")
|
|
|
public RestResponse list(@RequestBody LiftRequest request) {
|
|
|
- return liftService.list(request);
|
|
|
+ IPage<LiftResponse> page = liftService.list(request);
|
|
|
+ if (!StringUtils.isListEmpty(page.getRecords())) {
|
|
|
+ return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
|
|
|
+ }
|
|
|
+ return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -48,7 +58,26 @@ public class LiftController {
|
|
|
*/
|
|
|
@PostMapping("brand/list")
|
|
|
public RestResponse list(){
|
|
|
- return liftService.list();
|
|
|
+ List<LiftBrand> liftBrandList = liftService.list();
|
|
|
+ if (!StringUtils.isListEmpty(liftBrandList)) {
|
|
|
+ return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
|
|
|
+ }
|
|
|
+ return RestResponse.ok(liftBrandList, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @param request 电梯列表查询条件
|
|
|
+ * @return RestResponse 项目下电梯列表
|
|
|
+ * @description 查询项目下电梯列表
|
|
|
+ * @date 2019/12/17 11:04 AM
|
|
|
+ */
|
|
|
+ @PostMapping("project/list")
|
|
|
+ public RestResponse liftProjectList(@RequestBody LiftRequest request) {
|
|
|
+ IPage<LiftResponse> page = liftService.findLiftListByProjectId(request);
|
|
|
+ if (!StringUtils.isListEmpty(page.getRecords())) {
|
|
|
+ return RestResponse.ok(null, ApiConstants.RESULT_NO_DATA, MessageUtils.get("msg.data.empty"));
|
|
|
+ }
|
|
|
+ return RestResponse.ok(page, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.query.success"));
|
|
|
}
|
|
|
|
|
|
/**
|