Commit a89acf66 by 丁伟峰

移除了废弃的package空间引用com.dituhui.mp.*, com.alibaba.cloud.*

1 parent fc078c1b
Showing with 6 additions and 41 deletions
package com.dituhui.pea.district.service;
import com.dituhui.mp.district.util.*;
import com.dituhui.pea.district.util.elasticsearch.ESTool;
import com.dituhui.mp.district.vo.*;
import com.dituhui.pea.enums.CoordTypeEnum;
import com.dituhui.pea.district.constants.DistrictElasticsearchField;
import com.dituhui.pea.district.util.*;
......
......@@ -7,7 +7,6 @@ import com.dituhui.pea.enums.StatusCodeEnum;
import com.dituhui.pea.enums.ThirdPartyEnum;
import com.dituhui.pea.exception.BusinessException;
import com.dituhui.pea.gateway.commom.RedisService;
import com.dituhui.mp.pojo.*;
import com.dituhui.pea.pojo.*;
import com.dituhui.pea.user.ITeam;
import com.dituhui.pea.user.IUser;
......
......@@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableFeignClients(basePackages = {"com.dituhui.mp.geometry","com.dituhui.mp.gis"})
@EnableFeignClients(basePackages = {"com.dituhui.pea.geometry","com.dituhui.pea.gis"})
public class Application {
public static void main(String[] args) {
......
......@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONArray;
import com.dituhui.pea.gis.IExtendColumn;
import com.dituhui.pea.gis.elasticsearch.enums.Order;
import com.dituhui.mp.gis.pojo.*;
import com.dituhui.pea.gis.service.IExtendColumnService;
import com.dituhui.pea.gis.util.ParamBuildUtil;
import com.dituhui.pea.pojo.ExtendColumnInfo;
......
......@@ -16,8 +16,6 @@ import com.dituhui.pea.gis.enums.FieldTypeEnum;
import com.dituhui.pea.gis.enums.RedisKeyGroup;
import com.dituhui.pea.gis.exception.ExistException;
import com.dituhui.pea.gis.log.MiddlePlatformLoger;
import com.dituhui.mp.gis.pojo.*;
import com.dituhui.mp.gis.util.*;
import com.dituhui.pea.gis.pojo.*;
import com.dituhui.pea.gis.util.*;
import com.google.common.base.Functions;
......
......@@ -3,7 +3,6 @@ package com.dituhui.pea.gis.elasticsearch;
import com.dituhui.pea.gis.elasticsearch.enums.Order;
import com.dituhui.pea.gis.enums.FieldOrderTypeEnum;
import com.dituhui.pea.gis.enums.FieldTypeEnum;
import com.dituhui.mp.gis.pojo.*;
import com.dituhui.pea.gis.pojo.*;
import org.apache.commons.lang3.tuple.ImmutablePair;
......
package com.dituhui.pea.gis.elasticsearch.utils;
import com.dituhui.mp.gis.action.*;
import com.dituhui.pea.gis.elasticsearch.enums.TextAnalyzerEnum;
import com.dituhui.pea.gis.enums.FieldTypeEnum;
import com.dituhui.pea.gis.pojo.ExtendColumnMetadata;
......
......@@ -6,7 +6,6 @@ import com.dituhui.pea.gis.elasticsearch.enums.Order;
import com.dituhui.pea.gis.elasticsearch.enums.TextAnalyzerEnum;
import com.dituhui.pea.gis.enums.FieldTypeEnum;
import com.dituhui.pea.gis.log.MiddlePlatformLoger;
import com.dituhui.mp.gis.pojo.*;
import com.dituhui.pea.gis.util.LayerCodeUtil;
import com.dituhui.pea.gis.pojo.Point;
import com.dituhui.pea.gis.pojo.Region;
......
package com.dituhui.pea.gis.service;
import com.dituhui.pea.gis.elasticsearch.enums.Order;
import com.dituhui.mp.gis.pojo.*;
import com.dituhui.pea.gis.pojo.*;
import java.util.List;
......
package com.dituhui.pea.gis.service;
import com.dituhui.pea.gis.elasticsearch.enums.Order;
import com.dituhui.mp.gis.pojo.*;
import com.dituhui.pea.pojo.ExtendColumnRowInfo;
import com.dituhui.pea.pojo.PointBase;
import com.dituhui.pea.gis.pojo.ElasticsearchRow;
......
......@@ -22,9 +22,7 @@ import com.dituhui.pea.gis.exception.LockException;
import com.dituhui.pea.gis.kafka.Kafkaproducer;
import com.dituhui.pea.gis.kafka.action.AreaActionTypeEnums;
import com.dituhui.pea.gis.kafka.pojo.AreaMessage;
import com.dituhui.mp.gis.pojo.*;
import com.dituhui.pea.gis.service.IAreaService;
import com.dituhui.mp.gis.util.*;
import com.dituhui.pea.pojo.ExtendColumnRowInfo;
import com.dituhui.pea.pojo.GeometryInfo;
import com.dituhui.pea.pojo.PointBase;
......
......@@ -11,7 +11,6 @@ import com.dituhui.pea.gis.elasticsearch.enums.Order;
import com.dituhui.pea.gis.enums.FieldOrderTypeEnum;
import com.dituhui.pea.gis.enums.FieldTypeEnum;
import com.dituhui.pea.gis.exception.ExistException;
import com.dituhui.mp.gis.pojo.*;
import com.dituhui.pea.gis.service.IExtendColumnService;
import com.dituhui.pea.gis.util.AreaDataset;
import com.dituhui.pea.gis.pojo.*;
......
......@@ -8,7 +8,6 @@ import com.dituhui.pea.gis.constants.ConstantStatus;
import com.dituhui.pea.gis.elasticsearch.IExtendColumnBaseService;
import com.dituhui.pea.gis.elasticsearch.enums.Order;
import com.dituhui.pea.gis.elasticsearch.enums.SearchType;
import com.dituhui.mp.gis.pojo.*;
import com.dituhui.pea.gis.service.ILineService;
import com.dituhui.pea.gis.util.ParamBuildUtil;
import com.dituhui.pea.gis.util.StringUtil;
......
......@@ -8,7 +8,6 @@ import com.dituhui.pea.gis.constants.ConstantStatus;
import com.dituhui.pea.gis.elasticsearch.IExtendColumnBaseService;
import com.dituhui.pea.gis.elasticsearch.enums.Order;
import com.dituhui.pea.gis.elasticsearch.enums.SearchType;
import com.dituhui.mp.gis.pojo.*;
import com.dituhui.pea.gis.service.IPointService;
import com.dituhui.pea.gis.util.ParamBuildUtil;
import com.dituhui.pea.gis.util.StringUtil;
......
......@@ -51,7 +51,7 @@ public class RunAspect {
* @return obj
*/
@Deprecated
@Around("execution(* com.dituhui.mp.*.controller.*.*(..))")
@Around("execution(* com.dituhui.pea.*.controller.*.*(..))")
public Object webLog(ProceedingJoinPoint p) {
// 请求参数
StringBuilder sb = new StringBuilder();
......@@ -135,8 +135,8 @@ public class RunAspect {
* @return obj
* @throws Throwable throwable
*/
@Around("execution(* com.dituhui.mp.*.service.*.*(..)) || execution(* com.dituhui.mp.*.service.*.service.impl.*.*(..))"
+ "||execution(* com.dituhui.mp.*.service.*.custom.service.*.*(..))")
@Around("execution(* com.dituhui.pea.*.service.*.*(..)) || execution(* com.dituhui.pea.*.service.*.service.impl.*.*(..))"
+ "||execution(* com.dituhui.pea.*.service.*.custom.service.*.*(..))")
public Object serviceLog(ProceedingJoinPoint p) throws Throwable {
PlatformUser user = currentUser.getPlatformUser();
// 请求参数
......
......@@ -19,7 +19,7 @@ public class RequestInterceptor implements HandlerInterceptor {
/**
* 以 controller 包下定义的所有请求为切入点
*/
@Pointcut(value = "execution(public * com.alibaba.cloud.integration.order.controller..*.*(..))")
@Pointcut(value = "execution(public * com.dituhui.pea.order.controller..*.*(..))")
public void reqOpenAPILog() {
}
......
package com.dituhui.pea.order.service.impl;
import com.dituhui.pea.common.Result;
import com.alibaba.cloud.integration.order.dao.*;
import com.dituhui.pea.order.dao.*;
import com.dituhui.pea.order.dto.CapacityOrderQueryReqDTO;
import com.dituhui.pea.order.dto.CapacityOrderQueryRespDTO;
import com.dituhui.pea.order.dto.CapacityStatQueryReqDTO;
import com.dituhui.pea.order.dto.CapacityStatQueryRespDTO;
import com.alibaba.cloud.integration.order.entity.*;
import com.dituhui.pea.order.entity.*;
import com.dituhui.pea.order.service.CapacityQueryService;
import com.dituhui.pea.order.service.CommonService;
......
......@@ -2,11 +2,9 @@ package com.dituhui.pea.order.service.impl;
import com.dituhui.pea.common.BusinessException;
import com.dituhui.pea.common.Result;
import com.alibaba.cloud.integration.order.dao.*;
import com.dituhui.pea.order.dao.*;
import com.dituhui.pea.order.dto.DispatchEngineerOrderListResp;
import com.dituhui.pea.order.dto.DispatchOrderListResp;
import com.alibaba.cloud.integration.order.entity.*;
import com.dituhui.pea.order.entity.*;
import com.dituhui.pea.order.service.DispatchService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......
package com.dituhui.pea.order.service.impl;
import com.dituhui.pea.common.Result;
import com.alibaba.cloud.integration.order.dao.*;
import com.dituhui.pea.order.dao.*;
import com.dituhui.pea.order.dto.EnginnerTimelineResp;
import com.alibaba.cloud.integration.order.entity.*;
import com.dituhui.pea.order.entity.*;
import com.dituhui.pea.order.service.EngineerTimelineService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......
package com.dituhui.pea.order.service.impl;
import com.dituhui.pea.common.Result;
import com.alibaba.cloud.integration.order.dao.*;
import com.alibaba.cloud.integration.order.dto.*;
import com.alibaba.cloud.integration.order.entity.*;
import com.dituhui.pea.order.dao.*;
import com.dituhui.pea.order.dto.*;
import com.dituhui.pea.order.entity.*;
......
package com.dituhui.pea.order.service.impl;
import com.dituhui.pea.common.Result;
import com.alibaba.cloud.integration.order.dao.*;
import com.dituhui.pea.order.dao.*;
import com.dituhui.pea.order.dto.OrganizationEngineersRespDTO;
import com.dituhui.pea.order.dto.OrganizationTeamsRespDTO;
import com.dituhui.pea.order.dto.OrganizationTreeRespDTO;
import com.alibaba.cloud.integration.order.entity.*;
import com.dituhui.pea.order.entity.*;
import com.dituhui.pea.order.service.OrganizationService;
import lombok.extern.slf4j.Slf4j;
......
......@@ -2,11 +2,9 @@ package com.dituhui.pea.order.service.impl;
import com.dituhui.pea.common.BusinessException;
import com.dituhui.pea.common.Result;
import com.alibaba.cloud.integration.order.dao.*;
import com.dituhui.pea.order.dao.*;
import com.dituhui.pea.order.dto.ScheduleEngineerOverviewResp;
import com.dituhui.pea.order.dto.ScheduleOverviewResp;
import com.alibaba.cloud.integration.order.entity.*;
import com.dituhui.pea.order.entity.*;
import com.dituhui.pea.order.service.ScheduleService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......
package com.dituhui.pea.order.service.impl;
import com.dituhui.pea.common.Result;
import com.alibaba.cloud.integration.order.dao.*;
import com.alibaba.cloud.integration.order.dto.*;
import com.alibaba.cloud.integration.order.entity.*;
import com.dituhui.pea.order.dao.*;
import com.dituhui.pea.order.dto.*;
import com.dituhui.pea.order.entity.*;
......
......@@ -8,7 +8,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
@SpringBootApplication
@EnableFeignClients
@ComponentScan(basePackages = "com.dituhui.mp")
@ComponentScan(basePackages = "com.dituhui.pea")
@EnableJpaAuditing
public class Application {
......
......@@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil;
import com.dituhui.pea.enums.RedisKeyGroup;
import com.dituhui.pea.enums.StatusCodeEnum;
import com.dituhui.pea.enums.ThirdPartyEnum;
import com.dituhui.mp.pojo.*;
import com.dituhui.pea.pojo.*;
import com.dituhui.pea.user.IUser;
import com.dituhui.pea.user.commom.RedisService;
......
......@@ -7,8 +7,6 @@ import com.dituhui.pea.enums.StatusCodeEnum;
import com.dituhui.pea.exception.BusinessException;
import com.dituhui.pea.pojo.ResourceInfo;
import com.dituhui.pea.pojo.RoleInfo;
import com.dituhui.mp.user.dao.*;
import com.dituhui.mp.user.entity.*;
import com.dituhui.pea.user.dao.*;
import com.dituhui.pea.user.entity.*;
import com.google.common.collect.Lists;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!