diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml b/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml index 9fceb92..66a71c1 100644 --- a/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml +++ b/itc-pcitc-demo/itc-pcitc-demo-service/pom.xml @@ -18,6 +18,8 @@ ${java.version} ${java.version} pcitc/itc-pcitc-demo + http://172.27.46.206:23117 + false @@ -81,7 +83,7 @@ app - + + classes false - + --> + + com.geg + tanuki-boot-maven-plugin + 1.0.0 + + ${libServerUrl} + ${ignoreUpload} + ${libServerUser} + ${libServerPwd} + + + + + repackage + + + + org.apache.maven.plugins maven-surefire-plugin diff --git a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/controller/Testfrom3Controller.java b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/controller/Testfrom3Controller.java index 615d490..718f8fb 100644 --- a/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/controller/Testfrom3Controller.java +++ b/itc-pcitc-demo/itc-pcitc-demo-service/src/main/java/com/xjrsoft/module/dev/controller/Testfrom3Controller.java @@ -142,34 +142,17 @@ public class Testfrom3Controller { @Override public UpdateTestfrom3Dto before(DataOperationContent content) { - if(content.getType()==OperationType.DELETE) { - CommonCallUtils.deleteBefore(content.getTableName(),content.getIdValue()); - }else if(content.getType()==OperationType.DISABLE){ - CommonCallUtils.disableBefore(content.getTableName(),content.getIdValue()); - }else if(content.getType()==OperationType.ENABLE){ - CommonCallUtils.enableBefore(content.getTableName(),content.getIdValue()); - } + return content.getObj(); } @Override public UpdateTestfrom3Dto after(DataOperationContent content) { - if(content.getType()==OperationType.INSERT || content.getType()==OperationType.UPDATE) { + if(content.getType()==OperationType.UPDATE) { CommonCallUtils.saveAfter(content.getTableName(),content.getIdValue()); } return content.getObj(); } - - @Override - public void onError(DataOperationContent content) { - // TODO Auto-generated method stub - } - - @Override - public void onFinally(DataOperationContent content) { - // TODO Auto-generated method stub - } - })); } diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcContext.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcContext.java index e1a8fee..c5d5da2 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcContext.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcContext.java @@ -7,13 +7,17 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; import java.util.List; + import javax.sql.DataSource; + import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceUtils; import org.springframework.jdbc.support.JdbcUtils; + import com.pictc.jdbc.model.JdbcParam; import com.pictc.utils.CollectionUtils; + import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; @@ -23,7 +27,7 @@ import lombok.extern.slf4j.Slf4j; @Setter public class JdbcContext { -public static final int DEF_STEP = 1000; + public static final int DEF_STEP = 1000; private JdbcTemplate jdbc; diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcTools.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcTools.java index 0428aca..7c64f13 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcTools.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/jdbc/JdbcTools.java @@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.pictc.jdbc.model.JdbcParam; import com.pictc.jdbc.model.QueryParameter; import com.pictc.utils.CollectionUtils; diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java index ce370c8..14ba190 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/service/CommonCallService.java @@ -4,10 +4,10 @@ import java.util.List; import org.springframework.stereotype.Component; +import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; import com.google.api.client.util.Lists; import com.pictc.jdbc.JdbcTools; import com.pictc.jdbc.model.JdbcParam; -import com.pictc.utils.ListUtils; import com.pictc.utils.StringUtils; /**