Skip to content

N
new-nms
Commit 12d1c101 authored by YazhouChen's avatar YazhouChen
Browse files
Options

创建项目

parent 17fce864
Hide whitespace changes
Inline Side-by-side
Showing with 867 additions and 6500 deletions
.github/ISSUE_TEMPLATE/bug_report.md deleted 100644 → 0
View file @ 17fce864
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]
**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]
**Additional context**
Add any other context about the problem here.
.github/ISSUE_TEMPLATE/feature_request.md deleted 100644 → 0
View file @ 17fce864
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.
.idea/compiler.xml
View file @ 12d1c101
......@@ -34,5 +34,9 @@
<module name="generator" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="newnms" target="1.8" />
<module name="parent" target="1.8" />
</bytecodeTargetLevel>
</component>
</project>
\ No newline at end of file
.idea/encodings.xml
View file @ 12d1c101
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/admin" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/admin/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/admin/src/main/resources" charset="UTF-8" />
......@@ -18,8 +17,8 @@
<file url="file://$PROJECT_DIR$/generator" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/generator/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/generator/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hongxinhui/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hongxinhui/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/newnms/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/newnms/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/scheduled" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/scheduled/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/system/src/main/java" charset="UTF-8" />
......
.idea/misc.xml
View file @ 12d1c101
......@@ -12,6 +12,11 @@
<option value="$PROJECT_DIR$/system/pom.xml" />
</list>
</option>
<option name="ignoredFiles">
<set>
<option value="$PROJECT_DIR$/pom.xml" />
</set>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
......
.idea/workspace.xml
View file @ 12d1c101
......@@ -6,60 +6,154 @@
</artifacts-to-build>
</component>
<component name="ChangeListManager">
<list default="true" id="d78dbbd2-2fbf-4680-80a9-30edd19c4d7f" name="Default Changelist" comment="">
<list default="true" id="d78dbbd2-2fbf-4680-80a9-30edd19c4d7f" name="Default Changelist" comment="增加字段">
<change beforePath="$PROJECT_DIR$/.github/ISSUE_TEMPLATE/bug_report.md" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.github/ISSUE_TEMPLATE/feature_request.md" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/admin/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/target/classes/config/application-prod.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/config/target/classes/config/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/classes/config/application.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/distribution/target/distribution-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/distribution/target/distribution-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/distribution/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/distribution/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/framework/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/framework/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/framework/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generator/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/NoticeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/NoticeController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/NoticetypeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/NoticetypeService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticetypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticetypeServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/controller/NoticeController.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/controller/NoticeController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/NoticetypeService.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/NoticetypeService.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/NoticetypeServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/classes/com/hongxinhui/service/impl/NoticetypeServiceImpl.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scheduled/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scheduled/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scheduled/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scheduled/target/scheduled-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/scheduled/target/scheduled-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/system/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/system/target/maven-archiver/pom.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/system/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
<change beforePath="$PROJECT_DIR$/system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/system/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
</list>
<list id="4a792d78-9a34-41da-b33b-8e23add163e1" name="1" comment="">
<change beforePath="$PROJECT_DIR$/admin/target/admin-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/admin-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/admin/target/admin-2.0.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/admin/target/admin-2.0.jar.original" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/target/bootstrap-2.0.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/bootstrap/target/bootstrap-2.0.jar.original" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bootstrap/target/hongxinhui.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/config/target/config-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/config/target/config-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/framework/target/framework-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/framework-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/LoginSysUserVoConvertImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvertImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/framework/target/generated-sources/annotations/io/geekidea/springbootplus/framework/shiro/convert/ShiroMapstructConvertImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/generator/target/generator-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/generator/target/generator-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/target/example-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/hongxinhui/target/example-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/system/target/system-2.0.jar" beforeDir="false" afterPath="$PROJECT_DIR$/system/target/system-2.0.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/src/main/resources/config/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/config/src/main/resources/config/application-dev.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/src/main/resources/config/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/config/src/main/resources/config/application-prod.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/src/main/resources/config/application-uat.yml" beforeDir="false" afterPath="$PROJECT_DIR$/config/src/main/resources/config/application-uat.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/.gitignore" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/README.md" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/pom.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/ManageWayController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/MembersController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/MultithreadScheduleTask.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/NewsController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/NoticeController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/NoticetypeController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/SuperadmindbController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/SurveyController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/SurveyfileController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/UploadController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/WeChartAuthorizedController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/controller/WxController.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/ManageWay.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Members.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/News.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Notice.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Noticetype.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Superadmindb.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Survey.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/entity/Surveyfile.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/enums/EntityEnum.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/enums/MenuLevelEnum.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/enums/StateEnum.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/ManageWayMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/MembersMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/NewsMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/NoticeMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/NoticetypeMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/SuperadmindbMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/SurveyMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/mapper/SurveyfileMapper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/EnterPageParam.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembers.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembersPage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembersUpdate.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/HomeInfo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/ManageWayPageParam.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/MembersPageParam.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/NewsPageParam.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/NoticeAdd.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/NoticePageParam.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/NoticetypePageParam.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/NoticetypeUpdate.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/PersonalMembers.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/PersonalMembersPage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/PersonalMembersUpdate.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/SuperadmindbAdd.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/SuperadmindbPageParam.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/SurveyAdd.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/SurveyPageParam.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/param/SurveyfilePageParam.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/ManageWayService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/MembersService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/NewsService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/NoticeService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/NoticetypeService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/SuperadmindbService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/SurveyService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/SurveyfileService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/WxService.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/ManageWayServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/MembersServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NewsServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticeServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticetypeServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/SuperadmindbServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/SurveyServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/SurveyfileServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/service/impl/WxServiceImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/CapitalizationUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/CheckUtil.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/DateUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/DownloadHelper.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/EntityUtil.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/ExcelUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/FileUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/HttpSessionConfig.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/IdCardUtil.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/IpUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/ListUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/SendMail.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/StringUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/VerifyCodeUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/ZipUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/AccessTokenCommon.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/DateUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/MessageManager.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/SignatureUtil.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/StringUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/WXConfigInfo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/WXMessageUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/WXSecurityUtils.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/aes/AesException.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/aes/ByteGroup.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/aes/PKCS7Encoder.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/aes/SHA1.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/aes/WXBizMsgCrypt.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/aes/XMLParse.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/BaseMessage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/EventMessage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/ImageMessage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/LinkMessage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/LocationMessage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/MediaMessage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/MusicMessage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/NewsMessage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/RespMessage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/TextMessage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/VideoMessage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/utils/wx/msg/VoiceMessage.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/ProjectQueryVo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/SubjectinformationQueryVo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/SubjectsInfoStatisticsDashboard.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/SysDepartmentQueryVo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/SysUserQueryVo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/TCaseReportVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/TFirsthandDataPageList.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/TFolderManagementTreeVo.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/TSubmitRulesVO.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/countFiveYearsEntity.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/java/com/hongxinhui/vo/sysName.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/resources/mapper/ManageWayMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/resources/mapper/MembersMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/resources/mapper/NewsMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/resources/mapper/NoticeMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/resources/mapper/NoticetypeMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/resources/mapper/SuperadmindbMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/resources/mapper/SurveyMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/hongxinhui/src/main/resources/mapper/SurveyfileMapper.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/spring-boot-plus-error.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/logs/spring-boot-plus.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/spring-boot-plus.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
</list>
<list id="4a792d78-9a34-41da-b33b-8e23add163e1" name="1" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
......@@ -112,7 +206,7 @@
<component name="MavenImportPreferences">
<option name="enabledProfiles">
<list>
<option value="uat" />
<option value="dev" />
</list>
</option>
<option name="disabledProfiles">
......@@ -517,7 +611,11 @@
<workItem from="1638443514822" duration="614000" />
<workItem from="1638445910881" duration="612000" />
<workItem from="1638494470087" duration="26000" />
<workItem from="1639017569756" duration="3127000" />
<workItem from="1639017569756" duration="3171000" />
<workItem from="1640055489898" duration="676000" />
<workItem from="1640088864477" duration="25000" />
<workItem from="1641702308599" duration="2389000" />
<workItem from="1644548205512" duration="2435000" />
</task>
<task id="LOCAL-00001" summary="上传项目">
<created>1625797686627</created>
......@@ -568,7 +666,14 @@
<option name="project" value="LOCAL" />
<updated>1631254879642</updated>
</task>
<option name="localTasksCounter" value="8" />
<task id="LOCAL-00008" summary="增加字段">
<created>1639033554469</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1639033554469</updated>
</task>
<option name="localTasksCounter" value="9" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -595,69 +700,86 @@
<MESSAGE value="修改用户信息的redis 过期一小时" />
<MESSAGE value="添加了 新闻模块" />
<MESSAGE value="新闻表 增加描述字段" />
<option name="LAST_COMMIT_MESSAGE" value="新闻表 增加描述字段" />
<MESSAGE value="增加字段" />
<option name="LAST_COMMIT_MESSAGE" value="增加字段" />
</component>
<component name="WindowStateProjectService">
<state x="574" y="116" key="#com.intellij.ide.util.MemberChooser" timestamp="1639017664789">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="574" y="116" key="#com.intellij.ide.util.MemberChooser/0.0.1536.824@0.0.1536.824" timestamp="1639017664789" />
<state x="346" y="0" key="CommitChangelistDialog2" timestamp="1631254868972">
<state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1644549276845">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="499" y="159" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1536.824@0.0.1536.824" timestamp="1644549276845" />
<state x="346" y="0" key="CommitChangelistDialog2" timestamp="1644548412172">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="346" y="0" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1644548412172" />
<state x="122" y="80" width="1350" height="638" key="DiffContextDialog" timestamp="1639033566026">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="122" y="80" width="1350" height="638" key="DiffContextDialog/0.0.1536.824@0.0.1536.824" timestamp="1639033566026" />
<state x="549" y="102" key="FileChooserDialogImpl" timestamp="1644559189791">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="549" y="102" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1644559189791" />
<state width="1493" height="283" key="GridCell.Tab.0.bottom" timestamp="1644549850585">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="346" y="0" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1631254868972" />
<state x="122" y="80" width="1350" height="638" key="DiffContextDialog" timestamp="1631254854045">
<state width="1493" height="283" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1644549850585" />
<state width="1493" height="283" key="GridCell.Tab.0.center" timestamp="1644549850585">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="122" y="80" width="1350" height="638" key="DiffContextDialog/0.0.1536.824@0.0.1536.824" timestamp="1631254854045" />
<state width="1493" height="325" key="GridCell.Tab.0.bottom" timestamp="1639019356756">
<state width="1493" height="283" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1644549850585" />
<state width="1493" height="283" key="GridCell.Tab.0.left" timestamp="1644549850585">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="325" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1639019356756" />
<state width="1493" height="325" key="GridCell.Tab.0.center" timestamp="1639019356756">
<state width="1493" height="283" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1644549850585" />
<state width="1493" height="283" key="GridCell.Tab.0.right" timestamp="1644549850585">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="325" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1639019356756" />
<state width="1493" height="325" key="GridCell.Tab.0.left" timestamp="1639019356756">
<state width="1493" height="283" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1644549850585" />
<state width="1493" height="283" key="GridCell.Tab.1.bottom" timestamp="1644549850585">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="325" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1639019356756" />
<state width="1493" height="325" key="GridCell.Tab.0.right" timestamp="1639019356756">
<state width="1493" height="283" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1644549850585" />
<state width="1493" height="283" key="GridCell.Tab.1.center" timestamp="1644549850585">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="325" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1639019356756" />
<state width="1493" height="321" key="GridCell.Tab.1.bottom" timestamp="1631154135992">
<state width="1493" height="283" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1644549850585" />
<state width="1493" height="283" key="GridCell.Tab.1.left" timestamp="1644549850585">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="321" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1631154135992" />
<state width="1493" height="321" key="GridCell.Tab.1.center" timestamp="1631154135992">
<state width="1493" height="283" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1644549850585" />
<state width="1493" height="283" key="GridCell.Tab.1.right" timestamp="1644549850585">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="321" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1631154135992" />
<state width="1493" height="321" key="GridCell.Tab.1.left" timestamp="1631154135991">
<state width="1493" height="283" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1644549850585" />
<state x="249" y="0" key="SettingsEditor" timestamp="1644548907586">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="321" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1631154135991" />
<state width="1493" height="321" key="GridCell.Tab.1.right" timestamp="1631154135992">
<state x="249" y="0" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1644548907586" />
<state x="703" y="321" key="VCS.ChangelistChooser" timestamp="1639033572252">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="321" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1631154135992" />
<state x="703" y="321" key="VCS.ChangelistChooser" timestamp="1631254852181">
<state x="703" y="321" key="VCS.ChangelistChooser/0.0.1536.824@0.0.1536.824" timestamp="1639033572252" />
<state x="361" y="127" key="Vcs.Push.Dialog.v2" timestamp="1639033555770">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="703" y="321" key="VCS.ChangelistChooser/0.0.1536.824@0.0.1536.824" timestamp="1631254852181" />
<state x="361" y="127" key="Vcs.Push.Dialog.v2" timestamp="1631255107978">
<state x="361" y="127" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1639033555770" />
<state x="437" y="138" width="662" height="548" key="find.popup" timestamp="1644549838162">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="361" y="127" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1631255107978" />
<state x="437" y="78" width="836" height="746" key="find.popup" timestamp="1631153549690">
<state x="437" y="138" width="662" height="548" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1644549838162" />
<state x="178" y="110" key="new project wizard" timestamp="1644548852109">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="437" y="78" width="836" height="746" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1631153549690" />
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1631152017201">
<state x="178" y="110" key="new project wizard/0.0.1536.824@0.0.1536.824" timestamp="1644548852109" />
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1644549833715">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1631152017201" />
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1644549833715" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......
config/src/main/resources/config/application-dev.yml
View file @ 12d1c101
......@@ -9,7 +9,7 @@ spring-boot-plus:
spring:
datasource:
url: jdbc:mysql://114.67.82.178:3306/hxh?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
url: jdbc:mysql://114.67.82.178:3306/newnms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: changfa123$
......
config/src/main/resources/config/application-prod.yml
View file @ 12d1c101
......@@ -10,7 +10,7 @@ spring-boot-plus:
spring:
datasource:
url: jdbc:mysql://114.67.82.178:3306/hxh?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
url: jdbc:mysql://114.67.82.178:3306/newnms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: changfa123$
......
config/src/main/resources/config/application-uat.yml
View file @ 12d1c101
......@@ -10,7 +10,7 @@ spring-boot-plus:
spring:
datasource:
url: jdbc:mysql://123.57.2.247:3306/hxh?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
url: jdbc:mysql://123.57.2.247:3306/newnms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
username: root
password: changfa123$
......
hongxinhui/src/main/java/com/hongxinhui/controller/ManageWayController.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.controller;
import com.hongxinhui.entity.ManageWay;
import com.hongxinhui.entity.Notice;
import com.hongxinhui.service.ManageWayService;
import lombok.extern.slf4j.Slf4j;
import com.hongxinhui.param.ManageWayPageParam;
import io.geekidea.springbootplus.framework.common.controller.BaseController;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.common.param.IdParam;
import io.geekidea.springbootplus.framework.log.annotation.Module;
import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
import io.geekidea.springbootplus.framework.core.validator.groups.Add;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* 管理办法 控制器
*
* @author cyz
* @since 2021-08-05
*/
@Slf4j
@RestController
@RequestMapping("/manageWay")
@Module("${cfg.module}")
@Api(value = "管理办法API", tags = {"管理办法"})
public class ManageWayController extends BaseController {
@Autowired
private ManageWayService manageWayService;
/**
* 添加管理办法
*/
@PostMapping("/add")
@OperationLog(name = "添加管理办法", type = OperationLogType.ADD)
@ApiOperation(value = "添加管理办法", response = ApiResult.class)
public ApiResult<Boolean> addManageWay(@Validated(Add.class) @RequestBody ManageWay manageWay) throws Exception {
boolean flag = manageWayService.saveManageWay(manageWay);
return ApiResult.result(flag);
}
/**
* 修改管理办法
*/
@PostMapping("/update")
@OperationLog(name = "修改管理办法", type = OperationLogType.UPDATE)
@ApiOperation(value = "修改管理办法", response = ApiResult.class)
public ApiResult<Boolean> updateManageWay(@Validated(Update.class) @RequestBody ManageWay manageWay) throws Exception {
boolean flag = manageWayService.updateManageWay(manageWay);
return ApiResult.result(flag);
}
/**
* 删除管理办法
*/
@PostMapping("/delete/{id}")
@OperationLog(name = "删除管理办法", type = OperationLogType.DELETE)
@ApiOperation(value = "删除管理办法", response = ApiResult.class)
public ApiResult<Boolean> deleteManageWay(@PathVariable("id") Long id) throws Exception {
boolean flag = manageWayService.deleteManageWay(id);
return ApiResult.result(flag);
}
/**
* 获取管理办法详情
*/
@GetMapping("/info/{id}")
@OperationLog(name = "管理办法详情", type = OperationLogType.INFO)
@ApiOperation(value = "管理办法详情", response = ManageWay.class)
public ApiResult<ManageWay> getManageWay(@PathVariable("id") Long id) throws Exception {
ManageWay manageWay = manageWayService.getById(id);
return ApiResult.ok(manageWay);
}
/**
* 管理办法分页列表
*/
@PostMapping("/getPageList")
@OperationLog(name = "管理办法分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "管理办法分页列表", response = ManageWay.class)
public ApiResult<Paging<ManageWay>> getManageWayPageList(@Validated @RequestBody ManageWayPageParam manageWayPageParam) throws Exception {
Paging<ManageWay> paging = manageWayService.getManageWayPageList(manageWayPageParam);
return ApiResult.ok(paging);
}
@PostMapping("/updateStatus")
@OperationLog(name = "发布办法", type = OperationLogType.UPDATE)
@ApiOperation(value = "发布办法", response = ApiResult.class)
public ApiResult<Boolean> updateStatus(@RequestBody ManageWay manageWay) throws Exception {
boolean flag = manageWayService.updateStatus(manageWay);
return ApiResult.result(flag);
}
}
hongxinhui/src/main/java/com/hongxinhui/controller/MembersController.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.controller;
import com.hongxinhui.entity.Members;
import com.hongxinhui.param.*;
import com.hongxinhui.service.MembersService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import lombok.extern.slf4j.Slf4j;
import io.geekidea.springbootplus.framework.common.controller.BaseController;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.common.param.IdParam;
import io.geekidea.springbootplus.framework.log.annotation.Module;
import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
import io.geekidea.springbootplus.framework.core.validator.groups.Add;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
/**
* 控制器
*
* @author cyz
* @since 2021-06-29
*/
@Slf4j
@RestController
@RequestMapping("/members")
@Api(value = "后台管理-会员管理", tags = {"后台管理-会员管理"})
public class MembersController extends BaseController {
@Autowired
private MembersService membersService;
// /**
// * 添加
// */
// @PostMapping("/add")
// @OperationLog(name = "添加", type = OperationLogType.ADD)
// @ApiOperation(value = "添加", response = ApiResult.class)
// public ApiResult<Boolean> addMembers(@Validated(Add.class) @RequestBody Members members) throws Exception {
// boolean flag = membersService.saveMembers(members);
// return ApiResult.result(flag);
// }
//
// /**
// * 修改
// */
// @PostMapping("/update")
// @OperationLog(name = "修改", type = OperationLogType.UPDATE)
// @ApiOperation(value = "修改", response = ApiResult.class)
// public ApiResult<Boolean> updateMembers(@Validated(Update.class) @RequestBody Members members) throws Exception {
// boolean flag = membersService.updateMembers(members);
// return ApiResult.result(flag);
// }
//
//
// /**
// * 获取详情
// */
// @GetMapping("/info/{id}")
// @OperationLog(name = "详情", type = OperationLogType.INFO)
// @ApiOperation(value = "详情", response = Members.class)
// public ApiResult<Members> getMembers(@PathVariable("id") Long id) throws Exception {
// Members members = membersService.getById(id);
// return ApiResult.ok(members);
// }
/**
* 首页会员统计
*/
@PostMapping("/getHomeInfo")
@ApiOperation(value = "首页会员统计")
public ApiResult<HomeInfo> getHomeInfo() throws Exception {
HomeInfo paging = membersService.getHomeInfo();
return ApiResult.ok(paging);
}
/**
* 个人会员分页列表
*/
@PostMapping("/getPageListPersonal")
@ApiOperation(value = "个人会员分页列表", response = PersonalMembersPage.class)
public ApiResult<Paging<PersonalMembersPage>> getPageListPersonal(@Validated @RequestBody MembersPageParam membersPageParam) throws Exception {
Paging<PersonalMembersPage> paging = membersService.getMembersPageList(membersPageParam);
return ApiResult.ok(paging);
}
/**
* 企业会员分页列表
*/
@PostMapping("/getPageListEnterprise")
@ApiOperation(value = "企业会员分页列表")
public ApiResult<Paging<EnterpriseMembersPage>> getPageListEnterprise(@Validated @RequestBody EnterPageParam enterPageParam) throws Exception {
Paging<EnterpriseMembersPage> paging = membersService.getPageListEnterprise(enterPageParam);
return ApiResult.ok(paging);
}
/**
* 通过或者驳回会员的注册申请
*/
@PostMapping("/handleApply")
@ApiOperation(value = "通过或者驳回会员的注册申请")
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "会员id", required = true),
@ApiImplicitParam(name = "status", value = "1通过 2驳回 ", required = true)} )
public ApiResult<Object> handleApply(@RequestParam(value = "id") Integer id,
@RequestParam(value = "status") Integer status) throws Exception {
HashMap<String,Object> info = membersService.handleApply(id,status);
if(info.get("code").toString().equals("200")){
return ApiResult.ok("操作成功");
}else{
return ApiResult.fail(500, info.get("info").toString());
}
}
/**
* 删除
*/
@PostMapping("/delete/{id}")
@OperationLog(name = "删除", type = OperationLogType.DELETE)
@ApiOperation(value = "删除", response = ApiResult.class)
public ApiResult<Boolean> deleteMembers(@PathVariable("id") Long id) throws Exception {
boolean flag = membersService.deleteMembers(id);
return ApiResult.result(flag);
}
}
hongxinhui/src/main/java/com/hongxinhui/controller/MultithreadScheduleTask.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.controller;
import com.alibaba.fastjson.JSONObject;
import com.hongxinhui.utils.wx.AccessTokenCommon;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
//定时任务
@Component
@EnableScheduling // 1.开启定时任务
@EnableAsync // 2.开启多线程
public class MultithreadScheduleTask {
@Async
@Scheduled(cron = "0 0 0/2 * * ?") //每两个小时刷新
public void first() throws Exception {
if(AccessTokenCommon.TASKSTATUS.equals("1")){
System.out.println("第一个定时任务开始 : " + LocalDateTime.now().toLocalTime() + "\r\n线程 : " + Thread.currentThread().getName());
//替换变量appid和APPSECRET
String requestUrl = AccessTokenCommon.ACCESS_TOKEN_URL.replace("APPID", AccessTokenCommon.APPID).replace("APPSECRET", AccessTokenCommon.APPSECRET);
//使用微信工具类发送GET请求,这里"GET"要大写 ,获取到JSONObject类型
JSONObject jsonObject = JSONObject.parseObject( AccessTokenCommon.interfaceUtil(requestUrl));
//获取accexx_token
AccessTokenCommon.setAccessToken( jsonObject.getString("access_token"));
Thread.sleep(1000 * 10);
}
}
}
hongxinhui/src/main/java/com/hongxinhui/controller/NewsController.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.controller;
import com.hongxinhui.entity.ManageWay;
import com.hongxinhui.entity.News;
import com.hongxinhui.service.NewsService;
import lombok.extern.slf4j.Slf4j;
import com.hongxinhui.param.NewsPageParam;
import io.geekidea.springbootplus.framework.common.controller.BaseController;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.common.param.IdParam;
import io.geekidea.springbootplus.framework.log.annotation.Module;
import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
import io.geekidea.springbootplus.framework.core.validator.groups.Add;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* 新闻表 控制器
*
* @author cyz
* @since 2021-09-09
*/
@Slf4j
@RestController
@RequestMapping("/news")
@Module("${cfg.module}")
@Api(value = "新闻表API", tags = {"新闻表"})
public class NewsController extends BaseController {
@Autowired
private NewsService newsService;
/**
* 添加新闻表
*/
@PostMapping("/add")
@OperationLog(name = "添加新闻表", type = OperationLogType.ADD)
@ApiOperation(value = "添加新闻表", response = ApiResult.class)
public ApiResult<Boolean> addNews(@Validated(Add.class) @RequestBody News news) throws Exception {
boolean flag = newsService.saveNews(news);
return ApiResult.result(flag);
}
/**
* 修改新闻表
*/
@PostMapping("/update")
@OperationLog(name = "修改新闻表", type = OperationLogType.UPDATE)
@ApiOperation(value = "修改新闻表", response = ApiResult.class)
public ApiResult<Boolean> updateNews(@Validated(Update.class) @RequestBody News news) throws Exception {
boolean flag = newsService.updateNews(news);
return ApiResult.result(flag);
}
/**
* 删除新闻表
*/
@PostMapping("/delete/{id}")
@OperationLog(name = "删除新闻表", type = OperationLogType.DELETE)
@ApiOperation(value = "删除新闻表", response = ApiResult.class)
public ApiResult<Boolean> deleteNews(@PathVariable("id") Long id) throws Exception {
boolean flag = newsService.deleteNews(id);
return ApiResult.result(flag);
}
/**
* 获取新闻表详情
*/
@GetMapping("/info/{id}")
@OperationLog(name = "新闻表详情", type = OperationLogType.INFO)
@ApiOperation(value = "新闻表详情", response = News.class)
public ApiResult<News> getNews(@PathVariable("id") Long id) throws Exception {
News news = newsService.getByIdOne(id);
return ApiResult.ok(news);
}
/**
* 新闻表分页列表
*/
@PostMapping("/getPageList")
@OperationLog(name = "新闻表分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "新闻表分页列表", response = News.class)
public ApiResult<Paging<News>> getNewsPageList(@Validated @RequestBody NewsPageParam newsPageParam) throws Exception {
Paging<News> paging = newsService.getNewsPageList(newsPageParam);
return ApiResult.ok(paging);
}
@PostMapping("/updateStatus")
@OperationLog(name = "发布新闻", type = OperationLogType.UPDATE)
@ApiOperation(value = "发布新闻", response = ApiResult.class)
public ApiResult<Boolean> updateStatus(@RequestBody News news) throws Exception {
boolean flag = newsService.updateStatus(news);
return ApiResult.result(flag);
}
@GetMapping("/updateReadCount/{id}")
@OperationLog(name = "修改阅读数量", type = OperationLogType.UPDATE)
@ApiOperation(value = "修改阅读数量", response = ApiResult.class)
public ApiResult<Boolean> updateReadCount(@PathVariable("id") Long id) throws Exception {
boolean flag = newsService.updateReadCount(id);
return ApiResult.result(flag);
}
}
hongxinhui/src/main/java/com/hongxinhui/controller/NoticeController.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.controller;
import com.hongxinhui.entity.Members;
import com.hongxinhui.entity.Notice;
import com.hongxinhui.entity.Noticetype;
import com.hongxinhui.param.NoticeAdd;
import com.hongxinhui.param.NoticetypePageParam;
import com.hongxinhui.param.NoticetypeUpdate;
import com.hongxinhui.service.NoticeService;
import com.hongxinhui.service.NoticetypeService;
import io.geekidea.springbootplus.framework.common.api.ApiCode;
import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore;
import lombok.extern.slf4j.Slf4j;
import com.hongxinhui.param.NoticePageParam;
import io.geekidea.springbootplus.framework.common.controller.BaseController;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.common.param.IdParam;
import io.geekidea.springbootplus.framework.log.annotation.Module;
import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
import io.geekidea.springbootplus.framework.core.validator.groups.Add;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.List;
/**
* 控制器
*
* @author cyz
* @since 2021-07-01
*/
@Slf4j
@RestController
@RequestMapping("/notice")
@Module("${cfg.module}")
@Api(value = "后台管理-公告管理", tags = {"后台管理-公告管理"})
public class NoticeController extends BaseController {
@Autowired
private NoticeService noticeService;
@Autowired
private NoticetypeService noticetypeService;
/**
* 修改公告分类
*/
@PostMapping("/updateType")
@OperationLog(name = "修改公告分类", type = OperationLogType.UPDATE)
@ApiOperation(value = "修改公告分类", response = ApiResult.class)
public ApiResult<Object> updateNoticetype(@Validated(Update.class) @RequestBody NoticetypeUpdate noticetype) throws Exception {
HashMap<String,Object> info = noticetypeService.updateNoticetype(noticetype);
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("info").toString());
}else{
return ApiResult.fail(500, info.get("info").toString());
}
}
/**
* 删除
*/
@PostMapping("/deleteType/{id}")
@OperationLog(name = "删除公告分类", type = OperationLogType.DELETE)
@ApiOperation(value = "删除公告分类", response = ApiResult.class)
public ApiResult<Boolean> deleteNoticetype(@PathVariable("id") Long id) throws Exception {
boolean flag = noticetypeService.deleteNoticetype(id);
return ApiResult.result(flag);
}
/**
* 添加公告分类
*/
@PostMapping("/addType")
@OperationLog(name = "添加公告分类", type = OperationLogType.ADD)
@ApiOperation(value = "添加公告分类", response = ApiResult.class)
public ApiResult<Object> addType(@Validated(Add.class) @RequestBody Noticetype noticetype) throws Exception {
HashMap<String,Object> info = noticetypeService.saveNoticetype(noticetype);
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("info").toString());
}else{
return ApiResult.fail(500, info.get("info").toString());
}
}
/**
* 分页列表
*/
@PostMapping("/noticeTypeList")
@OperationLog(name = "公告类型下拉框 分页", type = OperationLogType.PAGE)
@ApiOperation(value = "公告类型下拉框 分页", response = Noticetype.class)
public ApiResult<Paging<Noticetype>> getNoticetypePageList(@Validated @RequestBody NoticetypePageParam noticetypePageParam) throws Exception {
Paging<Noticetype> paging = noticetypeService.getNoticetypePageList(noticetypePageParam);
return ApiResult.ok(paging);
}
@PostMapping("/noticeTypeListAll")
@OperationLogIgnore
@ApiOperation(value = "公告类型下拉框 不分页", notes = "公告类型下拉框 不分页")
public ApiResult<List< Noticetype>> noticeTypeList(HttpServletResponse response) throws Exception {
HashMap<String,Object> info = noticetypeService.noticeTypeList();
if(info.get("code").toString().equals("200")){
return ApiResult.ok( (List< Noticetype>)info.get("data"));
}else{
return ApiResult.result(ApiCode.FAIL,info.get("info").toString(),null);
}
}
/**
* 添加
*/
@PostMapping("/add")
@OperationLog(name = "添加公告", type = OperationLogType.ADD)
@ApiOperation(value = "添加公告", response = ApiResult.class)
public ApiResult<Boolean> addNotice(@Validated(Add.class) @RequestBody NoticeAdd notice) throws Exception {
boolean flag = noticeService.saveNotice(notice);
return ApiResult.result(flag);
}
/**
* 修改
*/
@PostMapping("/update")
@OperationLog(name = "修改", type = OperationLogType.UPDATE)
@ApiOperation(value = "修改", response = ApiResult.class)
public ApiResult<Boolean> updateNotice(@Validated(Update.class) @RequestBody Notice notice) throws Exception {
boolean flag = noticeService.updateNotice(notice);
return ApiResult.result(flag);
}
/**
* 修改
*/
@PostMapping("/updateStatus")
@OperationLog(name = "发布公告", type = OperationLogType.UPDATE)
@ApiOperation(value = "发布公告", response = ApiResult.class)
public ApiResult<Boolean> updateStatus(@RequestBody Notice notice) throws Exception {
boolean flag = noticeService.updateStatus(notice);
return ApiResult.result(flag);
}
/**
* 删除
*/
@PostMapping("/delete/{id}")
@OperationLog(name = "删除", type = OperationLogType.DELETE)
@ApiOperation(value = "删除", response = ApiResult.class)
public ApiResult<Boolean> deleteNotice(@PathVariable("id") Long id) throws Exception {
boolean flag = noticeService.deleteNotice(id);
return ApiResult.result(flag);
}
/**
* 获取详情
*/
@GetMapping("/info/{id}")
@OperationLog(name = "详情", type = OperationLogType.INFO)
@ApiOperation(value = "详情", response = Notice.class)
public ApiResult<Notice> getNotice(@PathVariable("id") Long id) throws Exception {
Notice notice = noticeService.getOneById(id);
notice.setContent(StringEscapeUtils.unescapeHtml4( notice.getContent()));
return ApiResult.ok(notice);
}
/**
* 分页列表
*/
@PostMapping("/getPageList")
@OperationLog(name = "分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "分页列表", response = Notice.class)
public ApiResult<Paging<Notice>> getNoticePageList(@Validated @RequestBody NoticePageParam noticePageParam) throws Exception {
Paging<Notice> paging = noticeService.getNoticePageList(noticePageParam);
return ApiResult.ok(paging);
}
@GetMapping("/getPayInfo")
@OperationLogIgnore
@ApiOperation(value = "获取某天银联无感文件", notes = "获取某天银联无感文件")
public ApiResult<Object> getOnlpayFile(@Param("day") String day) throws Exception {
HashMap<String,Object> info = noticetypeService.getOnlpayFile(day);
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("data"));
}else{
return ApiResult.result(ApiCode.FAIL,info.get("info").toString(),null);
}
}
@GetMapping("/getPayInfoDetail")
@OperationLogIgnore
@ApiOperation(value = "获取某天银联无感文件", notes = "获取某天银联无感文件")
public ApiResult<Object> getPayInfoDetail(@Param("day") String day) throws Exception {
HashMap<String,Object> info = noticetypeService.getPayInfoDetail(day);
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("data"));
}else{
return ApiResult.result(ApiCode.FAIL,info.get("info").toString(),null);
}
}
}
hongxinhui/src/main/java/com/hongxinhui/controller/NoticetypeController.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.controller;
import com.hongxinhui.entity.Noticetype;
import com.hongxinhui.service.NoticetypeService;
import lombok.extern.slf4j.Slf4j;
import com.hongxinhui.param.NoticetypePageParam;
import io.geekidea.springbootplus.framework.common.controller.BaseController;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.common.param.IdParam;
import io.geekidea.springbootplus.framework.log.annotation.Module;
import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
import io.geekidea.springbootplus.framework.core.validator.groups.Add;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* 控制器
*
* @author cyz
* @since 2021-07-01
*/
@Slf4j
@RestController
@RequestMapping("/noticetype")
@Module("${cfg.module}")
//@Api(value = "API", tags = {""})
public class NoticetypeController extends BaseController {
@Autowired
private NoticetypeService noticetypeService;
/**
* 添加
*/
// @PostMapping("/add")
// @OperationLog(name = "添加", type = OperationLogType.ADD)
// @ApiOperation(value = "添加", response = ApiResult.class)
// public ApiResult<Boolean> addNoticetype(@Validated(Add.class) @RequestBody Noticetype noticetype) throws Exception {
// boolean flag = noticetypeService.saveNoticetype(noticetype);
// return ApiResult.result(flag);
// }
/**
* 获取详情
*/
@GetMapping("/info/{id}")
@OperationLog(name = "详情", type = OperationLogType.INFO)
@ApiOperation(value = "详情", response = Noticetype.class)
public ApiResult<Noticetype> getNoticetype(@PathVariable("id") Long id) throws Exception {
Noticetype noticetype = noticetypeService.getById(id);
return ApiResult.ok(noticetype);
}
/**
* 分页列表
*/
@PostMapping("/getPageList")
@OperationLog(name = "分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "分页列表", response = Noticetype.class)
public ApiResult<Paging<Noticetype>> getNoticetypePageList(@Validated @RequestBody NoticetypePageParam noticetypePageParam) throws Exception {
Paging<Noticetype> paging = noticetypeService.getNoticetypePageList(noticetypePageParam);
return ApiResult.ok(paging);
}
}
hongxinhui/src/main/java/com/hongxinhui/controller/SuperadmindbController.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.controller;
import com.hongxinhui.entity.Superadmindb;
import com.hongxinhui.param.SuperadmindbAdd;
import com.hongxinhui.service.SuperadmindbService;
import com.hongxinhui.utils.StringUtils;
import io.geekidea.springbootplus.framework.common.api.ApiCode;
import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore;
import lombok.extern.slf4j.Slf4j;
import com.hongxinhui.param.SuperadmindbPageParam;
import io.geekidea.springbootplus.framework.common.controller.BaseController;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.common.param.IdParam;
import io.geekidea.springbootplus.framework.log.annotation.Module;
import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
import io.geekidea.springbootplus.framework.core.validator.groups.Add;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
/**
* 控制器
*
* @author cyz
* @since 2021-07-01
*/
@Slf4j
@RestController
@RequestMapping("/superadmindb")
@Module("${cfg.module}")
@Api(value = "后台管理-系统用户管理", tags = {"后台管理-系统用户管理"})
public class SuperadmindbController extends BaseController {
@Autowired
private SuperadmindbService superadmindbService;
@PostMapping("/login")
@OperationLogIgnore
@ApiOperation(value = "后台用户登录", notes = "后台用户登录")
public ApiResult<Object> login(@RequestParam(value = "name", required = true) String name,
@RequestParam(value = "pwd", required = true) String pwd,
HttpServletResponse response) throws Exception {
if(StringUtils.isEmpty(name)||StringUtils.isEmpty(pwd) ){
return ApiResult.fail(500, "必填不能为空");
}
HashMap<String,Object> info = superadmindbService.login(name,pwd);
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("data"),"登录成功");
}else{
return ApiResult.fail(500, info.get("info").toString());
}
}
@PostMapping("/loginOut")
@OperationLogIgnore
@ApiOperation(value = "退出登录", notes = "退出登录")
public ApiResult<Object> loginOut(HttpServletResponse response) throws Exception {
HashMap<String,Object> info = superadmindbService.loginOut();
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("data"),"退出成功");
}else{
return ApiResult.fail(500, info.get("info").toString());
}
}
/**
* 新建用户信息
*/
@PostMapping("/add")
@OperationLog(name = "新建用户信息", type = OperationLogType.ADD)
@ApiOperation(value = "新建用户信息", response = ApiResult.class)
public ApiResult<Boolean> addSuperadmindb(@Validated @RequestBody SuperadmindbAdd superadmindb) throws Exception {
boolean flag = superadmindbService.saveSuperadmindb(superadmindb);
if(!flag){
return ApiResult.result(ApiCode.FAIL,"账号已存在",null);
}
return ApiResult.result(flag);
}
/**
* 修改用户信息
*/
@PostMapping("/update")
@OperationLog(name = "修改用户信息", type = OperationLogType.UPDATE)
@ApiOperation(value = "修改用户信息", response = ApiResult.class)
public ApiResult<Boolean> updateSuperadmindb(@Validated @RequestBody SuperadmindbAdd superadmindb) throws Exception {
boolean flag = superadmindbService.updateSuperadmindb(superadmindb);
return ApiResult.result(flag);
}
/**
* 重置密码
*/
@PostMapping("/resetPassword/{id}")
@OperationLog(name = "重置用户密码", type = OperationLogType.UPDATE)
@ApiOperation(value = "重置用户密码", response = ApiResult.class)
public ApiResult<Boolean> resetPassword(@PathVariable("id") Long id) throws Exception {
boolean flag = superadmindbService.resetPassword(id);
return ApiResult.result(flag);
}
/**
* 修改密码
*/
@PostMapping("/updatePassword")
@OperationLog(name = "修改密码", type = OperationLogType.UPDATE)
@ApiOperation(value = "修改密码", response = ApiResult.class)
public ApiResult<Object> updatePassword(@RequestParam(value = "oldpwd", required = true) String oldpwd,
@RequestParam(value = "newold", required = true) String newold) throws Exception {
HashMap<String,Object> info = superadmindbService.updatePassword(oldpwd,newold);
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("data"),"登录成功");
}else{
return ApiResult.fail(500, info.get("info").toString());
}
}
/**
* 修改能否登录的状态
*/
@PostMapping("/updateStatus")
@OperationLog(name = "修改能否登录的状态 status传2修改为不能登录 传1修改为能登陆 ", type = OperationLogType.UPDATE)
@ApiOperation(value = "修改能否登录的状态 status传2修改为不能登录 传1修改为能登陆 ", response = ApiResult.class)
public ApiResult<Object> updateStatus(@RequestParam(value = "id", required = true) Integer id,
@RequestParam(value = "status", required = true) Integer status) throws Exception {
HashMap<String,Object> info = superadmindbService.updateStatus(id,status);
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("data"),"修改成功");
}else{
return ApiResult.fail(500, info.get("info").toString());
}
}
/**
* 删除
*/
@PostMapping("/delete/{id}")
@OperationLog(name = "删除", type = OperationLogType.DELETE)
@ApiOperation(value = "删除", response = ApiResult.class)
public ApiResult<Boolean> deleteSuperadmindb(@PathVariable("id") Long id) throws Exception {
boolean flag = superadmindbService.deleteSuperadmindb(id);
return ApiResult.result(flag);
}
/**
* 获取详情
*/
@GetMapping("/info/{id}")
@OperationLog(name = "详情", type = OperationLogType.INFO)
@ApiOperation(value = "详情", response = Superadmindb.class)
public ApiResult<Superadmindb> getSuperadmindb(@PathVariable("id") Long id) throws Exception {
Superadmindb superadmindb = superadmindbService.getById(id);
return ApiResult.ok(superadmindb);
}
/**
* 分页列表
*/
@PostMapping("/getPageList")
@OperationLog(name = "分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "分页列表", response = Superadmindb.class)
public ApiResult<Paging<Superadmindb>> getSuperadmindbPageList(@Validated @RequestBody SuperadmindbPageParam superadmindbPageParam) throws Exception {
Paging<Superadmindb> paging = superadmindbService.getSuperadmindbPageList(superadmindbPageParam);
return ApiResult.ok(paging);
}
}
hongxinhui/src/main/java/com/hongxinhui/controller/SurveyfileController.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.controller;
import com.hongxinhui.entity.Surveyfile;
import com.hongxinhui.service.SurveyfileService;
import lombok.extern.slf4j.Slf4j;
import com.hongxinhui.param.SurveyfilePageParam;
import io.geekidea.springbootplus.framework.common.controller.BaseController;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.common.param.IdParam;
import io.geekidea.springbootplus.framework.log.annotation.Module;
import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
import io.geekidea.springbootplus.framework.core.validator.groups.Add;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* 控制器
*
* @author cyz
* @since 2021-07-01
*/
@Slf4j
@RestController
@RequestMapping("/surveyfile")
@Module("${cfg.module}")
//@Api(value = "项目附件", tags = {"项目附件"})
public class SurveyfileController extends BaseController {
@Autowired
private SurveyfileService surveyfileService;
/**
* 添加
*/
@PostMapping("/add")
@OperationLog(name = "添加", type = OperationLogType.ADD)
@ApiOperation(value = "添加", response = ApiResult.class)
public ApiResult<Boolean> addSurveyfile(@Validated(Add.class) @RequestBody Surveyfile surveyfile) throws Exception {
boolean flag = surveyfileService.saveSurveyfile(surveyfile);
return ApiResult.result(flag);
}
/**
* 修改
*/
@PostMapping("/update")
@OperationLog(name = "修改", type = OperationLogType.UPDATE)
@ApiOperation(value = "修改", response = ApiResult.class)
public ApiResult<Boolean> updateSurveyfile(@Validated(Update.class) @RequestBody Surveyfile surveyfile) throws Exception {
boolean flag = surveyfileService.updateSurveyfile(surveyfile);
return ApiResult.result(flag);
}
/**
* 删除
*/
@PostMapping("/delete/{id}")
@OperationLog(name = "删除", type = OperationLogType.DELETE)
@ApiOperation(value = "删除", response = ApiResult.class)
public ApiResult<Boolean> deleteSurveyfile(@PathVariable("id") Long id) throws Exception {
boolean flag = surveyfileService.deleteSurveyfile(id);
return ApiResult.result(flag);
}
/**
* 获取详情
*/
@GetMapping("/info/{id}")
@OperationLog(name = "详情", type = OperationLogType.INFO)
@ApiOperation(value = "详情", response = Surveyfile.class)
public ApiResult<Surveyfile> getSurveyfile(@PathVariable("id") Long id) throws Exception {
Surveyfile surveyfile = surveyfileService.getById(id);
return ApiResult.ok(surveyfile);
}
/**
* 分页列表
*/
@PostMapping("/getPageList")
@OperationLog(name = "分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "分页列表", response = Surveyfile.class)
public ApiResult<Paging<Surveyfile>> getSurveyfilePageList(@Validated @RequestBody SurveyfilePageParam surveyfilePageParam) throws Exception {
Paging<Surveyfile> paging = surveyfileService.getSurveyfilePageList(surveyfilePageParam);
return ApiResult.ok(paging);
}
}
hongxinhui/src/main/java/com/hongxinhui/controller/UploadController.java deleted 100644 → 0
View file @ 17fce864
/*
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
*
* 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.
*/
package com.hongxinhui.controller;
import com.hongxinhui.entity.Surveyfile;
import com.hongxinhui.mapper.SurveyfileMapper;
import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.log.annotation.Module;
import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
import io.geekidea.springbootplus.framework.util.UploadUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.Map;
/**
* 上传控制器
*
* @author geekidea
* @date 2019/8/20
* @since 1.2.1-RELEASE
*/
@Slf4j
@RestController
@RequestMapping("/upload")
@Api(value = "文件上传通用接口", tags = {"文件上传通用接口" })
public class UploadController {
@Autowired
private SpringBootPlusProperties springBootPlusProperties;
@Autowired
private SurveyfileMapper surveyfileMapper;
/**
* 上传单个文件返回具体参数
*
* @return
*/
@PostMapping("/uploadReturnValues")
@OperationLog(name = "企业注册上传营业执照", type = OperationLogType.UPLOAD)
@ApiOperation(value = "企业注册上传营业执照", response = ApiResult.class)
@ApiImplicitParams({@ApiImplicitParam(name = "file", value = "文件", required = true, dataType = "__file")})
public ApiResult<Map> uploadReturnValues(@RequestParam("file") MultipartFile multipartFiles) throws Exception {
log.info("ContentType = " + multipartFiles.getContentType());
log.info("OriginalFilename = " + multipartFiles.getOriginalFilename());
log.info("Name = " + multipartFiles.getOriginalFilename());
log.info("Size = " + multipartFiles.getSize());
log.info("UploadPath = " + springBootPlusProperties.getUploadPath());
// 上传文件，返回保存的文件名称
String saveFileName = UploadUtil.upload(springBootPlusProperties.getUploadPath(), multipartFiles, originalFilename -> {
// 文件后缀
String fileExtension = FilenameUtils.getExtension(originalFilename);
// 这里可自定义文件名称，比如按照业务类型/文件格式/日期
String dateString = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssS")) + RandomStringUtils.randomNumeric(6);
String fileName = dateString + "." + fileExtension;
return fileName;
});
// 上传成功之后，返回访问路径，请根据实际情况设置
String fileAccessPath = springBootPlusProperties.getResourceAccessUrl() + saveFileName;
log.info("fileAccessPath:{}", fileAccessPath);
// 带参数返回
Map map = new HashMap();
map.put("ContentType", multipartFiles.getContentType());
map.put("OriginalFilename", multipartFiles.getOriginalFilename());
map.put("fileRealName", saveFileName);
map.put("Size", multipartFiles.getSize());
map.put("fileAccessPath", fileAccessPath);
return ApiResult.ok(map);
}
/**
* 上传单个文件返回具体附件ID
*
* @return
*/
@PostMapping("/uploadReturnValuesAndId")
@OperationLog(name = "后端上传项目的附件，返回附件ID", type = OperationLogType.UPLOAD)
@ApiOperation(value = "后端上传项目的附件，返回附件ID", response = ApiResult.class)
@ApiImplicitParams({@ApiImplicitParam(name = "file", value = "文件", required = true, dataType = "__file")})
public ApiResult<Map> uploadReturnValuesAndId(@RequestParam("file") MultipartFile multipartFiles) throws Exception {
log.info("ContentType = " + multipartFiles.getContentType());
log.info("OriginalFilename = " + multipartFiles.getOriginalFilename());
log.info("Name = " + multipartFiles.getOriginalFilename());
log.info("Size = " + multipartFiles.getSize());
log.info("UploadPath = " + springBootPlusProperties.getUploadPath());
// 上传文件，返回保存的文件名称
String saveFileName = UploadUtil.upload(springBootPlusProperties.getUploadPath(), multipartFiles, originalFilename -> {
// 文件后缀
String fileExtension = FilenameUtils.getExtension(originalFilename);
// 这里可自定义文件名称，比如按照业务类型/文件格式/日期
String dateString = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssS")) + RandomStringUtils.randomNumeric(6);
String fileName = dateString + "." + fileExtension;
return fileName;
});
// 上传成功之后，返回访问路径，请根据实际情况设置
String fileAccessPath = springBootPlusProperties.getResourceAccessUrl() + saveFileName;
log.info("fileAccessPath:{}", fileAccessPath);
// 带参数返回
Map map = new HashMap();
map.put("ContentType", multipartFiles.getContentType());
map.put("OriginalFilename", multipartFiles.getOriginalFilename());
map.put("fileRealName", saveFileName);
map.put("Size", multipartFiles.getSize());
map.put("fileAccessPath", fileAccessPath);
Surveyfile surveyfile = new Surveyfile();
surveyfile.setFilePath(fileAccessPath);
surveyfile.setFileName(multipartFiles.getOriginalFilename());
surveyfile.setSize(Double.valueOf( multipartFiles.getSize()));
surveyfileMapper.insert(surveyfile);
map.put("fileId", surveyfile.getFileID());
return ApiResult.ok(map);
}
}
hongxinhui/src/main/java/com/hongxinhui/controller/WeChartAuthorizedController.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.controller;
import com.alibaba.fastjson.JSONObject;
import com.hongxinhui.utils.StringUtils;
import com.hongxinhui.utils.wx.*;
import com.hongxinhui.utils.wx.msg.*;
import io.geekidea.springbootplus.framework.common.controller.BaseController;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.io.SAXReader;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.security.NoSuchAlgorithmException;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@Controller
@RequestMapping(value = "/weChartAuthorized")
public class WeChartAuthorizedController extends BaseController {
/** 处理消息的Manager */
private final MessageManager messageManager = MessageManager.getInstance();
/**
* 处理请求
* @param request {@link HttpServletRequest}
* @param response {@link HttpServletResponse}
*/
@RequestMapping(value = { "/handleRequest" })
public void handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
this.getRequest().setCharacterEncoding("UTF-8");
this.getResponse().setCharacterEncoding("UTF-8");
System.out.println("开始校验信息是否是从微信服务器发出");
// 签名
String signature = this.getRequest().getParameter("signature");
// 时间戳
String timestamp = this.getRequest().getParameter("timestamp");
// 随机数
String nonce = this.getRequest().getParameter("nonce");
// 通过检验signature对请求进行校验，若校验成功则原样返回echostr，表示接入成功，否则接入失败
boolean ispost = Objects.equals("POST", this.getRequest().getMethod().toUpperCase());
if (ispost) {
System.out.println("接入成功，正在处理逻辑");
InputStream inputStream = this.getRequest().getInputStream();
Map<String, String> reqMap = WXMessageUtils.parseXML(inputStream);
WXConfigInfo wxConfig = new WXConfigInfo();
if (!reqMap.isEmpty()) {
String encrypt = reqMap.get(WXMessageUtils.ENCRYPT);
String dencrypt ="";
if(StringUtils.isEmpty(encrypt)){
//测试公众号 或 没有加密方式
String xml="";
Document document = DocumentHelper.createDocument();
String s = reqMap.toString();
if(s.indexOf("Ticket")>-1||s.indexOf("ToUserName")>-1){
StringBuffer sb = new StringBuffer("");
sb.append("<xml>");
if(s.indexOf("Ticket")>-1){
String a1 = s.substring(s.indexOf("Ticket")+7,s.indexOf("CreateTime")-2);
sb.append("<Ticket><![CDATA["+a1+"]]></Ticket>");
}
if(s.indexOf("CreateTime")>-1){
String a2 = s.substring(s.indexOf("CreateTime")+11,s.indexOf("EventKey")-2);
sb.append("<CreateTime>"+a2+"</CreateTime>");
}
if(s.indexOf("EventKey")>-1){
String a3 = s.substring(s.indexOf("EventKey")+9,s.indexOf("Event=")-2);
//System.out.println("a3 = " + a3);
if(!StringUtils.isEmpty(a3)){
sb.append("<EventKey><![CDATA["+a3+"]]></EventKey>");
}
}
if(s.indexOf("Event")>-1){
String a4 = s.substring(s.indexOf("Event=")+6,s.indexOf("ToUserName=")-2);
sb.append("<Event><![CDATA["+a4+"]]></Event>");
if(a4.equals("VIEW")){
sb.append("<MsgType><![CDATA[event]]></MsgType>");
}
}
if(s.indexOf("ToUserName")>-1){
String a5 = s.substring(s.indexOf("ToUserName=")+11,s.indexOf("FromUserName=")-2);
sb.append("<ToUserName><![CDATA["+a5+"]]></ToUserName>");
}
if(s.indexOf("FromUserName")>-1){
String a6 = s.substring(s.indexOf("FromUserName=")+13,s.indexOf("MsgType=")-2);
sb.append("<FromUserName><![CDATA["+a6+"]]></FromUserName>");
}
sb.append("</xml>");
xml = sb.toString();
//System.out.println("xml = " + xml);
}else{
try{
Map<String, String> map = new HashMap<String, String>();
SAXReader reader = new SAXReader();
Document doc = reader.read(inputStream);
}catch (Exception ex){
}
}
dencrypt = xml;
}else{
wxConfig.setPersonalToken("weixin");
wxConfig.setEncodingAesKey("");
wxConfig.setAppId(AccessTokenCommon.APPID);
dencrypt = WXSecurityUtils.decrypt(wxConfig, encrypt);
}
BaseMessage reciveMessage = messageManager.handleRequestMessage(dencrypt);
String openId = reciveMessage.getFromUserName();
System.out.println("openId = " + openId);
BaseMessage replyMessage = null;
long timeStamp = new Date().getTime();
if (reciveMessage instanceof TextMessage) {
// 文本消息
replyMessage = handleText((TextMessage) reciveMessage, timeStamp);
} else if (reciveMessage instanceof EventMessage) {
// 事件消息
replyMessage = handleEvent((EventMessage) reciveMessage, timeStamp,request);
} else if (reciveMessage instanceof ImageMessage) {
// 图片消息
replyMessage = handleImageMessage((ImageMessage) reciveMessage, timeStamp);
} else if (reciveMessage instanceof LinkMessage) {
// 链接消息
replyMessage = handleLinkMessage((LinkMessage) reciveMessage, timeStamp);
} else if (reciveMessage instanceof VoiceMessage) {
// 语音消息
replyMessage = handleVoiceMessage((VoiceMessage) reciveMessage, timeStamp);
} else if (reciveMessage instanceof VideoMessage) {
// 视频消息
replyMessage = handleVideoMessage((VideoMessage) reciveMessage, timeStamp);
} else if (reciveMessage instanceof LocationMessage) {
replyMessage = handleLocationMessage((LocationMessage) reciveMessage, timeStamp);
}
String reply = messageManager.handleResponseMessage(replyMessage);
//加密方式
String encryptType = request.getParameter("encrypt_type");
if (!"".equals(reply)) {
reply = reply.trim();
if(AccessTokenCommon.APPID.indexOf("wx5a35ff48a06af06c")>=0&&StringUtils.isEmpty(encryptType)){
}else{
try {
reply = WXSecurityUtils.getWXBizMsgCrypt(wxConfig).encryptMsg(reply, timeStamp + "", nonce);
}catch (Exception e){
e.printStackTrace();
}
}
}
this.getResponse().getWriter().write(reply);
} else {
this.getResponse().getWriter().write("");
}
} else {
if (SignatureUtil.checkSignature(signature, timestamp, nonce)) {
// 随机字符串
String echostr = this.getRequest().getParameter("echostr");
System.out.println("接入成功，echostr {}"+echostr);
this.getResponse().getWriter().write(echostr);
}
}
}
/**
* 创建菜单
* @param request {@link HttpServletRequest}
* @param response {@link HttpServletResponse}
*/
@PostMapping(value = { "/createMenu" })
public void createMenu(HttpServletRequest request, HttpServletResponse response) throws Exception {
String data = "{\n" +
" \"button\": [\n" +
" {\n" +
" \"type\": \"click\", \n" +
" \"name\": \"今日歌曲\", \n" +
" \"key\": \"V1001_TODAY_MUSIC\"\n" +
" }, \n" +
" {\n" +
" \"name\": \"菜单\", \n" +
" \"sub_button\": [\n" +
" {\n" +
" \"type\": \"view\", \n" +
" \"name\": \"搜索\", \n" +
" \"url\": \"http://www.soso.com/\"\n" +
" }, \n" +
" {\n" +
" \"type\": \"click\", \n" +
" \"name\": \"赞一下我们\", \n" +
" \"key\": \"V1001_GOOD\"\n" +
" }\n" +
" ]\n" +
" }\n" +
" ]\n" +
"}";
JSONObject jsonObject = JSONObject.parseObject( AccessTokenCommon.interfaceUtilPost(AccessTokenCommon.CREATE_MENU_URL+AccessTokenCommon.getAccessToken(), data));
//获取accexx_token
System.out.println("jsonObject = " + jsonObject);
}
/**
* 处理文本消息
* @param textMessage 文本消息对象
* @param timeStamp 时间戳
* @return {@link BaseMessage}
*/
private BaseMessage handleText(TextMessage textMessage, long timeStamp) {
BaseMessage baseMessage = null;
if ( textMessage != null) {
baseMessage = new BaseMessage();
String from = textMessage.getFromUserName();
String to = textMessage.getToUserName();
String content = textMessage.getContent();
//System.out.println("from: " + from);
//System.out.println("to: " + to);
//System.out.println("content: " + content);
baseMessage.setToUserName(from);
baseMessage.setFromUserName(to);
baseMessage.setCreateTime(new Date().getTime());
baseMessage.setMsgType("transfer_customer_service");
}
return baseMessage;
}
/**
* 处理拉取消息事件
* @param eventMessage 事件消息对象
* @param timeStamp 时间戳
* @return {@link BaseMessage}
*/
private BaseMessage handleClickEvent(EventMessage eventMessage, long timeStamp) {
BaseMessage news = null;
switch (eventMessage.getEventKey()){
case "V1001_TODAY_MUSIC":
//按钮一
news = getTextMessage(eventMessage, "点击了按钮1"+eventMessage.getFromUserName());
break;
}
return news;
}
/**
* 文本消息信息
* @param message {@link BaseMessage}
* @param content 要发送的内容
* @return {@link TextMessage}
*/
private TextMessage getTextMessage(BaseMessage message, String content) {
TextMessage textMessage = new TextMessage();
//System.out.println("?????????????? = " );
//System.out.println("?????????????? = "+JSONObject.toJSONString(message) );
textMessage.setMsgId(message.getMsgId());
textMessage.setToUserName(message.getFromUserName());
textMessage.setFromUserName(message.getToUserName());
textMessage.setMsgType(TextMessage.TEXT_TYPE);
textMessage.setCreateTime(System.currentTimeMillis());
textMessage.setFunFlag(0);
textMessage.setContent(content);
return textMessage;
}
/**
* 处理跳转链接事件
* @param eventMessage 事件消息对象
* @param timeStamp 时间戳
* @return {@link BaseMessage}
*/
private BaseMessage handleViewEvent(EventMessage eventMessage, long timeStamp) {
return null;
}
/**
* 处理事件消息
* @param eventMessage 事件消息对象
* @param timeStamp 时间戳
* @return {@link BaseMessage}
*/
private BaseMessage handleEvent(EventMessage eventMessage, long timeStamp, HttpServletRequest request) {
if (eventMessage == null) {
return null;
}
BaseMessage message = null;
switch (eventMessage.getEventType()) {
case EventMessage.EVENT_TYPE_SUBSCRIBE:
// 关注
break;
case EventMessage.EVENT_TYPE_UNSUBSCRIBE:
// 取消关注
break;
case EventMessage.EVENT_TYPE_SCAN_SUBSCRIBE:
// 扫描二维码（已关注）
break;
case EventMessage.EVENT_TYPE_SCAN_UNSUBSCRIBE:
// 扫描二维码（未关注）
break;
case EventMessage.EVENT_TYPE_CLICK:
//点击事件click
message = handleClickEvent(eventMessage, timeStamp);
break;
case EventMessage.EVENT_TYPE_VIEW:
message = handleViewEvent(eventMessage, timeStamp);
break;
case EventMessage.EVENT_TYPE_LOCATION:
message = handleLocationEvent(eventMessage, timeStamp);
break;
case EventMessage.EVENT_TYPE_SIGN:
message = handleSignEvent(eventMessage, timeStamp);
break;
default:
break;
}
return message;
}
/**
* 签名功能 判断是否是当前用户的openId
* @param eventMessage 事件消息对象
* @param timeStamp 时间戳
* @return {@link BaseMessage}
*/
private BaseMessage handleSignEvent(EventMessage eventMessage, long timeStamp) {
String openId = eventMessage.getFromUserName();
return eventMessage;
}
/**
* 处理上报地理位置事件
* @param eventMessage 事件消息对象
* @param timeStamp 时间戳
* @return {@link BaseMessage}
*/
private BaseMessage handleLocationEvent(EventMessage eventMessage, long timeStamp) {
return null;
}
/**
* 处理图片消息
* @param imageMessage 图片消息对象
* @param timeStamp 时间戳
* @return {@link BaseMessage}
*/
private BaseMessage handleImageMessage(ImageMessage imageMessage, long timeStamp) {
if (imageMessage != null) {
String from = imageMessage.getFromUserName();
}
return null;
}
/**
* 处理链接消息
* @param linkMessage 链接消息对象
* @param timeStamp 时间戳
* @return {@link BaseMessage}
*/
private BaseMessage handleLinkMessage(LinkMessage linkMessage, long timeStamp) {
// TextMessage textMessage = getTextMessage(linkMessage, "处理链接消息！");
return null;
}
/**
* 处理语音消息
* @param voiceMessage 语音消息对象
* @param timeStamp 时间戳
* @return {@link BaseMessage}
*/
private BaseMessage handleVoiceMessage(VoiceMessage voiceMessage, long timeStamp) {
if (voiceMessage != null) {
String from = voiceMessage.getFromUserName();
}
return null;
}
/**
* 处理视频消息
* @param videoMessage 视频消息对象
* @param timeStamp 时间戳
* @return {@link BaseMessage}
*/
private BaseMessage handleVideoMessage(VideoMessage videoMessage, long timeStamp) {
// TextMessage textMessage = getTextMessage(videoMessage, "处理视频消息！");
return null;
}
/**
* 处理地理位置消息
* @param locationMessage 地理位置消息对象
* @param timeStamp 时间戳
* @return {@link BaseMessage}
*/
private BaseMessage handleLocationMessage(LocationMessage locationMessage, long timeStamp) {
return null;
}
}
hongxinhui/src/main/java/com/hongxinhui/controller/WxController.java deleted 100644 → 0
View file @ 17fce864
/*
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
*
* 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.
*/
package com.hongxinhui.controller;
import com.hongxinhui.entity.ManageWay;
import com.hongxinhui.entity.Members;
import com.hongxinhui.entity.Notice;
import com.hongxinhui.entity.Survey;
import com.hongxinhui.param.EnterpriseMembers;
import com.hongxinhui.param.EnterpriseMembersUpdate;
import com.hongxinhui.param.PersonalMembers;
import com.hongxinhui.param.PersonalMembersUpdate;
import com.hongxinhui.service.MembersService;
import com.hongxinhui.service.WxService;
import com.hongxinhui.utils.IpUtils;
import com.hongxinhui.utils.StringUtils;
import com.hongxinhui.utils.VerifyCodeUtils;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.log.annotation.OperationLogIgnore;
import io.geekidea.springbootplus.framework.util.IpUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;
/**
* 微信公众号接口
*
**/
@Slf4j
@RestController
@Api(value = "微信公众号接口", tags = {"微信公众号接口"})
public class WxController {
@Autowired
private WxService wxService;
@Autowired
private MembersService membersService;
@Autowired
private RedisTemplate redisTemplate;
@PostMapping("/sendMsg")
@OperationLogIgnore
@ApiOperation(value = "发送手机验证码", notes = "根据手机号发送验证码")
public ApiResult<Object> sendMsg(@RequestParam(value = "phone", required = true) String phone, HttpServletResponse response) throws Exception {
HashMap<String,Object> info = wxService.sendMsg(phone);
System.out.println("info = " + info);
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("verificationCode").toString());
}else{
return ApiResult.fail(500, info.get("msg").toString());
}
}
@PostMapping("/personalRegister")
@OperationLogIgnore
@ApiOperation(value = "个人用户注册", notes = "个人用户注册")
public ApiResult<Object> personalRegister(@RequestBody PersonalMembers personalMembers,
HttpServletResponse response) throws Exception {
if(StringUtils.isEmpty(personalMembers.getName())||StringUtils.isEmpty(personalMembers.getPhone())||StringUtils.isEmpty(personalMembers.getEmail())||StringUtils.isEmpty(personalMembers.getIdcard())||
StringUtils.isEmpty(personalMembers.getPassword())||StringUtils.isEmpty(personalMembers.getPasswordAgain()) ){
return ApiResult.fail(500, "必填不能为空");
}
HashMap<String,Object> info = membersService.personalRegister(personalMembers);
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("info").toString());
}else{
return ApiResult.fail(500, info.get("info").toString());
}
}
@PostMapping("/personalUpdate")
@OperationLogIgnore
@ApiOperation(value = "个人用户信息修改", notes = "个人用户信息修改")
public ApiResult<Object> personalUpdate(@RequestBody PersonalMembersUpdate personalMembers,
HttpServletResponse response) throws Exception {
HashMap<String,Object> info = membersService.personalUpdate(personalMembers);
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("info").toString());
}else{
return ApiResult.result(Integer.valueOf(info.get("code").toString()),info.get("info").toString(),null);
}
}
@PostMapping("/enterpriseRegister")
@OperationLogIgnore
@ApiOperation(value = "企业用户注册", notes = "企业用户注册")
public ApiResult<Object> enterpriseRegister(@RequestBody EnterpriseMembers enterpriseMembers,
HttpServletResponse response) throws Exception {
HashMap<String,Object> info = membersService.enterpriseRegister(enterpriseMembers);
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("info").toString());
}else{
return ApiResult.fail(500, info.get("info").toString());
}
}
@PostMapping("/enterpriseUpdate")
@OperationLogIgnore
@ApiOperation(value = "企业用户信息修改", notes = "企业用户信息修改")
public ApiResult<Object> enterpriseUpdate(@RequestBody EnterpriseMembersUpdate enterpriseMembers,
HttpServletResponse response) throws Exception {
HashMap<String,Object> info = membersService.enterpriseUpdate(enterpriseMembers);
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("info").toString());
}else{
return ApiResult.result(Integer.valueOf(info.get("code").toString()),info.get("info").toString(),null);
}
}
@PostMapping("/personalInfo")
@OperationLogIgnore
@ApiOperation(value = "会员信息-个人用户信息 或 企业用户信息 ", notes = "会员信息-个人用户信息 或 企业用户信息 ")
public ApiResult<Members> personalInfo(HttpServletResponse response) throws Exception {
HashMap<String,Object> info = membersService.personalInfo();
if(info.get("code").toString().equals("200")){
return ApiResult.ok( (Members)info.get("data"));
}else{
return ApiResult.result(Integer.valueOf(info.get("code").toString()),info.get("info").toString(),null);
}
}
@PostMapping("/noticeList")
@OperationLogIgnore
@ApiOperation(value = "公告大厅列表 ", notes = "公告大厅列表 ")
public ApiResult<List<Notice>> noticeList(HttpServletResponse response) throws Exception {
HashMap<String,Object> info = membersService.noticeList();
if(info.get("code").toString().equals("200")){
return ApiResult.ok( (List<Notice>)info.get("data"));
}else{
return ApiResult.result(Integer.valueOf(info.get("code").toString()),info.get("info").toString(),null);
}
}
@PostMapping("/manageWayList")
@OperationLogIgnore
@ApiOperation(value = "管理办法列表 ", notes = "管理办法列表 ")
public ApiResult<List<ManageWay>> manageWayList(HttpServletResponse response) throws Exception {
HashMap<String,Object> info = membersService.manageWayList();
if(info.get("code").toString().equals("200")){
return ApiResult.ok( (List<ManageWay>)info.get("data"));
}else{
return ApiResult.result(Integer.valueOf(info.get("code").toString()),info.get("info").toString(),null);
}
}
@PostMapping("/surveyList")
@OperationLogIgnore
@ApiOperation(value = "资产查询列表 ", notes = "资产查询列表 ")
public ApiResult<List<Survey>> surveyList(HttpServletResponse response) throws Exception {
HashMap<String,Object> info = membersService.surveyList();
if(info.get("code").toString().equals("200")){
return ApiResult.ok( (List<Survey>)info.get("data"));
}else{
return ApiResult.result(Integer.valueOf(info.get("code").toString()),info.get("info").toString(),null);
}
}
/**
* 会员登录验证码
* @return 验证码图片
*/
@GetMapping(value = "/verifyCode")
@ApiOperation(value = "会员登录验证码", notes = "会员登录验证码")
public void verifyCode(final HttpServletResponse rsp, HttpServletRequest request) {
try {
System.out.println("000000000000000000" + IpUtils.getIpAddress(request));
} catch (Exception e) {
e.printStackTrace();
}
String code = VerifyCodeUtils.outPrint(rsp);
redisTemplate.opsForValue().set("VERIFY_CODE_SESSION_KEY",code,5 , TimeUnit.MINUTES);//5分钟过期
System.out.println("code: " + code);
System.out.println("code: " + redisTemplate.opsForValue().get("VERIFY_CODE_SESSION_KEY"));
}
@PostMapping("/wxlogin")
@OperationLogIgnore
@ApiOperation(value = "用户登录", notes = "用户登录")
public ApiResult<Object> wxlogin(@RequestParam(value = "phone", required = true) String phone,
@RequestParam(value = "verifyCode", required = true) String verifyCode,
@RequestParam(value = "pwd", required = true) String pwd,
HttpServletResponse response) throws Exception {
System.out.println("phone = " + phone);
System.out.println("verifyCode = " + verifyCode);
System.out.println("verifyCode = " + redisTemplate.opsForValue().get("VERIFY_CODE_SESSION_KEY"));
System.out.println("pwd = " + pwd);
if(StringUtils.isEmpty(phone)||StringUtils.isEmpty(pwd) ){//||StringUtils.isEmpty(verifyCode)
return ApiResult.fail(500, "必填不能为空");
}
HashMap<String,Object> info = membersService.login(phone,verifyCode,pwd);
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("data"),"登录成功");
}else{
return ApiResult.fail(500, info.get("info").toString());
}
}
@PostMapping("/passwordUpdateone")
@OperationLogIgnore
@ApiOperation(value = "重置密码第一个页面", notes = "重置密码第一个页面")
public ApiResult<Object> passwordUpdateone(@RequestParam(value = "phone", required = true) String phone,
@RequestParam(value = "verifyCode", required = true) String verifyCode,
HttpServletResponse response) throws Exception {
if(StringUtils.isEmpty(phone)||StringUtils.isEmpty(verifyCode) ){
return ApiResult.fail(500, "必填不能为空");
}
HashMap<String,Object> info = membersService.passwordUpdateone(phone,verifyCode);
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("data"),"校验成功");
}else{
return ApiResult.fail(500, info.get("info").toString());
}
}
/**
* 重置密码
*/
@PostMapping("/passwordUpdatetwo")
@OperationLogIgnore
@ApiOperation(value = "重置密码第二页面", notes = "重置密码第二页面")
public ApiResult<Object> passwordUpdatetwo(@RequestParam(value = "phone", required = true) String phone,
@RequestParam(value = "pwd", required = true) String pwd,
HttpServletResponse response) throws Exception {
if(StringUtils.isEmpty(pwd)|| StringUtils.isEmpty(phone) ){
return ApiResult.fail(500, "必填不能为空");
}
HashMap<String,Object> info = membersService.passwordUpdatetwo(phone,pwd);
if(info.get("code").toString().equals("200")){
return ApiResult.ok(info.get("info").toString());
}else{
return ApiResult.fail(500, info.get("info").toString());
}
}
}
hongxinhui/src/main/java/com/hongxinhui/entity/ManageWay.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.entity;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
/**
* 管理办法
*
* @author cyz
* @since 2021-08-05
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "ManageWay对象")
public class ManageWay extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@TableId(value = "ID", type = IdType.AUTO)
private Long id;
@ApiModelProperty("管理办法标题")
private String title;
@ApiModelProperty("办法内容")
private String content;
@ApiModelProperty("办法状态1草稿2已发布")
private Integer status;
@ApiModelProperty("发布时间")
@TableField("releaseTime")
private Date releaseTime;
@ApiModelProperty("创建时间")
@TableField("createTime")
private Date createTime;
@ApiModelProperty("创建人")
@TableField("createUser")
private Integer createUser;
@ApiModelProperty("1正常0删除")
@TableLogic
private Integer enable;
@ApiModelProperty("创建人名字")
@TableField(exist = false)
private String createUserstr;
public enum FieldEnum implements BaseEnum {
title("title", "管理办法标题"),
content("content", "办法内容"),
status("status", "办法状态1草稿2已发布"),
releaseTime("releaseTime", "发布时间"),
createTime("createTime", "创建时间"),
createUser("createUser", "创建人"),
enable("enable", "1正常0删除"),
id("id", "编号");
/**
* name
*/
@Getter
private final String name;
/**
* desc
*/
@Getter
private final String desc;
FieldEnum(String name, String desc) {
this.name = name;
this.desc = desc;
}
@Override
public Integer getCode() {
return null;
}
}
}
hongxinhui/src/main/java/com/hongxinhui/entity/Members.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.entity;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
/**
*
*
* @author cyz
* @since 2021-06-29
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Members对象")
public class Members extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@TableId(value = "ID", type = IdType.AUTO)
private Long id;
@ApiModelProperty("1个人用户2企业用户")
@TableField("userType")
private Integer userType;
@ApiModelProperty("姓名")
@TableField("Name")
private String Name;
@ApiModelProperty("机构全称")
@TableField("EnterpriseName")
private String EnterpriseName;
@ApiModelProperty("企业类型")
private Integer type;
@ApiModelProperty("统一社会信用代码")
private String code;
@ApiModelProperty("法人代表姓名")
@TableField("legalpName")
private String legalpName;
@ApiModelProperty("法人身份证 正面")
@TableField("legalpIdcard1")
private String legalpIdcard1;
@ApiModelProperty("法人身份证 反面")
@TableField("legalpIdcard2")
private String legalpIdcard2;
@ApiModelProperty("邮箱")
private String email;
@ApiModelProperty("省")
@TableField("Province")
private String Province;
@ApiModelProperty("联系人姓名")
private String contacts;
@ApiModelProperty("手机号")
private String phone;
@ApiModelProperty("密码md5")
private String password;
@ApiModelProperty("密码 没加密的")
private String pwd;
@ApiModelProperty("身份证号")
@TableField("Idcard")
private String Idcard;
@ApiModelProperty("营业执照(图片路径)")
@TableField("businessLicense")
private String businessLicense;
@TableField("createTime")
private Date createTime;
@TableField("updateTime")
private Date updateTime;
@ApiModelProperty("1启用0禁用")
@TableLogic
private Integer enable;
// private String openid;
@ApiModelProperty("审核状态0审核中1审核成功2审核失败")
private Integer checkstatus;
@ApiModelProperty("机构联系地址")
private String address;
@ApiModelProperty("会员类型 1管理类会员 2自营类会员 3经济类会员 4服务类会员")
private Integer mtype;
@ApiModelProperty("token")
private String token;
@ApiModelProperty("最近登录时间")
private Date lastLoginTime;
public enum FieldEnum implements BaseEnum {
userType("userType", "1个人用户2企业用户"),
Name("Name", "姓名"),
EnterpriseName("EnterpriseName", "机构全称"),
type("type", "企业类型"),
code("code", "统一社会信用代码"),
legalpName("legalpName", "法人代表姓名"),
email("email", "邮箱"),
Province("Province", "省"),
contacts("contacts", "联系人姓名"),
phone("phone", "手机号"),
Idcard("Idcard", "身份证号"),
businessLicense("businessLicense", "营业执照(图片路径)"),
createTime("createTime", ""),
enable("enable", "1启用0禁用"),
// openid("openid", ""),
checkstatus("checkstatus", "审核状态0审核中1审核成功2审核失败"),
id("id", "编号");
/**
* name
*/
@Getter
private final String name;
/**
* desc
*/
@Getter
private final String desc;
FieldEnum(String name, String desc) {
this.name = name;
this.desc = desc;
}
@Override
public Integer getCode() {
return null;
}
}
}
hongxinhui/src/main/java/com/hongxinhui/entity/News.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.entity;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
/**
* 新闻表
*
* @author cyz
* @since 2021-09-09
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "News对象")
public class News extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@TableId(value = "ID", type = IdType.AUTO)
private Long id;
@ApiModelProperty("新闻标题")
private String title;
@ApiModelProperty("描述")
private String describestr;
@ApiModelProperty("新闻的logo，传附件ID")
private String logopic;
@TableField(exist = false)
@ApiModelProperty("新闻的logo路径")
private String logpath;
@ApiModelProperty("新闻类型id 1行业新闻 2公司新闻")
@TableField("typeId")
private Integer typeId;
@ApiModelProperty("新闻内容")
private String content;
@ApiModelProperty("新闻状态1草稿2已发布")
private Integer status;
@ApiModelProperty("阅读数量")
private Integer readcount;
@ApiModelProperty("发布时间")
@TableField("releaseTime")
private Date releaseTime;
@ApiModelProperty("创建时间")
@TableField("createTime")
private Date createTime;
@ApiModelProperty("创建人")
@TableField("createUser")
private Integer createUser;
@ApiModelProperty("创建人名字")
@TableField(exist = false)
private String createUserstr;
@ApiModelProperty("1正常0删除")
@TableLogic
private Integer enable;
public enum FieldEnum implements BaseEnum {
title("title", "新闻标题"),
logopic("logopic", "新闻的logo，传附件ID"),
typeId("typeId", "新闻类型id 1行业新闻 2公司新闻"),
content("content", "新闻内容"),
status("status", "新闻状态1草稿2已发布"),
readcount("readcount", "阅读数量"),
releaseTime("releaseTime", "发布时间"),
createTime("createTime", "创建时间"),
createUser("createUser", "创建人"),
enable("enable", "1正常0删除"),
id("id", "编号");
/**
* name
*/
@Getter
private final String name;
/**
* desc
*/
@Getter
private final String desc;
FieldEnum(String name, String desc) {
this.name = name;
this.desc = desc;
}
@Override
public Integer getCode() {
return null;
}
}
}
hongxinhui/src/main/java/com/hongxinhui/entity/Notice.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.entity;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import org.apache.commons.text.StringEscapeUtils;
/**
*
*
* @author cyz
* @since 2021-07-01
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Notice对象")
public class Notice extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@TableId(value = "ID", type = IdType.AUTO)
private Long id;
@ApiModelProperty("公告标题")
private String title;
@ApiModelProperty("类型id")
@TableField("typeId")
private Integer typeId;
@ApiModelProperty("类型字符串")
@TableField(exist = false)
private String typeStr;
@ApiModelProperty("公告内容")
private String content;
@ApiModelProperty("公告状态1草稿2已发布")
private Integer status;
@ApiModelProperty("发布时间")
@TableField("releaseTime")
private Date releaseTime;
@ApiModelProperty("创建时间")
@TableField("createTime")
private Date createTime;
@ApiModelProperty("创建人id")
@TableField("createUser")
private Integer createUser;
@ApiModelProperty("创建人名字")
@TableField(exist = false)
private String createUserstr;
@ApiModelProperty("1正常0删除")
@TableLogic
private Integer enable;
public enum FieldEnum implements BaseEnum {
title("title", "公告标题"),
typeId("typeId", "类型id"),
content("content", "公告内容"),
status("status", "公告状态1草稿2已发布"),
releaseTime("releaseTime", "发布时间"),
createTime("createTime", "创建时间"),
createUser("createUser", "创建人"),
enable("enable", "1正常0删除"),
id("id", "编号");
/**
* name
*/
@Getter
private final String name;
/**
* desc
*/
@Getter
private final String desc;
FieldEnum(String name, String desc) {
this.name = name;
this.desc = desc;
}
@Override
public Integer getCode() {
return null;
}
}
}
hongxinhui/src/main/java/com/hongxinhui/entity/Noticetype.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.entity;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
/**
*
*
* @author cyz
* @since 2021-07-01
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Noticetype对象")
public class Noticetype extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@TableId(value = "ID", type = IdType.AUTO)
private Long id;
@ApiModelProperty("公告类型")
private String name;
@TableField("createTime")
private Date createTime;
@TableLogic
private Integer enable;
}
hongxinhui/src/main/java/com/hongxinhui/entity/Superadmindb.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.entity;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
/**
*
*
* @author cyz
* @since 2021-07-01
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Superadmindb对象")
public class Superadmindb extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@TableId(value = "ID", type = IdType.AUTO)
private Long id;
@ApiModelProperty("姓名")
private String nickname;
@ApiModelProperty("账号")
@TableField("AdminUsername")
private String adminUsername;
@TableField("AdminPassword")
private String adminPassword;
@ApiModelProperty("注册时间")
@TableField("CreateTime")
private Date createTime;
@ApiModelProperty("登录状态 1能登陆 2不能登录")
@TableField("status")
private Integer status;
@TableLogic
@ApiModelProperty("有效性 1正常 0被删除")
private Integer enable;
@TableField(exist = false)
private String token;
public enum FieldEnum implements BaseEnum {
nickname("nickname", "姓名"),
AdminUsername("AdminUsername", "账号"),
AdminPassword("AdminPassword", ""),
CreateTime("CreateTime", ""),
enable("enable", ""),
id("id", "编号");
/**
* name
*/
@Getter
private final String name;
/**
* desc
*/
@Getter
private final String desc;
FieldEnum(String name, String desc) {
this.name = name;
this.desc = desc;
}
@Override
public Integer getCode() {
return null;
}
}
}
hongxinhui/src/main/java/com/hongxinhui/entity/Surveyfile.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.entity;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
/**
*
*
* @author cyz
* @since 2021-07-01
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Surveyfile对象")
public class Surveyfile extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "fileID不能为空", groups = {Update.class})
@TableId(value = "fileID", type = IdType.AUTO)
private Long fileID;
@ApiModelProperty("文件名")
@TableField("fileName")
private String fileName;
@ApiModelProperty("文件地址")
@TableField("filePath")
private String filePath;
@ApiModelProperty("大小")
private Double size;
@ApiModelProperty("上传时间")
@TableField("createTime")
private Date createTime;
@TableLogic
private Integer enable;
@TableField("surveyId")
private Integer surveyId;
public enum FieldEnum implements BaseEnum {
fileName("fileName", "文件名"),
filePath("filePath", "文件地址"),
size("size", "大小"),
createTime("createTime", "上传时间"),
enable("enable", ""),
id("id", "编号");
/**
* name
*/
@Getter
private final String name;
/**
* desc
*/
@Getter
private final String desc;
FieldEnum(String name, String desc) {
this.name = name;
this.desc = desc;
}
@Override
public Integer getCode() {
return null;
}
}
}
hongxinhui/src/main/java/com/hongxinhui/mapper/ManageWayMapper.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hongxinhui.entity.ManageWay;
import com.hongxinhui.param.ManageWayPageParam;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.io.Serializable;
/**
* 管理办法 Mapper 接口
*
* @author cyz
* @since 2021-08-05
*/
@Repository
public interface ManageWayMapper extends BaseMapper<ManageWay> {
}
hongxinhui/src/main/java/com/hongxinhui/mapper/MembersMapper.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.mapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hongxinhui.entity.Members;
import com.hongxinhui.param.EnterpriseMembersPage;
import com.hongxinhui.param.MembersPageParam;
import com.hongxinhui.param.PersonalMembersPage;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.io.Serializable;
/**
* Mapper 接口
*
* @author cyz
* @since 2021-06-29
*/
@Repository
public interface MembersMapper extends BaseMapper<Members> {
IPage<PersonalMembersPage> selectPagePersonal(Page<PersonalMembersPage> page, @Param("ew") QueryWrapper<Members> wrapper);
@Select(" SELECT count(*) count FROM members WHERE `enable` = 1 AND checkstatus = 1 AND YEARWEEK( date_format(updateTime, '%Y-%m-%d'),1) = YEARWEEK(now(), 1) ")
Long getWeekcount();
@Select(" SELECT count(*) count FROM members WHERE `enable` = 1 AND checkstatus = 1 AND userType = #{userType}")
Long getUserTypeCount(Integer userType);
IPage<EnterpriseMembersPage> selectPageEnterprise(Page<EnterpriseMembersPage> page, @Param("ew") QueryWrapper<Members> wrapper);
}
hongxinhui/src/main/java/com/hongxinhui/mapper/NewsMapper.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hongxinhui.entity.News;
import com.hongxinhui.param.NewsPageParam;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.io.Serializable;
/**
* 新闻表 Mapper 接口
*
* @author cyz
* @since 2021-09-09
*/
@Repository
public interface NewsMapper extends BaseMapper<News> {
}
hongxinhui/src/main/java/com/hongxinhui/mapper/NoticeMapper.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hongxinhui.entity.Notice;
import com.hongxinhui.param.NoticePageParam;
import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.io.Serializable;
/**
* Mapper 接口
*
* @author cyz
* @since 2021-07-01
*/
@Repository
public interface NoticeMapper extends BaseMapper<Notice> {
@Select(" select * from notice where id = #{id} ")
Notice selectOneById(Long id);
}
hongxinhui/src/main/java/com/hongxinhui/mapper/NoticetypeMapper.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hongxinhui.entity.Noticetype;
import com.hongxinhui.param.NoticetypePageParam;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.io.Serializable;
/**
* Mapper 接口
*
* @author cyz
* @since 2021-07-01
*/
@Repository
public interface NoticetypeMapper extends BaseMapper<Noticetype> {
}
hongxinhui/src/main/java/com/hongxinhui/mapper/SuperadmindbMapper.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hongxinhui.entity.Superadmindb;
import com.hongxinhui.param.SuperadmindbPageParam;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.io.Serializable;
/**
* Mapper 接口
*
* @author cyz
* @since 2021-07-01
*/
@Repository
public interface SuperadmindbMapper extends BaseMapper<Superadmindb> {
}
hongxinhui/src/main/java/com/hongxinhui/mapper/SurveyfileMapper.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.hongxinhui.entity.Surveyfile;
import com.hongxinhui.param.SurveyfilePageParam;
import org.apache.ibatis.annotations.Update;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.io.Serializable;
/**
* Mapper 接口
*
* @author cyz
* @since 2021-07-01
*/
@Repository
public interface SurveyfileMapper extends BaseMapper<Surveyfile> {
@Update(" update surveyfile set surveyId = null where surveyId = #{surveyid} ")
int updateSurveyId(int surveyid);
}
hongxinhui/src/main/java/com/hongxinhui/param/EnterPageParam.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* <pre>
* 分页参数对象
* </pre>
*
* @author cyz
* @date 2021-06-29
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "企业会员分页参数")
public class EnterPageParam extends BasePageOrderParam {
@ApiModelProperty("机构名称")
private String enterpriseName;
@ApiModelProperty("企业类型，-1全部 1金融机构2类金融机构3普通机构")
private Integer type;
@ApiModelProperty("法人代表姓名")
private String legalpName;
@ApiModelProperty("省份")
private String province;
@ApiModelProperty(value = "会员状态0等待审批1已通过2已驳回-1全部")
private Integer checkstatus;
@ApiModelProperty("联系人姓名")
private String contacts;
@ApiModelProperty("联系方式")
private String phone;
@ApiModelProperty("开始时间")
private Date beginTime;
@ApiModelProperty("结束时间")
private Date endTime;
}
hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembers.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
*
*
* @author cyz
* @since 2021-06-29
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "企业注册信息")
public class EnterpriseMembers extends BaseEntity {
@ApiModelProperty("机构全称")
private String enterpriseName;
@ApiModelProperty("机构类型，-1全部 1金融机构2类金融机构3普通机构")
private Integer type;
@ApiModelProperty("统一社会信用代码")
private String code;
@ApiModelProperty("法人代表姓名")
private String legalpName;
@ApiModelProperty("法人身份证 正面")
private String legalpIdcard1;
@ApiModelProperty("法人身份证 反面")
private String legalpIdcard2;
@ApiModelProperty("机构常用邮箱")
private String email;
@ApiModelProperty("省份")
private String province;
@ApiModelProperty("联系人姓名")
private String contacts;
@ApiModelProperty("手机号")
private String phone;
@ApiModelProperty("身份证号")
private String idcard;
@ApiModelProperty("营业执照(图片路径)")
private String businessLicense;
// private String openid;
@ApiModelProperty("机构联系地址")
private String address;
@ApiModelProperty("会员类型 1管理类会员 2自营类会员 3经济类会员 4服务类会员")
private Integer mtype;
@ApiModelProperty(value = "密码md5的",required = true)
private String password;
@ApiModelProperty(value = "确认密码",required = true)
private String passwordAgain;
}
hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembersPage.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import com.baomidou.mybatisplus.annotation.TableField;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
*
*
* @author cyz
* @since 2021-06-29
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "企业注册信息分页")
public class EnterpriseMembersPage extends BaseEntity {
@ApiModelProperty("序号")
private Long id;
@ApiModelProperty("会员状态0等待审批1已通过2已驳回")
private Integer checkstatus;
@ApiModelProperty("机构名称")
private String enterpriseName;
@ApiModelProperty("企业类型，1金融机构2类金融机构3普通机构")
private Integer type;
@ApiModelProperty("统一社会信用代码")
private String code;
@ApiModelProperty("法人代表姓名")
private String legalpName;
@ApiModelProperty("法人身份证 正面")
@TableField("legalpIdcard1")
private String legalpIdcard1;
@ApiModelProperty("法人身份证 反面")
@TableField("legalpIdcard2")
private String legalpIdcard2;
@ApiModelProperty("邮箱")
private String email;
@ApiModelProperty("省份")
private String province;
@ApiModelProperty("联系人姓名")
private String contacts;
@ApiModelProperty("联系方式")
private String phone;
@ApiModelProperty("身份证号")
private String idcard;
@ApiModelProperty("注册时间")
private Date createTime;
@ApiModelProperty("营业执照(图片路径)")
private String businessLicense;
@ApiModelProperty("会员类型 1管理类会员 2自营类会员 3经济类会员 4服务类会员")
private Integer mtype;
@ApiModelProperty("会员类型 1管理类会员 2自营类会员 3经济类会员 4服务类会员")
@TableField(exist = false)
private String mtypestr;
public String getMtypestr() {
switch (this.mtype){
case 1:
mtypestr="管理类会员";
break;
case 2:
mtypestr="自营类会员";
break;
case 3:
mtypestr="经济类会员";
break;
case 4:
mtypestr="服务类会员";
break;
}
return mtypestr;
}
}
hongxinhui/src/main/java/com/hongxinhui/param/EnterpriseMembersUpdate.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
*
*
* @author cyz
* @since 2021-06-29
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "企业注册信息修改")
public class EnterpriseMembersUpdate extends BaseEntity {
@ApiModelProperty("机构全称")
private String enterpriseName;
@ApiModelProperty("机构类型，-1全部 1金融机构2类金融机构3普通机构")
private Integer type;
@ApiModelProperty("统一社会信用代码")
private String code;
@ApiModelProperty("法人代表姓名")
private String legalpName;
@ApiModelProperty("法人身份证 正面")
private String legalpIdcard1;
@ApiModelProperty("法人身份证 反面")
private String legalpIdcard2;
@ApiModelProperty("机构常用邮箱")
private String email;
@ApiModelProperty("省份")
private String province;
@ApiModelProperty("联系人姓名")
private String contacts;
@ApiModelProperty("手机号")
private String phone;
@ApiModelProperty("身份证号")
private String idcard;
@ApiModelProperty("营业执照(图片路径)")
private String businessLicense;
@ApiModelProperty("机构联系地址")
private String address;
@ApiModelProperty("会员类型 1管理类会员 2自营类会员 3经济类会员 4服务类会员")
private Integer mtype;
}
hongxinhui/src/main/java/com/hongxinhui/param/HomeInfo.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
/**
*
*
* @author cyz
* @since 2021-07-01
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "首页会员统计")
public class HomeInfo {
@ApiModelProperty("个人会员数量")
private Integer percount;
@ApiModelProperty("企业会员数量")
private Integer enterprisecount;
@ApiModelProperty("项目数量")
private Integer surveycount;
@ApiModelProperty("新加项目规模")
private Double weekcount;
}
hongxinhui/src/main/java/com/hongxinhui/param/ManageWayPageParam.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
import java.util.Date;
/**
* <pre>
* 管理办法 分页参数对象
* </pre>
*
* @author cyz
* @date 2021-08-05
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "管理办法分页参数")
public class ManageWayPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
@ApiModelProperty("公告标题")
private String title;
@ApiModelProperty("公告状态-1全部1草稿2已发布")
private Integer status;
@ApiModelProperty("开始时间")
private Date beginTime;
@ApiModelProperty("结束时间")
private Date endTime;
}
hongxinhui/src/main/java/com/hongxinhui/param/MembersPageParam.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
/**
* <pre>
* 分页参数对象
* </pre>
*
* @author cyz
* @date 2021-06-29
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "会员分页参数")
public class MembersPageParam extends BasePageOrderParam {
@ApiModelProperty(value = "会员姓名")
private String name;
@ApiModelProperty(value = "联系方式")
private String phone;
@ApiModelProperty(value = "会员状态0等待审批1已通过2已驳回-1全部")
private Integer checkstatus;
}
hongxinhui/src/main/java/com/hongxinhui/param/NewsPageParam.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
import java.util.Date;
/**
* <pre>
* 新闻表 分页参数对象
* </pre>
*
* @author cyz
* @date 2021-09-09
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "新闻表分页参数")
public class NewsPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
@ApiModelProperty("新闻标题")
private String title;
@ApiModelProperty("新闻类型-1行业2公司")
private Integer type;
@ApiModelProperty("新闻状态-1全部1草稿2已发布")
private Integer status;
@ApiModelProperty("开始时间")
private Date beginTime;
@ApiModelProperty("结束时间")
private Date endTime;
}
hongxinhui/src/main/java/com/hongxinhui/param/NoticeAdd.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
/**
*
*
* @author cyz
* @since 2021-07-01
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "新建公告对象")
public class NoticeAdd {
private Long id;
@ApiModelProperty("公告标题")
private String title;
@ApiModelProperty("类型id")
private Integer typeId;
@ApiModelProperty("公告内容")
private String content;
@ApiModelProperty("公告状态 1保存 2发布")
private Integer status;
}
hongxinhui/src/main/java/com/hongxinhui/param/NoticePageParam.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
import java.util.Date;
/**
* <pre>
* 分页参数对象
* </pre>
*
* @author cyz
* @date 2021-07-01
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "公告分页参数")
public class NoticePageParam extends BasePageOrderParam {
@ApiModelProperty("公告标题")
private String title;
@ApiModelProperty("公告状态-1全部1草稿2已发布")
private Integer status;
@ApiModelProperty("开始时间")
private Date beginTime;
@ApiModelProperty("结束时间")
private Date endTime;
}
hongxinhui/src/main/java/com/hongxinhui/param/NoticetypePageParam.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
/**
* <pre>
* 分页参数对象
* </pre>
*
* @author cyz
* @date 2021-07-01
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "公告类型分页参数")
public class NoticetypePageParam extends BasePageOrderParam {
}
hongxinhui/src/main/java/com/hongxinhui/param/NoticetypeUpdate.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
*
*
* @author cyz
* @since 2021-07-01
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "公告对象修改")
public class NoticetypeUpdate {
private Long id;
@ApiModelProperty("公告类型")
private String name;
}
hongxinhui/src/main/java/com/hongxinhui/param/PersonalMembers.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
*
*
* @author cyz
* @since 2021-06-29
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "个人注册信息")
public class PersonalMembers extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "姓名",required = true)
private String Name;
@ApiModelProperty(value = "手机号",required = true)
private String phone;
@ApiModelProperty(value = "身份证号",required = true)
private String Idcard;
@ApiModelProperty("邮箱")
private String email;
// @ApiModelProperty(value = "openid",required = true)
// private String openid;
@ApiModelProperty(value = "密码",required = true)
private String password;
@ApiModelProperty(value = "确认密码",required = true)
private String passwordAgain;
}
hongxinhui/src/main/java/com/hongxinhui/param/PersonalMembersPage.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
/**
*
*
* @author cyz
* @since 2021-06-29
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "个人会员列表")
public class PersonalMembersPage extends BaseEntity {
@ApiModelProperty(value = "序号")
private Long id;
@ApiModelProperty("会员状态0等待审批1已通过2已驳回")
private Integer checkstatus;
@ApiModelProperty(value = "会员姓名")
private String name;
@ApiModelProperty(value = "联系方式")
private String phone;
@ApiModelProperty(value = "身份证号")
private String idcard;
@ApiModelProperty(value = "注册时间")
private Date createTime;
}
hongxinhui/src/main/java/com/hongxinhui/param/PersonalMembersUpdate.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
*
*
* @author cyz
* @since 2021-06-29
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "个人注册信息修改")
public class PersonalMembersUpdate extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "姓名",required = true)
private String Name;
@ApiModelProperty(value = "手机号",required = true)
private String phone;
@ApiModelProperty(value = "身份证号",required = true)
private String Idcard;
@ApiModelProperty("邮箱")
private String email;
}
hongxinhui/src/main/java/com/hongxinhui/param/SuperadmindbAdd.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
*
*
* @author cyz
* @since 2021-07-01
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "新建用户对象")
public class SuperadmindbAdd {
private Long id;
@ApiModelProperty("用户姓名")
private String nickname;
@ApiModelProperty("账号")
private String adminUsername;
}
hongxinhui/src/main/java/com/hongxinhui/param/SuperadmindbPageParam.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
/**
* <pre>
* 分页参数对象
* </pre>
*
* @author cyz
* @date 2021-07-01
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "用户信息分页参数")
public class SuperadmindbPageParam extends BasePageOrderParam {
@ApiModelProperty("用户姓名")
private String nickname;
@ApiModelProperty("账号")
private String adminUsername;
}
hongxinhui/src/main/java/com/hongxinhui/param/SurveyfilePageParam.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.param;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
/**
* <pre>
* 分页参数对象
* </pre>
*
* @author cyz
* @date 2021-07-01
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "分页参数")
public class SurveyfilePageParam extends BasePageOrderParam {
}
hongxinhui/src/main/java/com/hongxinhui/service/ManageWayService.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service;
import com.hongxinhui.entity.ManageWay;
import com.hongxinhui.param.ManageWayPageParam;
import io.geekidea.springbootplus.framework.common.service.BaseService;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
/**
* 管理办法 服务类
*
* @author cyz
* @since 2021-08-05
*/
public interface ManageWayService extends BaseService<ManageWay> {
/**
* 保存
*
* @param manageWay
* @return
* @throws Exception
*/
boolean saveManageWay(ManageWay manageWay) throws Exception;
/**
* 修改
*
* @param manageWay
* @return
* @throws Exception
*/
boolean updateManageWay(ManageWay manageWay) throws Exception;
/**
* 删除
*
* @param id
* @return
* @throws Exception
*/
boolean deleteManageWay(Long id) throws Exception;
/**
* 获取分页对象
*
* @param manageWayQueryParam
* @return
* @throws Exception
*/
Paging<ManageWay> getManageWayPageList(ManageWayPageParam manageWayPageParam) throws Exception;
boolean updateStatus(ManageWay manageWay);
}
hongxinhui/src/main/java/com/hongxinhui/service/MembersService.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service;
import com.hongxinhui.entity.Members;
import com.hongxinhui.param.*;
import io.geekidea.springbootplus.framework.common.service.BaseService;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import java.util.HashMap;
/**
* 服务类
*
* @author cyz
* @since 2021-06-29
*/
public interface MembersService extends BaseService<Members> {
/**
* 保存
*
* @param members
* @return
* @throws Exception
*/
boolean saveMembers(Members members) throws Exception;
/**
* 修改
*
* @param members
* @return
* @throws Exception
*/
boolean updateMembers(Members members) throws Exception;
/**
* 删除
*
* @param id
* @return
* @throws Exception
*/
boolean deleteMembers(Long id) throws Exception;
/**
* 获取分页对象
*
* @param
* @return
* @throws Exception
*/
Paging<PersonalMembersPage> getMembersPageList(MembersPageParam membersPageParam) throws Exception;
HashMap<String, Object> personalRegister(PersonalMembers personalMembers);
HashMap<String, Object> enterpriseRegister(EnterpriseMembers enterpriseMembers);
HashMap<String, Object> login(String phone, String verifyCode, String pwd);
HashMap<String, Object> personalInfo();
HomeInfo getHomeInfo();
HashMap<String, Object> handleApply(Integer id, Integer status);
Paging<EnterpriseMembersPage> getPageListEnterprise(EnterPageParam enterPageParam);
HashMap<String, Object> personalUpdate(PersonalMembersUpdate personalMembers);
HashMap<String, Object> enterpriseUpdate(EnterpriseMembersUpdate enterpriseMembers);
HashMap<String, Object> noticeList();
HashMap<String, Object> surveyList();
HashMap<String, Object> passwordUpdateone(String phone, String verifyCode);
HashMap<String, Object> passwordUpdatetwo(String phone, String pwd);
HashMap<String, Object> manageWayList();
}
hongxinhui/src/main/java/com/hongxinhui/service/NewsService.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service;
import com.hongxinhui.entity.News;
import com.hongxinhui.param.NewsPageParam;
import io.geekidea.springbootplus.framework.common.service.BaseService;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
/**
* 新闻表 服务类
*
* @author cyz
* @since 2021-09-09
*/
public interface NewsService extends BaseService<News> {
/**
* 保存
*
* @param news
* @return
* @throws Exception
*/
boolean saveNews(News news) throws Exception;
/**
* 修改
*
* @param news
* @return
* @throws Exception
*/
boolean updateNews(News news) throws Exception;
/**
* 删除
*
* @param id
* @return
* @throws Exception
*/
boolean deleteNews(Long id) throws Exception;
/**
* 获取分页对象
*
* @param newsQueryParam
* @return
* @throws Exception
*/
Paging<News> getNewsPageList(NewsPageParam newsPageParam) throws Exception;
boolean updateStatus(News news);
boolean updateReadCount(Long id);
News getByIdOne(Long id);
}
hongxinhui/src/main/java/com/hongxinhui/service/NoticeService.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service;
import com.hongxinhui.entity.Notice;
import com.hongxinhui.param.NoticeAdd;
import com.hongxinhui.param.NoticePageParam;
import io.geekidea.springbootplus.framework.common.service.BaseService;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
/**
* 服务类
*
* @author cyz
* @since 2021-07-01
*/
public interface NoticeService extends BaseService<Notice> {
/**
* 保存
*
* @param notice
* @return
* @throws Exception
*/
boolean saveNotice(NoticeAdd notice) throws Exception;
/**
* 修改
*
* @param notice
* @return
* @throws Exception
*/
boolean updateNotice(Notice notice) throws Exception;
/**
* 删除
*
* @param id
* @return
* @throws Exception
*/
boolean deleteNotice(Long id) throws Exception;
/**
* 获取分页对象
*
* @param noticePageParam
* @return
* @throws Exception
*/
Paging<Notice> getNoticePageList(NoticePageParam noticePageParam) throws Exception;
boolean updateStatus(Notice notice);
Notice getOneById(Long id);
}
hongxinhui/src/main/java/com/hongxinhui/service/NoticetypeService.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service;
import com.hongxinhui.entity.Noticetype;
import com.hongxinhui.param.NoticetypePageParam;
import com.hongxinhui.param.NoticetypeUpdate;
import io.geekidea.springbootplus.framework.common.service.BaseService;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import java.util.HashMap;
/**
* 服务类
*
* @author cyz
* @since 2021-07-01
*/
public interface NoticetypeService extends BaseService<Noticetype> {
/**
* 保存
*
* @param noticetype
* @return
* @throws Exception
*/
HashMap<String,Object> saveNoticetype(Noticetype noticetype) throws Exception;
/**
* 修改
*
* @param noticetype
* @return
* @throws Exception
*/
HashMap<String,Object> updateNoticetype(NoticetypeUpdate noticetype) throws Exception;
/**
* 删除
*
* @param id
* @return
* @throws Exception
*/
boolean deleteNoticetype(Long id) throws Exception;
/**
* 获取分页对象
*
* @param noticetypePageParam
* @return
* @throws Exception
*/
Paging<Noticetype> getNoticetypePageList(NoticetypePageParam noticetypePageParam) throws Exception;
HashMap<String, Object> noticeTypeList();
HashMap<String, Object> getOnlpayFile(String day);
HashMap<String, Object> getPayInfoDetail(String day);
}
hongxinhui/src/main/java/com/hongxinhui/service/SuperadmindbService.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service;
import com.hongxinhui.entity.Superadmindb;
import com.hongxinhui.param.SuperadmindbAdd;
import com.hongxinhui.param.SuperadmindbPageParam;
import io.geekidea.springbootplus.framework.common.service.BaseService;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import java.util.HashMap;
/**
* 服务类
*
* @author cyz
* @since 2021-07-01
*/
public interface SuperadmindbService extends BaseService<Superadmindb> {
/**
* 保存
*
* @param superadmindb
* @return
* @throws Exception
*/
boolean saveSuperadmindb(SuperadmindbAdd superadmindb) throws Exception;
/**
* 修改
*
* @param superadmindb
* @return
* @throws Exception
*/
boolean updateSuperadmindb(SuperadmindbAdd superadmindb) throws Exception;
/**
* 删除
*
* @param id
* @return
* @throws Exception
*/
boolean deleteSuperadmindb(Long id) throws Exception;
/**
* 获取分页对象
*
* @return
* @throws Exception
*/
Paging<Superadmindb> getSuperadmindbPageList(SuperadmindbPageParam superadmindbPageParam) throws Exception;
HashMap<String, Object> login(String name, String pwd);
boolean resetPassword(Long id);
HashMap<String, Object> updatePassword( String oldpwd, String newold);
HashMap<String, Object> updateStatus(Integer id, Integer status);
HashMap<String, Object> loginOut();
}
hongxinhui/src/main/java/com/hongxinhui/service/SurveyfileService.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service;
import com.hongxinhui.entity.Surveyfile;
import com.hongxinhui.param.SurveyfilePageParam;
import io.geekidea.springbootplus.framework.common.service.BaseService;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
/**
* 服务类
*
* @author cyz
* @since 2021-07-01
*/
public interface SurveyfileService extends BaseService<Surveyfile> {
/**
* 保存
*
* @param surveyfile
* @return
* @throws Exception
*/
boolean saveSurveyfile(Surveyfile surveyfile) throws Exception;
/**
* 修改
*
* @param surveyfile
* @return
* @throws Exception
*/
boolean updateSurveyfile(Surveyfile surveyfile) throws Exception;
/**
* 删除
*
* @param id
* @return
* @throws Exception
*/
boolean deleteSurveyfile(Long id) throws Exception;
/**
* 获取分页对象
*
* @param surveyfilePageParam
* @return
* @throws Exception
*/
Paging<Surveyfile> getSurveyfilePageList(SurveyfilePageParam surveyfilePageParam) throws Exception;
}
hongxinhui/src/main/java/com/hongxinhui/service/WxService.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service;
import java.util.HashMap;
/**
* 服务类
*
* @author cyz
* @since 2021-06-28
*/
public interface WxService {
HashMap<String,Object> sendMsg(String phone);
}
hongxinhui/src/main/java/com/hongxinhui/service/impl/ManageWayServiceImpl.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.hongxinhui.entity.ManageWay;
import com.hongxinhui.entity.Notice;
import com.hongxinhui.entity.Superadmindb;
import com.hongxinhui.mapper.ManageWayMapper;
import com.hongxinhui.mapper.SuperadmindbMapper;
import com.hongxinhui.service.ManageWayService;
import com.hongxinhui.param.ManageWayPageParam;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.hongxinhui.utils.StringUtils;
import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.geekidea.springbootplus.framework.util.LoginUtil;
import org.apache.commons.text.StringEscapeUtils;
import org.springframework.transaction.annotation.Transactional;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
/**
* 管理办法 服务实现类
*
* @author cyz
* @since 2021-08-05
*/
@Slf4j
@Service
public class ManageWayServiceImpl extends BaseServiceImpl<ManageWayMapper, ManageWay> implements ManageWayService {
@Autowired
private ManageWayMapper manageWayMapper;
@Autowired
private SuperadmindbMapper superadmindbMapper;
@Transactional(rollbackFor = Exception.class)
@Override
public boolean saveManageWay(ManageWay manageWay) throws Exception {
manageWay.setContent(StringEscapeUtils.unescapeHtml4( manageWay.getContent() ));//转义html
if(manageWay.getStatus()==2){
manageWay.setReleaseTime(new Date());
}
Superadmindb user = (Superadmindb) LoginUtil.getSysUser();
if(user!=null){
manageWay.setCreateUser(user.getId().intValue());
}else{
return false;
}
return manageWayMapper.insert(manageWay)>0;
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean updateManageWay(ManageWay manageWay) throws Exception {
return super.updateById(manageWay);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean deleteManageWay(Long id) throws Exception {
return super.removeById(id);
}
@Override
public Paging<ManageWay> getManageWayPageList(ManageWayPageParam manageWayPageParam) throws Exception {
Page<ManageWay> page = new PageInfo<>(manageWayPageParam, OrderItem.desc(getLambdaColumn(ManageWay::getCreateTime)));
QueryWrapper<ManageWay> wrapper = new QueryWrapper<>();
if(manageWayPageParam.getStatus()!=null&&manageWayPageParam.getStatus()!=-1){
wrapper.eq("status",manageWayPageParam.getStatus());
}
if(!StringUtils.isEmpty(manageWayPageParam.getTitle())){
wrapper.like("title",manageWayPageParam.getTitle());
}
if(manageWayPageParam.getBeginTime()!=null){
wrapper.ge("releaseTime",manageWayPageParam.getBeginTime());
}
if(manageWayPageParam.getEndTime()!=null){
wrapper.le("releaseTime",manageWayPageParam.getEndTime());
}
IPage<ManageWay> iPage = manageWayMapper.selectPage(page, wrapper);
for (ManageWay manageWay:iPage.getRecords()) {
Integer createUser = manageWay.getCreateUser();
if(createUser!=null){
manageWay.setCreateUserstr(superadmindbMapper.selectById(createUser).getNickname());
}
manageWay.setContent(StringEscapeUtils.unescapeHtml4(manageWay.getContent()));
}
return new Paging<ManageWay>(iPage);
}
@Override
public boolean updateStatus(ManageWay manageWay) {
manageWay.setStatus(2);
manageWay.setReleaseTime(new Date());
int count = manageWayMapper.updateById(manageWay);
return count>0;
}
}
hongxinhui/src/main/java/com/hongxinhui/service/impl/MembersServiceImpl.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.hongxinhui.entity.*;
import com.hongxinhui.mapper.*;
import com.hongxinhui.param.*;
import com.hongxinhui.service.MembersService;
import com.hongxinhui.utils.CheckUtil;
import com.hongxinhui.utils.IdCardUtil;
import com.hongxinhui.utils.SendMail;
import com.hongxinhui.utils.StringUtils;
import io.geekidea.springbootplus.config.properties.JwtProperties;
import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.geekidea.springbootplus.framework.shiro.cache.LoginRedisService;
import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
import io.geekidea.springbootplus.framework.util.LoginUtil;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.springframework.beans.BeanUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.transaction.annotation.Transactional;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import java.time.Duration;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
* 服务实现类
*
* @author cyz
* @since 2021-06-29
*/
@Slf4j
@Service
public class MembersServiceImpl extends BaseServiceImpl<MembersMapper, Members> implements MembersService {
@Autowired
private MembersMapper membersMapper;
@Autowired
private SurveyMapper surveyMapper;
@Autowired
private SurveyfileMapper surveyfileMapper;
@Autowired
private NoticeMapper noticeMapper;
@Autowired
private ManageWayMapper manageWayMapper;
@Autowired
private NoticetypeMapper noticetypeMapper;
@Lazy
@Autowired
private JwtProperties jwtProperties;
@Autowired
private RedisTemplate redisTemplate;
@Lazy
@Autowired
private SpringBootPlusProperties springBootPlusProperties;
@Lazy
@Autowired
private LoginRedisService loginRedisService;
@Transactional(rollbackFor = Exception.class)
@Override
public boolean saveMembers(Members members) throws Exception {
return super.save(members);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean updateMembers(Members members) throws Exception {
return super.updateById(members);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean deleteMembers(Long id) throws Exception {
return super.removeById(id);
}
@Override
public Paging<PersonalMembersPage> getMembersPageList(MembersPageParam membersPageParam) throws Exception {
Page<PersonalMembersPage> page = new PageInfo<>(membersPageParam);
List<OrderItem> orders = page.getOrders();
OrderItem orderItem = orders.get(0);
orderItem.setColumn("ID").setAsc(false);
QueryWrapper<Members> wrapper = new QueryWrapper<>();
wrapper.eq("userType",1);//个人用户
wrapper.eq("enable",1);
if(!StringUtils.isEmpty(membersPageParam.getName())){
wrapper.like("Name",membersPageParam.getName());
}
if(!StringUtils.isEmpty(membersPageParam.getPhone())){
wrapper.like("phone",membersPageParam.getPhone());
}
if(membersPageParam.getCheckstatus()!=null&&membersPageParam.getCheckstatus()!=-1){
wrapper.eq("checkstatus",membersPageParam.getCheckstatus());
}
IPage<PersonalMembersPage> iPage = membersMapper.selectPagePersonal(page, wrapper);
return new Paging<PersonalMembersPage>(iPage);
}
public boolean isEmail(String email){
if (null==email || "".equals(email)){
return false;
}
String regEx1 = "^([a-z0-9A-Z]+[-|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$";
Pattern p = Pattern.compile(regEx1);
Matcher m = p.matcher(email);
if(m.matches()){
return true;
}else{
return false;
}
}
@Override
public HashMap<String, Object> personalRegister(PersonalMembers personalMembers) {
HashMap<String, Object> hashMap = new HashMap<>();
//检验手机号格式
if(!CheckUtil.isMobile(personalMembers.getPhone())){
hashMap.put("info","请输入正确手机号！");
hashMap.put("code","500");
return hashMap;
}
//检验身份证号
if(!IdCardUtil.isValidatedAllIdcard(personalMembers.getIdcard())){
hashMap.put("info","请输入正确身份证号！");
hashMap.put("code","500");
return hashMap;
}
//检验邮箱
if(!isEmail(personalMembers.getEmail())){
hashMap.put("info","请输入正确邮箱！");
hashMap.put("code","500");
return hashMap;
}
//校验密码
if(!personalMembers.getPassword().equals(personalMembers.getPasswordAgain())){
hashMap.put("info","两次输入密码不一致！");
hashMap.put("code","500");
return hashMap;
}
QueryWrapper<Members> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("enable",1);
queryWrapper.eq("phone",personalMembers.getPhone());
queryWrapper.ne("checkstatus",2); //不查询 之前审核不通过的
Members members = membersMapper.selectOne(queryWrapper);
if(members!=null){
if(members.getCheckstatus()==0){
hashMap.put("info","手机号已注册，正在审核中！");
}else if(members.getCheckstatus()==1){
hashMap.put("info","手机号已注册！");
}
hashMap.put("code","500");
return hashMap;
}
members = new Members();
members.setPassword(DigestUtils.md5Hex(personalMembers.getPassword()));//
members.setName(personalMembers.getName());
members.setPhone(personalMembers.getPhone());
members.setEmail(personalMembers.getEmail());//邮箱
//校验身份证号
members.setIdcard(personalMembers.getIdcard());
//个人用户类型
members.setUserType(1);
members.setPwd(personalMembers.getPassword());
int insert = membersMapper.insert(members);
if(insert>0){
hashMap.put("code","200");
hashMap.put("info","注册成功");
}
return hashMap;
}
@Override
public HashMap<String, Object> enterpriseRegister(EnterpriseMembers enterpriseMembers) {
HashMap<String, Object> hashMap = new HashMap<>();
//检验手机号格式
if(!CheckUtil.isMobile(enterpriseMembers.getPhone())){
hashMap.put("info","请输入正确手机号！");
hashMap.put("code","500");
return hashMap;
}
//检验邮箱
if(!isEmail(enterpriseMembers.getEmail())){
hashMap.put("info","请输入正确邮箱！");
hashMap.put("code","500");
return hashMap;
}
//校验密码
if(!enterpriseMembers.getPassword().equals(enterpriseMembers.getPasswordAgain())){
hashMap.put("info","两次输入密码不一致！");
hashMap.put("code","500");
return hashMap;
}
QueryWrapper<Members> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("enable",1);
queryWrapper.eq("phone",enterpriseMembers.getPhone());
queryWrapper.ne("checkstatus",2); //不查询 之前审核不通过的
Members members = membersMapper.selectOne(queryWrapper);
//是否判断机构名称重复
if(members!=null){
if(members.getCheckstatus()==0){
hashMap.put("info","手机号已注册，正在审核中！");
}else if(members.getCheckstatus()==1){
hashMap.put("info","手机号已注册！");
}
hashMap.put("code","500");
return hashMap;
}
members = new Members();
//校验身份证号
BeanUtils.copyProperties(enterpriseMembers, members);
//企业用户类型
members.setUserType(2);
members.setPassword(DigestUtils.md5Hex(enterpriseMembers.getPassword()));
members.setPwd(enterpriseMembers.getPassword());
int insert = membersMapper.insert(members);
if(insert>0){
hashMap.put("code","200");
hashMap.put("info","注册成功");
}
return hashMap;
}
@Override
public HashMap<String, Object> login(String phone, String verifyCode,String pwd) {
HashMap<String, Object> hashMap = new HashMap<>();
System.out.println(" " + redisTemplate.opsForValue().get("VERIFY_CODE_SESSION_KEY"));
if(!verifyCode.equalsIgnoreCase(redisTemplate.opsForValue().get("VERIFY_CODE_SESSION_KEY").toString())){
hashMap.put("code","500");
hashMap.put("info","验证码错误!");
return hashMap;
}
QueryWrapper<Members> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("enable",1);
queryWrapper.ne("checkstatus",2);//审核通过的用户和未审核的用户
queryWrapper.eq("phone",phone);
Members members = membersMapper.selectOne(queryWrapper);
if(members==null){
hashMap.put("code","500");
hashMap.put("info","用户不存在!");
return hashMap;
}
if(members.getCheckstatus()==0){
hashMap.put("code","500");
hashMap.put("info","账号正在审核中!");
return hashMap;
}
if(!members.getPassword().equals(DigestUtils.md5Hex(pwd) )){
hashMap.put("code","500");
hashMap.put("info","密码错误请重新输入!");
return hashMap;
}
io.geekidea.springbootplus.framework.shiro.vo.Members members1 = new io.geekidea.springbootplus.framework.shiro.vo.Members();
BeanUtils.copyProperties(members, members1);
String username = phone;
// 生成token字符串并返回
Long expireSecond = jwtProperties.getExpireSecond();
String newSalt = "666666";// 如果盐值为空，则使用默认值：666666
String token = JwtUtil.generateToken(username, newSalt, Duration.ofSeconds(expireSecond));
log.debug("token:{}", token);
// 创建AuthenticationToken
// JwtToken jwtToken = JwtToken.build(token, username, newSalt, expireSecond);
//
// boolean enableShiro = springBootPlusProperties.getShiro().isEnable();
// if (enableShiro) {
// // 从SecurityUtils里边创建一个 subject
// Subject subject = SecurityUtils.getSubject();
// // 执行认证登录
// subject.login(jwtToken);
// } else {
// log.warn("未启用Shiro");
// }
// 缓存登录信息到Redis
// loginRedisService.cacheLoginInfo(jwtToken, members1);
log.debug("登录成功,username:{}", username);
log.debug("token:{}", token);
System.out.println("token = " + token);
members.setToken(token);
members.setLastLoginTime(new Date());
membersMapper.updateById(members);
redisTemplate.opsForValue().set("USER_"+token,members ,60 , TimeUnit.MINUTES);//60分钟过期
hashMap.put("code","200");
hashMap.put("info","登录成功!");
hashMap.put("data",members);
return hashMap;
}
@Override
public HashMap<String, Object> personalInfo() {
HashMap<String, Object> hashMap = new HashMap<>();
Members weChartUser = (Members)LoginUtil.getWxUser();
if(weChartUser==null){
hashMap.put("code","501");
hashMap.put("info","请先去登录!");
return hashMap;
}
String token = weChartUser.getToken();
weChartUser = membersMapper.selectById(weChartUser.getId());
if(weChartUser==null){
hashMap.put("code","501");
hashMap.put("info","请先去登录!");
redisTemplate.opsForValue().set("USER_"+token,null);
return hashMap;
}
hashMap.put("code","200");
hashMap.put("info","登录成功!");
hashMap.put("data",weChartUser);
return hashMap;
}
//首页会员统计
@Override
public HomeInfo getHomeInfo() {
HomeInfo homeInfo = new HomeInfo();
homeInfo.setPercount(membersMapper.getUserTypeCount(1).intValue());//个人会员数量
homeInfo.setEnterprisecount(membersMapper.getUserTypeCount(2).intValue());//企业会员数量
int surveycount = surveyMapper.getTotalCount().intValue();
homeInfo.setSurveycount(surveycount);//项目数量
Double totalCountMoney = surveyMapper.getTotalCountMoney();
homeInfo.setWeekcount(totalCountMoney);
return homeInfo;
}
//通过或者驳回会员的注册申请
@Override
public HashMap<String, Object> handleApply(Integer id, Integer status) {
HashMap<String, Object> hashMap = new HashMap<>();
Members members = new Members();
members.setId(Long.valueOf( id));
members.setCheckstatus(status);
int count = membersMapper.updateById(members);
if(count>0){
hashMap.put("code","200");
hashMap.put("info","操作成功");
if(status==1){
members = membersMapper.selectById(id);
SendMail sendMail = new SendMail();
sendMail.setSubject("请保管好您的账号密码");
// sendMail.setContent("请保管好您的账号密码：</br>账号："+personalMembers.getPhone()+"</br>密码："+personalMembers.getPassword());
sendMail.setContent("尊敬的会员：您好!\n" +
"<div style='margin-left:50px;'>感谢您注册宜春弘鑫汇资产服务有限公司的会员。 \n" +
"</br>您的登录账号为： "+members.getPhone()+" ；</br>密码为 ："+members.getPwd()+"\n" +
"</br><span style='color:red;'>重要提示</span>：请妥善保管您的会员账号和密码；若忘记登录密码，请申请重置密码。</br>如有任何疑问可通过以下方式联系我方，非常感谢您的理解与支持。有疑问通过以下方式咨询：xiangmubu@hxhsevice.com</div>\n" +
"</br></br>宜春弘鑫汇资产服务有限公司");
//收件人电子邮箱
sendMail.setToAccount(members.getEmail());
//抄送人电子邮箱
sendMail.setToAccountAdd("");
//发送邮件方法
SendMail.sendMailMessage(sendMail);
}
}else{
hashMap.put("code","500");
hashMap.put("info","操作失败");
}
return hashMap;
}
//企业会员分页列表
@Override
public Paging<EnterpriseMembersPage> getPageListEnterprise(EnterPageParam enterPageParam) {
Page<EnterpriseMembersPage> page = new PageInfo<>(enterPageParam);
List<OrderItem> orders = page.getOrders();
OrderItem orderItem = orders.get(0);
orderItem.setColumn("ID").setAsc(false);
QueryWrapper<Members> wrapper = new QueryWrapper<>();
wrapper.eq("userType",2);//个人用户
wrapper.eq("enable",1);
if(!StringUtils.isEmpty(enterPageParam.getEnterpriseName())){
wrapper.like("enterpriseName",enterPageParam.getEnterpriseName());
}
if(enterPageParam.getType()!=null&&enterPageParam.getType()!=-1){
wrapper.eq("type",enterPageParam.getType());
}
if(!StringUtils.isEmpty(enterPageParam.getLegalpName())){
wrapper.like("legalpName",enterPageParam.getLegalpName());
}
if(!StringUtils.isEmpty(enterPageParam.getProvince())){
wrapper.like("province",enterPageParam.getProvince());
}
if(enterPageParam.getCheckstatus()!=null&&enterPageParam.getCheckstatus()!=-1){
wrapper.eq("checkstatus",enterPageParam.getCheckstatus());
}
if(!StringUtils.isEmpty(enterPageParam.getContacts())){
wrapper.like("contacts",enterPageParam.getContacts());
}
if(!StringUtils.isEmpty(enterPageParam.getPhone())){
wrapper.like("phone",enterPageParam.getPhone());
}
if(enterPageParam.getBeginTime()!=null){
wrapper.ge("createTime",enterPageParam.getBeginTime());
}
if(enterPageParam.getEndTime()!=null){
wrapper.le("createTime",enterPageParam.getEndTime());
}
IPage<EnterpriseMembersPage> iPage = membersMapper.selectPageEnterprise(page, wrapper);
return new Paging<EnterpriseMembersPage>(iPage);
}
@Override
public HashMap<String, Object> personalUpdate(PersonalMembersUpdate personalMembers) {
HashMap<String, Object> hashMap = new HashMap<>();
Members weChartUser = (Members)LoginUtil.getWxUser();
if(weChartUser==null){
hashMap.put("code","501");
hashMap.put("info","请先去登录!");
return hashMap;
}
Members members = new Members();
BeanUtils.copyProperties(personalMembers, members);
members.setId(weChartUser.getId());
membersMapper.updateById(members);
hashMap.put("code","200");
hashMap.put("info","修改成功!");
return hashMap;
}
@Override
public HashMap<String, Object> enterpriseUpdate(EnterpriseMembersUpdate enterpriseMembers) {
HashMap<String, Object> hashMap = new HashMap<>();
Members weChartUser = (Members)LoginUtil.getWxUser();
if(weChartUser==null){
hashMap.put("code","501");
hashMap.put("info","请先去登录!");
return hashMap;
}
Members members = new Members();
BeanUtils.copyProperties(enterpriseMembers, members);
members.setId(weChartUser.getId());
membersMapper.updateById(members);
hashMap.put("code","200");
hashMap.put("info","修改成功!");
return hashMap;
}
@Override
public HashMap<String, Object> noticeList() {
HashMap<String, Object> hashMap = new HashMap<>();
Members weChartUser = (Members)LoginUtil.getWxUser();
if(weChartUser==null){
hashMap.put("code","501");
hashMap.put("info","请先去登录!");
return hashMap;
}
QueryWrapper<Notice> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("enable",1);
queryWrapper.eq("status",2);//已发布的
List<Notice> notices = noticeMapper.selectList(queryWrapper);
for (Notice notice:notices) {
Noticetype noticetype = noticetypeMapper.selectById(notice.getTypeId());
if(noticetype!=null){
notice.setTypeStr(noticetype.getName());
}
notice.setContent(StringEscapeUtils.unescapeHtml4(notice.getContent()));
// System.out.println("notice.getContent() = " + notice.getContent());
}
hashMap.put("code","200");
hashMap.put("info","查询成功");
hashMap.put("data",notices);
return hashMap;
}
@Override
public HashMap<String, Object> surveyList() {
HashMap<String, Object> hashMap = new HashMap<>();
Members weChartUser = (Members)LoginUtil.getWxUser();
if(weChartUser==null){
hashMap.put("code","501");
hashMap.put("info","请先去登录!");
return hashMap;
}
QueryWrapper<Survey> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("enable",1);
List<Survey> surveys = surveyMapper.selectList(queryWrapper);
for (Survey survey:surveys) {
QueryWrapper<Surveyfile> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("surveyId",survey.getId());
List<Surveyfile> surveyfiles = surveyfileMapper.selectList(queryWrapper1);
survey.setFilelist(surveyfiles);
}
hashMap.put("code","200");
hashMap.put("info","查询成功");
hashMap.put("data",surveys);
return hashMap;
}
@Override
public HashMap<String, Object> passwordUpdateone(String phone, String verifyCode) {
HashMap<String, Object> hashMap = new HashMap<>();
if(!verifyCode.equalsIgnoreCase( redisTemplate.opsForValue().get("VERIFY_CODE_SESSION_KEY").toString())){
hashMap.put("code","500");
hashMap.put("info","验证码错误!");
return hashMap;
}
QueryWrapper<Members> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("enable",1);
queryWrapper.ne("checkstatus",2);//审核通过的用户和未审核的用户
queryWrapper.eq("phone",phone);
Members members = membersMapper.selectOne(queryWrapper);
if(members==null){
hashMap.put("code","500");
hashMap.put("info","用户不存在!");
return hashMap;
}
hashMap.put("code","200");
hashMap.put("info","校验成功");
return hashMap;
}
@Override
public HashMap<String, Object> passwordUpdatetwo(String phone, String pwd) {
HashMap<String, Object> hashMap = new HashMap<>();
QueryWrapper<Members> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("enable",1);
queryWrapper.ne("checkstatus",2);//审核通过的用户和未审核的用户
queryWrapper.eq("phone",phone);
Members members = membersMapper.selectOne(queryWrapper);
if(members==null){
hashMap.put("code","500");
hashMap.put("info","用户不存在!");
return hashMap;
}
members.setPassword(pwd);
membersMapper.updateById(members);
hashMap.put("code","200");
hashMap.put("info","修改成功");
return hashMap;
}
@Override
public HashMap<String, Object> manageWayList() {
HashMap<String, Object> hashMap = new HashMap<>();
Members weChartUser = (Members)LoginUtil.getWxUser();
if(weChartUser==null){
hashMap.put("code","501");
hashMap.put("info","请先去登录!");
return hashMap;
}
QueryWrapper<ManageWay> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("enable",1);
queryWrapper.eq("status",2);//已发布的
List<ManageWay> manageWays = manageWayMapper.selectList(queryWrapper);
for (ManageWay manageWay:manageWays) {
manageWay.setContent(StringEscapeUtils.unescapeHtml4(manageWay.getContent()));
}
hashMap.put("code","200");
hashMap.put("info","查询成功");
hashMap.put("data",manageWays);
return hashMap;
}
}
hongxinhui/src/main/java/com/hongxinhui/service/impl/NewsServiceImpl.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.hongxinhui.entity.ManageWay;
import com.hongxinhui.entity.News;
import com.hongxinhui.entity.Superadmindb;
import com.hongxinhui.entity.Surveyfile;
import com.hongxinhui.mapper.NewsMapper;
import com.hongxinhui.mapper.SuperadmindbMapper;
import com.hongxinhui.mapper.SurveyfileMapper;
import com.hongxinhui.service.NewsService;
import com.hongxinhui.param.NewsPageParam;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.hongxinhui.utils.StringUtils;
import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.geekidea.springbootplus.framework.util.LoginUtil;
import org.apache.commons.text.StringEscapeUtils;
import org.springframework.transaction.annotation.Transactional;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
/**
* 新闻表 服务实现类
*
* @author cyz
* @since 2021-09-09
*/
@Slf4j
@Service
public class NewsServiceImpl extends BaseServiceImpl<NewsMapper, News> implements NewsService {
@Autowired
private NewsMapper newsMapper;
@Autowired
private SurveyfileMapper surveyfileMapper;
@Autowired
private SuperadmindbMapper superadmindbMapper;
@Transactional(rollbackFor = Exception.class)
@Override
public boolean saveNews(News news) throws Exception {
if(StringUtils.isEmpty( news.getContent())){
news.setContent(news.getDescribestr());
}
news.setContent(StringEscapeUtils.unescapeHtml4( news.getContent() ));//转义html
news.setTitle(StringEscapeUtils.unescapeHtml4( news.getTitle() ));//转义html
news.setDescribestr(StringEscapeUtils.unescapeHtml4( news.getDescribestr() ));//转义html
if(news.getStatus()==2){
news.setReleaseTime(new Date());
}
Superadmindb user = (Superadmindb) LoginUtil.getSysUser();
if(user!=null){
news.setCreateUser(user.getId().intValue());
}else{
// return false;
news.setCreateUser(0);
}
return newsMapper.insert(news)>0;
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean updateNews(News news) throws Exception {
return super.updateById(news);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean deleteNews(Long id) throws Exception {
return super.removeById(id);
}
@Override
public Paging<News> getNewsPageList(NewsPageParam newsPageParam) throws Exception {
Page<News> page = new PageInfo<>(newsPageParam, OrderItem.desc(getLambdaColumn(News::getCreateTime)));
QueryWrapper<News> wrapper = new QueryWrapper<>();
if(newsPageParam.getType()!=null&&newsPageParam.getType()!=0){
wrapper.eq("typeId",newsPageParam.getType());
}
if(newsPageParam.getStatus()!=null&&newsPageParam.getStatus()!=-1){
wrapper.eq("status",newsPageParam.getStatus());
}
if(!StringUtils.isEmpty(newsPageParam.getTitle())){
wrapper.like("title",newsPageParam.getTitle());
}
if(newsPageParam.getBeginTime()!=null){
wrapper.ge("releaseTime",newsPageParam.getBeginTime());
}
if(newsPageParam.getEndTime()!=null){
wrapper.le("releaseTime",newsPageParam.getEndTime());
}
IPage<News> iPage = newsMapper.selectPage(page, wrapper);
for (News news:iPage.getRecords()) {
String logopic = news.getLogopic();
if(!StringUtils.isEmpty(logopic)){
Integer fileid = Integer.valueOf(logopic);
Surveyfile surveyfile = surveyfileMapper.selectById(fileid);
if(surveyfile!=null){
news.setLogpath(surveyfile.getFilePath());
}
}
Integer createUser = news.getCreateUser();
if(createUser!=null){
news.setCreateUserstr(superadmindbMapper.selectById(createUser).getNickname());
}
news.setContent(StringEscapeUtils.unescapeHtml4(news.getContent()).replaceAll("&ldquo;","\\“").replaceAll("&rdquo;","\\”") );
news.setTitle(StringEscapeUtils.unescapeHtml4( news.getTitle() ).replaceAll("&ldquo;","\\“").replaceAll("&rdquo;","\\”") );//转义html
news.setDescribestr(StringEscapeUtils.unescapeHtml4( news.getDescribestr() ).replaceAll("&ldquo;","\\“").replaceAll("&rdquo;","\\”") );//转义html
}
return new Paging<News>(iPage);
}
@Override
public boolean updateStatus(News news) {
news.setStatus(2);
news.setReleaseTime(new Date());
int count = newsMapper.updateById(news);
return count>0;
}
@Override
public boolean updateReadCount(Long id) {
News news = newsMapper.selectById(id);
news.setReadcount(news.getReadcount()+1) ;
int count = newsMapper.updateById(news);
return count>0;
}
@Override
public News getByIdOne(Long id) {
News news = newsMapper.selectById(id);
String logopic = news.getLogopic();
if(!StringUtils.isEmpty(logopic)){
Integer fileid = Integer.valueOf(logopic);
Surveyfile surveyfile = surveyfileMapper.selectById(fileid);
if(surveyfile!=null){
news.setLogpath(surveyfile.getFilePath());
}
}
Integer createUser = news.getCreateUser();
if(createUser!=null){
news.setCreateUserstr(superadmindbMapper.selectById(createUser).getNickname());
}
news.setContent(StringEscapeUtils.unescapeHtml4(news.getContent()).replaceAll("&ldquo;","\\“").replaceAll("&rdquo;","\\”") );
news.setTitle(StringEscapeUtils.unescapeHtml4( news.getTitle() ).replaceAll("&ldquo;","\\“").replaceAll("&rdquo;","\\”") );//转义html
news.setDescribestr(StringEscapeUtils.unescapeHtml4( news.getDescribestr() ).replaceAll("&ldquo;","\\“").replaceAll("&rdquo;","\\”") );//转义html
return news;
}
}
hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticeServiceImpl.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.hongxinhui.entity.Notice;
import com.hongxinhui.entity.Noticetype;
import com.hongxinhui.entity.Superadmindb;
import com.hongxinhui.mapper.NoticeMapper;
import com.hongxinhui.mapper.NoticetypeMapper;
import com.hongxinhui.mapper.SuperadmindbMapper;
import com.hongxinhui.param.NoticeAdd;
import com.hongxinhui.service.NoticeService;
import com.hongxinhui.param.NoticePageParam;
import com.hongxinhui.utils.StringUtils;
import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.geekidea.springbootplus.framework.util.LoginUtil;
import org.apache.commons.text.StringEscapeUtils;
import org.springframework.transaction.annotation.Transactional;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Date;
/**
* 服务实现类
*
* @author cyz
* @since 2021-07-01
*/
@Slf4j
@Service
public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> implements NoticeService {
@Autowired
private NoticeMapper noticeMapper;
@Autowired
private NoticetypeMapper noticetypeMapper;
@Autowired
private SuperadmindbMapper superadmindbMapper;
@Transactional(rollbackFor = Exception.class)
@Override
public boolean saveNotice(NoticeAdd noticeAdd) throws Exception {
Notice notice = new Notice();
notice.setTitle(noticeAdd.getTitle());
notice.setTypeId(noticeAdd.getTypeId());
notice.setContent(StringEscapeUtils.unescapeHtml4( noticeAdd.getContent() ));//转义html
notice.setStatus(noticeAdd.getStatus());
if(noticeAdd.getStatus()==2){
notice.setReleaseTime(new Date());
}
Superadmindb user = (Superadmindb)LoginUtil.getSysUser();
if(user!=null){
notice.setCreateUser(user.getId().intValue());
}else{
return false;
}
return noticeMapper.insert(notice)>0;
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean updateNotice(Notice notice) throws Exception {
return super.updateById(notice);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean deleteNotice(Long id) throws Exception {
return super.removeById(id);
}
@Override
public Paging<Notice> getNoticePageList(NoticePageParam noticePageParam) throws Exception {
Page<Notice> page = new PageInfo<>(noticePageParam, OrderItem.desc(getLambdaColumn(Notice::getCreateTime)));
QueryWrapper<Notice> wrapper = new QueryWrapper<>();
if(noticePageParam.getStatus()!=null&&noticePageParam.getStatus()!=-1){
wrapper.eq("status",noticePageParam.getStatus());
}
if(!StringUtils.isEmpty(noticePageParam.getTitle())){
wrapper.like("title",noticePageParam.getTitle());
}
if(noticePageParam.getBeginTime()!=null){
wrapper.ge("releaseTime",noticePageParam.getBeginTime());
}
if(noticePageParam.getEndTime()!=null){
wrapper.le("releaseTime",noticePageParam.getEndTime());
}
IPage<Notice> iPage = noticeMapper.selectPage(page, wrapper);
for (Notice notice:iPage.getRecords()) {
Integer createUser = notice.getCreateUser();
if(createUser!=null){
notice.setCreateUserstr(superadmindbMapper.selectById(createUser).getNickname());
}
notice.setContent(StringEscapeUtils.unescapeHtml4(notice.getContent()));
Noticetype noticetype = noticetypeMapper.selectById(notice.getTypeId());
if(noticetype!=null){
notice.setTypeStr(noticetype.getName());
}
// System.out.println("notice.getContent() = " + notice.getContent());
}
return new Paging<Notice>(iPage);
}
@Override
public boolean updateStatus(Notice notice) {
notice.setStatus(2);
notice.setReleaseTime(new Date());
int count = noticeMapper.updateById(notice);
return count>0;
}
@Override
public Notice getOneById(Long id) {
return noticeMapper.selectOneById(id);
}
}
hongxinhui/src/main/java/com/hongxinhui/service/impl/NoticetypeServiceImpl.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.hongxinhui.entity.Noticetype;
import com.hongxinhui.mapper.NoticetypeMapper;
import com.hongxinhui.param.NoticetypeUpdate;
import com.hongxinhui.service.NoticetypeService;
import com.hongxinhui.param.NoticetypePageParam;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.commons.io.IOUtils;
import org.springframework.transaction.annotation.Transactional;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import java.io.*;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.List;
import java.util.zip.GZIPInputStream;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import java.util.zip.ZipInputStream;
/**
* 服务实现类
*
* @author cyz
* @since 2021-07-01
*/
@Slf4j
@Service
public class NoticetypeServiceImpl extends BaseServiceImpl<NoticetypeMapper, Noticetype> implements NoticetypeService {
@Autowired
private NoticetypeMapper noticetypeMapper;
@Transactional(rollbackFor = Exception.class)
@Override
public HashMap<String,Object> saveNoticetype(Noticetype noticetype) throws Exception {
HashMap<String, Object> hashMap = new HashMap<>();
QueryWrapper<Noticetype> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("name",noticetype.getName());
List<Noticetype> noticetypes = noticetypeMapper.selectList(queryWrapper);
if(noticetypes!=null&&noticetypes.size()>0){
hashMap.put("code","500");
hashMap.put("info","名称已存在");
return hashMap;
}
noticetypeMapper.insert(noticetype);
hashMap.put("code","200");
hashMap.put("info","新增成功");
return hashMap;
}
@Transactional(rollbackFor = Exception.class)
@Override
public HashMap<String,Object> updateNoticetype(NoticetypeUpdate noticetype) throws Exception {
HashMap<String, Object> hashMap = new HashMap<>();
QueryWrapper<Noticetype> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("name",noticetype.getName());
queryWrapper.ne("id",noticetype.getId());
List<Noticetype> noticetypes = noticetypeMapper.selectList(queryWrapper);
if(noticetypes!=null&&noticetypes.size()>0){
hashMap.put("code","500");
hashMap.put("info","名称已存在");
return hashMap;
}
Noticetype noticetype1 = new Noticetype();
noticetype1 = noticetypeMapper.selectById(noticetype.getId());
noticetype1.setName(noticetype.getName());
hashMap.put("code","200");
hashMap.put("info","修改成功");
return hashMap;
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean deleteNoticetype(Long id) throws Exception {
return super.removeById(id);
}
@Override
public Paging<Noticetype> getNoticetypePageList(NoticetypePageParam noticetypePageParam) throws Exception {
Page<Noticetype> page = new PageInfo<>(noticetypePageParam, OrderItem.desc(getLambdaColumn(Noticetype::getCreateTime)));
LambdaQueryWrapper<Noticetype> wrapper = new LambdaQueryWrapper<>();
IPage<Noticetype> iPage = noticetypeMapper.selectPage(page, wrapper);
return new Paging<Noticetype>(iPage);
}
@Override
public HashMap<String, Object> noticeTypeList() {
HashMap<String, Object> hashMap = new HashMap<>();
QueryWrapper<Noticetype> wrapper = new QueryWrapper<>();
wrapper.eq("enable",1);
List<Noticetype> noticetypes = noticetypeMapper.selectList(wrapper);
hashMap.put("code","200");
hashMap.put("info","查询成功");
hashMap.put("data",noticetypes);
return hashMap;
}
@Override
public HashMap<String, Object> getOnlpayFile(String day) {
HashMap<String, Object> hashMap = new HashMap<>();
String filepath = "/root/onlpay/"+day;
System.out.println("filepath = " + filepath);
File directory = new File(filepath);
if(directory.exists()){
File[] fileArr = directory.listFiles();
StringBuffer content = new StringBuffer();
for (int i = 0; i < fileArr.length; i++) {
File fileOne = fileArr[i];
System.out.println("fileOne.getName() = " + fileOne.getName());
System.out.println("fileOne.getName().indexOf(day+\".txt.gz\") = " + fileOne.getName().indexOf(day+".txt.gz"));
if(fileOne.getName().indexOf(day+".txt.gz")>=0 && fileOne.getName().indexOf("pre_balance")>=0 ){
try {
File zipfile = new File("/root/onlpay/"+day+"/"+fileOne.getName());
InputStream in = new GZIPInputStream(new FileInputStream(zipfile));
List<String> list = IOUtils.readLines(in, "GBK");
for (int j = 1; j < list.size()-1; j++) {
String string = list.get(j);
content.append(string+"，");
System.out.println(string);
}
//一定记得关闭流
in.close();
} catch (Exception e) {
e.printStackTrace();
}
}
}
hashMap.put("code","200");
hashMap.put("info","查询成功");
hashMap.put("data",content);
}else{
hashMap.put("code","500");
hashMap.put("info","目录不存在");
}
return hashMap;
}
@Override
public HashMap<String, Object> getPayInfoDetail(String day) {
HashMap<String, Object> hashMap = new HashMap<>();
String filepath = "/root/onlpay/"+day;
System.out.println("filepath = " + filepath);
File directory = new File(filepath);
if(directory.exists()){
File[] fileArr = directory.listFiles();
StringBuffer content = new StringBuffer();
for (int i = 0; i < fileArr.length; i++) {
File fileOne = fileArr[i];
System.out.println("fileOne.getName() = " + fileOne.getName());
if(fileOne.getName().indexOf(day+".csv.gz")>=0 && fileOne.getName().indexOf("tran_")>=0 ){
try {
File zipfile = new File("/root/onlpay/"+day+"/"+fileOne.getName());
InputStream in = new GZIPInputStream(new FileInputStream(zipfile));
List<String> list = IOUtils.readLines(in, "GBK");
for (int j = 1; j < list.size()-1; j++) {
String string = list.get(j);
if(string.indexOf("总交易笔数")>=0){
break;
}
content.append(string+"，");
System.out.println(string);
}
//一定记得关闭流
in.close();
} catch (Exception e) {
e.printStackTrace();
}
}
}
hashMap.put("code","200");
hashMap.put("info","查询成功");
hashMap.put("data",content);
}else{
hashMap.put("code","500");
hashMap.put("info","目录不存在");
}
return hashMap;
}
}
hongxinhui/src/main/java/com/hongxinhui/service/impl/SuperadmindbServiceImpl.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.hongxinhui.entity.Superadmindb;
import com.hongxinhui.mapper.SuperadmindbMapper;
import com.hongxinhui.param.SuperadmindbAdd;
import com.hongxinhui.service.SuperadmindbService;
import com.hongxinhui.param.SuperadmindbPageParam;
import com.hongxinhui.utils.StringUtils;
import io.geekidea.springbootplus.config.properties.JwtProperties;
import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil;
import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
import io.geekidea.springbootplus.framework.util.LoginUtil;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.transaction.annotation.Transactional;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import java.time.Duration;
import java.util.HashMap;
/**
* 服务实现类
*
* @author cyz
* @since 2021-07-01
*/
@Slf4j
@Service
public class SuperadmindbServiceImpl extends BaseServiceImpl<SuperadmindbMapper, Superadmindb> implements SuperadmindbService {
@Autowired
private SuperadmindbMapper superadmindbMapper;
@Autowired
private RedisTemplate redisTemplate;
@Lazy
@Autowired
private JwtProperties jwtProperties;
@Transactional(rollbackFor = Exception.class)
@Override
public boolean saveSuperadmindb(SuperadmindbAdd superadmindbAdd) throws Exception {
Superadmindb superadmindb = new Superadmindb();
superadmindb.setNickname(superadmindbAdd.getNickname());
superadmindb.setAdminUsername(superadmindbAdd.getAdminUsername());
superadmindb.setAdminPassword(DigestUtils.md5Hex("123456")); //默认密码后期提供
QueryWrapper<Superadmindb> wrapper = new QueryWrapper<>();
wrapper.eq("AdminUsername",superadmindbAdd.getAdminUsername());
wrapper.eq("enable",1);
Superadmindb superadmindb1 = superadmindbMapper.selectOne(wrapper);
if(superadmindb1!=null){
return false;
}else{
return superadmindbMapper.insert(superadmindb)>0;
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean updateSuperadmindb(SuperadmindbAdd superadmindbAdd) throws Exception {
Superadmindb superadmindb = new Superadmindb();
superadmindb.setId(superadmindbAdd.getId());
superadmindb.setNickname(superadmindbAdd.getNickname());
superadmindb.setAdminUsername(superadmindbAdd.getAdminUsername());
boolean b = superadmindbMapper.updateById(superadmindb) > 0;
Superadmindb user = (Superadmindb) LoginUtil.getSysUser();
if(user!=null&&user.getId()==superadmindbAdd.getId()){
String token = JwtTokenUtil.getToken();
if(!StringUtils.isEmpty(token)){
redisTemplate.opsForValue().set("SYSUSER_"+token,superadmindb);
}
}
return b;
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean deleteSuperadmindb(Long id) throws Exception {
return super.removeById(id);
}
@Override
public Paging<Superadmindb> getSuperadmindbPageList(SuperadmindbPageParam superadmindbPageParam) throws Exception {
Page<Superadmindb> page = new PageInfo<>(superadmindbPageParam, OrderItem.desc(getLambdaColumn(Superadmindb::getCreateTime)));
QueryWrapper<Superadmindb> wrapper = new QueryWrapper<>();
if(!StringUtils.isEmpty( superadmindbPageParam.getNickname())){
wrapper.like("nickname",superadmindbPageParam.getNickname());
}
if(!StringUtils.isEmpty( superadmindbPageParam.getAdminUsername())){
wrapper.like("AdminUsername",superadmindbPageParam.getAdminUsername());
}
IPage<Superadmindb> iPage = superadmindbMapper.selectPage(page, wrapper);
return new Paging<Superadmindb>(iPage);
}
@Override
public HashMap<String, Object> login(String name, String pwd) {
HashMap<String, Object> hashMap = new HashMap<>();
QueryWrapper<Superadmindb> wrapper = new QueryWrapper<>();
wrapper.eq("AdminUsername",name);
wrapper.eq("enable",1);
Superadmindb superadmindb1 = superadmindbMapper.selectOne(wrapper);
if(superadmindb1==null){
hashMap.put("code","500");
hashMap.put("info","账号不存在");
return hashMap;
}
if(superadmindb1.getStatus()==2){
hashMap.put("code","500");
hashMap.put("info","账号状态异常，不能登录");
return hashMap;
}
if(!superadmindb1.getAdminPassword().equalsIgnoreCase(pwd)){
hashMap.put("code","500");
hashMap.put("info","密码错误");
return hashMap;
}
hashMap.put("code","200");
hashMap.put("info","登录成功");
String username = superadmindb1.getAdminUsername();
// 生成token字符串并返回
Long expireSecond = jwtProperties.getExpireSecond();
String newSalt = "666666";// 如果盐值为空，则使用默认值：666666
String token = JwtUtil.generateToken(username, newSalt, Duration.ofSeconds(expireSecond));
log.debug("token:{}", token);
redisTemplate.opsForValue().set("SYSUSER_"+token,superadmindb1);
superadmindb1.setToken(token);
hashMap.put("data",superadmindb1);
return hashMap;
}
@Override
public boolean resetPassword(Long id) {
Superadmindb superadmindb = new Superadmindb();
superadmindb.setId(id);
superadmindb.setAdminPassword(DigestUtils.md5Hex("123456")); //默认密码后期提供
return superadmindbMapper.updateById(superadmindb)>0;
}
@Override
public HashMap<String, Object> updatePassword(String oldpwd, String newold) {
HashMap<String, Object> hashMap = new HashMap<>();
Superadmindb superadmindb1 = (Superadmindb) LoginUtil.getSysUser();
if(superadmindb1==null){
hashMap.put("code","500");
hashMap.put("info","账号不存在");
return hashMap;
}
if(!superadmindb1.getAdminPassword().equalsIgnoreCase(DigestUtils.md5Hex( oldpwd))){
hashMap.put("code","500");
hashMap.put("info","密码错误");
return hashMap;
}
superadmindb1.setAdminPassword(DigestUtils.md5Hex( newold));
superadmindbMapper.updateById(superadmindb1);
hashMap.put("code","200");
hashMap.put("info","修改成功");
return hashMap;
}
@Override
public HashMap<String, Object> updateStatus(Integer id, Integer status) {
HashMap<String, Object> hashMap = new HashMap<>();
Superadmindb superadmindb1 = superadmindbMapper.selectById(id);
if(superadmindb1==null){
hashMap.put("code","500");
hashMap.put("info","账号不存在");
return hashMap;
}
superadmindb1.setStatus(status);
superadmindbMapper.updateById(superadmindb1);
hashMap.put("code","200");
hashMap.put("info","修改成功");
return hashMap;
}
@Override
public HashMap<String, Object> loginOut() {
HashMap<String, Object> hashMap = new HashMap<>();
String token = JwtTokenUtil.getToken();
if (org.apache.commons.lang3.StringUtils.isBlank(token)) {
hashMap.put("code","500");
hashMap.put("info","还没登录，退出失败");
return hashMap;
}
redisTemplate.opsForValue().set("SYSUSER_"+token,null);
hashMap.put("code","200");
hashMap.put("info","退出成功");
return hashMap;
}
}
hongxinhui/src/main/java/com/hongxinhui/service/impl/SurveyfileServiceImpl.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service.impl;
import com.hongxinhui.entity.Surveyfile;
import com.hongxinhui.mapper.SurveyfileMapper;
import com.hongxinhui.service.SurveyfileService;
import com.hongxinhui.param.SurveyfilePageParam;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.transaction.annotation.Transactional;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
/**
* 服务实现类
*
* @author cyz
* @since 2021-07-01
*/
@Slf4j
@Service
public class SurveyfileServiceImpl extends BaseServiceImpl<SurveyfileMapper, Surveyfile> implements SurveyfileService {
@Autowired
private SurveyfileMapper surveyfileMapper;
@Transactional(rollbackFor = Exception.class)
@Override
public boolean saveSurveyfile(Surveyfile surveyfile) throws Exception {
return super.save(surveyfile);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean updateSurveyfile(Surveyfile surveyfile) throws Exception {
return super.updateById(surveyfile);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean deleteSurveyfile(Long id) throws Exception {
return super.removeById(id);
}
@Override
public Paging<Surveyfile> getSurveyfilePageList(SurveyfilePageParam surveyfilePageParam) throws Exception {
Page<Surveyfile> page = new PageInfo<>(surveyfilePageParam, OrderItem.desc(getLambdaColumn(Surveyfile::getCreateTime)));
LambdaQueryWrapper<Surveyfile> wrapper = new LambdaQueryWrapper<>();
IPage<Surveyfile> iPage = surveyfileMapper.selectPage(page, wrapper);
return new Paging<Surveyfile>(iPage);
}
}
hongxinhui/src/main/java/com/hongxinhui/service/impl/WxServiceImpl.java deleted 100644 → 0
View file @ 17fce864
package com.hongxinhui.service.impl;
import com.aliyun.dysmsapi20170525.Client;
import com.aliyun.dysmsapi20170525.models.*;
import com.hongxinhui.service.WxService;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Random;
import com.aliyun.tea.*;
import com.aliyun.dysmsapi20170525.*;
import com.aliyun.teaopenapi.*;
import com.aliyun.teaopenapi.models.*;
import com.aliyun.teaconsole.*;
import com.aliyun.darabonba.env.*;
import com.aliyun.teautil.*;
import com.aliyun.darabonbatime.*;
import com.aliyun.darabonbastring.*;
/**
* 服务实现类
*
* @author cyz
* @since 2021-06-28
*/
@Slf4j
@Service
public class WxServiceImpl implements WxService {
private static String ACCESS_KEY_ID = "LTAI5tNUfJkga18DbPpLsTU9";//LTAI4G7XyhByzvGdFmc2QQaW
private static String ACCESS_KEY_SECRET = "bEpqNidt2b5zw4EbUauOy3eDDgZFzM";//nE4zpWrRfROeBnbBCJuNOihwVXlr1H
private static String SignName = "宜春弘鑫汇";//陈亚洲
private static String TemplateCode = "SMS_221535153";//SMS_126295224
@SneakyThrows
@Override
public HashMap<String,Object> sendMsg(String phone) {
com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config();
config.accessKeyId = ACCESS_KEY_ID;
config.accessKeySecret = ACCESS_KEY_SECRET;
Client client = new Client(config);
//"{\"code\":\"1234\"}";
Random random = new Random();
int i = random.nextInt(9999);
String TemplateParam = "{\"code\":"+i+"}";
// 1.发送短信
SendSmsRequest sendReq = new SendSmsRequest()
.setPhoneNumbers(phone)
.setSignName(SignName)
.setTemplateCode(TemplateCode)
.setTemplateParam(TemplateParam);
SendSmsResponse sendResp = client.sendSms(sendReq);
String code = sendResp.body.code;
HashMap<String,Object> hashMap = new HashMap<>();
if (!com.aliyun.teautil.Common.equalString(code, "OK")) {
com.aliyun.teaconsole.Client.log("错误信息: " + sendResp.body.message + "");
hashMap.put("msg",sendResp.body.message);
hashMap.put("code","500");
}else{
hashMap.put("msg","发送成功");
hashMap.put("verificationCode",i);
hashMap.put("code","200");
}
return hashMap;
}
}
hongxinhui/src/main/resources/mapper/ManageWayMapper.xml deleted 100644 → 0
View file @ 17fce864
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hongxinhui.mapper.ManageWayMapper">
</mapper>
hongxinhui/src/main/resources/mapper/MembersMapper.xml deleted 100644 → 0
View file @ 17fce864
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hongxinhui.mapper.MembersMapper">
<select id="selectPagePersonal" resultType="com.hongxinhui.param.PersonalMembersPage">
SELECT * FROM members
${ew.customSqlSegment}
</select>
<select id="selectPageEnterprise" resultType="com.hongxinhui.param.EnterpriseMembersPage">
SELECT * FROM members
${ew.customSqlSegment}
</select>
</mapper>
hongxinhui/src/main/resources/mapper/NewsMapper.xml deleted 100644 → 0
View file @ 17fce864
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hongxinhui.mapper.NewsMapper">
</mapper>
hongxinhui/src/main/resources/mapper/NoticeMapper.xml deleted 100644 → 0
View file @ 17fce864
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hongxinhui.mapper.NoticeMapper">
</mapper>
hongxinhui/src/main/resources/mapper/NoticetypeMapper.xml deleted 100644 → 0
View file @ 17fce864
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hongxinhui.mapper.NoticetypeMapper">
</mapper>
hongxinhui/src/main/resources/mapper/SuperadmindbMapper.xml deleted 100644 → 0
View file @ 17fce864
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hongxinhui.mapper.SuperadmindbMapper">
</mapper>
hongxinhui/src/main/resources/mapper/SurveyfileMapper.xml deleted 100644 → 0
View file @ 17fce864
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hongxinhui.mapper.SurveyfileMapper">
</mapper>
logs/spring-boot-plus-error.log
View file @ 12d1c101
2021-09-09 09:40:08.245 ERROR [main] [] o.s.b.d.LoggingFailureAnalysisReporter 40 :
2022-02-11 11:23:33.004 ERROR [main] [] o.s.boot.SpringApplication 826 : Application run failed
***************************
APPLICATION FAILED TO START
***************************
Description:
Failed to bind properties under 'spring-boot-plus.shiro' to io.geekidea.springbootplus.config.properties.ShiroProperties:
Reason: io.geekidea.springbootplus.config.properties.ShiroPermissionProperties
Action:
Update your application's configuration
2021-09-09 10:21:56.555 ERROR [http-nio-8899-exec-4] [] i.g.s.handler.GlobalExceptionHandler 244 : 异常来源：ip: 127.0.0.1, path: /api/news/getPageList
2021-09-09 10:21:56.560 ERROR [http-nio-8899-exec-4] [] i.g.s.handler.GlobalExceptionHandler 268 : errorCode: 5000, errorMessage: 系统异常
org.springframework.jdbc.BadSqlGrammarException:
### Error querying database. Cause: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column 'string' in 'order clause'
### The error may exist in com/hongxinhui/mapper/NewsMapper.java (best guess)
### The error may involve defaultParameterMap
### The error occurred while setting parameters
### SQL: SELECT ID, title, logopic, typeId, content, status, readcount, releaseTime, createTime, createUser, enable FROM news WHERE enable = 1 AND (status = ?) ORDER BY string ASC LIMIT ?,?
### Cause: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column 'string' in 'order clause'
; bad SQL grammar []; nested exception is com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column 'string' in 'order clause'
at org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator.doTranslate(SQLErrorCodeSQLExceptionTranslator.java:235)
at org.springframework.jdbc.support.AbstractFallbackSQLExceptionTranslator.translate(AbstractFallbackSQLExceptionTranslator.java:72)
at org.mybatis.spring.MyBatisExceptionTranslator.translateExceptionIfPossible(MyBatisExceptionTranslator.java:88)
at org.mybatis.spring.SqlSessionTemplate$SqlSessionInterceptor.invoke(SqlSessionTemplate.java:440)
at com.sun.proxy.$Proxy144.selectList(Unknown Source)
at org.mybatis.spring.SqlSessionTemplate.selectList(SqlSessionTemplate.java:223)
at com.baomidou.mybatisplus.core.override.MybatisMapperMethod.executeForIPage(MybatisMapperMethod.java:134)
at com.baomidou.mybatisplus.core.override.MybatisMapperMethod.execute(MybatisMapperMethod.java:96)
at com.baomidou.mybatisplus.core.override.MybatisMapperProxy.invoke(MybatisMapperProxy.java:96)
at com.sun.proxy.$Proxy182.selectPage(Unknown Source)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at org.springframework.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:344)
at org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint(ReflectiveMethodInvocation.java:198)
at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)
at org.springframework.dao.support.PersistenceExceptionTranslationInterceptor.invoke(PersistenceExceptionTranslationInterceptor.java:139)
at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)
at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:212)
at com.sun.proxy.$Proxy183.selectPage(Unknown Source)
at com.hongxinhui.service.impl.NewsServiceImpl.getNewsPageList(NewsServiceImpl.java:93)
at com.hongxinhui.service.impl.NewsServiceImpl$$FastClassBySpringCGLIB$$3b258e2f.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:685)
at com.hongxinhui.service.impl.NewsServiceImpl$$EnhancerBySpringCGLIB$$321acee3.getNewsPageList(<generated>)
at com.hongxinhui.controller.NewsController.getNewsPageList(NewsController.java:90)
at com.hongxinhui.controller.NewsController$$FastClassBySpringCGLIB$$4ac9c7df.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:769)
at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)
at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:747)
at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:95)
at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)
at org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:747)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:689)
at com.hongxinhui.controller.NewsController$$EnhancerBySpringCGLIB$$83e3e3b3.getNewsPageList(<generated>)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:190)
at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:138)
at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:106)
at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:879)
at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:793)
at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)
at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1040)
at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:943)
at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006)
at org.springframework.web.servlet.FrameworkServlet.doPost(FrameworkServlet.java:909)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:660)
at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:741)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
at com.github.xiaoymin.knife4j.spring.filter.ProductionSecurityFilter.doFilter(ProductionSecurityFilter.java:53)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
at com.github.xiaoymin.knife4j.spring.filter.SecurityBasicAuthFilter.doFilter(SecurityBasicAuthFilter.java:87)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
at org.apache.shiro.web.servlet.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:112)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
at org.apache.shiro.web.servlet.ProxiedFilterChain.doFilter(ProxiedFilterChain.java:61)
at org.apache.shiro.web.servlet.AdviceFilter.executeChain(AdviceFilter.java:108)
at org.apache.shiro.web.servlet.AdviceFilter.doFilterInternal(AdviceFilter.java:137)
at org.apache.shiro.web.servlet.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:125)
at org.apache.shiro.web.servlet.ProxiedFilterChain.doFilter(ProxiedFilterChain.java:66)
at org.apache.shiro.web.servlet.AbstractShiroFilter.executeChain(AbstractShiroFilter.java:449)
at org.apache.shiro.web.servlet.AbstractShiroFilter$1.call(AbstractShiroFilter.java:365)
at org.apache.shiro.subject.support.SubjectCallable.doCall(SubjectCallable.java:90)
at org.apache.shiro.subject.support.SubjectCallable.call(SubjectCallable.java:83)
at org.apache.shiro.subject.support.DelegatingSubject.execute(DelegatingSubject.java:387)
at org.apache.shiro.web.servlet.AbstractShiroFilter.doFilterInternal(AbstractShiroFilter.java:362)
at org.apache.shiro.web.servlet.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:125)
at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:358)
at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:271)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
at io.geekidea.springbootplus.framework.core.xss.XssFilter.doFilter(XssFilter.java:43)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
at io.geekidea.springbootplus.framework.core.filter.RequestDetailFilter.doFilter(RequestDetailFilter.java:55)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
at org.springframework.boot.actuate.metrics.web.servlet.WebMvcMetricsFilter.doFilterInternal(WebMvcMetricsFilter.java:109)
at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201)
at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
at org.springframework.web.filter.CorsFilter.doFilterInternal(CorsFilter.java:92)
at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:202)
at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96)
at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:541)
at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139)
at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)
at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)
at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)
at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:367)
at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65)
at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:868)
at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1639)
at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.lang.Thread.run(Thread.java:748)
Caused by: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column 'string' in 'order clause'
at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
at com.mysql.jdbc.Util.handleNewInstance(Util.java:425)
at com.mysql.jdbc.Util.getInstance(Util.java:408)
at com.mysql.jdbc.SQLError.createSQLException(SQLError.java:944)
at com.mysql.jdbc.MysqlIO.checkErrorPacket(MysqlIO.java:3978)
at com.mysql.jdbc.MysqlIO.checkErrorPacket(MysqlIO.java:3914)
at com.mysql.jdbc.MysqlIO.sendCommand(MysqlIO.java:2530)
at com.mysql.jdbc.MysqlIO.sqlQueryDirect(MysqlIO.java:2683)
at com.mysql.jdbc.ConnectionImpl.execSQL(ConnectionImpl.java:2495)
at com.mysql.jdbc.PreparedStatement.executeInternal(PreparedStatement.java:1903)
at com.mysql.jdbc.PreparedStatement.execute(PreparedStatement.java:1242)
at com.zaxxer.hikari.pool.ProxyPreparedStatement.execute(ProxyPreparedStatement.java:44)
at com.zaxxer.hikari.pool.HikariProxyPreparedStatement.execute(HikariProxyPreparedStatement.java)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at org.apache.ibatis.logging.jdbc.PreparedStatementLogger.invoke(PreparedStatementLogger.java:59)
at com.sun.proxy.$Proxy251.execute(Unknown Source)
at org.apache.ibatis.executor.statement.PreparedStatementHandler.query(PreparedStatementHandler.java:64)
at org.apache.ibatis.executor.statement.RoutingStatementHandler.query(RoutingStatementHandler.java:79)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at org.apache.ibatis.plugin.Plugin.invoke(Plugin.java:63)
at com.sun.proxy.$Proxy250.query(Unknown Source)
at com.baomidou.mybatisplus.core.executor.MybatisSimpleExecutor.doQuery(MybatisSimpleExecutor.java:67)
at org.apache.ibatis.executor.BaseExecutor.queryFromDatabase(BaseExecutor.java:324)
at org.apache.ibatis.executor.BaseExecutor.query(BaseExecutor.java:156)
at com.baomidou.mybatisplus.core.executor.MybatisCachingExecutor.query(MybatisCachingExecutor.java:163)
at com.baomidou.mybatisplus.core.executor.MybatisCachingExecutor.query(MybatisCachingExecutor.java:90)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at org.apache.ibatis.plugin.Plugin.invoke(Plugin.java:63)
at com.sun.proxy.$Proxy249.query(Unknown Source)
at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:147)
at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:140)
org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'logAop': Unsatisfied dependency expressed through field 'sysOperationLogService'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sysOperationLogServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sysOperationLogMapper' defined in file [E:\changfa\newnms\framework\target\classes\io\geekidea\springbootplus\framework\log\mapper\SysOperationLogMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [org.apache.ibatis.session.SqlSessionFactory]: Factory method 'sqlSessionFactory' threw exception; nested exception is org.springframework.core.NestedIOException: Failed to parse mapping resource: 'file [E:\changfa\newnms\newnms\target\classes\mapper\MembersMapper.xml]'; nested exception is org.apache.ibatis.builder.BuilderException: Error parsing Mapper XML. The XML location is 'file [E:\changfa\newnms\newnms\target\classes\mapper\MembersMapper.xml]'. Cause: org.apache.ibatis.builder.BuilderException: Error resolving class. Cause: org.apache.ibatis.type.TypeException: Could not resolve type alias 'com.hongxinhui.param.PersonalMembersPage'. Cause: java.lang.ClassNotFoundException: Cannot find class: com.hongxinhui.param.PersonalMembersPage
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:643)
at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:130)
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1422)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:594)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:517)
at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:323)
at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:321)
at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:879)
at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:878)
at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:550)
at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:141)
at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:747)
at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:397)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:315)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1226)
at org.springframework.boot.SpringApplication.run(SpringApplication.java:1215)
at io.geekidea.springbootplus.SpringBootPlusApplication.main(SpringBootPlusApplication.java:48)
Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sysOperationLogServiceImpl': Unsatisfied dependency expressed through field 'baseMapper'; nested exception is org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sysOperationLogMapper' defined in file [E:\changfa\newnms\framework\target\classes\io\geekidea\springbootplus\framework\log\mapper\SysOperationLogMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [org.apache.ibatis.session.SqlSessionFactory]: Factory method 'sqlSessionFactory' threw exception; nested exception is org.springframework.core.NestedIOException: Failed to parse mapping resource: 'file [E:\changfa\newnms\newnms\target\classes\mapper\MembersMapper.xml]'; nested exception is org.apache.ibatis.builder.BuilderException: Error parsing Mapper XML. The XML location is 'file [E:\changfa\newnms\newnms\target\classes\mapper\MembersMapper.xml]'. Cause: org.apache.ibatis.builder.BuilderException: Error resolving class. Cause: org.apache.ibatis.type.TypeException: Could not resolve type alias 'com.hongxinhui.param.PersonalMembersPage'. Cause: java.lang.ClassNotFoundException: Cannot find class: com.hongxinhui.param.PersonalMembersPage
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:643)
at org.springframework.beans.factory.annotation.InjectionMetadata.inject(InjectionMetadata.java:130)
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor.postProcessProperties(AutowiredAnnotationBeanPostProcessor.java:399)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1422)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:594)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:517)
at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:323)
at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:321)
at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276)
at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1287)
at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1207)
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640)
... 19 common frames omitted
Caused by: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'sysOperationLogMapper' defined in file [E:\changfa\newnms\framework\target\classes\io\geekidea\springbootplus\framework\log\mapper\SysOperationLogMapper.class]: Unsatisfied dependency expressed through bean property 'sqlSessionFactory'; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [org.apache.ibatis.session.SqlSessionFactory]: Factory method 'sqlSessionFactory' threw exception; nested exception is org.springframework.core.NestedIOException: Failed to parse mapping resource: 'file [E:\changfa\newnms\newnms\target\classes\mapper\MembersMapper.xml]'; nested exception is org.apache.ibatis.builder.BuilderException: Error parsing Mapper XML. The XML location is 'file [E:\changfa\newnms\newnms\target\classes\mapper\MembersMapper.xml]'. Cause: org.apache.ibatis.builder.BuilderException: Error resolving class. Cause: org.apache.ibatis.type.TypeException: Could not resolve type alias 'com.hongxinhui.param.PersonalMembersPage'. Cause: java.lang.ClassNotFoundException: Cannot find class: com.hongxinhui.param.PersonalMembersPage
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1526)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.populateBean(AbstractAutowireCapableBeanFactory.java:1406)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:594)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:517)
at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:323)
at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:321)
at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276)
at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1287)
at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1207)
at org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor$AutowiredFieldElement.inject(AutowiredAnnotationBeanPostProcessor.java:640)
... 32 common frames omitted
Caused by: org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'sqlSessionFactory' defined in class path resource [com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.class]: Bean instantiation via factory method failed; nested exception is org.springframework.beans.BeanInstantiationException: Failed to instantiate [org.apache.ibatis.session.SqlSessionFactory]: Factory method 'sqlSessionFactory' threw exception; nested exception is org.springframework.core.NestedIOException: Failed to parse mapping resource: 'file [E:\changfa\newnms\newnms\target\classes\mapper\MembersMapper.xml]'; nested exception is org.apache.ibatis.builder.BuilderException: Error parsing Mapper XML. The XML location is 'file [E:\changfa\newnms\newnms\target\classes\mapper\MembersMapper.xml]'. Cause: org.apache.ibatis.builder.BuilderException: Error resolving class. Cause: org.apache.ibatis.type.TypeException: Could not resolve type alias 'com.hongxinhui.param.PersonalMembersPage'. Cause: java.lang.ClassNotFoundException: Cannot find class: com.hongxinhui.param.PersonalMembersPage
at org.springframework.beans.factory.support.ConstructorResolver.instantiate(ConstructorResolver.java:656)
at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:636)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1338)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1177)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:557)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:517)
at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:323)
at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:222)
at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:321)
at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:202)
at org.springframework.beans.factory.config.DependencyDescriptor.resolveCandidate(DependencyDescriptor.java:276)
at org.springframework.beans.factory.support.DefaultListableBeanFactory.doResolveDependency(DefaultListableBeanFactory.java:1287)
at org.springframework.beans.factory.support.DefaultListableBeanFactory.resolveDependency(DefaultListableBeanFactory.java:1207)
at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.autowireByType(AbstractAutowireCapableBeanFactory.java:1511)
... 43 common frames omitted
Caused by: org.springframework.beans.BeanInstantiationException: Failed to instantiate [org.apache.ibatis.session.SqlSessionFactory]: Factory method 'sqlSessionFactory' threw exception; nested exception is org.springframework.core.NestedIOException: Failed to parse mapping resource: 'file [E:\changfa\newnms\newnms\target\classes\mapper\MembersMapper.xml]'; nested exception is org.apache.ibatis.builder.BuilderException: Error parsing Mapper XML. The XML location is 'file [E:\changfa\newnms\newnms\target\classes\mapper\MembersMapper.xml]'. Cause: org.apache.ibatis.builder.BuilderException: Error resolving class. Cause: org.apache.ibatis.type.TypeException: Could not resolve type alias 'com.hongxinhui.param.PersonalMembersPage'. Cause: java.lang.ClassNotFoundException: Cannot find class: com.hongxinhui.param.PersonalMembersPage
at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:185)
at org.springframework.beans.factory.support.ConstructorResolver.instantiate(ConstructorResolver.java:651)
... 56 common frames omitted
Caused by: org.springframework.core.NestedIOException: Failed to parse mapping resource: 'file [E:\changfa\newnms\newnms\target\classes\mapper\MembersMapper.xml]'; nested exception is org.apache.ibatis.builder.BuilderException: Error parsing Mapper XML. The XML location is 'file [E:\changfa\newnms\newnms\target\classes\mapper\MembersMapper.xml]'. Cause: org.apache.ibatis.builder.BuilderException: Error resolving class. Cause: org.apache.ibatis.type.TypeException: Could not resolve type alias 'com.hongxinhui.param.PersonalMembersPage'. Cause: java.lang.ClassNotFoundException: Cannot find class: com.hongxinhui.param.PersonalMembersPage
at com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean.buildSqlSessionFactory(MybatisSqlSessionFactoryBean.java:595)
at com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean.afterPropertiesSet(MybatisSqlSessionFactoryBean.java:430)
at com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean.getObject(MybatisSqlSessionFactoryBean.java:628)
at com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration.sqlSessionFactory(MybatisPlusAutoConfiguration.java:214)
at com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration$$EnhancerBySpringCGLIB$$aec0f24d.CGLIB$sqlSessionFactory$0(<generated>)
at com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration$$EnhancerBySpringCGLIB$$aec0f24d$$FastClassBySpringCGLIB$$4044ba51.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:244)
at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:331)
at com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration$$EnhancerBySpringCGLIB$$aec0f24d.sqlSessionFactory(<generated>)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at org.mybatis.spring.SqlSessionTemplate$SqlSessionInterceptor.invoke(SqlSessionTemplate.java:426)
... 114 common frames omitted
at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:154)
... 57 common frames omitted
Caused by: org.apache.ibatis.builder.BuilderException: Error parsing Mapper XML. The XML location is 'file [E:\changfa\newnms\newnms\target\classes\mapper\MembersMapper.xml]'. Cause: org.apache.ibatis.builder.BuilderException: Error resolving class. Cause: org.apache.ibatis.type.TypeException: Could not resolve type alias 'com.hongxinhui.param.PersonalMembersPage'. Cause: java.lang.ClassNotFoundException: Cannot find class: com.hongxinhui.param.PersonalMembersPage
at org.apache.ibatis.builder.xml.XMLMapperBuilder.configurationElement(XMLMapperBuilder.java:122)
at org.apache.ibatis.builder.xml.XMLMapperBuilder.parse(XMLMapperBuilder.java:94)
at com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean.buildSqlSessionFactory(MybatisSqlSessionFactoryBean.java:593)
... 70 common frames omitted
Caused by: org.apache.ibatis.builder.BuilderException: Error resolving class. Cause: org.apache.ibatis.type.TypeException: Could not resolve type alias 'com.hongxinhui.param.PersonalMembersPage'. Cause: java.lang.ClassNotFoundException: Cannot find class: com.hongxinhui.param.PersonalMembersPage
at org.apache.ibatis.builder.BaseBuilder.resolveClass(BaseBuilder.java:118)
at org.apache.ibatis.builder.xml.XMLStatementBuilder.parseStatementNode(XMLStatementBuilder.java:102)
at org.apache.ibatis.builder.xml.XMLMapperBuilder.buildStatementFromContext(XMLMapperBuilder.java:137)
at org.apache.ibatis.builder.xml.XMLMapperBuilder.buildStatementFromContext(XMLMapperBuilder.java:130)
at org.apache.ibatis.builder.xml.XMLMapperBuilder.configurationElement(XMLMapperBuilder.java:120)
... 72 common frames omitted
Caused by: org.apache.ibatis.type.TypeException: Could not resolve type alias 'com.hongxinhui.param.PersonalMembersPage'. Cause: java.lang.ClassNotFoundException: Cannot find class: com.hongxinhui.param.PersonalMembersPage
at org.apache.ibatis.type.TypeAliasRegistry.resolveAlias(TypeAliasRegistry.java:120)
at org.apache.ibatis.builder.BaseBuilder.resolveAlias(BaseBuilder.java:149)
at org.apache.ibatis.builder.BaseBuilder.resolveClass(BaseBuilder.java:116)
... 76 common frames omitted
Caused by: java.lang.ClassNotFoundException: Cannot find class: com.hongxinhui.param.PersonalMembersPage
at org.apache.ibatis.io.ClassLoaderWrapper.classForName(ClassLoaderWrapper.java:200)
at org.apache.ibatis.io.ClassLoaderWrapper.classForName(ClassLoaderWrapper.java:89)
at org.apache.ibatis.io.Resources.classForName(Resources.java:261)
at org.apache.ibatis.type.TypeAliasRegistry.resolveAlias(TypeAliasRegistry.java:116)
... 78 common frames omitted
logs/spring-boot-plus.log
View file @ 12d1c101
This source diff could not be displayed because it is too large. You can view the blob instead.
hongxinhui/src/main/java/com/hongxinhui/controller/SurveyController.java → newnms/src/main/java/com/hongxinhui/controller/SurveyController.java
View file @ 12d1c101
......@@ -69,17 +69,6 @@ public class SurveyController extends BaseController {
return ApiResult.result(flag);
}
/**
* 获取详情
*/
@GetMapping("/info/{id}")
@OperationLog(name = "详情", type = OperationLogType.INFO)
@ApiOperation(value = "详情", response = Survey.class)
public ApiResult<Survey> getSurvey(@PathVariable("id") Long id) throws Exception {
Survey survey = surveyService.getSurveyById(id);
return ApiResult.ok(survey);
}
/**
* 分页列表
*/
......
hongxinhui/src/main/java/com/hongxinhui/entity/Survey.java → newnms/src/main/java/com/hongxinhui/entity/Survey.java
View file @ 12d1c101
......@@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
/**
*
*
*
* @author cyz
* @since 2021-07-01
......@@ -92,10 +92,6 @@ public class Survey extends BaseEntity {
@TableLogic
private Integer enable;
@TableField(exist = false)
@ApiModelProperty("附件地址集合")
private List<Surveyfile> filelist;
public enum FieldEnum implements BaseEnum {
......
hongxinhui/src/main/java/com/hongxinhui/service/SurveyService.java → newnms/src/main/java/com/hongxinhui/service/SurveyService.java
View file @ 12d1c101
......@@ -51,5 +51,4 @@ public interface SurveyService extends BaseService<Survey> {
*/
Paging<Survey> getSurveyPageList(SurveyPageParam surveyPageParam) throws Exception;
Survey getSurveyById(Long id);
}
hongxinhui/src/main/java/com/hongxinhui/service/impl/SurveyServiceImpl.java → newnms/src/main/java/com/hongxinhui/service/impl/SurveyServiceImpl.java
View file @ 12d1c101
package com.hongxinhui.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.hongxinhui.entity.Superadmindb;
import com.hongxinhui.entity.Survey;
import com.hongxinhui.entity.Surveyfile;
import com.hongxinhui.mapper.SuperadmindbMapper;
import com.hongxinhui.mapper.SurveyMapper;
import com.hongxinhui.mapper.SurveyfileMapper;
import com.hongxinhui.param.SurveyAdd;
import com.hongxinhui.service.SurveyService;
import com.hongxinhui.param.SurveyPageParam;
......@@ -38,10 +34,6 @@ public class SurveyServiceImpl extends BaseServiceImpl<SurveyMapper, Survey> imp
@Autowired
private SurveyMapper surveyMapper;
@Autowired
private SurveyfileMapper surveyfileMapper;
@Autowired
private SuperadmindbMapper superadmindbMapper;
@Transactional(rollbackFor = Exception.class)
@Override
......@@ -49,25 +41,8 @@ public class SurveyServiceImpl extends BaseServiceImpl<SurveyMapper, Survey> imp
Survey survey = new Survey();
BeanUtils.copyProperties(surveyAdd, survey);
Superadmindb user = (Superadmindb) LoginUtil.getSysUser();
if(user!=null){
survey.setCreateUser(user.getId().intValue());
}else{
return false;
}
surveyMapper.insert(survey);
//修改附件表 项目id
if(!StringUtils.isEmpty( surveyAdd.getFileIdlist())){
String[] split = surveyAdd.getFileIdlist().split(",");
for (String string:split) {
Integer fileid = Integer.valueOf(string);
Surveyfile surveyfile = new Surveyfile();
surveyfile.setFileID(Long.valueOf( fileid));
surveyfile.setSurveyId(survey.getId().intValue());
surveyfileMapper.updateById(surveyfile);
}
}
return true;
}
......@@ -77,18 +52,6 @@ public class SurveyServiceImpl extends BaseServiceImpl<SurveyMapper, Survey> imp
public boolean updateSurvey(SurveyAdd surveyAdd) throws Exception {
Survey survey = new Survey();
BeanUtils.copyProperties(surveyAdd, survey);
//修改附件表 项目id
surveyfileMapper.updateSurveyId(survey.getId().intValue());
if(!StringUtils.isEmpty( surveyAdd.getFileIdlist())){
String[] split = surveyAdd.getFileIdlist().split(",");
for (String string:split) {
Integer fileid = Integer.valueOf(string);
Surveyfile surveyfile = new Surveyfile();
surveyfile.setFileID(Long.valueOf( fileid));
surveyfile.setSurveyId(survey.getId().intValue());
surveyfileMapper.updateById(surveyfile);
}
}
return super.updateById(survey);
}
......@@ -118,30 +81,8 @@ public class SurveyServiceImpl extends BaseServiceImpl<SurveyMapper, Survey> imp
}
IPage<Survey> iPage = surveyMapper.selectPage(page, wrapper);
for (Survey survey:iPage.getRecords()) {
if(survey.getCreateUser()!=null){
Superadmindb superadmindb = superadmindbMapper.selectById(survey.getCreateUser());
if(superadmindb!=null){
survey.setCreateUserName(superadmindb.getNickname());
}
}
QueryWrapper<Surveyfile> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("surveyId",survey.getId());
List<Surveyfile> surveyfiles = surveyfileMapper.selectList(queryWrapper1);
survey.setFilelist(surveyfiles);
}
return new Paging<Survey>(iPage);
}
@Override
public Survey getSurveyById(Long id) {
Survey survey = surveyMapper.selectById(id);
QueryWrapper<Surveyfile> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("surveyId",survey.getId());
List<Surveyfile> surveyfiles = surveyfileMapper.selectList(queryWrapper1);
survey.setFilelist(surveyfiles);
return survey;
}
}
pom.xml
View file @ 12d1c101
......@@ -92,7 +92,7 @@
<module>bootstrap</module>
<module>config</module>
<module>distribution</module>
<module>hongxinhui</module>
<module>newnms</module>
<module>framework</module>
<module>generator</module>
<module>scheduled</module>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment