|
@@ -1,11 +1,12 @@
|
|
package cn.com.ty.lift.business.project.service;
|
|
package cn.com.ty.lift.business.project.service;
|
|
|
|
|
|
|
|
+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.model.request.LiftExtensionRequest;
|
|
|
|
+import cn.com.ty.lift.business.library.service.LiftService;
|
|
import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceAppRequest;
|
|
import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceAppRequest;
|
|
-import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceRecordRequest;
|
|
|
|
import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse;
|
|
import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenancePlanResponse;
|
|
-import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenanceRecordResponse;
|
|
|
|
import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenancePlanMapper;
|
|
import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenancePlanMapper;
|
|
-import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenanceRecordMapper;
|
|
|
|
import cn.com.ty.lift.business.project.dao.entity.Project;
|
|
import cn.com.ty.lift.business.project.dao.entity.Project;
|
|
import cn.com.ty.lift.business.project.dao.entity.model.ProjectAppUser;
|
|
import cn.com.ty.lift.business.project.dao.entity.model.ProjectAppUser;
|
|
import cn.com.ty.lift.business.project.dao.entity.model.request.CompanyRequest;
|
|
import cn.com.ty.lift.business.project.dao.entity.model.request.CompanyRequest;
|
|
@@ -15,11 +16,13 @@ import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectDetailRe
|
|
import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectLiftResponse;
|
|
import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectLiftResponse;
|
|
import cn.com.ty.lift.business.project.dao.mapper.ProjectMapper;
|
|
import cn.com.ty.lift.business.project.dao.mapper.ProjectMapper;
|
|
import cn.com.ty.lift.business.project.dao.mapper.ProjectUserMapper;
|
|
import cn.com.ty.lift.business.project.dao.mapper.ProjectUserMapper;
|
|
|
|
+import cn.com.xwy.boot.web.dto.RestResponse;
|
|
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
+import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
@@ -37,13 +40,13 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper,Project> {
|
|
private ProjectMapper projectMapper;
|
|
private ProjectMapper projectMapper;
|
|
|
|
|
|
@Resource
|
|
@Resource
|
|
- private ProjectUserMapper projectUserMapper;
|
|
|
|
|
|
+ private LiftService liftService;
|
|
|
|
|
|
@Resource
|
|
@Resource
|
|
- private MaintenancePlanMapper maintenancePlanMapper;
|
|
|
|
|
|
+ private ProjectUserMapper projectUserMapper;
|
|
|
|
|
|
@Resource
|
|
@Resource
|
|
- private MaintenanceRecordMapper maintenanceRecordMapper;
|
|
|
|
|
|
+ private MaintenancePlanMapper maintenancePlanMapper;
|
|
|
|
|
|
/**
|
|
/**
|
|
* @param request 公司id
|
|
* @param request 公司id
|
|
@@ -67,6 +70,22 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper,Project> {
|
|
return projectMapper.findListByProjectId(page, request);
|
|
return projectMapper.findListByProjectId(page, request);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * @param request 新增电梯数据项
|
|
|
|
+ * @return RestResponse 状态码和返回消息
|
|
|
|
+ * @description 新增电梯
|
|
|
|
+ * @date 2020/1/11 4:22 下午
|
|
|
|
+ */
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
|
+ public RestResponse add(LiftExtensionRequest request){
|
|
|
|
+ Lift lift = request.getLift();
|
|
|
|
+ boolean result = liftService.save(lift);
|
|
|
|
+ if (!result) {
|
|
|
|
+ return RestResponse.fail(MessageUtils.get("msg.add.fail"));
|
|
|
|
+ }
|
|
|
|
+ return liftService.saveCompanyLiftInfo(lift.getId(), request.getMtCompanyId());
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* @param request 项目id
|
|
* @param request 项目id
|
|
* @return RestResponse 项目详情
|
|
* @return RestResponse 项目详情
|
|
@@ -91,14 +110,4 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper,Project> {
|
|
return maintenancePlanMapper.findListByWorkerId(page, request);
|
|
return maintenancePlanMapper.findListByWorkerId(page, request);
|
|
}
|
|
}
|
|
|
|
|
|
- /**
|
|
|
|
- * @param request 公司id和电梯id
|
|
|
|
- * @return RestResponse 保养信息
|
|
|
|
- * @description 根据公司id和电梯id查询上次保养信息
|
|
|
|
- * @date 2020/1/6 5:37 下午
|
|
|
|
- */
|
|
|
|
- public MaintenanceRecordResponse recordInfo(MaintenanceRecordRequest request) {
|
|
|
|
- return maintenanceRecordMapper.findRecordByCompanyId(request);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
}
|
|
}
|