diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index a1c2a23..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
diff --git a/.idea/CopilotChatHistory.xml b/.idea/CopilotChatHistory.xml
new file mode 100644
index 0000000..2455bc4
--- /dev/null
+++ b/.idea/CopilotChatHistory.xml
@@ -0,0 +1,92 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/CopilotWebChatHistory.xml b/.idea/CopilotWebChatHistory.xml
new file mode 100644
index 0000000..6527f35
--- /dev/null
+++ b/.idea/CopilotWebChatHistory.xml
@@ -0,0 +1,1567 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 2d3568f..10e8010 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,13 +7,12 @@
-
+
diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
new file mode 100644
index 0000000..92ce326
--- /dev/null
+++ b/.idea/dataSources.local.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+ master_key
+ nmgjtjt
+
+ user_and_system_sources
+
+
+
\ No newline at end of file
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
new file mode 100644
index 0000000..47fc13f
--- /dev/null
+++ b/.idea/dataSources.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ oracle.19
+ true
+ false
+ oracle.jdbc.OracleDriver
+ jdbc:oracle:thin:@10.15.0.12:1521:ORAL
+
+
+
+
+
+ $ProjectFileDir$
+
+
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..63e9001
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..0c1b5d4
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..2b63946
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d645138..a5151a0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,16 +3,76 @@
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -75,80 +135,97 @@
- {
- "keyToString": {
- "Application.DivPassDataImpl.executor": "Run",
- "Application.ImageUtils.executor": "Run",
- "Application.PubTools.executor": "Run",
- "Application.QCodeInfoServiceImpl.executor": "Debug",
- "Application.SensitiveFilter.executor": "Run",
- "Application.main.executor": "Run",
- "Application.redisConfigUtil.executor": "Debug",
- "Maven.IntegraManager [clean].executor": "Run",
- "Maven.IntegraManager [install].executor": "Run",
- "Maven.IntegralManager [clean].executor": "Run",
- "Maven.IntegralManager [install].executor": "Run",
- "Maven.IntegralManager [validate].executor": "Run",
- "Maven.IntegralManagerSys [clean].executor": "Run",
- "Maven.IntegralManagerSys [install].executor": "Run",
- "Maven.devProject [clean].executor": "Run",
- "Maven.devProject [install].executor": "Run",
- "Maven.dev_project [clean].executor": "Run",
- "Maven.dev_project [install].executor": "Run",
- "Maven.special_event [clean].executor": "Run",
- "Maven.special_event [install].executor": "Run",
- "Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor": "Run",
- "Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor": "Run",
- "Maven.special_event [package].executor": "Run",
- "Maven.special_event [validate].executor": "Run",
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "TomEE Server.special_event.executor": "Debug",
- "Tomcat Server.Tomcat 9.0.80.executor": "Debug",
- "deletionFromPopupRequiresConfirmation": "false",
- "git-widget-placeholder": "master",
- "kotlin-language-version-configured": "true",
- "last_opened_file_path": "D:/workspace/IntegralManager",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "project.structure.last.edited": "Modules",
- "project.structure.proportion": "0.15",
- "project.structure.side.proportion": "0.37169158",
- "settings.editor.selected.configurable": "reference.settings.project.maven.importing",
- "vue.rearranger.settings.migration": "true"
+
+}]]>
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -164,11 +241,11 @@
-
+
-
+
@@ -250,6 +327,8 @@
@@ -360,9 +439,15 @@
+
+
@@ -537,7 +622,52 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -731,7 +861,31 @@
1739870419806
-
+
+
+ 1740463493215
+
+
+
+ 1740463493215
+
+
+
+ 1746519427010
+
+
+
+ 1746519427011
+
+
+
+ 1746759881177
+
+
+
+ 1746759881177
+
+
@@ -764,7 +918,10 @@
-
+
+
+
+
@@ -779,6 +936,16 @@
111
+
+ file://$PROJECT_DIR$/src/main/java/com/nmgs/util/redisConfigUtil.java
+ 13
+
+
+
+ file://$PROJECT_DIR$/src/main/java/com/nmgs/service/impl/UserTableServiceImpl.java
+ 116
+
+
diff --git a/IntegraManager.iml b/IntegraManager.iml
deleted file mode 100644
index 0326c76..0000000
--- a/IntegraManager.iml
+++ /dev/null
@@ -1,192 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 261eeb9..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/README.md b/README.md
deleted file mode 100644
index 75a92c3..0000000
--- a/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# IntegralManager
-
-#### 介绍
-天润科丰小程序后台接口
-
-#### 软件架构
-采用springbbot +mybatisplus +tomcat +负载均衡
-
-
-#### 安装教程
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 使用说明
-
-1. xxxx
-2. xxxx
-3. xxxx
-
-#### 参与贡献
-
-1. Fork 本仓库
-2. 新建 Feat_xxx 分支
-3. 提交代码
-4. 新建 Pull Request
-
-
-#### 特技
-
-1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
-3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
-4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
-5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
diff --git a/pom.xml b/pom.xml
index 47198b6..ca4a609 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
com.example
- IntegraManager
+ IntegralManager
1.0-SNAPSHOT
war
@@ -53,7 +53,7 @@
mysql
mysql-connector-java
- 8.0.23
+ 8.0.11
@@ -147,11 +147,6 @@
hibernate-validator
6.2.0.Final
-
com.tetragramato
custom-spring-boot-resttemplate
@@ -224,6 +219,17 @@
commons-io
2.4
+
+
+ com.aliyun
+ ocr_api20210707
+ 3.1.2
+
+
+
+ org.springframework.boot
+ spring-boot-starter-jta-atomikos
+
diff --git a/src/main/java/com/nmgs/AppController/ServiceAreaOperatorsController.java b/src/main/java/com/nmgs/AppController/ServiceAreaOperatorsController.java
index f0ec2c2..bdb71a7 100644
--- a/src/main/java/com/nmgs/AppController/ServiceAreaOperatorsController.java
+++ b/src/main/java/com/nmgs/AppController/ServiceAreaOperatorsController.java
@@ -2,7 +2,7 @@ package com.nmgs.AppController;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.nmgs.config.ResultData;
import com.nmgs.entity.ServiceAreaOperators;
-import com.nmgs.mapper.OperatorsMapper;
+import com.nmgs.mapperset.oraclemapper.OperatorsMapper;
import com.nmgs.service.IOperatorsService;
import com.nmgs.util.TokenUtil;
import io.swagger.annotations.Api;
diff --git a/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java b/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java
index ca600f5..ffdef76 100644
--- a/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java
+++ b/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java
@@ -10,6 +10,8 @@ import org.springframework.core.env.PropertiesPropertySource;
import java.io.File;
import java.io.FileInputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
import java.util.Properties;
@Configuration
@@ -36,38 +38,80 @@ public class MyEnvironmentPostProcessor implements EnvironmentPostProcessor {
if (!fileNewproperties.exists()) {
fileNewproperties.createNewFile();
}
- properties.load(new FileInputStream(path));
+ properties.load(Files.newInputStream(Paths.get(path)));
String DBType = properties.getProperty("DBType") == null ? "1" : properties.getProperty("DBType");
- Newproperties.load(new FileInputStream(NewPath));
+ Newproperties.load(Files.newInputStream(Paths.get(NewPath)));
properties.setProperty("spring.logback.logPath",PathUtil.TomcatPath+"/logs");
- properties.setProperty("spring.datasource.url",properties.getProperty("DBUrl"));
- properties.setProperty("spring.datasource.username",properties.getProperty("DBUserName"));
- properties.setProperty("spring.datasource.password",PassWordUtils.decrypt(properties.getProperty("DBPassWord")));
+ properties.setProperty("spring.datasource.primary.jdbc-url", properties.getProperty("DBUrl"));
+ properties.setProperty("spring.datasource.primary.username", properties.getProperty("DBUserName"));
+ properties.setProperty("spring.datasource.primary.password", PassWordUtils.decrypt(properties.getProperty("DBPassWord")));
+ properties.setProperty("spring.datasource.main.jdbc-url", properties.getProperty("DBUrl"));
+ properties.setProperty("spring.datasource.main.username", properties.getProperty("DBUserName"));
+ properties.setProperty("spring.datasource.main.password", PassWordUtils.decrypt(properties.getProperty("DBPassWord")));
if(DBType.equals("1")){
- properties.setProperty("spring.datasource.driver-class-name",Newproperties.getProperty("sqlClassName"));
- properties.setProperty("spring.datasource.validationQuery",Newproperties.getProperty("sqlvalidationQuery"));
- properties.setProperty("spring.datasource.hikari.connection-test-query",Newproperties.getProperty("sqlvalidationQuery"));
+ properties.setProperty("spring.datasource.primary.driver-class-name", Newproperties.getProperty("sqlClassName"));
+ properties.setProperty("spring.datasource.primary.validationQuery", Newproperties.getProperty("sqlvalidationQuery"));
+ properties.setProperty("spring.datasource.primary.hikari.connection-test-query", Newproperties.getProperty("sqlvalidationQuery"));
+ properties.setProperty("spring.datasource.main.driver-class-name", Newproperties.getProperty("sqlClassName"));
+ properties.setProperty("spring.datasource.main.validationQuery", Newproperties.getProperty("sqlvalidationQuery"));
+ properties.setProperty("spring.datasource.main.hikari.connection-test-query", Newproperties.getProperty("sqlvalidationQuery"));
}else if(DBType.equals("2")){
- properties.setProperty("spring.datasource.driver-class-name",Newproperties.getProperty("OracleClassName"));
- properties.setProperty("spring.datasource.validationQuery",Newproperties.getProperty("OraclevalidationQuery"));
- properties.setProperty("spring.datasource.hikari.connection-test-query",Newproperties.getProperty("OraclevalidationQuery"));
+ properties.setProperty("spring.datasource.primary.driver-class-name", Newproperties.getProperty("OracleClassName"));
+ properties.setProperty("spring.datasource.primary.validationQuery", Newproperties.getProperty("OraclevalidationQuery"));
+ properties.setProperty("spring.datasource.primary.hikari.connection-test-query", Newproperties.getProperty("OraclevalidationQuery"));
+ properties.setProperty("spring.datasource.main.driver-class-name", Newproperties.getProperty("OracleClassName"));
+ properties.setProperty("spring.datasource.main.validationQuery", Newproperties.getProperty("OraclevalidationQuery"));
+ properties.setProperty("spring.datasource.main.hikari.connection-test-query", Newproperties.getProperty("OraclevalidationQuery"));
}else if(DBType.equals("3")){
- properties.setProperty("spring.datasource.driver-class-name",Newproperties.getProperty("DMClassName"));
- properties.setProperty("spring.datasource.validationQuery",Newproperties.getProperty("DMvalidationQuery"));
- properties.setProperty("spring.datasource.hikari.connection-test-query",Newproperties.getProperty("DMvalidationQuery"));
+ properties.setProperty("spring.datasource.primary.driver-class-name", Newproperties.getProperty("DMClassName"));
+ properties.setProperty("spring.datasource.primary.validationQuery", Newproperties.getProperty("DMvalidationQuery"));
+ properties.setProperty("spring.datasource.primary.hikari.connection-test-query", Newproperties.getProperty("DMvalidationQuery"));
+ properties.setProperty("spring.datasource.main.driver-class-name", Newproperties.getProperty("DMClassName"));
+ properties.setProperty("spring.datasource.main.validationQuery", Newproperties.getProperty("DMvalidationQuery"));
+ properties.setProperty("spring.datasource.main.hikari.connection-test-query", Newproperties.getProperty("DMvalidationQuery"));
}else if(DBType.equals("4")){
- properties.setProperty("spring.datasource.driver-class-name",Newproperties.getProperty("MySQLClassName"));
- properties.setProperty("spring.datasource.validationQuery",Newproperties.getProperty("MySQLvalidationQuery"));
- properties.setProperty("spring.datasource.hikari.connection-test-query",Newproperties.getProperty("MySQLvalidationQuery"));
+ properties.setProperty("spring.datasource.primary.driver-class-name", Newproperties.getProperty("MySQLClassName"));
+ properties.setProperty("spring.datasource.primary.validationQuery", Newproperties.getProperty("MySQLvalidationQuery"));
+ properties.setProperty("spring.datasource.primary.hikari.connection-test-query", Newproperties.getProperty("MySQLvalidationQuery"));
+ properties.setProperty("spring.datasource.main.driver-class-name", Newproperties.getProperty("MySQLClassName"));
+ properties.setProperty("spring.datasource.main.validationQuery", Newproperties.getProperty("MySQLvalidationQuery"));
+ properties.setProperty("spring.datasource.main.hikari.connection-test-query", Newproperties.getProperty("MySQLvalidationQuery"));
+ }
+ String BakDBType = properties.getProperty("BakDBType") == null ? "1" : properties.getProperty("BakDBType");
+ properties.setProperty("spring.datasource.bak.jdbc-url", properties.getProperty("BAKDBUrl"));
+ properties.setProperty("spring.datasource.bak.username", properties.getProperty("BAKDBUserName"));
+ properties.setProperty("spring.datasource.bak.password", PassWordUtils.decrypt(properties.getProperty("BAKDBPassWord")));
+ if (BakDBType.equals("1")) {
+ properties.setProperty("spring.datasource.bak.driver-class-name", Newproperties.getProperty("sqlClassName"));
+ properties.setProperty("spring.datasource.bak.validationQuery", Newproperties.getProperty("sqlvalidationQuery"));
+ properties.setProperty("spring.datasource.bak.hikari.connection-test-query", Newproperties.getProperty("sqlvalidationQuery"));
+ } else if (BakDBType.equals("2")) {
+ properties.setProperty("spring.datasource.bak.driver-class-name", Newproperties.getProperty("OracleClassName"));
+ properties.setProperty("spring.datasource.bak.validationQuery", Newproperties.getProperty("OraclevalidationQuery"));
+ properties.setProperty("spring.datasource.bak.hikari.connection-test-query", Newproperties.getProperty("OraclevalidationQuery"));
+ } else if (BakDBType.equals("3")) {
+ properties.setProperty("spring.datasource.bak.driver-class-name", Newproperties.getProperty("DMClassName"));
+ properties.setProperty("spring.datasource.bak.validationQuery", Newproperties.getProperty("DMvalidationQuery"));
+ properties.setProperty("spring.datasource.bak.hikari.connection-test-query", Newproperties.getProperty("DMvalidationQuery"));
+ } else if (BakDBType.equals("4")) {
+ properties.setProperty("spring.datasource.bak.driver-class-name", Newproperties.getProperty("MySQLClassName"));
+ properties.setProperty("spring.datasource.bak.validationQuery", Newproperties.getProperty("MySQLvalidationQuery"));
+ properties.setProperty("spring.datasource.bak.hikari.connection-test-query", Newproperties.getProperty("MySQLvalidationQuery"));
}
System.out.println("---------------------------IntegralManager本次载入数据库----------------------");
- System.out.println("server.port: " + properties.getProperty("server.port"));
- System.out.println("server.ip: " + properties.getProperty("server.ip"));
-
- System.out.println(" url : " + properties.getProperty("spring.datasource.url"));
- System.out.println(" username : " + properties.getProperty("spring.datasource.username"));
- System.out.println(" password : " + properties.getProperty("spring.datasource.password"));
- System.out.println(" driver-class-name : " + properties.getProperty("spring.datasource.driver-class-name"));
+ System.out.println(" url : " + properties.getProperty("spring.datasource.primary.jdbc-url"));
+ System.out.println(" username : " + properties.getProperty("spring.datasource.primary.username"));
+ System.out.println(" password : " + properties.getProperty("spring.datasource.primary.password"));
+ System.out.println(" driver-class-name : " + properties.getProperty("spring.datasource.primary.driver-class-name"));
+ System.out.println(" bakurl : " + properties.getProperty("spring.datasource.bak.jdbc-url"));
+ System.out.println(" bakusername : " + properties.getProperty("spring.datasource.bak.username"));
+ System.out.println(" bakpassword : " + properties.getProperty("spring.datasource.bak.password"));
+ System.out.println(" bakdriver-class-name : " + properties.getProperty("spring.datasource.bak.driver-class-name"));
+ System.out.println(" mainurl : " + properties.getProperty("spring.datasource.main.jdbc-url"));
+ System.out.println(" mainusername : " + properties.getProperty("spring.datasource.main.username"));
+ System.out.println(" mainpassword : " + properties.getProperty("spring.datasource.main.password"));
+ System.out.println(" maindriver-class-name : " + properties.getProperty("spring.datasource.main.driver-class-name"));
+ System.out.println("---------------------------IntegralManager本次载入数据库----------------------");
//环境名称随意取，但尽量不能和其他环境名称相同，避免不生效
PropertiesPropertySource propertySource = new PropertiesPropertySource("environmentPostProcessor", properties);
PropertiesPropertySource newPropertySource = new PropertiesPropertySource("newEnvironmentPostProcessor", Newproperties);
diff --git a/src/main/java/com/nmgs/common/GlobalExceptionHandler.java b/src/main/java/com/nmgs/common/GlobalExceptionHandler.java
new file mode 100644
index 0000000..a05e971
--- /dev/null
+++ b/src/main/java/com/nmgs/common/GlobalExceptionHandler.java
@@ -0,0 +1,46 @@
+package com.nmgs.common;
+
+import com.nmgs.config.ResultData;
+import com.nmgs.util.LogUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataAccessException;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import java.sql.SQLException;
+
+@Slf4j
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+ @ExceptionHandler(DataAccessException.class)
+ @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+ public ResultData handleDataAccessException(DataAccessException e) {
+ LogUtil.WriteLog_Error("数据库操作失败:" + e.getMessage(),"GlobalExceptionHandler");
+ return ResultData.fail("数据库操作失败" );
+ }
+
+ @ExceptionHandler(SQLException.class)
+ @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+ public ResultData handleSQLException(SQLException e) {
+ LogUtil.WriteLog_Error("数据库SQL执行失败:" + e.getMessage(),"GlobalExceptionHandler");
+ return ResultData.fail("数据库SQL执行失败");
+ }
+
+ @ExceptionHandler(IllegalArgumentException.class)
+ @ResponseStatus(HttpStatus.BAD_REQUEST)
+ public ResultData handleIllegalArgumentException(IllegalArgumentException e) {
+ LogUtil.WriteLog_Error("参数错误:" + e.getMessage(),"GlobalExceptionHandler");
+ return ResultData.fail("参数错误" );
+ }
+
+ @ExceptionHandler(Exception.class)
+ @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+ public ResultData handleGenericException(Exception e) {
+ LogUtil.WriteLog_Error("服务器内部错误:" + e.getMessage(),"GlobalExceptionHandler");
+ return ResultData.fail("服务器内部错误" );
+ }
+}
diff --git a/src/main/java/com/nmgs/config/DataSourceConfig.java b/src/main/java/com/nmgs/config/DataSourceConfig.java
new file mode 100644
index 0000000..c75abfb
--- /dev/null
+++ b/src/main/java/com/nmgs/config/DataSourceConfig.java
@@ -0,0 +1,172 @@
+package com.nmgs.config;
+
+import com.atomikos.icatch.jta.UserTransactionImp;
+import com.atomikos.icatch.jta.UserTransactionManager;
+import com.mysql.cj.jdbc.MysqlXADataSource;
+import com.nmgs.util.PropertiesUtil;
+import com.trkf.PasswordEncryption.PassWordUtils;
+import com.zaxxer.hikari.HikariDataSource;
+import oracle.jdbc.xa.client.OracleXADataSource;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.boot.jta.atomikos.AtomikosDataSourceBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.jta.JtaTransactionManager;
+
+import javax.sql.DataSource;
+import javax.sql.XADataSource;
+import javax.transaction.SystemException;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+import java.sql.SQLException;
+
+@Configuration
+@EnableTransactionManagement
+public class DataSourceConfig {
+
+
+
+ @Bean
+ public UserTransaction localuserTransaction() throws SystemException {
+ UserTransactionImp userTransactionImp = new UserTransactionImp();
+ userTransactionImp.setTransactionTimeout(6000);
+ return userTransactionImp;
+ }
+
+ @Bean
+ public TransactionManager localtransactionManager() throws SystemException {
+ UserTransactionManager userTransactionManager = new UserTransactionManager();
+ userTransactionManager.setForceShutdown(false);
+ userTransactionManager.setTransactionTimeout(6000);
+ return userTransactionManager;
+ }
+
+ @Bean
+ public JtaTransactionManager jtatransactionManager(
+ UserTransaction localuserTransaction,
+ TransactionManager localtransactionManager) {
+ JtaTransactionManager jtaTransactionManager = new JtaTransactionManager(localuserTransaction, localtransactionManager);
+ jtaTransactionManager.setDefaultTimeout(6000);
+ return jtaTransactionManager;
+ }
+ /**
+ * 将这个对象放入spring容器中（交给Spring管理）
+ * @ConfigurationProperties 自动配置属性
+ */
+ @Bean
+ @ConfigurationProperties(prefix = "spring.datasource.primary")
+ public XADataSource getDataSourcePrimary() throws SQLException {
+ // 创建XA连接池
+ if("2".equals(PropertiesUtil.getValue("DBType"))){
+ OracleXADataSource oracleXADataSource = new OracleXADataSource();
+ oracleXADataSource.setURL(PropertiesUtil.getValue("DBUrl"));
+ oracleXADataSource.setUser(PropertiesUtil.getValue("DBUserName"));
+ oracleXADataSource.setPassword(PassWordUtils.decrypt(PropertiesUtil.getValue("DBPassWord")));
+ return oracleXADataSource;
+ }else if("4".equals(PropertiesUtil.getValue("DBType"))){
+ MysqlXADataSource oracleXADataSource = new MysqlXADataSource();
+ oracleXADataSource.setURL(PropertiesUtil.getValue("DBUrl"));
+ oracleXADataSource.setUser(PropertiesUtil.getValue("DBUserName"));
+ oracleXADataSource.setPassword(PassWordUtils.decrypt(PropertiesUtil.getValue("DBPassWord")));
+ return oracleXADataSource;
+ }
+ return null;
+ }
+
+
+ @Bean(name = "primaryDataSource")
+ @DependsOn({"getDataSourcePrimary","jtatransactionManager"})
+ public DataSource primaryDataSource(@Qualifier("getDataSourcePrimary") XADataSource xaDataSource) {
+ AtomikosDataSourceBean atomikosDataSourceBean = new AtomikosDataSourceBean();
+ //atomikosDataSourceBean.setXaDataSourceClassName("com.zaxxer.hikari.HikariXADataSource");
+ // 必须为数据源指定唯一标识
+ atomikosDataSourceBean.setUniqueResourceName("oracleDataSource");
+ atomikosDataSourceBean.setMinPoolSize(3);
+ atomikosDataSourceBean.setMaxPoolSize(25);
+ atomikosDataSourceBean.setMaxIdleTime(60000);
+ //获取连接的最大等待时间（单位：秒），超时抛出异常。默认 0（无限等待），建议设为 30 秒。
+ atomikosDataSourceBean.setBorrowConnectionTimeout(300);
+ // 每分钟检查空闲连接（单位：秒）
+ atomikosDataSourceBean.setMaintenanceInterval(60);
+ //事务超时后强制回收连接的等待时间（单位：秒），默认为 0（不启用）。
+ atomikosDataSourceBean.setReapTimeout(20); // 事务超时20秒后回收:
+ atomikosDataSourceBean.setXaDataSource(xaDataSource);
+ return atomikosDataSourceBean;
+
+ }
+
+ /**
+ * 将这个对象放入spring容器中（交给Spring管理）
+ * @ConfigurationProperties 自动配置属性
+ */
+ @Bean
+ @ConfigurationProperties(prefix = "spring.datasource.bak")
+ public XADataSource getDataSourceBak() throws SQLException {
+ // 创建XA连接池
+ // 创建XA连接池
+ if("2".equals(PropertiesUtil.getValue("BakDBType"))){
+ OracleXADataSource oracleXADataSource = new OracleXADataSource();
+ oracleXADataSource.setURL(PropertiesUtil.getValue("BAKDBUrl"));
+ oracleXADataSource.setUser(PropertiesUtil.getValue("BAKDBUserName"));
+ oracleXADataSource.setPassword(PassWordUtils.decrypt(PropertiesUtil.getValue("BAKDBPassWord")));
+ return oracleXADataSource;
+ }else if("4".equals(PropertiesUtil.getValue("BakDBType"))){
+ MysqlXADataSource oracleXADataSource = new MysqlXADataSource();
+ oracleXADataSource.setURL(PropertiesUtil.getValue("BAKDBUrl"));
+ oracleXADataSource.setUser(PropertiesUtil.getValue("BAKDBUserName"));
+ oracleXADataSource.setPassword(PassWordUtils.decrypt(PropertiesUtil.getValue("BAKDBPassWord")));
+ return oracleXADataSource;
+ }
+ return null;
+ }
+ @Bean(name = "bakDataSource")
+ @DependsOn({"getDataSourceBak","jtatransactionManager"})
+ public DataSource bakDataSource(@Qualifier("getDataSourceBak") XADataSource xaDataSource) {
+ AtomikosDataSourceBean atomikosDataSourceBean = new AtomikosDataSourceBean();
+ //atomikosDataSourceBean.setXaDataSourceClassName("com.zaxxer.hikari.HikariXADataSource");
+ // 必须为数据源指定唯一标识
+ atomikosDataSourceBean.setUniqueResourceName("mysqlDataSource");
+ atomikosDataSourceBean.setMinPoolSize(2);
+ atomikosDataSourceBean.setMaxPoolSize(50);
+ // 空闲连接保留 300 秒（5分钟）
+ atomikosDataSourceBean.setMaxIdleTime(60000);
+ atomikosDataSourceBean.setTestQuery("select 1");
+ //获取连接的最大等待时间（单位：秒），超时抛出异常。默认 0（无限等待），建议设为 30 秒。
+ atomikosDataSourceBean.setBorrowConnectionTimeout(300);
+ // 每分钟检查空闲连接（单位：秒）
+ atomikosDataSourceBean.setMaintenanceInterval(60);
+ //事务超时后强制回收连接的等待时间（单位：秒），默认为 0（不启用）。
+ atomikosDataSourceBean.setReapTimeout(20); // 事务超时20秒后回收:
+ atomikosDataSourceBean.setXaDataSource(xaDataSource);
+ return atomikosDataSourceBean;
+
+ }
+
+
+ @Bean(name = "commonDataSource")
+ @ConfigurationProperties(prefix = "spring.datasource.main")
+ public DataSource commonDataSource() {
+ return DataSourceBuilder.create().type(HikariDataSource.class).build();
+ }
+ public static DataSource initSource(String sourceType){
+ DataSourceConfig dsc=new DataSourceConfig();
+ try{
+ if("PRIMARY".equals(sourceType)){
+ return (DataSource) dsc.getDataSourcePrimary();
+ }else if("BAK".equals(sourceType)){
+ return (DataSource)dsc.getDataSourcePrimary();
+ }else if("COMMON".equals(sourceType)){
+ return dsc.commonDataSource();
+ }
+
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return null;
+ }
+}
+
diff --git a/src/main/java/com/nmgs/config/MybatisConfig.java b/src/main/java/com/nmgs/config/MybatisConfig.java
index a1c7589..aa43581 100644
--- a/src/main/java/com/nmgs/config/MybatisConfig.java
+++ b/src/main/java/com/nmgs/config/MybatisConfig.java
@@ -1,13 +1,25 @@
package com.nmgs.config;
import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.nmgs.util.PropertiesUtil;
+import org.apache.ibatis.logging.stdout.StdOutImpl;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-//@Configuration
+import javax.sql.DataSource;
+
+@Configuration
public class MybatisConfig {
- // @Bean
+ @Bean
public MybatisPlusInterceptor mybatisPlusInterceptor() {
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
if(PropertiesUtil.getValue("DBType").equals("1")){
@@ -21,19 +33,109 @@ public class MybatisConfig {
}
return interceptor;
}
- /**
- *旧版
- *分页插件
- */
-// @Bean
-// public PaginationInterceptor paginationInterceptor() {
-// PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
-// // 设置请求的页面大于最大页后操作， true调回到首页，false 继续请求 默认false
-// // paginationInterceptor.setOverflow(false);
-// // 设置最大单页限制数量，默认 500 条，-1 不受限制
-// // paginationInterceptor.setLimit(500);
-// // 开启 count 的 join 优化,只针对部分 left join
-// paginationInterceptor.setCountSqlParser(new JsqlParserCountOptimize(true));
-// return paginationInterceptor;
-// }
+
+ @Configuration
+ @MapperScan(
+ basePackages = "com.nmgs.mapperset.mysqlmapper",
+ sqlSessionFactoryRef = "mysqlSqlSessionFactory"
+ )
+ public static class MysqlMyBatisConfig {
+
+ @Autowired
+ @Qualifier("bakDataSource")
+ private DataSource bakDataSource;
+ @Autowired
+ @Qualifier("mybatisPlusInterceptor")
+ private MybatisPlusInterceptor mybatisPlusInterceptor;
+
+ @Bean
+ public SqlSessionFactory mysqlSqlSessionFactory() throws Exception {
+ SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+ if(bakDataSource==null){
+ bakDataSource=DataSourceConfig.initSource("BAK");
+ }
+ sessionFactory.setDataSource(bakDataSource);
+ MybatisConfiguration configuration = new MybatisConfiguration();
+ configuration.addInterceptor(mybatisPlusInterceptor );
+ // 配置打印sql语句
+ if("Y".equals(PropertiesUtil.getValue("mybatislogImplEnabled"))){
+ configuration.setLogImpl(StdOutImpl.class);
+ }
+ sessionFactory.setConfiguration(configuration);
+ sessionFactory.setMapperLocations(
+ new PathMatchingResourcePatternResolver()
+ .getResources("classpath:com/nmgs/mapperset/mysqlmapper/*.xml")
+ );
+ return sessionFactory.getObject();
+ }
+ }
+
+ @Configuration
+ @MapperScan(
+ basePackages = "com.nmgs.mapperset.oraclemapper",
+ sqlSessionFactoryRef = "oracleSqlSessionFactory"
+ )
+ public static class OracleMyBatisConfig {
+
+ @Autowired
+ @Qualifier("primaryDataSource")
+ private DataSource primaryDataSource;
+ @Autowired
+ @Qualifier("mybatisPlusInterceptor")
+ private MybatisPlusInterceptor mybatisPlusInterceptor;
+ @Bean
+ public SqlSessionFactory oracleSqlSessionFactory() throws Exception {
+ SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+ sessionFactory.setDataSource(primaryDataSource);
+ if(primaryDataSource==null){
+ primaryDataSource=DataSourceConfig.initSource("PRIMARY");
+ }
+ MybatisConfiguration configuration = new MybatisConfiguration();
+ configuration.addInterceptor(mybatisPlusInterceptor );
+ // 配置打印sql语句
+ if("Y".equals(PropertiesUtil.getValue("mybatislogImplEnabled"))){
+ configuration.setLogImpl(StdOutImpl.class);
+ }
+ sessionFactory.setConfiguration(configuration);
+ sessionFactory.setMapperLocations(
+ new PathMatchingResourcePatternResolver()
+ .getResources("classpath:com/nmgs/mapperset/oraclemapper/*.xml")
+ );
+ return sessionFactory.getObject();
+ }
+ }
+ @Configuration
+ @MapperScan(
+ basePackages = "com.nmgs.mappercommon",
+ sqlSessionFactoryRef = "commonSqlSessionFactory"
+ )
+ public static class commonMyBatisConfig {
+
+ @Autowired
+ @Qualifier("commonDataSource")
+ private DataSource commonDataSource;
+ @Autowired
+ @Qualifier("mybatisPlusInterceptor")
+ private MybatisPlusInterceptor mybatisPlusInterceptor;
+ @Bean
+ public SqlSessionFactory commonSqlSessionFactory() throws Exception {
+ SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+ if(commonDataSource==null){
+ commonDataSource=DataSourceConfig.initSource("COMMON");
+ }
+ sessionFactory.setDataSource(commonDataSource);
+ MybatisConfiguration configuration = new MybatisConfiguration();
+ configuration.addInterceptor(mybatisPlusInterceptor );
+ // 配置打印sql语句
+ if("Y".equals(PropertiesUtil.getValue("mybatislogImplEnabled"))){
+ configuration.setLogImpl(StdOutImpl.class);
+ }
+ sessionFactory.setConfiguration(configuration);
+ sessionFactory.setMapperLocations(
+ new PathMatchingResourcePatternResolver()
+ .getResources("classpath:com/nmgs/mappercommon/*.xml")
+ );
+ return sessionFactory.getObject();
+ }
+ }
}
diff --git a/src/main/java/com/nmgs/controller/FileUploadController.java b/src/main/java/com/nmgs/controller/FileUploadController.java
index c7c1ef9..abb8ee7 100644
--- a/src/main/java/com/nmgs/controller/FileUploadController.java
+++ b/src/main/java/com/nmgs/controller/FileUploadController.java
@@ -34,10 +34,7 @@ public class FileUploadController {
String os = props.getProperty("os.name").toLowerCase();
String fileAddressLocal = PathUtil.uploadPath + "/" + PubTools.getCurrentDateYMD();
if (os.startsWith("win")) {
- // fileAddressLocal = PropertiesUtil.getValue("fileAddressWin");
fileAddressLocal = fileAddressLocal.replace("/", "\\");
- } else {
- // fileAddressLocal = PropertiesUtil.getValue("fileAddressLinux");
}
LogUtil.WriteLog_Info("附件上传接口====fileAddressLocal====" + fileAddressLocal, "FileUploadController");
if (!PubTools.isNull(fileAddressLocal)) {
@@ -56,36 +53,13 @@ public class FileUploadController {
} else {
return ResultData.fail("上传附件失败:附件类型不匹配");
}
-
- /* File dest = new File(PropertiesUtil.getValue("fileTemp"), fileName);
- System.out.println(filedata.getOriginalFilename());
- // 使用下面的jar包
- FileUtils.copyInputStreamToFile(filedata.getInputStream(), dest);
- File fileTemp = new File(PropertiesUtil.getValue("fileTemp") + "/" + fileName);
- if (!fileTemp.exists()) {
- return ResultData.success(2, "附件上传失败");
- }
- String imageBase64 = ImageUtils.getImgFileToBase64(PropertiesUtil.getValue("fileTemp") + "/" + fileName);
- if (fileTemp.exists()) {
- fileTemp.delete();
- }*/
byte[] bytes = filedata.getBytes();
String imageBase64 = ImageUtils.byteToBase64(bytes);
if (PubTools.isNull(imageBase64)) {
- return ResultData.success(2, "附件解析失败");
+ return ResultData.fail(-1, "附件解析失败");
}
String addWaterImage = ImageUtils.addImageWaterMark(imageBase64, "仅用于内蒙古交通货运车辆积分会员认证", fileName);
if (!PubTools.isNull(addWaterImage)) {
- /*// ImageUtils.delFile(fileName, false);
- byte[] imageBytes = Base64.getDecoder().decode(addWaterImage);
- // 创建文件
- File file = new File(fileAddressLocal, fileName); // 指定上传位置
- if (file.exists()) {
- file.delete();
- }
- // 保存文件
- LogUtil.WriteLog_Info("附件开始上传到服务器===========" + PubTools.getCurrentDate(), "FileUploadController");
- FileUtils.writeByteArrayToFile(file, imageBytes);*/
LogUtil.WriteLog_Info("附件上传到服务器结束===========" + PubTools.getCurrentDate(), "FileUploadController");
} else if ("-9999".equals(addWaterImage)) {
throw new Exception("附件添加水印失败");
@@ -93,7 +67,6 @@ public class FileUploadController {
}
LogUtil.WriteLog_Info("附件上传接口执行结束===========" + PubTools.getCurrentDate(), "FileUploadController");
} catch (Exception e) {
- e.printStackTrace();
return ResultData.fail("上传附件失败:" + e.getMessage());
}
return ResultData.success("上传成功", fileName, 1);
diff --git a/src/main/java/com/nmgs/controller/InitController.java b/src/main/java/com/nmgs/controller/InitController.java
deleted file mode 100644
index f60e497..0000000
--- a/src/main/java/com/nmgs/controller/InitController.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.nmgs.controller;
-
-import io.swagger.annotations.Api;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-@Component
-@Api(tags = "项目启动初始化")
-public class InitController {
-
- @PostConstruct
- public void init() {
- // 初始化代码
- System.out.println("初始化方法被调用");
- }
-}
diff --git a/src/main/java/com/nmgs/controller/WebSocketRedis.java b/src/main/java/com/nmgs/controller/WebSocketRedis.java
index 3f5eb94..1522716 100644
--- a/src/main/java/com/nmgs/controller/WebSocketRedis.java
+++ b/src/main/java/com/nmgs/controller/WebSocketRedis.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.atomic.AtomicInteger;
-@Component
+//@Component
@ServerEndpoint(value = "/webSocketCheck/{userId}")
public class WebSocketRedis {
Log log= LogFactory.getLog(WebSocketRedis.class);
diff --git a/src/main/java/com/nmgs/mapper/IntegrationListMapper.java b/src/main/java/com/nmgs/mapper/IntegrationListMapper.java
deleted file mode 100644
index 2b70882..0000000
--- a/src/main/java/com/nmgs/mapper/IntegrationListMapper.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.nmgs.mapper;
-
-
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.nmgs.entity.IntegrationList;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface IntegrationListMapper extends MppBaseMapper {
-
-
- /**
- * 获取用户增加积分清单
- * @param params
- * @return
- */
- List getUserAddIntegation(@Param("params") Map params);
-
- /**
- * 获取用户消费积分清单
- * @param params
- * @return
- */
- List getUserPayIntegation(@Param("params") Map params);
-
- Integer getMaxId();
-
- /**
- * 获取每日积分增长量
- * @param param
- * @return
- */
- List> getIntegrationGrowTotal(@Param("params")Map param);
-
- /**
- * 获取车辆积分增长量排名前十
- * @param params
- * @return
- */
- List> getCarIntegrationGrowTotal(@Param("params")Map params);
-
- /**
- * 获取月增长积分、消费积分
- * @param params
- * @return
- */
- Map getMonthFeeTotal(@Param("params")Map params);
-
- /**
- * 消费积分分类占比
- * @param params
- * @return
- */
- List> getFeeTypeTotal(@Param("params")Map params);
-
- /**
- * 根据日期获取排名积分奖励情况
- * @param params
- * @return
- */
- List getAMEScoreByTime(@Param("params") Map params);
-
- @Select("select max(list.TOTALADDINTEGRATION) from INTEGRATION_LIST_TABLE list where list.USERID = #{id}")
- BigDecimal getTotalAddIntegrationByUserId(@Param("id")Integer id);
-}
diff --git a/src/main/java/com/nmgs/mapper/IntegrationListMapper.xml b/src/main/java/com/nmgs/mapper/IntegrationListMapper.xml
deleted file mode 100644
index 05e807d..0000000
--- a/src/main/java/com/nmgs/mapper/IntegrationListMapper.xml
+++ /dev/null
@@ -1,319 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapper/PayIntegrationNumberMapper.java b/src/main/java/com/nmgs/mapper/PayIntegrationNumberMapper.java
deleted file mode 100644
index 9d5dd8f..0000000
--- a/src/main/java/com/nmgs/mapper/PayIntegrationNumberMapper.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.nmgs.mapper;
-
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.nmgs.entity.PayIntegrationNumber;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-
-@Mapper
-public interface PayIntegrationNumberMapper extends MppBaseMapper {
-
-
- /**
- * 获取配置信息
- * @return
- */
- List getPayIntegrationNumberList();
-
- /**
- * 获取最大id
- * @return
- */
- Integer getMaxId();
-
-
- /**
- * 根据类型获取配置的积分
- * @param type
- * @return
- */
- @Select("SELECT pay.ID,pay.VALUE,pay.type FROM pay_integration_number_table pay where pay.type=#{type}")
- PayIntegrationNumber getAuScore(@Param("type") String type);
-}
diff --git a/src/main/java/com/nmgs/mapper/PayIntegrationNumberMapper.xml b/src/main/java/com/nmgs/mapper/PayIntegrationNumberMapper.xml
deleted file mode 100644
index 619c365..0000000
--- a/src/main/java/com/nmgs/mapper/PayIntegrationNumberMapper.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapper/ServiceAreaMapper.java b/src/main/java/com/nmgs/mapper/ServiceAreaMapper.java
deleted file mode 100644
index d2a7983..0000000
--- a/src/main/java/com/nmgs/mapper/ServiceAreaMapper.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.nmgs.mapper;
-
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.nmgs.entity.ServiceArea;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface ServiceAreaMapper extends MppBaseMapper {
- /**
- * 分页查找岗位数据
- * @param page
- * @param params
- * @return
- */
- Page getServiceAreaList(Page page, @Param("params") Map params);
-
- /**
- * 获取最大id
- * @return
- */
- Integer getMaxId();
-
- /**
- *获取服务区类型数据
- * @return
- */
- List> selectServiceTypeList();
-
- /**
- *获取服务区服务种类数据
- * @return
- */
- List> selectServiceKindList();
-
- /**
- * 根据日期获取服务器核销次数前五
- * @param params
- * @return
- */
- List> getServiceAreaCafCount(@Param("params") Map params);
- /**
- * 根据日期获取服务器积分消费排名
- * @param params
- * @return
- */
- List> getServiceAreaCafTotal(@Param("params")Map params);
-
- /**
- * 服务器积分消费占比
- * @param params
- * @return
- */
- List> getServiceAreaFee(@Param("params")Map params);
-}
diff --git a/src/main/java/com/nmgs/mapper/ServiceAreaMapper.xml b/src/main/java/com/nmgs/mapper/ServiceAreaMapper.xml
deleted file mode 100644
index 3245c29..0000000
--- a/src/main/java/com/nmgs/mapper/ServiceAreaMapper.xml
+++ /dev/null
@@ -1,236 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapper/ServiceAreaPicMapper.java b/src/main/java/com/nmgs/mapper/ServiceAreaPicMapper.java
deleted file mode 100644
index dd551ec..0000000
--- a/src/main/java/com/nmgs/mapper/ServiceAreaPicMapper.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.nmgs.mapper;
-
-
-import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
-import com.nmgs.entity.ServiceAreaPic;
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface ServiceAreaPicMapper extends MppBaseMapper {
-
- /**
- * 获取最大id
- * @return
- */
- Integer getMaxId();
-
-
- @Delete("delete from service_area_pic_table where SERVICEID=#{id}")
- int deletePicByAreaId(@Param("id") Integer id);
-
- @Select("select ID,SERVICEID,PICDATA from service_area_pic_table where SERVICEID=#{params.id}")
- List getAreaPic(@Param("params")Map params);
-
-}
diff --git a/src/main/java/com/nmgs/mapper/ServiceAreaPicMapper.xml b/src/main/java/com/nmgs/mapper/ServiceAreaPicMapper.xml
deleted file mode 100644
index f1f6840..0000000
--- a/src/main/java/com/nmgs/mapper/ServiceAreaPicMapper.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapper/Mapper.java b/src/main/java/com/nmgs/mappercommon/Mapper.java
similarity index 91%
rename from src/main/java/com/nmgs/mapper/Mapper.java
rename to src/main/java/com/nmgs/mappercommon/Mapper.java
index 04954be..eafc9cc 100644
--- a/src/main/java/com/nmgs/mapper/Mapper.java
+++ b/src/main/java/com/nmgs/mappercommon/Mapper.java
@@ -1,4 +1,4 @@
-package com.nmgs.mapper;
+package com.nmgs.mappercommon;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,7 +10,7 @@ import java.util.List;
import java.util.Map;
-@org.apache.ibatis.annotations.Mapper
+//@org.apache.ibatis.annotations.Mapper
public interface Mapper extends BaseMapper {
diff --git a/src/main/java/com/nmgs/mapper/Mapper.xml b/src/main/java/com/nmgs/mappercommon/Mapper.xml
similarity index 93%
rename from src/main/java/com/nmgs/mapper/Mapper.xml
rename to src/main/java/com/nmgs/mappercommon/Mapper.xml
index 891fc45..58bdb1d 100644
--- a/src/main/java/com/nmgs/mapper/Mapper.xml
+++ b/src/main/java/com/nmgs/mappercommon/Mapper.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/AppointmentInfoMyMapper.java b/src/main/java/com/nmgs/mapperset/mysqlmapper/AppointmentInfoMyMapper.java
new file mode 100644
index 0000000..d206203
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/AppointmentInfoMyMapper.java
@@ -0,0 +1,18 @@
+package com.nmgs.mapperset.mysqlmapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+//@Mapper
+public interface AppointmentInfoMyMapper {
+
+ /**
+ * 新增用户车辆信息
+ * @param param
+ * @return
+ */
+ public int addAppointmentInfo(@Param("params") Map param);
+ public int updateConpleteStatus(@Param("params") Map param);
+
+}
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/AppointmentInfoMyMapper.xml b/src/main/java/com/nmgs/mapperset/mysqlmapper/AppointmentInfoMyMapper.xml
new file mode 100644
index 0000000..e2d8d75
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/AppointmentInfoMyMapper.xml
@@ -0,0 +1,46 @@
+
+
+
+
+ update APPOINTMENT_INFO_TABLE
+ set COMPLETESTATUS=#{params.completeStatus}
+ where ORDERID = #{params.orderId}
+
+
+ insert into APPOINTMENT_INFO_TABLE(ID,USERID,ACARNO,APPOINTMENTTYPE,APPOINTMENTTIME,APPOINTMENTLINEID,
+ CREATETIME,SERVICEAREAID,MEALS,MEALSCOUNT,COMPLETESTATUS,INTEGRATIONLISTID,
+ SERVICEOPERATIONID,TOTALINTEGRAL,ORDERID)
+ values (#{params.maxId},${params.userId},#{params.acarno},#{params.appointmenttype},
+
+ dateadd(day,0,#{params.appointtime}),
+
+
+ TO_DATE(#{params.appointtime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ TO_DATE(#{params.appointtime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ STR_TO_DATE(#{params.appointtime}, '%Y-%m-%d %H:%i:%s'),
+
+ #{params.appointmentlineid},
+
+ dateadd(day,0,#{params.createtime}),
+
+
+ TO_DATE(#{params.createtime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ TO_DATE(#{params.createtime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ STR_TO_DATE(#{params.createtime}, '%Y-%m-%d %H:%i:%s'),
+
+ #{params.serviceareaId},#{params.meals},#{params.mealscount},#{params.completeStatus},#{params.integrationListId},
+ #{params.serviceOperationId,jdbcType=VARCHAR},#{params.totalIntegral},#{params.orderId})
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/CafterTableMyMapper.java b/src/main/java/com/nmgs/mapperset/mysqlmapper/CafterTableMyMapper.java
new file mode 100644
index 0000000..6912411
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/CafterTableMyMapper.java
@@ -0,0 +1,19 @@
+package com.nmgs.mapperset.mysqlmapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+//@Mapper
+public interface CafterTableMyMapper {
+
+ /**
+ * 新增用户车辆信息
+ * @param param
+ * @return
+ */
+ public int addcafter(@Param("params") Map param);
+ public int updatecafter(@Param("params") Map param);
+ public int updatecafterConpleteStatus(@Param("params") Map param);
+
+}
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/CafterTableMyMapper.xml b/src/main/java/com/nmgs/mapperset/mysqlmapper/CafterTableMyMapper.xml
new file mode 100644
index 0000000..c11f9e6
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/CafterTableMyMapper.xml
@@ -0,0 +1,57 @@
+
+
+
+
+ update CAFTER_TABLE
+ set rollback=#{params.rollback}
+
+
+ ,ROLLBACKTIME = dateadd(day,0,#{params.rollbackTime})
+
+
+ ,ROLLBACKTIME= TO_DATE(#{params.rollbackTime}, 'YYYY-MM-DD HH24:mi:ss')
+
+
+ ,ROLLBACKTIME= TO_DATE(#{params.rollbackTime}, 'YYYY-MM-DD HH24:mi:ss')
+
+
+ ,ROLLBACKTIME= STR_TO_DATE(#{params.rollbackTime}, '%Y-%m-%d %H:%i:%s')
+
+
+
+ ,INTEGRALROLLBACK=#{params.integralrollback}
+
+ where ORDERID = #{params.orderId} AND USERJOBNUMBER= #{params.serverOperationId}
+
+
+ insert into CAFTER_TABLE(ID,
+ ACARNO,
+ USERID,
+ CAFTERTIME,
+ USERJOBNUMBER,
+ TRIMINTEGRAL,
+ INTEGRATIONLISTID,
+ ORDERID,CONTENT) values (#{params.maxId},#{params.acarNo},#{params.userId},
+
+ dateadd(day,0,#{params.cafterTime}),
+
+
+ TO_DATE(#{params.cafterTime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ TO_DATE(#{params.cafterTime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ STR_TO_DATE(#{params.cafterTime}, '%Y-%m-%d %H:%i:%s'),
+
+ #{params.userJobnumber}, #{params.trimintegral},#{params.integrationListId},#{params.orderId},#{params.content})
+
+
+ update CAFTER_TABLE
+ set COMPLETESTATUS=#{params.completeStatus}
+ where ORDERID = #{params.orderId}
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegralLeavingMyMapper.java b/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegralLeavingMyMapper.java
new file mode 100644
index 0000000..65f6e7d
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegralLeavingMyMapper.java
@@ -0,0 +1,17 @@
+package com.nmgs.mapperset.mysqlmapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+//@Mapper
+public interface IntegralLeavingMyMapper {
+
+ /**
+ * 新增用户车辆信息
+ * @param param
+ * @return
+ */
+ public int addIntegralLeaving(@Param("params") Map param);
+
+}
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegralLeavingMyMapper.xml b/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegralLeavingMyMapper.xml
new file mode 100644
index 0000000..74be044
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegralLeavingMyMapper.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+ insert into INTEGRAL_LEAVEMESSAGE_TABLE(ID,USERID,POSITION,MESSAGE,CREATETIME,REPLYSTATUS)
+ values(#{params.maxId},(SELECT ID FROM WEIXN_USER_TABLE WHERE OPENID=#{params.openId}),
+ #{params.positon},#{params.message},
+
+ dateadd(day,0,#{params.currentDate}),
+
+
+ TO_DATE(#{params.currentDate}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ TO_DATE(#{params.currentDate}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ STR_TO_DATE(#{params.currentDate}, '%Y-%m-%d %H:%i:%s'),
+
+ #{params.replyStatus})
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegralSignMyMapper.java b/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegralSignMyMapper.java
new file mode 100644
index 0000000..3ee319a
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegralSignMyMapper.java
@@ -0,0 +1,23 @@
+package com.nmgs.mapperset.mysqlmapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+//@Mapper
+public interface IntegralSignMyMapper {
+
+ /**
+ * 新增用户签到信息
+ * @param param
+ * @return
+ */
+ public int addIntegralSign(@Param("params") Map param);
+ /**
+ * 修改用户签到信息
+ * @param param
+ * @return
+ */
+ public int updateIntegralSign(@Param("params") Map param);
+
+}
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegralSignMyMapper.xml b/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegralSignMyMapper.xml
new file mode 100644
index 0000000..fb0fb16
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegralSignMyMapper.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+ insert into INTEGRAL_SIGN_TABLE(USERID,MONTH,DAY${params.dayvalue})
+ values((SELECT ID FROM WEIXN_USER_TABLE WHERE OPENID=#{params.openId}),
+ #{params.month},'Y')
+
+
+ UPDATE INTEGRAL_SIGN_TABLE set Day${params.dayvalue}='Y' where USERID=(SELECT ID FROM WEIXN_USER_TABLE WHERE OPENID=#{params.openId})
+ AND MONTH=#{params.month}
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegrationListMyMapper.java b/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegrationListMyMapper.java
new file mode 100644
index 0000000..654c61a
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegrationListMyMapper.java
@@ -0,0 +1,17 @@
+package com.nmgs.mapperset.mysqlmapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+//@Mapper
+public interface IntegrationListMyMapper {
+
+ /**
+ * 新增用户签到积分信息
+ * @param param
+ * @return
+ */
+ public int addIntegralList(@Param("params") Map param);
+
+}
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegrationListMyMapper.xml b/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegrationListMyMapper.xml
new file mode 100644
index 0000000..36fa5bb
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/IntegrationListMyMapper.xml
@@ -0,0 +1,27 @@
+
+
+
+
+ INSERT INTO integration_list_table ( ID, USERID,ACARNO, LASTINTEGRATION, TOTALADDINTEGRATION,PAYINTEGRATION, RESTINTEGRATION,
+ PAYTIME, PAYTYPE,CPENABLEINTEGRATION,OGENABLEINTEGRATION )
+ values(#{params.maxid},#{params.userId},#{params.acarNo},#{params.lastintegration},#{params.totalintegration},
+ #{params.payintegration},#{params.restintegration},
+
+ dateadd(day,0,#{params.payTime}),
+
+
+ TO_DATE(#{params.payTime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ TO_DATE(#{params.payTime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ STR_TO_DATE(#{params.payTime}, '%Y-%m-%d %H:%i:%s'),
+
+ #{params.paytype},#{params.cpenableintegration},#{params.ogenableintegration})
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/OperatorsMyMapper.java b/src/main/java/com/nmgs/mapperset/mysqlmapper/OperatorsMyMapper.java
new file mode 100644
index 0000000..53bcdd4
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/OperatorsMyMapper.java
@@ -0,0 +1,55 @@
+package com.nmgs.mapperset.mysqlmapper;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
+import com.nmgs.entity.ServiceAreaOperators;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+//@Mapper
+public interface OperatorsMyMapper extends MppBaseMapper {
+
+ /**
+ * 分页查询运营人员数据
+ *
+ * @param page
+ * @param params
+ * @return
+ */
+ Page getOperatorsList(Page page, @Param("params") Map params);
+
+
+ /**
+ * 获取员工角色
+ *
+ * @return
+ */
+ List> selectRoleListList();
+
+ /**
+ * 获取服务区
+ *
+ * @return
+ */
+ List> selectServiceAreaList();
+
+
+ /**
+ * 获取最大id
+ *
+ * @return
+ */
+ Integer getMaxId();
+
+ /**
+ * 根据工号获取数据
+ *
+ * @return
+ */
+ List getOperationByJobNumber(@Param("jobNumber") String jobNumber);
+
+
+}
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/OperatorsMyMapper.xml b/src/main/java/com/nmgs/mapperset/mysqlmapper/OperatorsMyMapper.xml
new file mode 100644
index 0000000..d7294eb
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/OperatorsMyMapper.xml
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/UserTableMysqlMapper.java b/src/main/java/com/nmgs/mapperset/mysqlmapper/UserTableMysqlMapper.java
new file mode 100644
index 0000000..3315667
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/UserTableMysqlMapper.java
@@ -0,0 +1,28 @@
+package com.nmgs.mapperset.mysqlmapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+//@Mapper
+public interface UserTableMysqlMapper {
+
+ /**
+ * 新增用户
+ * @param param
+ * @return
+ */
+ public int addUser(@Param("params") Map param);
+
+ /**
+ * 用户信息修改
+ * @return
+ */
+ public int updateUser(@Param("params") Map param);
+ /**
+ * 用户信息修改
+ * @return
+ */
+ public int updateUserById(@Param("params") Map param);
+}
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/UserTableMysqlMapper.xml b/src/main/java/com/nmgs/mapperset/mysqlmapper/UserTableMysqlMapper.xml
new file mode 100644
index 0000000..d9cecc0
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/UserTableMysqlMapper.xml
@@ -0,0 +1,61 @@
+
+
+
+
+ update WEIXN_USER_TABLE set CERTIFICATION=#{params.certification} ,NUMBERPICNAME=#{params.filename}
+
+ ,phone=#{params.phone}
+
+
+ ,REALNAME=#{params.realName}
+
+
+ ,IDNUMBER=#{params.idNumber}
+
+
+ ,CREATETIME <= dateadd(day,0,#{params.createTime})
+
+
+ ,CREATETIME= TO_DATE(#{params.createTime}, 'YYYY-MM-DD HH24:mi:ss')
+
+
+ ,CREATETIME= TO_DATE(#{params.createTime}, 'YYYY-MM-DD HH24:mi:ss')
+
+
+ ,CREATETIME= STR_TO_DATE(#{params.createTime}, '%Y-%m-%d %H:%i:%s')
+
+ where OPENID=#{params.openid}
+
+
+ insert into WEIXN_USER_TABLE(ID,OPENID,USERNAME,CREATETIME,ENABLEINTEGRATION,STARLEVEL,OILENABLEINTEGRATION,GASENABLEINTEGRATION,
+ SPENABLEINTEGRATION,CAFENABLEINTEGRATION,CERTIFICATION,OGENABLEINTEGRATION,CPENABLEINTEGRATION,REFERRERCODE)
+ values(#{params.userid},#{params.openid},#{params.username}
+
+ ,dateadd(day,0,#{params.createTime})
+
+
+ ,TO_DATE(#{params.createTime}, 'YYYY-MM-DD HH24:mi:ss')
+
+
+ ,TO_DATE(#{params.createTime}, 'YYYY-MM-DD HH24:mi:ss')
+
+
+ ,STR_TO_DATE(#{params.createTime}, '%Y-%m-%d %H:%i:%s')
+
+ ,0,0,0,0,0,0,0,0,0,#{params.REFERRERCODE})
+
+
+ update WEIXN_USER_TABLE SET
+
+ CPENABLEINTEGRATION=#{params.enabledTICp},
+
+
+ OGENABLEINTEGRATION=#{params.enabledTIOG},
+
+ ENABLEINTEGRATION= #{params.enabledTI}
+ where OPENID=#{params.userId}
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/UserVehicleMyMapper.java b/src/main/java/com/nmgs/mapperset/mysqlmapper/UserVehicleMyMapper.java
new file mode 100644
index 0000000..e20a440
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/UserVehicleMyMapper.java
@@ -0,0 +1,28 @@
+package com.nmgs.mapperset.mysqlmapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+//@Mapper
+public interface UserVehicleMyMapper {
+
+ /**
+ * 新增用户车辆信息
+ * @param param
+ * @return
+ */
+ public int addUserVehicle(@Param("params") Map param);
+ /**
+ * 修改用户车辆信息
+ * @param param
+ * @return
+ */
+ public int updateUserVehicle(@Param("params") Map param);
+ /**
+ * 删除用户车辆信息
+ * @return
+ */
+ public int delUserVehcile(@Param("params") Map param);
+
+}
diff --git a/src/main/java/com/nmgs/mapperset/mysqlmapper/UserVehicleMyMapper.xml b/src/main/java/com/nmgs/mapperset/mysqlmapper/UserVehicleMyMapper.xml
new file mode 100644
index 0000000..4ffa2e7
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/mysqlmapper/UserVehicleMyMapper.xml
@@ -0,0 +1,86 @@
+
+
+
+
+ update user_vehicle_table
+ set CERTIFICATION=#{params.certification}
+
+
+ ,CANCELTIME = dateadd(day,0,#{params.cancelTime})
+
+
+ ,CANCELTIME= TO_DATE(#{params.cancelTime}, 'YYYY-MM-DD HH24:mi:ss')
+
+
+ ,CANCELTIME= TO_DATE(#{params.cancelTime}, 'YYYY-MM-DD HH24:mi:ss')
+
+
+ ,CANCELTIME= STR_TO_DATE(#{params.cancelTime}, '%Y-%m-%d %H:%i:%s')
+
+
+
+
+ ,CREATETIME = dateadd(day,0,#{params.createTime})
+
+
+ ,CREATETIME= TO_DATE(#{params.createTime}, 'YYYY-MM-DD HH24:mi:ss')
+
+
+ ,CREATETIME= TO_DATE(#{params.createTime}, 'YYYY-MM-DD HH24:mi:ss')
+
+
+ ,CREATETIME= STR_TO_DATE(#{params.createTime}, '%Y-%m-%d %H:%i:%s')
+
+
+
+ ,LICENSEPICNAME=#{params.licensepic}
+
+
+ ,PERMITPICNAME=#{params.permitpic}
+
+
+ ,VEHICLEPICNAME=#{params.vehiclePic}
+
+
+ ,REFERRERCODE=#{params.referrerCode}
+
+
+ ,CHECKUSERNAME=#{params.checkName}
+
+
+ ,CHECKUSERNUMBER=#{params.checkUserNumber}
+
+ where USERID=#{params.userId} AND ACARNO=#{params.aCarNo}
+
+ AND ${params.commonCondition}
+
+
+
+ insert into user_vehicle_table(USERID,ACARNO,CREATETIME,CERTIFICATION)
+ values((SELECT ID FROM WEIXN_USER_TABLE WHERE OPENID=#{params.openid}),#{params.aCarNo},
+
+ dateadd(day,0,#{params.createTime}),
+
+
+ TO_DATE(#{params.createTime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ TO_DATE(#{params.createTime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ STR_TO_DATE(#{params.createTime}, '%Y-%m-%d %H:%i:%s'),
+
+ #{params.certification})
+
+
+
+ delete from user_vehicle_table where USERID=#{params.userId} AND ACARNO=#{params.aCarNo}
+
+ AND ${params.commonCondition}
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapperset/oraclemapper/AppointmentInfoMapper.java b/src/main/java/com/nmgs/mapperset/oraclemapper/AppointmentInfoMapper.java
new file mode 100644
index 0000000..0dade8a
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/oraclemapper/AppointmentInfoMapper.java
@@ -0,0 +1,18 @@
+package com.nmgs.mapperset.oraclemapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+//@Mapper
+public interface AppointmentInfoMapper {
+
+ /**
+ * 新增用户车辆信息
+ * @param param
+ * @return
+ */
+ public int addAppointmentInfo(@Param("params") Map param);
+ public int updateConpleteStatus(@Param("params") Map param);
+
+}
diff --git a/src/main/java/com/nmgs/mapperset/oraclemapper/AppointmentInfoMapper.xml b/src/main/java/com/nmgs/mapperset/oraclemapper/AppointmentInfoMapper.xml
new file mode 100644
index 0000000..98bcfa3
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/oraclemapper/AppointmentInfoMapper.xml
@@ -0,0 +1,46 @@
+
+
+
+
+ update APPOINTMENT_INFO_TABLE
+ set COMPLETESTATUS=#{params.completeStatus}
+ where ORDERID = #{params.orderId}
+
+
+ insert into APPOINTMENT_INFO_TABLE(ID,USERID,ACARNO,APPOINTMENTTYPE,APPOINTMENTTIME,APPOINTMENTLINEID,
+ CREATETIME,SERVICEAREAID,MEALS,MEALSCOUNT,COMPLETESTATUS,INTEGRATIONLISTID,
+ SERVICEOPERATIONID,TOTALINTEGRAL,ORDERID)
+ values (#{params.maxId},${params.userId},#{params.acarno},#{params.appointmenttype},
+
+ dateadd(day,0,#{params.appointtime}),
+
+
+ TO_DATE(#{params.appointtime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ TO_DATE(#{params.appointtime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ STR_TO_DATE(#{params.appointtime}, '%Y-%m-%d %H:%i:%s'),
+
+ #{params.appointmentlineid},
+
+ dateadd(day,0,#{params.createtime}),
+
+
+ TO_DATE(#{params.createtime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ TO_DATE(#{params.createtime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ STR_TO_DATE(#{params.createtime}, '%Y-%m-%d %H:%i:%s'),
+
+ #{params.serviceareaId},#{params.meals},#{params.mealscount},#{params.completeStatus},#{params.integrationListId},
+ #{params.serviceOperationId,jdbcType=VARCHAR},#{params.totalIntegral},#{params.orderId})
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapperset/oraclemapper/CafterTableMapper.java b/src/main/java/com/nmgs/mapperset/oraclemapper/CafterTableMapper.java
new file mode 100644
index 0000000..99e00a3
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/oraclemapper/CafterTableMapper.java
@@ -0,0 +1,19 @@
+package com.nmgs.mapperset.oraclemapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+//@Mapper
+public interface CafterTableMapper {
+
+ /**
+ * 新增用户车辆信息
+ * @param param
+ * @return
+ */
+ public int addcafter(@Param("params") Map param);
+ public int updatecafter(@Param("params") Map param);
+ public int updatecafterConpleteStatus(@Param("params") Map param);
+
+}
diff --git a/src/main/java/com/nmgs/mapperset/oraclemapper/CafterTableMapper.xml b/src/main/java/com/nmgs/mapperset/oraclemapper/CafterTableMapper.xml
new file mode 100644
index 0000000..abf876f
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/oraclemapper/CafterTableMapper.xml
@@ -0,0 +1,58 @@
+
+
+
+
+ update CAFTER_TABLE
+ set rollback=#{params.rollback}
+
+
+ ,ROLLBACKTIME = dateadd(day,0,#{params.rollbackTime})
+
+
+ ,ROLLBACKTIME= TO_DATE(#{params.rollbackTime}, 'YYYY-MM-DD HH24:mi:ss')
+
+
+ ,ROLLBACKTIME= TO_DATE(#{params.rollbackTime}, 'YYYY-MM-DD HH24:mi:ss')
+
+
+ ,ROLLBACKTIME= STR_TO_DATE(#{params.cancelTime}, '%Y-%m-%d %H:%i:%s')
+
+
+
+ ,INTEGRALROLLBACK=#{params.integralrollback}
+
+ where ORDERID = #{params.orderId} AND USERJOBNUMBER= #{params.serverOperationId}
+
+
+ update CAFTER_TABLE
+ set COMPLETESTATUS=#{params.completeStatus}
+ where ORDERID = #{params.orderId}
+
+
+ insert into CAFTER_TABLE(ID,
+ ACARNO,
+ USERID,
+ CAFTERTIME,
+ USERJOBNUMBER,
+ TRIMINTEGRAL,
+ INTEGRATIONLISTID,
+ ORDERID,CONTENT) values (#{params.maxId},#{params.acarNo},#{params.userId},
+
+ dateadd(day,0,#{params.cafterTime}),
+
+
+ TO_DATE(#{params.cafterTime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ TO_DATE(#{params.cafterTime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ STR_TO_DATE(#{params.cafterTime}, '%Y-%m-%d %H:%i:%s'),
+
+ #{params.userJobnumber}, #{params.trimintegral},#{params.integrationListId},#{params.orderId},#{params.content})
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapperset/oraclemapper/IntegralLeavingMapper.java b/src/main/java/com/nmgs/mapperset/oraclemapper/IntegralLeavingMapper.java
new file mode 100644
index 0000000..14b3dae
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/oraclemapper/IntegralLeavingMapper.java
@@ -0,0 +1,17 @@
+package com.nmgs.mapperset.oraclemapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+//@Mapper
+public interface IntegralLeavingMapper {
+
+ /**
+ * 新增用户车辆信息
+ * @param param
+ * @return
+ */
+ public int addIntegralLeaving(@Param("params") Map param);
+
+}
diff --git a/src/main/java/com/nmgs/mapperset/oraclemapper/IntegralLeavingMapper.xml b/src/main/java/com/nmgs/mapperset/oraclemapper/IntegralLeavingMapper.xml
new file mode 100644
index 0000000..e29e508
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/oraclemapper/IntegralLeavingMapper.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+ insert into INTEGRAL_LEAVEMESSAGE_TABLE(ID,USERID,POSITION,MESSAGE,CREATETIME,REPLYSTATUS)
+ values(#{params.maxId},(SELECT ID FROM WEIXN_USER_TABLE WHERE OPENID=#{params.openId}),
+ #{params.positon},#{params.message},
+
+ dateadd(day,0,#{params.currentDate}),
+
+
+ TO_DATE(#{params.currentDate}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ TO_DATE(#{params.currentDate}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ STR_TO_DATE(#{params.currentDate}, '%Y-%m-%d %H:%i:%s'),
+
+ #{params.replyStatus})
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapperset/oraclemapper/IntegralSignMapper.java b/src/main/java/com/nmgs/mapperset/oraclemapper/IntegralSignMapper.java
new file mode 100644
index 0000000..376f655
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/oraclemapper/IntegralSignMapper.java
@@ -0,0 +1,23 @@
+package com.nmgs.mapperset.oraclemapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+//@Mapper
+public interface IntegralSignMapper {
+
+ /**
+ * 新增用户签到信息
+ * @param param
+ * @return
+ */
+ public int addIntegralSign(@Param("params") Map param);
+ /**
+ * 修改用户签到信息
+ * @param param
+ * @return
+ */
+ public int updateIntegralSign(@Param("params") Map param);
+
+}
diff --git a/src/main/java/com/nmgs/mapperset/oraclemapper/IntegralSignMapper.xml b/src/main/java/com/nmgs/mapperset/oraclemapper/IntegralSignMapper.xml
new file mode 100644
index 0000000..d9d0dfa
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/oraclemapper/IntegralSignMapper.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+ insert into INTEGRAL_SIGN_TABLE(USERID,MONTH,DAY${params.dayvalue})
+ values((SELECT ID FROM WEIXN_USER_TABLE WHERE OPENID=#{params.openId}),
+ #{params.month},'Y')
+
+
+ UPDATE INTEGRAL_SIGN_TABLE set Day${params.dayvalue}='Y' where USERID=(SELECT ID FROM WEIXN_USER_TABLE WHERE OPENID=#{params.openId})
+ AND MONTH=#{params.month}
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapperset/oraclemapper/IntegrationListMapper.java b/src/main/java/com/nmgs/mapperset/oraclemapper/IntegrationListMapper.java
new file mode 100644
index 0000000..27b6120
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/oraclemapper/IntegrationListMapper.java
@@ -0,0 +1,17 @@
+package com.nmgs.mapperset.oraclemapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+//@Mapper
+public interface IntegrationListMapper {
+
+ /**
+ * 新增用户签到积分信息
+ * @param param
+ * @return
+ */
+ public int addIntegralList(@Param("params") Map param);
+
+}
diff --git a/src/main/java/com/nmgs/mapperset/oraclemapper/IntegrationListMapper.xml b/src/main/java/com/nmgs/mapperset/oraclemapper/IntegrationListMapper.xml
new file mode 100644
index 0000000..e8aaf4f
--- /dev/null
+++ b/src/main/java/com/nmgs/mapperset/oraclemapper/IntegrationListMapper.xml
@@ -0,0 +1,34 @@
+
+
+
+
+ INSERT INTO integration_list_table ( ID, USERID,ACARNO, LASTINTEGRATION,
+
+ TOTALADDINTEGRATION,
+
+ PAYINTEGRATION, RESTINTEGRATION,
+ PAYTIME, PAYTYPE,CPENABLEINTEGRATION,OGENABLEINTEGRATION )
+ values(#{params.maxid},#{params.userId},#{params.acarNo},#{params.lastintegration},
+
+ #{params.totalintegration},
+
+ #{params.payintegration},#{params.restintegration},
+
+ dateadd(day,0,#{params.payTime}),
+
+
+ TO_DATE(#{params.payTime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ TO_DATE(#{params.payTime}, 'YYYY-MM-DD HH24:mi:ss'),
+
+
+ STR_TO_DATE(#{params.payTime}, '%Y-%m-%d %H:%i:%s'),
+
+ #{params.paytype},#{params.cpenableintegration},#{params.ogenableintegration})
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/nmgs/mapper/OperatorsMapper.java b/src/main/java/com/nmgs/mapperset/oraclemapper/OperatorsMapper.java
similarity index 74%
rename from src/main/java/com/nmgs/mapper/OperatorsMapper.java
rename to src/main/java/com/nmgs/mapperset/oraclemapper/OperatorsMapper.java
index 4ac6fdc..375bd15 100644
--- a/src/main/java/com/nmgs/mapper/OperatorsMapper.java
+++ b/src/main/java/com/nmgs/mapperset/oraclemapper/OperatorsMapper.java
@@ -1,52 +1,55 @@
-package com.nmgs.mapper;
+package com.nmgs.mapperset.oraclemapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import com.nmgs.entity.ServiceAreaOperators;
-import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
-@Mapper
+//@Mapper
public interface OperatorsMapper extends MppBaseMapper {
/**
* 分页查询运营人员数据
+ *
* @param page
* @param params
* @return
*/
- Page getOperatorsList(Page page, @Param("params")Map params);
-
+ Page getOperatorsList(Page page, @Param("params") Map params);
/**
* 获取员工角色
+ *
* @return
*/
- List> selectRoleListList();
+ List> selectRoleListList();
/**
* 获取服务区
+ *
* @return
*/
- List> selectServiceAreaList();
+ List> selectServiceAreaList();
/**
* 获取最大id
+ *
* @return
*/
Integer getMaxId();
/**
* 根据工号获取数据
+ *
* @return
*/
- List getOperationByJobNumber(@Param("jobNumber")String jobNumber);
+ List getOperationByJobNumber(@Param("jobNumber") String jobNumber);
}
diff --git a/src/main/java/com/nmgs/mapper/OperatorsMapper.xml b/src/main/java/com/nmgs/mapperset/oraclemapper/OperatorsMapper.xml
similarity index 50%
rename from src/main/java/com/nmgs/mapper/OperatorsMapper.xml
rename to src/main/java/com/nmgs/mapperset/oraclemapper/OperatorsMapper.xml
index aad784d..52e3009 100644
--- a/src/main/java/com/nmgs/mapper/OperatorsMapper.xml
+++ b/src/main/java/com/nmgs/mapperset/oraclemapper/OperatorsMapper.xml
@@ -2,22 +2,22 @@
-
+
-
-