解决冲突

modules/i3plus-pojo-ptl-pcn/pom.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>i3plus-pojo</artifactId>
-        <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>i3plus-pojo-ptl-pcn</artifactId>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>i3plus.pojo</groupId>
-            <artifactId>i3plus-pojo-base</artifactId>
-        </dependency>
-    </dependencies>
-
-
-
-
-</project>

modules/i3plus-pojo-ptl-pcn/src/main/java/cn/estsh/i3plus/pojo/ptl/pcn/repository/PtlAreaSectionTaskDetailRepository.java

@@ -1,20 +0,0 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.repository;
-
-
-import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlAreaSectionTaskDetail;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * @author Wynne.Lu
- * @date 2020/2/12 17:41
- * @desc
- */
-
-public interface PtlAreaSectionTaskDetailRepository extends BaseRepository<PtlAreaSectionTaskDetail, Long> {
-
-}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModule.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionModuleGroup.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActionRoute.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActor.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlActorRule.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaRoute.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTaskSeq.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiParam;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlControl.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElement.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlElementAttribute.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterface.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElement.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlInterfaceElementAttribute.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTask.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageType.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMessageTypeFormat.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlRouteStatus.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlTag.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.bean;
+package cn.estsh.i3plus.pojo.ptl.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActionModuleModel.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.model;
+package cn.estsh.i3plus.pojo.ptl.model;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/ActorMessageModel.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.model;
+package cn.estsh.i3plus.pojo.ptl.model;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/AttrModel.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.model;
+package cn.estsh.i3plus.pojo.ptl.model;
 
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/CommonMsgModel.java

@@ -1,6 +1,6 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.model;
+package cn.estsh.i3plus.pojo.ptl.model;
 
-import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlRouteStatus;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/LightOnModel.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.model;
+package cn.estsh.i3plus.pojo.ptl.model;
 
 import lombok.Data;
 import lombok.ToString;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/SpecificRuleModel.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.model;
+package cn.estsh.i3plus.pojo.ptl.model;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/model/WsResultBean.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.model;
+package cn.estsh.i3plus.pojo.ptl.model;
 
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleGroupRepository.java

@@ -1,10 +1,8 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.repository;
+package cn.estsh.i3plus.pojo.ptl.repository;
 
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlActionModuleGroup;
-
-import java.util.List;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlActionModuleGroup;
 
 /**
  * @author Wynne.Lu

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActionModuleRepository.java

@@ -1,11 +1,8 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.repository;
+package cn.estsh.i3plus.pojo.ptl.repository;
 
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlActionModule;
-
-import java.util.Collection;
-import java.util.List;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlActionModule;
 
 /**
  * @author Wynne.Lu

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActorRepository.java

@@ -1,8 +1,8 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.repository;
+package cn.estsh.i3plus.pojo.ptl.repository;
 
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlActor;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlActor;
 
 /**
  * @author Wynne.Lu

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlActorRuleRepository.java

@@ -1,9 +1,8 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.repository;
+package cn.estsh.i3plus.pojo.ptl.repository;
 
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlActorRule;
-import org.springframework.stereotype.Repository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlActorRule;
 
 /**
  * @author Wynne.Lu

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaRouteRepository.java

@@ -1,8 +1,8 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.repository;
+package cn.estsh.i3plus.pojo.ptl.repository;
 
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlAreaRoute;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaRoute;
 
 /**
  * @author Wynne.Lu

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskDetailRepository.java

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaSectionTaskDetail;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+public interface PtlAreaSectionTaskDetailRepository extends BaseRepository<PtlAreaSectionTaskDetail, Long> {
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlControlRepository.java

@@ -1,11 +1,8 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.repository;
+package cn.estsh.i3plus.pojo.ptl.repository;
 
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlControl;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlControl;
 
 /**
  * @author Wynne.Lu

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlElementRepository.java

@@ -1,8 +1,8 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.repository;
+package cn.estsh.i3plus.pojo.ptl.repository;
 
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlElement;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlElement;
 
 /**
  * @author Wynne.Lu

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlInterfaceElementRepository.java

@@ -1,8 +1,8 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.repository;
+package cn.estsh.i3plus.pojo.ptl.repository;
 
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlInterfaceElement;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlInterfaceElement;
 
 /**
  * @author Wynne.Lu

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlInterfaceRepository.java

@@ -1,8 +1,8 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.repository;
+package cn.estsh.i3plus.pojo.ptl.repository;
 
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlInterface;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlInterface;
 
 /**
  * @author Wynne.Lu

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMessageTypeFormatRepository.java

@@ -1,8 +1,8 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.repository;
+package cn.estsh.i3plus.pojo.ptl.repository;
 
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlMessageTypeFormat;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlMessageTypeFormat;
 
 /**
  * @author Wynne.Lu

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMessageTypeRepository.java

@@ -1,9 +1,8 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.repository;
+package cn.estsh.i3plus.pojo.ptl.repository;
 
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlMessageType;
-import org.springframework.data.jpa.repository.JpaRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlMessageType;
 
 /**
  * @author Wynne.Lu

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlRouteStatusRepository.java

@@ -1,10 +1,8 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.repository;
+package cn.estsh.i3plus.pojo.ptl.repository;
 
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlRouteStatus;
-
-import java.util.List;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlRouteStatus;
 
 /**
  * @author Wynne.Lu

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlTagRepository.java

@@ -1,10 +1,7 @@
-package cn.estsh.i3plus.pojo.ptl.pcn.repository;
+package cn.estsh.i3plus.pojo.ptl.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.pcn.bean.PtlTag;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlTag;
 
 /**
  * @author Wynne.Lu

pom.xml

@@ -34,7 +34,6 @@
         <module>modules/i3plus-pojo-aps</module>
         <module>modules/i3plus-pojo-lac</module>
         <module>modules/i3plus-pojo-ptl</module>
-        <module>modules/i3plus-pojo-ptl-pcn</module>
     </modules>
 
     <dependencies>