1.删除不用接口

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PlanTaskServiceImpl.java

@@ -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.Toke;
 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.PlanTaskVo;
 import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
@@ -36,7 +35,6 @@ import com.yeejoin.amos.maintenance.feign.RemoteSecurityService;
 import com.yeejoin.amos.maintenance.quartz.IJobService;
 import org.apache.commons.collections.CollectionUtils;
 import org.assertj.core.util.Lists;
-import org.omg.CORBA.OBJ_ADAPTER;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -330,8 +328,9 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         //2.循环遍历执行
         HashMap<String, Object> paramMap = new HashMap<String, Object>();
         for (Plan plan : planList) {
-            if (StringUtils.isEmpty(plan.getUserId()))
+            if (StringUtils.isEmpty(plan.getUserId())) {
                 continue;
+            }
             paramMap.clear();
             paramMap.put("id", plan.getId());
             //2.1计划数据合法性校验
@@ -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
     public Page<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params, CommonPageable pageParam) {
@@ -576,18 +566,13 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         if (total == 0) {
             return new PageImpl<>(content, pageParam, total);
         }
-        params.put("offset",pageParam.getOffset());
-        params.put("pageSize",pageParam.getPageSize());
+        params.put("offset", pageParam.getOffset());
+        params.put("pageSize", pageParam.getPageSize());
         content = planTaskMapper.getPlanTasks(params);
         return new PageImpl<>(content, pageParam, total);
     }
 
     @Override
-    public Map queryPlanTaskById(Long planTaskId) {
-        return planTaskMapper.queryPlanTaskById(planTaskId);
-    }
-
-    @Override
     public List getPlanTaskPoints(Map<String, Object> param) {
         return planTaskMapper.getPlanTaskPoints(param);
     }
@@ -881,11 +866,6 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     }
 
     @Override
-    public List<CodeOrderVo> queryCodeOrderVo(HashMap<String, Object> params) {
-        return planTaskMapper.queryCodeOrderVo(params);
-    }
-
-    @Override
     public PlanTask selectPlanTaskStatus(Long id) {
         // TODO Auto-generated method stub
         if (iplanTaskDao.existsById(id)) {
@@ -1018,16 +998,16 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 
     @Override
     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));
-        RoutePoint routePoint = rOp.orElseThrow(()->new RuntimeException("计划清单不存在该点"));
-        Point point = iPointDao.findById(routePoint.getPointId()).orElseThrow(()->new RuntimeException("维保项不存在"));
-        PlanTaskDetail planTaskDetail = iPlanTaskDetailDao.findById(Long.parseLong(planTaskDetailId)).orElseThrow(()->new RuntimeException("任务不存在"));
-        PlanTask planTask = iplanTaskDao.findById(planTaskDetail.getTaskNo()).orElseThrow(()->new RuntimeException("主任务不存在"));
-        Map<String,Object> facility = this.buildFacilityDetail(point,planTask);
+        RoutePoint routePoint = rOp.orElseThrow(() -> new RuntimeException("计划清单不存在该点"));
+        Point point = iPointDao.findById(routePoint.getPointId()).orElseThrow(() -> new RuntimeException("维保项不存在"));
+        PlanTaskDetail planTaskDetail = iPlanTaskDetailDao.findById(Long.parseLong(planTaskDetailId)).orElseThrow(() -> new RuntimeException("任务不存在"));
+        PlanTask planTask = iplanTaskDao.findById(planTaskDetail.getTaskNo()).orElseThrow(() -> new RuntimeException("主任务不存在"));
+        Map<String, Object> facility = this.buildFacilityDetail(point, planTask);
         List<Map<String, Object>> itemList = this.buildCheckInputItem(routePointId);
-        result.put("facility",facility);
-        result.put("itemList",itemList);
+        result.put("facility", facility);
+        result.put("itemList", itemList);
         return result;
     }
 
@@ -1036,13 +1016,13 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     }
 
     private Map<String, Object> buildFacilityDetail(Point point, PlanTask planTask) {
-        Map<String,Object> facility = new LinkedHashMap<>();
-        facility.put("name",point.getName());
-        facility.put("pointId",point.getId());
-        facility.put("pointNo",point.getPointNo());
-        facility.put("position",point.getBuildingName() + point.getAddress());
-        facility.put("userName",planTask.getUserName());
-        facility.put("riskAndManage",point.getRemark());
+        Map<String, Object> facility = new LinkedHashMap<>();
+        facility.put("name", point.getName());
+        facility.put("pointId", point.getId());
+        facility.put("pointNo", point.getPointNo());
+        facility.put("position", point.getBuildingName() + point.getAddress());
+        facility.put("userName", planTask.getUserName());
+        facility.put("riskAndManage", point.getRemark());
         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

@@ -60,34 +60,17 @@ public interface IPlanTaskService {
 	 */
 	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 page
 	 * @return
 	 */
 	Page<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params, CommonPageable page);
 
-	/**
-	 *  根据计划任务Id获取计划任务信息
-	 * @param planTaskId
-	 * @return
-	 */
-	Map queryPlanTaskById(Long planTaskId);
 
 	/**
 	 * 	根据计划ID获取所有的 任务计划巡检点
@@ -138,11 +121,9 @@ public interface IPlanTaskService {
 	List<LeavePlanTaskVo> queryLeavePlanTask(HashMap<String, Object> params);
 
 
-	List<CodeOrderVo> queryCodeOrderVo(HashMap<String, Object> params);
-
 	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();