Skip to content

A
amos-boot-biz
Commit e8a1e751 authored by suhuiguang's avatar suhuiguang
Browse files
Options

1.删除不用接口

parent 5a82f5e4
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 508 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/controller/PlanTaskController.java
View file @ e8a1e751
package com.yeejoin.amos.maintenance.business.controller; package com.yeejoin.amos.maintenance.business.controller;
import com.alibaba.fastjson.JSONObject;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.maintenance.business.constants.XJConstant;
import com.yeejoin.amos.maintenance.business.param.PlanTaskPageParam; import com.yeejoin.amos.maintenance.business.param.PlanTaskPageParam;
import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService; import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService;
import com.yeejoin.amos.maintenance.business.service.intfc.IPointService; import com.yeejoin.amos.maintenance.business.service.intfc.IPointService;
import com.yeejoin.amos.maintenance.business.service.intfc.IRouteService; import com.yeejoin.amos.maintenance.business.util.CommonResponse;
import com.yeejoin.amos.maintenance.business.util.*; import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
import com.yeejoin.amos.maintenance.business.vo.CodeOrderVo; import com.yeejoin.amos.maintenance.business.util.FileHelper;
import com.yeejoin.amos.maintenance.business.util.PlanTaskPageParamUtil;
import com.yeejoin.amos.maintenance.business.vo.PlanTaskVo; import com.yeejoin.amos.maintenance.business.vo.PlanTaskVo;
import com.yeejoin.amos.maintenance.business.vo.PointInputItemVo; import com.yeejoin.amos.maintenance.common.enums.OrderByEnum;
import com.yeejoin.amos.maintenance.common.enums.*; import com.yeejoin.amos.maintenance.common.enums.PlanTaskDetailIsFinishEnum;
import com.yeejoin.amos.maintenance.core.common.request.CommonPageable; import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
import com.yeejoin.amos.maintenance.core.common.request.CommonRequest; import com.yeejoin.amos.maintenance.core.common.request.CommonRequest;
import com.yeejoin.amos.maintenance.core.common.response.AppPointCheckRespone;
import com.yeejoin.amos.maintenance.core.framework.PersonIdentify; import com.yeejoin.amos.maintenance.core.framework.PersonIdentify;
import com.yeejoin.amos.maintenance.dao.entity.Point;
import com.yeejoin.amos.maintenance.dao.entity.PointClassify;
import com.yeejoin.amos.maintenance.exception.YeeException; import com.yeejoin.amos.maintenance.exception.YeeException;
import com.yeejoin.amos.maintenance.feign.RemoteSecurityService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
...@@ -28,16 +22,15 @@ import org.slf4j.Logger; ...@@ -28,16 +22,15 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType; import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.Bean; import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.text.ParseException; import java.util.HashMap;
import java.text.SimpleDateFormat; import java.util.List;
import java.util.*; import java.util.Map;
@RestController @RestController
@RequestMapping(value = "/api/planTask") @RequestMapping(value = "/api/planTask")
...@@ -51,12 +44,6 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -51,12 +44,6 @@ public class PlanTaskController extends AbstractBaseController {
@Autowired @Autowired
IPointService pointService; IPointService pointService;
@Autowired
private IRouteService routeService;
@Autowired
private RemoteSecurityService remoteSecurityService;
/** /**
* 计划执行查询 * 计划执行查询
* *
...@@ -111,29 +98,6 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -111,29 +98,6 @@ public class PlanTaskController extends AbstractBaseController {
} }
} }
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "初始化统计数据", notes = "始化统计数据")
@RequestMapping(value = "/resetPlanTask", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse resetPlanTask(@ApiParam(value = "组织编码", required = false) @RequestParam(required = true) String orgCode) {
ReginParams reginParams = getSelectedOrgInfo();
String companyId = reginParams.getCompany().getSequenceNbr().toString();
Toke toke = new Toke();
toke.setAppKey(getAppKey());
toke.setProduct(getProduct());
toke.setToke(getToken());
List<AgencyUserModel> list = remoteSecurityService.listUserByCompanyId(getToken(), getProduct(), getAppKey(), companyId);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
for (AgencyUserModel u : list) {
try {
planTaskService.reformStatisticsPlanTask("2019-01-01", sdf.format(new Date()), u.getUserId() + "", orgCode);
} catch (ParseException e) {
e.printStackTrace();
}
}
return CommonResponseUtil.success();
}
/** /**
* 计划执行删除 * 计划执行删除
* *
...@@ -160,7 +124,7 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -160,7 +124,7 @@ public class PlanTaskController extends AbstractBaseController {
@ApiOperation(value = "执行计划导出", notes = "执行计划导出") @ApiOperation(value = "执行计划导出", notes = "执行计划导出")
@PostMapping(value = "/reportPlanTask", produces = "application/vnd.ms-excel;charset=UTF-8") @PostMapping(value = "/reportPlanTask", produces = "application/vnd.ms-excel;charset=UTF-8")
public void planTaskReport( public void planTaskReport(
@ApiParam(value = "导出参数", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "导出参数") @RequestBody(required = false) List<CommonRequest> queryRequests,
HttpServletResponse response) { HttpServletResponse response) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
...@@ -169,7 +133,7 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -169,7 +133,7 @@ public class PlanTaskController extends AbstractBaseController {
PlanTaskPageParam params = new PlanTaskPageParam(); PlanTaskPageParam params = new PlanTaskPageParam();
PlanTaskPageParamUtil.fillChkInfoParam(queryRequests, null, params, paramMap); PlanTaskPageParamUtil.fillChkInfoParam(queryRequests, null, params, paramMap);
List<PlanTaskVo> list = planTaskService.planTaskReport(getToken(), getProduct(), getAppKey(), params); List<PlanTaskVo> list = planTaskService.planTaskReport(getToken(), getProduct(), getAppKey(), params);
String fileName = "计划执行" + new Date().getTime(); String fileName = "计划执行" + System.currentTimeMillis();
FileHelper.exportExcel(list, "计划执行", "计划执行", PlanTaskVo.class, fileName + ".xls", response); FileHelper.exportExcel(list, "计划执行", "计划执行", PlanTaskVo.class, fileName + ".xls", response);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
...@@ -192,14 +156,13 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -192,14 +156,13 @@ public class PlanTaskController extends AbstractBaseController {
* *
* @return * @return
*/ */
@ApiOperation(value = "定时执行任务表生成(<font color='blue'>release</font>)", notes = "定时执行任务表生成") @ApiOperation(value = "定时执行任务表生成", notes = "定时执行任务表生成")
@RequestMapping(value = "/queryOmission", method = RequestMethod.GET, produces = "application/json;charset=UTF-8") @RequestMapping(value = "/queryOmission", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
public CommonResponse pushCarData() { public CommonResponse pushCarData() {
try { try {
planTaskService.taskExecution(null); planTaskService.taskExecution(null);
return CommonResponseUtil.success(); return CommonResponseUtil.success();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return CommonResponseUtil.failure(); return CommonResponseUtil.failure();
} }
...@@ -218,238 +181,29 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -218,238 +181,29 @@ public class PlanTaskController extends AbstractBaseController {
planTaskService.taskExecution(runDate); planTaskService.taskExecution(runDate);
return CommonResponseUtil.success(); return CommonResponseUtil.success();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return CommonResponseUtil.failure(); return CommonResponseUtil.failure();
} }
} }
/**
* 根据点查询用户权限所有巡检执行计划
*
* @param dataType 数据类型
* @param serial 巡检点编号
* @param planTaskId 巡检任务Id
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "根据点查询用户权限所有巡检执行计划(<font color='blue'>手机app</font>)", notes = "根据点查询用户权限所有巡检执行计划(<font color='blue'>手机app</font>)") @ApiOperation(value = "维保设施分页列表-mobile", notes = "维保设施分页列表-mobile")
@RequestMapping(value = "/queryPlanTaskBySerial", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse qryPlanTaskByPoint(
@ApiParam(value = "数据类型", required = false) @RequestParam(required = true) int dataType,
@ApiParam(value = "巡检点编号", required = true) @RequestParam(required = true) String serial,
@ApiParam(value = "参数", required = false) @RequestParam(required = false) Long planTaskId) {
try {
HashMap<String, Object> params = new HashMap<>();
ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getOrgCode(reginParams);
params.put("orgCode", loginOrgCode);
params.put("pointNo", serial);
Point point = pointService.queryPointByPointNo(params);
// 1.通用校验
if (point == null) {
return CommonResponseUtil.failure("巡检点不存在");
}
long pointId = point.getId();
// 2.计划巡检校验
if (planTaskId != null) {
// 1.校验当前点的执行情况，不能重复巡检及超时巡检
params.put("planTaskId", planTaskId);
List<CodeOrderVo> list = planTaskService.queryCodeOrderVo(params);
if (ObjectUtils.isEmpty(list)) {
return CommonResponseUtil.failure("该计划已刷新，请重新选择！！！");
}
if (list.get(0).getStatus() == PlanTaskFinishStatusEnum.OVERTIME.getValue()) {
return CommonResponseUtil.failure("任务已超时！");
}
if (list.get(0).getStatus() == PlanTaskFinishStatusEnum.FINISHED.getValue()) {
return CommonResponseUtil.failure("任务已结束！");
}
//2.顺序执行->按照点planTaskId，查询出所有点并按照orderNo排序,判断上一个点的执行情况
for (int i = 0; i < list.size(); i++) {
if (list.get(i).getPointId() == pointId) {
if (!PlanTaskDetailStatusEnum.NOTSTARTED.getValue().equals(list.get(i).getIsFinish())) {
return CommonResponseUtil.failure("任务已结束！");
}
if (TaskIsOrderEnum.ISORDER.getValue().equals(list.get(0).getInOrder())) {
if (i > 0 && PlanTaskDetailStatusEnum.NOTSTARTED.getValue().equals(list.get(i - 1).getIsFinish())) {
return CommonResponseUtil.failure("请按顺序执行！");
}
}
}
}
}
return CommonResponseUtil.success(point);
} catch (Exception e) {
log.error(e.getMessage(), e);
return CommonResponseUtil.failure("巡检点查询失败");
}
}
/**
* 查询任务点详情
*
* @param planTaskId
* @param pointId
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
//@Authorization(ingore = true)
@ApiOperation(value = "根据计划任务ID和点ID初始化巡检页面(<font color='blue'>手机app</font>)", notes = "根据计划任务ID和点ID初始化巡检页面((<font color='blue'>手机app</font>)")
@RequestMapping(value = "/initPlanTask", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse qryPlanTaskDetailById(
@ApiParam(value = "巡检计划任务ID") @RequestParam(required = false) Long planTaskId,
@ApiParam(value = "巡检点id", required = true) @RequestParam(required = true) Long pointId) {
try {
Map<String, Object> response = new HashMap<String, Object>();
if (planTaskId != null && planTaskId > 0) {
Point point = pointService.queryPointById(pointId);
if (!XJConstant.IS_FIXED_YES.equals(point.getIsFixed())) {
// 1.校验当前点的执行情况，不能重复巡检及超时巡检
HashMap<String, Object> params = new HashMap<String, Object>();
params.put("planTaskId", planTaskId);
List<CodeOrderVo> list = planTaskService.queryCodeOrderVo(params);
if (ObjectUtils.isEmpty(list)) {
return CommonResponseUtil.failure("该计划已刷新，请重新选择！！！");
}
if (list.get(0).getStatus() == PlanTaskFinishStatusEnum.OVERTIME.getValue()) {
return CommonResponseUtil.failure("任务已超时！");
}
if (list.get(0).getStatus() == PlanTaskFinishStatusEnum.FINISHED.getValue()) {
return CommonResponseUtil.failure("任务已结束！");
}
//2.顺序执行->按照点planTaskId，查询出所有点并按照orderNo排序,判断上一个点的执行情况
for (int i = 0; i < list.size(); i++) {
if (list.get(i).getPointId().longValue() == pointId) {
if (!PlanTaskDetailStatusEnum.NOTSTARTED.getValue().equals(list.get(i).getIsFinish())) {
return CommonResponseUtil.failure("任务已结束！");
}
if (TaskIsOrderEnum.ISORDER.getValue().equals(list.get(0).getInOrder())) {
if (i > 0 && PlanTaskDetailStatusEnum.NOTSTARTED.getValue().equals(list.get(i - 1).getIsFinish())) {
return CommonResponseUtil.failure("请按顺序执行！");
}
}
}
}
}
Map taskDetail = planTaskService.findPlanTaskByTaskIdAndPointId(planTaskId, pointId);
taskDetail.put("shotMaxNumber", point.getShotMaxNumber());
taskDetail.put("shotMinNumber", point.getShotMinNumber());
response.put("planTask", taskDetail);
List<PointInputItemVo> inputItems = routeService
.listRoutePointInputItem(Long.valueOf(taskDetail.get("routeId").toString()), pointId);
List<Map<String, Object>> pointClassify = pointService.queryPointClassifyByRouteIdAndPointId(
Long.valueOf(taskDetail.get("routeId").toString()), pointId);
pointClassify.removeAll(Collections.singleton(null));
response.put("class", pointClassify);
response.put("checkItem", inputItems);
return CommonResponseUtil.success(response);
} else {
Point point = pointService.queryPointById(pointId);
List<PointInputItemVo> inputItems = pointService.queryPointClassInputItem(pointId);
response.put("checkItem", inputItems);
List<PointClassify> catalogs = pointService.queryPointClassify(pointId);
response.put("class", catalogs);
response.put("point", point);
return CommonResponseUtil.success(response);
}
} catch (Exception e) {
return CommonResponseUtil.failure(e.getMessage());
}
}
/**
* 查询任务点详情
*
* @param planTaskId
* @param pointId
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
// @Authorization(ingore = true)
@ApiOperation(value = "根据计划任务ID和点ID初始化巡检页面(<font color='blue'>手机app</font>)", notes = "根据计划任务ID和点ID初始化巡检页面((<font color='blue'>手机app</font>)")
@RequestMapping(value = "/v2/initPlanTask", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse qryPlanTaskDetailByIdInVersion2(
@ApiParam(value = "巡检计划任务ID") @RequestParam(required = false) Long planTaskId,
@ApiParam(value = "巡检点id", required = true) @RequestParam(required = true) Long pointId) {
try {
Map<String, Object> response = new HashMap<String, Object>();
if (planTaskId != null && planTaskId > 0) {
Point point = pointService.queryPointById(pointId);
if (!XJConstant.IS_FIXED_YES.equals(point.getIsFixed())) {
// 1.校验当前点的执行情况，不能重复巡检及超时巡检
HashMap<String, Object> params = new HashMap<String, Object>();
params.put("planTaskId", planTaskId);
List<CodeOrderVo> list = planTaskService.queryCodeOrderVo(params);
if (ObjectUtils.isEmpty(list)) {
return CommonResponseUtil.failure("该计划已刷新，请重新选择！！！");
}
if (list.get(0).getStatus() == PlanTaskFinishStatusEnum.OVERTIME.getValue()) {
return CommonResponseUtil.failure("任务已超时！");
}
if (list.get(0).getStatus() == PlanTaskFinishStatusEnum.FINISHED.getValue()) {
return CommonResponseUtil.failure("任务已结束！");
}
//2.顺序执行->按照点planTaskId，查询出所有点并按照orderNo排序,判断上一个点的执行情况
for (int i = 0; i < list.size(); i++) {
if (list.get(i).getPointId().longValue() == pointId) {
if (!PlanTaskDetailStatusEnum.NOTSTARTED.getValue().equals(list.get(i).getIsFinish())) {
return CommonResponseUtil.failure("任务已结束！");
}
if (TaskIsOrderEnum.ISORDER.getValue().equals(list.get(0).getInOrder())) {
if (i > 0 && PlanTaskDetailStatusEnum.NOTSTARTED.getValue().equals(list.get(i - 1).getIsFinish())) {
return CommonResponseUtil.failure("请按顺序执行！");
}
}
}
}
}
Map taskDetail = planTaskService.findPlanTaskByTaskIdAndPointId(planTaskId, pointId);
taskDetail.put("shotMaxNumber", point.getShotMaxNumber());
taskDetail.put("shotMinNumber", point.getShotMinNumber());
response.put("planTask", taskDetail);
Long routeId = Long.valueOf(taskDetail.get("routeId").toString());
List<PointInputItemVo> inputItems = routeService.listRoutePointInputItem(routeId, pointId);
List<Map<String, Object>> pointClassify = pointService.queryPointClassifyByRouteIdAndPointId(routeId, pointId);
pointClassify.removeAll(Collections.singleton(null));
response.put("class", pointClassify);
response.put("checkItem", pointService.getClassifyRiskDescMap(inputItems));
log.info(JSONObject.toJSONString(response));
return CommonResponseUtil.success(response);
} else {
Point point = pointService.queryPointById(pointId);
JSONObject inputItems = pointService.getClassifyRiskDescMap(pointId);
response.put("checkItem", inputItems);
List<PointClassify> catalogs = pointService.queryPointClassify(pointId);
response.put("class", catalogs);
response.put("point", point);
log.info(JSONObject.toJSONString(response));
return CommonResponseUtil.success(response);
}
} catch (Exception e) {
log.error("请求异常", e);
return CommonResponseUtil.failure(e.getMessage());
}
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "根据计划任务ID查询计划任务详情和任务点(<font color='blue'>手机app</font>)", notes = "根据计划任务ID查询计划任务详情和任务点(<font color='blue'>手机app</font>)")
@RequestMapping(value = "/point/{planTaskId}/list", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/point/{planTaskId}/list", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse qryPlanTaskById( public CommonResponse qryPlanTaskById(
@ApiParam(value = "巡检计划任务ID", required = true) @PathVariable Long planTaskId, @ApiParam(value = "巡检计划任务ID", required = true) @PathVariable Long planTaskId,
@ApiParam(value = "建筑id", required = true) @RequestParam(value = "buildingId",required = false) String buildingId, @ApiParam(value = "建筑id", required = true) @RequestParam(value = "buildingId", required = false) String buildingId,
@ApiParam(value = "维保状态", required = true) @RequestParam(value = "isFinish",required = false) String isFinish, @ApiParam(value = "维保状态", required = true) @RequestParam(value = "isFinish", required = false) String isFinish,
@ApiParam(value = "消防系统id", required = true) @RequestParam(value = "systemId",required = false) String systemId, @ApiParam(value = "消防系统id", required = true) @RequestParam(value = "systemId", required = false) String systemId,
@ApiParam(value = "设备编号", required = true) @RequestParam(value = "pointNo",required = false) String pointNo, @ApiParam(value = "设备编号", required = true) @RequestParam(value = "pointNo", required = false) String pointNo,
@ApiParam(value = "设备名称", required = true) @RequestParam(value = "pointName",required = false) String pointName @ApiParam(value = "设备名称", required = true) @RequestParam(value = "pointName", required = false) String pointName
) { ) {
Map<String,Object> param = new HashMap<>(); Map<String, Object> param = new HashMap<>();
param.put("planTaskId",planTaskId); param.put("planTaskId", planTaskId);
param.put("buildingId",buildingId); param.put("buildingId", buildingId);
param.put("isFinish",isFinish); param.put("isFinish", isFinish);
param.put("systemId",systemId); param.put("systemId", systemId);
param.put("pointNo",pointNo); param.put("pointNo", pointNo);
param.put("pointName",pointName); param.put("pointName", pointName);
return CommonResponseUtil.success(planTaskService.getPlanTaskPoints(param)); return CommonResponseUtil.success(planTaskService.getPlanTaskPoints(param));
} }
...@@ -465,13 +219,13 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -465,13 +219,13 @@ public class PlanTaskController extends AbstractBaseController {
@RequestMapping(value = "/queryPlanTask", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/queryPlanTask", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse qryLoginUserPlanTask( public CommonResponse qryLoginUserPlanTask(
@ApiParam(value = "人员") @RequestParam(value = "userId", required = false) Long userId, @ApiParam(value = "人员") @RequestParam(value = "userId", required = false) Long userId,
@ApiParam(value = "开始日期",required = true) @RequestParam(value = "startDate") String startTime, @ApiParam(value = "开始日期", required = true) @RequestParam(value = "startDate") String startTime,
@ApiParam(value = "结束日期",required = true) @RequestParam(value = "endDate") String endTime, @ApiParam(value = "结束日期", required = true) @RequestParam(value = "endDate") String endTime,
@ApiParam(value = "维保状态") @RequestParam(value = "finishStatus", required = false) Integer finishStatus, @ApiParam(value = "维保状态") @RequestParam(value = "finishStatus", required = false) Integer finishStatus,
@ApiParam(value = "排序条件") @RequestParam(value = "orderBy",defaultValue = "1") String orderBy, @ApiParam(value = "排序条件") @RequestParam(value = "orderBy", defaultValue = "1") String orderBy,
@ApiParam(value = "业主单位") @RequestParam(value = "companyId", required = false) String companyId, @ApiParam(value = "业主单位") @RequestParam(value = "companyId", required = false) String companyId,
@ApiParam(value = "当前页", required =true) @RequestParam(value = "pageNumber") int pageNumber, @ApiParam(value = "当前页", required = true) @RequestParam(value = "pageNumber") int pageNumber,
@ApiParam(value = "页大小", required =true) @RequestParam(value = "pageSize") int pageSize) throws Exception { @ApiParam(value = "页大小", required = true) @RequestParam(value = "pageSize") int pageSize) throws Exception {
HashMap<String, Object> params = new HashMap<>(); HashMap<String, Object> params = new HashMap<>();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getOrgCode(reginParams); String loginOrgCode = getOrgCode(reginParams);
...@@ -488,188 +242,20 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -488,188 +242,20 @@ public class PlanTaskController extends AbstractBaseController {
return CommonResponseUtil.success(planTaskService.getPlanTasks(params, pageable)); return CommonResponseUtil.success(planTaskService.getPlanTasks(params, pageable));
} }
public static Object nvl(Object param) {
return param != null ? param : null;
}
/**
* 查询任务列表
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "获取用户当前所正在进行中和尚未开始的任务个数(<font color='blue'>手机app</font>)", notes = "获取用户当前所欲呕正在进行中和尚未开始的任务个数(<font color='blue'>手机app</font>)")
@RequestMapping(value = "/queryPlanTaskCount", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
public CommonResponse hasPlanTask() {
try {
int count = planTaskService.getCurrentPlanTaskCount(getUserId());
return CommonResponseUtil.success(count);
} catch (Exception e) {
log.error(e.getMessage(), e);
return CommonResponseUtil.failure(e.getMessage());
}
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/queryPlanTaskStatistics", produces = "application/json;charset=UTF-8")
@ApiOperation(value = "查询用户计划任务统计(<font color='blue'>手机app</font>)", notes = "查询用户计划任务统计(<font color='blue'>手机app</font>)<br />font color='blue'>参数： startTime, endTime </font>")
public CommonResponse queryPlanTaskStatistics(
@ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests) {
HashMap<String, Object> params = new HashMap<String, Object>();
HashMap<String, Object> resp = new HashMap<String, Object>();
ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getOrgCode(reginParams);
PlanTaskPageParamUtil.fillPlanTask(queryRequests, params);
params.put("userId", getUserId());
if (queryRequests != null && queryRequests.size() > 0) {
for (int i = 0; i < queryRequests.size(); i++) {
String name = queryRequests.get(i).getName();
if ("startTime".equals(name)) {
params.put("startTime", queryRequests.get(i).getValue());
} else if ("endTime".equals(name)) {
params.put("endTime", queryRequests.get(i).getValue());
}
}
}
Map<String, Object> userResp = planTaskService.getPlanTaskStatisticsForApp(params);
resp.put("user", userResp);
params.put("userId", null);
params.put("orgCode", loginOrgCode);
Map<String, Object> orgResp = planTaskService.getPlanTaskStatisticsForApp(params);
resp.put("company", orgResp);
params.put("orgCode", null);
return CommonResponseUtil.success(resp);
}
/**
* 根据任务id和点id获取“未开始”任务点详情
*
* @param planTaskId
* @param pointId
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "根据任务id和点id获取“未开始”任务点详情(<font color='blue'>手机app</font>)", notes = "根据任务id和点id获取“未开始”任务点详情(<font color='blue'>手机app</font>)")
@RequestMapping(value = "/queryPointPlanTaskDetail", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryPointPlanTaskDetail(
@ApiParam(value = "巡检计划任务ID", required = true) @RequestParam(required = true) Long planTaskId,
@ApiParam(value = "巡检点ID", required = true) @RequestParam(required = true) Long pointId) {
try {
AppPointCheckRespone result = planTaskService.queryPointPlanTaskDetail(getToken(), getProduct(), getAppKey(), planTaskId, pointId);
if (ObjectUtils.isEmpty(result)) {
return CommonResponseUtil.failure("该计划巡检点已更新，请退回重新选择");
}
return CommonResponseUtil.success(result);
} catch (Exception e) {
log.error(e.getMessage(), e);
return CommonResponseUtil.failure(e.getMessage());
}
}
/**
* 根据任务id和点id获取“未开始”任务点详情
*
* @param planTaskId
* @param pointId
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "根据任务id和点id获取“未开始”任务点详情(<font color='blue'>手机app</font>)", notes = "根据任务id和点id获取“未开始”任务点详情(<font color='blue'>手机app</font>)")
@RequestMapping(value = "/v2/queryPointPlanTaskDetail", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryPointPlanTaskDetailInVersion2(
@ApiParam(value = "巡检计划任务ID", required = true) @RequestParam(required = true) Long planTaskId,
@ApiParam(value = "巡检点ID", required = true) @RequestParam(required = true) Long pointId) {
try {
AppPointCheckRespone result = planTaskService.queryPointPlanTaskDetailInVersion2(getToken(), getProduct(), getAppKey(), planTaskId, pointId);
if (ObjectUtils.isEmpty(result)) {
return CommonResponseUtil.failure("该计划巡检点已更新，请退回重新选择");
}
return CommonResponseUtil.success(result);
} catch (Exception e) {
log.error(e.getMessage(), e);
return CommonResponseUtil.failure(e.getMessage());
}
}
/**
* 离线同步计划
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
//@Authorization(ingore = true)
@ApiOperation(value = "获取离线巡检数据", notes = "取离线巡检数据")
@RequestMapping(value = "/queryLeavePlanTask", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryLeavePlanTask() {
String userId = getUserId();
ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getOrgCode(reginParams);
HashMap<String, Object> params = new HashMap<String, Object>();
params.put("userId", userId);
params.put("orgCode", loginOrgCode);
return CommonResponseUtil.success(planTaskService.queryLeavePlanTask(params));
}
/**
* 业务查询巡检点时间戳数据
*
* @param userId
* @param createDate
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "业务查询巡检点时间戳数据", notes = "业务查询巡检点时间戳数据")
@RequestMapping(value = "/queryPlanTaskTimeAxis", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryPlanTaskTimeAxis(
@ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long userId,
@ApiParam(value = "天数", required = false) @RequestParam(required = false) Integer createDate) {
try {
List<Map<String, Object>> result = planTaskService.queryPlanTaskTimeAxis(userId, createDate);
return CommonResponseUtil.success(result);
} catch (Exception e) {
log.error(e.getMessage(), e);
return CommonResponseUtil.failure(e.getMessage());
}
}
/**
* 业务查询巡检点时间戳数据（业务大屏）
*
* @param userId
* @param createDate
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "业务查询巡检点时间戳数据", notes = "业务查询巡检点时间戳数据")
@RequestMapping(value = "/queryTimeAxis", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
public CommonResponse queryTimeAxis(
@ApiParam(value = "用户id", required = false) @RequestParam(required = false) Long userId,
@ApiParam(value = "天数", required = false) @RequestParam(required = false) Integer createDate) {
try {
List<Map<String, Object>> result = planTaskService.queryTimeAxis(userId, createDate);
return CommonResponseUtil.success(result);
} catch (Exception e) {
log.error(e.getMessage(), e);
return CommonResponseUtil.failure(e.getMessage());
}
}
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询维保设施，检查内容详情") @ApiOperation(value = "查询维保设施，检查内容详情")
@GetMapping(value = "/task-point-detail") @GetMapping(value = "/task-point-detail")
public CommonResponse planTaskPointDetail( public CommonResponse planTaskPointDetail(
@RequestParam(value = "routePointId") String routePointId, @RequestParam(value = "routePointId") String routePointId,
@RequestParam(value = "id") String planTaskDetailId @RequestParam(value = "id") String planTaskDetailId
){ ) {
return CommonResponseUtil.success(planTaskService.planTaskPointDetail(planTaskDetailId,routePointId)); return CommonResponseUtil.success(planTaskService.planTaskPointDetail(planTaskDetailId, routePointId));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "维保设施完成状态下拉枚举数据") @ApiOperation(value = "维保设施完成状态下拉枚举数据")
@GetMapping(value = "/taskDetail/finishStatus/list") @GetMapping(value = "/taskDetail/finishStatus/list")
public CommonResponse planTaskPointDetail(){ public CommonResponse planTaskPointDetail() {
return CommonResponseUtil.success(PlanTaskDetailIsFinishEnum.getEnumList()); return CommonResponseUtil.success(PlanTaskDetailIsFinishEnum.getEnumList());
} }
} }
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PlanTaskServiceImpl.java
View file @ e8a1e751
...@@ -22,7 +22,6 @@ import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService; ...@@ -22,7 +22,6 @@ import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService;
import com.yeejoin.amos.maintenance.business.util.PlanTaskUtil; import com.yeejoin.amos.maintenance.business.util.PlanTaskUtil;
import com.yeejoin.amos.maintenance.business.util.Toke; import com.yeejoin.amos.maintenance.business.util.Toke;
import com.yeejoin.amos.maintenance.business.vo.CalDateVo; import com.yeejoin.amos.maintenance.business.vo.CalDateVo;
import com.yeejoin.amos.maintenance.business.vo.CodeOrderVo;
import com.yeejoin.amos.maintenance.business.vo.LeavePlanTaskVo; import com.yeejoin.amos.maintenance.business.vo.LeavePlanTaskVo;
import com.yeejoin.amos.maintenance.business.vo.PlanTaskVo; import com.yeejoin.amos.maintenance.business.vo.PlanTaskVo;
import com.yeejoin.amos.maintenance.core.common.request.CommonPageable; import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
...@@ -36,7 +35,6 @@ import com.yeejoin.amos.maintenance.feign.RemoteSecurityService; ...@@ -36,7 +35,6 @@ import com.yeejoin.amos.maintenance.feign.RemoteSecurityService;
import com.yeejoin.amos.maintenance.quartz.IJobService; import com.yeejoin.amos.maintenance.quartz.IJobService;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.assertj.core.util.Lists; import org.assertj.core.util.Lists;
import org.omg.CORBA.OBJ_ADAPTER;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -330,8 +328,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -330,8 +328,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
//2.循环遍历执行 //2.循环遍历执行
HashMap<String, Object> paramMap = new HashMap<String, Object>(); HashMap<String, Object> paramMap = new HashMap<String, Object>();
for (Plan plan : planList) { for (Plan plan : planList) {
if (StringUtils.isEmpty(plan.getUserId())) if (StringUtils.isEmpty(plan.getUserId())) {
continue; continue;
}
paramMap.clear(); paramMap.clear();
paramMap.put("id", plan.getId()); paramMap.put("id", plan.getId());
//2.1计划数据合法性校验 //2.1计划数据合法性校验
...@@ -559,15 +558,6 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -559,15 +558,6 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
} }
} }
@Override
public List getPlanTaskInfo(HashMap<String, Object> param) {
return planTaskMapper.getPlanTaskByPointId(param);
}
@Override
public Map findPlanTaskByTaskIdAndPointId(long plantaskId, long pointId) {
return planTaskDetailMapper.findPlanTaskByTaskIdAndPointId(plantaskId, pointId);
}
@Override @Override
public Page<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params, CommonPageable pageParam) { public Page<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params, CommonPageable pageParam) {
...@@ -576,18 +566,13 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -576,18 +566,13 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
if (total == 0) { if (total == 0) {
return new PageImpl<>(content, pageParam, total); return new PageImpl<>(content, pageParam, total);
} }
params.put("offset",pageParam.getOffset()); params.put("offset", pageParam.getOffset());
params.put("pageSize",pageParam.getPageSize()); params.put("pageSize", pageParam.getPageSize());
content = planTaskMapper.getPlanTasks(params); content = planTaskMapper.getPlanTasks(params);
return new PageImpl<>(content, pageParam, total); return new PageImpl<>(content, pageParam, total);
} }
@Override @Override
public Map queryPlanTaskById(Long planTaskId) {
return planTaskMapper.queryPlanTaskById(planTaskId);
}
@Override
public List getPlanTaskPoints(Map<String, Object> param) { public List getPlanTaskPoints(Map<String, Object> param) {
return planTaskMapper.getPlanTaskPoints(param); return planTaskMapper.getPlanTaskPoints(param);
} }
...@@ -881,11 +866,6 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -881,11 +866,6 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
} }
@Override @Override
public List<CodeOrderVo> queryCodeOrderVo(HashMap<String, Object> params) {
return planTaskMapper.queryCodeOrderVo(params);
}
@Override
public PlanTask selectPlanTaskStatus(Long id) { public PlanTask selectPlanTaskStatus(Long id) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
if (iplanTaskDao.existsById(id)) { if (iplanTaskDao.existsById(id)) {
...@@ -1018,16 +998,16 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -1018,16 +998,16 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
@Override @Override
public Map<String, Object> planTaskPointDetail(String planTaskDetailId, String routePointId) { public Map<String, Object> planTaskPointDetail(String planTaskDetailId, String routePointId) {
Map<String,Object> result = new LinkedHashMap<>(); Map<String, Object> result = new LinkedHashMap<>();
Optional<RoutePoint> rOp = iRoutePointDao.findById(Long.parseLong(routePointId)); Optional<RoutePoint> rOp = iRoutePointDao.findById(Long.parseLong(routePointId));
RoutePoint routePoint = rOp.orElseThrow(()->new RuntimeException("计划清单不存在该点")); RoutePoint routePoint = rOp.orElseThrow(() -> new RuntimeException("计划清单不存在该点"));
Point point = iPointDao.findById(routePoint.getPointId()).orElseThrow(()->new RuntimeException("维保项不存在")); Point point = iPointDao.findById(routePoint.getPointId()).orElseThrow(() -> new RuntimeException("维保项不存在"));
PlanTaskDetail planTaskDetail = iPlanTaskDetailDao.findById(Long.parseLong(planTaskDetailId)).orElseThrow(()->new RuntimeException("任务不存在")); PlanTaskDetail planTaskDetail = iPlanTaskDetailDao.findById(Long.parseLong(planTaskDetailId)).orElseThrow(() -> new RuntimeException("任务不存在"));
PlanTask planTask = iplanTaskDao.findById(planTaskDetail.getTaskNo()).orElseThrow(()->new RuntimeException("主任务不存在")); PlanTask planTask = iplanTaskDao.findById(planTaskDetail.getTaskNo()).orElseThrow(() -> new RuntimeException("主任务不存在"));
Map<String,Object> facility = this.buildFacilityDetail(point,planTask); Map<String, Object> facility = this.buildFacilityDetail(point, planTask);
List<Map<String, Object>> itemList = this.buildCheckInputItem(routePointId); List<Map<String, Object>> itemList = this.buildCheckInputItem(routePointId);
result.put("facility",facility); result.put("facility", facility);
result.put("itemList",itemList); result.put("itemList", itemList);
return result; return result;
} }
...@@ -1036,13 +1016,13 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -1036,13 +1016,13 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
} }
private Map<String, Object> buildFacilityDetail(Point point, PlanTask planTask) { private Map<String, Object> buildFacilityDetail(Point point, PlanTask planTask) {
Map<String,Object> facility = new LinkedHashMap<>(); Map<String, Object> facility = new LinkedHashMap<>();
facility.put("name",point.getName()); facility.put("name", point.getName());
facility.put("pointId",point.getId()); facility.put("pointId", point.getId());
facility.put("pointNo",point.getPointNo()); facility.put("pointNo", point.getPointNo());
facility.put("position",point.getBuildingName() + point.getAddress()); facility.put("position", point.getBuildingName() + point.getAddress());
facility.put("userName",planTask.getUserName()); facility.put("userName", planTask.getUserName());
facility.put("riskAndManage",point.getRemark()); facility.put("riskAndManage", point.getRemark());
return facility; return facility;
} }
} }
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/IPlanTaskService.java
View file @ e8a1e751
...@@ -60,34 +60,17 @@ public interface IPlanTaskService { ...@@ -60,34 +60,17 @@ public interface IPlanTaskService {
*/ */
void disablePlanTask(Long[] routeIds); void disablePlanTask(Long[] routeIds);
/**
* app 根据条件查询用户权限内所有当前巡检计划任务
* @param params
* @return
*/
List getPlanTaskInfo(HashMap<String, Object> params);
/**
* 根据计划任务ID查询任务想起
* @param id
* @return
*/
public Map findPlanTaskByTaskIdAndPointId(long id, long pointId);
/** /**
* 天剑查询假话任务信息 * 计划任务列表
* @param params * @param params
* @param page * @param page
* @return * @return
*/ */
Page<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params, CommonPageable page); Page<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params, CommonPageable page);
/**
* 根据计划任务Id获取计划任务信息
* @param planTaskId
* @return
*/
Map queryPlanTaskById(Long planTaskId);
/** /**
* 根据计划ID获取所有的 任务计划巡检点 * 根据计划ID获取所有的 任务计划巡检点
...@@ -138,11 +121,9 @@ public interface IPlanTaskService { ...@@ -138,11 +121,9 @@ public interface IPlanTaskService {
List<LeavePlanTaskVo> queryLeavePlanTask(HashMap<String, Object> params); List<LeavePlanTaskVo> queryLeavePlanTask(HashMap<String, Object> params);
List<CodeOrderVo> queryCodeOrderVo(HashMap<String, Object> params);
PlanTask selectPlanTaskStatus(Long id); PlanTask selectPlanTaskStatus(Long id);
public void reformStatisticsPlanTask(String strBginDate, String strEndDate, String userId, String orgCode) throws ParseException; void reformStatisticsPlanTask(String strBginDate, String strEndDate, String userId, String orgCode) throws ParseException;
void initPlanStatusOrGenDate(); void initPlanStatusOrGenDate();
......
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