From 49503838f8dba3ae7328cdbbdef29f6c9f69deee Mon Sep 17 00:00:00 2001
From: licc <lichuchuan@jtep.com.cn>
Date: Sat, 20 Feb 2021 17:50:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E6=A8=A1?=
=?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cn/wisenergy/mapper/AccountMapper.java | 16 -
.../wisenergy/mapper/AdmissionRuleMapper.java | 18 -
.../cn/wisenergy/mapper/BannerMapper.java | 65 --
.../java/cn/wisenergy/mapper/CardMapper.java | 43 -
.../cn/wisenergy/mapper/GraduationMapper.java | 16 -
.../wisenergy/mapper/LoginRecordMapper.java | 32 -
.../cn/wisenergy/mapper/PayRecordMapper.java | 22 -
.../java/cn/wisenergy/mapper/PriceMapper.java | 20 -
.../cn/wisenergy/mapper/ProfessionMapper.java | 23 -
.../cn/wisenergy/mapper/RefillCardMapper.java | 54 --
.../cn/wisenergy/mapper/SchemeMapper.java | 39 -
.../wisenergy/mapper/SchemeRecordMapper.java | 62 --
.../cn/wisenergy/mapper/ScoreInfoMapper.java | 33 -
.../cn/wisenergy/mapper/UserLimitMapper.java | 22 -
.../mapper/UserLimitRecordMapper.java | 16 -
.../wisenergy/mapper/UserVolunteerMapper.java | 23 -
.../java/cn/wisenergy/mapper/UsersMapper.java | 53 --
.../cn/wisenergy/mapper/VolunteerMapper.java | 24 -
.../resources/mapper/AdmissionRuleMapper.xml | 108 ---
.../main/resources/mapper/BannerMapper.xml | 131 ---
.../src/main/resources/mapper/CardMapper.xml | 108 ---
.../resources/mapper/GraduationMapper.xml | 64 --
.../resources/mapper/LoginRecordMapper.xml | 88 --
.../main/resources/mapper/PayRecordMapper.xml | 103 ---
.../src/main/resources/mapper/PriceMapper.xml | 82 --
.../resources/mapper/ProfessionMapper.xml | 89 ---
.../resources/mapper/RefillCardMapper.xml | 120 ---
.../main/resources/mapper/SchemeMapper.xml | 116 ---
.../resources/mapper/SchemeRecordMapper.xml | 116 ---
.../main/resources/mapper/ScoreInfoMapper.xml | 127 ---
.../main/resources/mapper/UserLimitMapper.xml | 78 --
.../mapper/UserLimitRecordMapper.xml | 77 --
.../resources/mapper/UserVolunteerMapper.xml | 89 ---
.../src/main/resources/mapper/UsersMapper.xml | 167 ----
.../main/resources/mapper/VolunteerMapper.xml | 175 ----
.../cn/wisenergy/model/app/AccountInfo.java | 57 --
.../cn/wisenergy/model/app/AdmissionRule.java | 87 --
.../java/cn/wisenergy/model/app/Banner.java | 74 --
.../java/cn/wisenergy/model/app/CardInfo.java | 73 --
.../cn/wisenergy/model/app/Graduation.java | 53 --
.../cn/wisenergy/model/app/LoginRecord.java | 61 --
.../cn/wisenergy/model/app/PayRecord.java | 73 --
.../java/cn/wisenergy/model/app/Price.java | 60 --
.../cn/wisenergy/model/app/Profession.java | 78 --
.../cn/wisenergy/model/app/RefillCard.java | 59 --
.../cn/wisenergy/model/app/SchemeInfo.java | 70 --
.../model/app/SchemeQueryRecord.java | 79 --
.../cn/wisenergy/model/app/ScoreInfo.java | 111 ---
.../java/cn/wisenergy/model/app/User.java | 100 ---
.../cn/wisenergy/model/app/UserLimit.java | 58 --
.../wisenergy/model/app/UserLimitRecord.java | 58 --
.../cn/wisenergy/model/app/UserVolunteer.java | 39 -
.../cn/wisenergy/model/app/Volunteer.java | 149 ----
.../cn/wisenergy/model/common/BaseEntity.java | 35 -
.../cn/wisenergy/model/dto/AccountDto.java | 32 -
.../cn/wisenergy/model/dto/BannerDto.java | 52 --
.../cn/wisenergy/model/dto/ExportCardDto.java | 51 --
.../cn/wisenergy/model/dto/PayPageDto.java | 21 -
.../cn/wisenergy/model/dto/PayQueryDto.java | 22 -
.../cn/wisenergy/model/dto/RefillCardDto.java | 40 -
.../cn/wisenergy/model/dto/UserCommitDto.java | 71 --
.../cn/wisenergy/model/dto/UserInfoDto.java | 121 ---
.../cn/wisenergy/model/enums/CardStatus.java | 43 -
.../model/enums/OperationTypeEnum.java | 53 --
.../cn/wisenergy/model/enums/PayType.java | 47 --
.../cn/wisenergy/model/enums/SceneType.java | 51 --
.../model/enums/SchemeTypeEnums.java | 53 --
.../cn/wisenergy/model/enums/SourceType.java | 51 --
.../model/enums/StudentClassEnum.java | 46 --
.../cn/wisenergy/model/enums/StudentType.java | 43 -
.../wisenergy/model/enums/TemplateType.java | 35 -
.../cn/wisenergy/model/vo/AccountLoginVo.java | 24 -
.../cn/wisenergy/model/vo/AddLimitVo.java | 44 -
.../model/vo/AdvertisingQueryVo.java | 65 --
.../cn/wisenergy/model/vo/LoginOutVo.java | 21 -
.../cn/wisenergy/model/vo/MinusLimitVo.java | 27 -
.../wisenergy/model/vo/PayRecordQueryVo.java | 47 --
.../wisenergy/model/vo/PayRecordShowVo.java | 51 --
.../cn/wisenergy/model/vo/SchemeQueryVo.java | 37 -
.../model/vo/SchemeRecordQueryVo.java | 48 --
.../java/cn/wisenergy/model/vo/SchemeVo.java | 58 --
.../java/cn/wisenergy/model/vo/SendSmsVo.java | 37 -
.../wisenergy/model/vo/UpdatePasswordVo.java | 37 -
.../cn/wisenergy/model/vo/UserInfoVo.java | 49 --
.../cn/wisenergy/model/vo/UserLoginVo.java | 49 --
.../cn/wisenergy/model/vo/UserQueryVo.java | 70 --
.../cn/wisenergy/model/vo/UserRegisterVo.java | 50 --
.../cn/wisenergy/model/vo/UserShowVo.java | 54 --
.../cn/wisenergy/model/vo/VolunteerVo.java | 42 -
.../wisenergy/service/app/AccountSerivce.java | 14 -
.../wisenergy/service/app/BannerService.java | 67 --
.../cn/wisenergy/service/app/Daosupport.java | 26 -
.../service/app/GraduationSerivce.java | 11 -
.../service/app/PayRecordService.java | 30 -
.../wisenergy/service/app/PriceService.java | 14 -
.../service/app/ProfessionService.java | 20 -
.../service/app/RefillCardService.java | 48 --
.../service/app/SchemeRecordService.java | 52 --
.../wisenergy/service/app/SchemeService.java | 53 --
.../wisenergy/service/app/SendSmsSerVice.java | 33 -
.../service/app/UserLimitService.java | 38 -
.../service/app/UserLoginService.java | 71 --
.../cn/wisenergy/service/app/UserService.java | 71 --
.../service/app/UserVolunteerService.java | 11 -
.../service/app/VolunteerService.java | 50 --
.../wisenergy/service/app/WxPayService.java | 38 -
.../service/app/impl/AccountSerivceImpl.java | 58 --
.../service/app/impl/BannerServiceImpl.java | 159 ----
.../service/app/impl/DaoSupportImpl.java | 49 --
.../app/impl/GraduationSerivceImpl.java | 27 -
.../app/impl/PayRecordServiceImpl.java | 97 ---
.../service/app/impl/PriceServiceImpl.java | 28 -
.../app/impl/ProfessionServiceImpl.java | 180 -----
.../app/impl/RefillCardServiceImpl.java | 164 ----
.../app/impl/SchemeRecordServiceImpl.java | 296 -------
.../service/app/impl/SchemeServiceImpl.java | 755 ------------------
.../service/app/impl/SendSmsSerViceImpl.java | 127 ---
.../app/impl/UserLimitServiceImpl.java | 168 ----
.../app/impl/UserLoginServiceImpl.java | 300 -------
.../service/app/impl/UserServiceImpl.java | 296 -------
.../app/impl/UserVolunteerServiceImpl.java | 15 -
.../app/impl/VolunteerServiceImpl.java | 187 -----
.../service/app/impl/WxPayServiceImpl.java | 235 ------
.../wisenergy/service/cache/RedisService.java | 666 ---------------
.../wisenergy/service/common/CachePrefix.java | 16 -
.../cn/wisenergy/service/common/Common.java | 90 ---
.../cn/wisenergy/service/common/PdfUtil.java | 231 ------
.../service/common/RefillCardManager.java | 60 --
.../service/common/VolunteerListener.java | 151 ----
.../service/common/VolunteerManager.java | 415 ----------
.../service/httpClient/Credentials.java | 12 -
.../service/httpClient/SignatureExec.java | 78 --
.../service/httpClient/Validator.java | 9 -
.../WechatPayHttpClientBuilder.java | 75 --
.../httpClient/WechatPayUploadHttpPost.java | 78 --
.../auth/AutoUpdateCertificatesVerifier.java | 181 -----
.../httpClient/auth/CertificatesVerifier.java | 65 --
.../httpClient/auth/PrivateKeySigner.java | 36 -
.../service/httpClient/auth/Signer.java | 15 -
.../service/httpClient/auth/Verifier.java | 13 -
.../auth/WechatPay2Credentials.java | 94 ---
.../httpClient/auth/WechatPay2Validator.java | 108 ---
.../service/httpClient/util/AesUtil.java | 45 --
.../service/httpClient/util/PemUtil.java | 56 --
.../httpClient/util/RsaCryptoUtil.java | 50 --
.../cn/wisenergy/service/util/SignDemo.java | 81 --
.../cn/wisenergy/service/util/WxPayUtil.java | 168 ----
.../cn/wisenergy/service/wxpay/WxCommon.java | 63 --
.../controller/app/BannerController.java | 102 ---
.../controller/app/FileUploadController.java | 84 --
.../controller/app/GraduationController.java | 31 -
.../admin/controller/app/PayController.java | 218 -----
.../controller/app/PayRecordController.java | 60 --
.../admin/controller/app/PriceController.java | 36 -
.../controller/app/ProfessionController.java | 44 -
.../controller/app/RefillCardController.java | 77 --
.../controller/app/SchemeController.java | 136 ----
.../app/SchemeRecordController.java | 99 ---
.../controller/app/SendSmsController.java | 59 --
.../admin/controller/app/UserController.java | 129 ---
.../controller/app/UserLimitController.java | 68 --
.../controller/app/UserLoginController.java | 122 ---
.../controller/app/VolunteerController.java | 19 -
.../wisenergy/web/common/BaseController.java | 1 -
.../web/config/swagger/Swagger2.java | 2 +-
.../wisenergy/web/shiro/filter/AuthRealm.java | 2 -
.../src/main/resources/application-dev.yml | 4 +-
167 files changed, 3 insertions(+), 13369 deletions(-)
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AccountMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AdmissionRuleMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/BannerMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/CardMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/GraduationMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/LoginRecordMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/PayRecordMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/PriceMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ProfessionMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/RefillCardMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/SchemeMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/SchemeRecordMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ScoreInfoMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserLimitMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserLimitRecordMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserVolunteerMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java
delete mode 100644 wisenergy-mapper/src/main/java/cn/wisenergy/mapper/VolunteerMapper.java
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/AdmissionRuleMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/BannerMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/CardMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/GraduationMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/LoginRecordMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/PayRecordMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/PriceMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/ProfessionMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/RefillCardMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/SchemeMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/SchemeRecordMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/ScoreInfoMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/UserLimitMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/UserLimitRecordMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/UserVolunteerMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
delete mode 100644 wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/AccountInfo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/AdmissionRule.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/Banner.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/CardInfo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/Graduation.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/LoginRecord.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/PayRecord.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/Price.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/Profession.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/RefillCard.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/SchemeInfo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/SchemeQueryRecord.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/ScoreInfo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/UserLimit.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/UserLimitRecord.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/UserVolunteer.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/app/Volunteer.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/common/BaseEntity.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/dto/AccountDto.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/dto/BannerDto.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/dto/ExportCardDto.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/dto/PayPageDto.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/dto/PayQueryDto.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/dto/RefillCardDto.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserCommitDto.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserInfoDto.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/enums/CardStatus.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/enums/OperationTypeEnum.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/enums/PayType.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/enums/SceneType.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/enums/SchemeTypeEnums.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/enums/SourceType.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/enums/StudentClassEnum.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/enums/StudentType.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/enums/TemplateType.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/AccountLoginVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/AddLimitVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/AdvertisingQueryVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/LoginOutVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/MinusLimitVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/PayRecordQueryVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/PayRecordShowVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeQueryVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeRecordQueryVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/SendSmsVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/UpdatePasswordVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserInfoVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserLoginVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserQueryVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserRegisterVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserShowVo.java
delete mode 100644 wisenergy-model/src/main/java/cn/wisenergy/model/vo/VolunteerVo.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/AccountSerivce.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/BannerService.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/Daosupport.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/GraduationSerivce.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/PayRecordService.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/PriceService.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/ProfessionService.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/RefillCardService.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/SchemeRecordService.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/SchemeService.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/SendSmsSerVice.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLimitService.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLoginService.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/UserVolunteerService.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/VolunteerService.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/WxPayService.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AccountSerivceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BannerServiceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/DaoSupportImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/GraduationSerivceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/PayRecordServiceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/PriceServiceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/ProfessionServiceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/RefillCardServiceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeRecordServiceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SendSmsSerViceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLimitServiceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserVolunteerServiceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/VolunteerServiceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/WxPayServiceImpl.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/cache/RedisService.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/common/CachePrefix.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/common/Common.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/common/PdfUtil.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/common/RefillCardManager.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerListener.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerManager.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/Credentials.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/SignatureExec.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/Validator.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/WechatPayHttpClientBuilder.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/WechatPayUploadHttpPost.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/AutoUpdateCertificatesVerifier.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/CertificatesVerifier.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/PrivateKeySigner.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/Signer.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/Verifier.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/WechatPay2Credentials.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/WechatPay2Validator.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/util/AesUtil.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/util/PemUtil.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/util/RsaCryptoUtil.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/util/SignDemo.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/util/WxPayUtil.java
delete mode 100644 wisenergy-service/src/main/java/cn/wisenergy/service/wxpay/WxCommon.java
delete mode 100644 wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/BannerController.java
delete mode 100644 wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/FileUploadController.java
delete mode 100644 wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/GraduationController.java
delete mode 100644 wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PayController.java
delete mode 100644 wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PayRecordController.java
delete mode 100644 wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PriceController.java
delete mode 100644 wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/ProfessionController.java
delete mode 100644 wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/RefillCardController.java
delete mode 100644 wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SchemeController.java
delete mode 100644 wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SchemeRecordController.java
delete mode 100644 wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SendSmsController.java
delete mode 100644 wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java
delete mode 100644 wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserLimitController.java
delete mode 100644 wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserLoginController.java
delete mode 100644 wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/VolunteerController.java
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AccountMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AccountMapper.java
deleted file mode 100644
index 012edb9..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AccountMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.AccountInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.Map;
-
-public interface AccountMapper extends BaseMapper<AccountInfo> {
- /**
- * 查询管ç†å‘˜ä¿¡æ¯
- * @param map 查询å‚æ•°
- * @return
- */
- AccountInfo getAccountInfo(Map<String, Object> map);
-
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AdmissionRuleMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AdmissionRuleMapper.java
deleted file mode 100644
index d68eb4b..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/AdmissionRuleMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.AdmissionRule;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @author 86187
- */
-public interface AdmissionRuleMapper extends BaseMapper<AdmissionRule> {
- AdmissionRule add(AdmissionRule admissionRule);
-
- int edit(AdmissionRule admissionRule);
-
- int delById(@Param("id") Integer id);
-
- AdmissionRule getByType(@Param("type") Integer type);
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/BannerMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/BannerMapper.java
deleted file mode 100644
index 0df8469..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/BannerMapper.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.Banner;
-import cn.wisenergy.model.dto.BannerDto;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface BannerMapper extends BaseMapper<Banner> {
- /**
- * æ·»åŠ å¹¿å‘Š
- *
- * @param advertising 广告信æ¯
- * @return 广告信æ¯
- */
- int add(Banner advertising);
-
- /**
- * 编辑广告
- *
- * @param advertising 广告信æ¯
- * @return 结果
- */
- int edit(Banner advertising);
-
- /**
- * åˆ é™¤å¹¿å‘Š
- *
- * @param id 广告id
- * @return 结果
- */
- int delById(@Param("id") Integer id);
-
- /**
- * 获å–广告列表
- * @param map ç›é€‰å‚æ•°
- * @return 广告列表
- */
- List<BannerDto> getList(Map<String,Object> map);
-
- /**
- * 统计广告æ¡æ•°
- * @return 广告æ¡æ•°
- */
- int count(Map<String,Object> map);
-
- /**
- * 通过广告id查询广告信æ¯
- * @param id
- * @return
- */
- Banner getById(@Param("id") Integer id);
-
- /**
- * 通过广告ID改å˜æŠ•æ”¾çŠ¶æ€
- * @param id
- * @param status
- * @return
- */
- int editStatus(@Param("id") Integer id, @Param("status") Integer status);
-
- List<Banner> getTopBanners(@Param("type") Integer type);
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/CardMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/CardMapper.java
deleted file mode 100644
index abf6b1c..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/CardMapper.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.CardInfo;
-import cn.wisenergy.model.dto.ExportCardDto;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @author 86187
- */
-public interface CardMapper extends BaseMapper<CardInfo> {
- /**
- * æ·»åŠ å……å€¼å¡åå¡
- *
- * @param cardInfos
- * @return
- */
- int add(List<CardInfo> cardInfos);
-
- /**
- * 编辑
- * @param cardInfo ä¿¡æ¯
- * @return 结果
- */
- int edit(CardInfo cardInfo);
-
- /**
- * æ ¹æ®å¯†ç 获å–充值å¡ä¿¡æ¯
- *
- * @param secretKey 密ç
- * @return 充值å¡ä¿¡æ¯
- */
- CardInfo getBySecretKey(@Param("secretKey") String secretKey);
-
- /**
- * 通过批次å·èŽ·å–所有å—å¡
- * @param batchNumber 批次å·
- * @return åå¡é›†åˆ
- */
- List<CardInfo> getList(@Param("batchNumber")String batchNumber);
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/GraduationMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/GraduationMapper.java
deleted file mode 100644
index aede4b6..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/GraduationMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.Graduation;
-import cn.wisenergy.model.dto.BannerDto;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-import java.util.Map;
-
-public interface GraduationMapper extends BaseMapper<Graduation> {
- /**
- * 获å–广告列表
- * @return æ¯•ä¸šé™¢æ ¡åˆ—è¡¨
- */
- List<Graduation> getList();
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/LoginRecordMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/LoginRecordMapper.java
deleted file mode 100644
index 56cee49..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/LoginRecordMapper.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.LoginRecord;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-public interface LoginRecordMapper extends BaseMapper<LoginRecord> {
-
- /**
- * æ·»åŠ ç™»å½•ä¿¡æ¯
- * @param loginRecord 登录信æ¯
- * @return 登录信æ¯
- */
- int add(LoginRecord loginRecord);
-
- /**
- * 编辑
- * @param loginRecord 登录信æ¯
- * @return 结果
- */
- int edit(LoginRecord loginRecord);
-
- /**
- * åˆ é™¤ç™»å½•è®°å½•
- * @param id 记录id
- * @return 结果
- */
- int delById(@Param("id") Integer id);
-
- LoginRecord getById(@Param("userId") Integer userId);
-
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/PayRecordMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/PayRecordMapper.java
deleted file mode 100644
index f15aa2f..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/PayRecordMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.PayRecord;
-import cn.wisenergy.model.vo.PayRecordShowVo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author 86187
- */
-public interface PayRecordMapper extends BaseMapper<PayRecord> {
- int add(PayRecord payRecord);
-
- List<PayRecordShowVo> getList(Map<String,Object> map);
-
- int count(Map<String,Object> map);
-
- List<PayRecord> getById(@Param("userId") Integer userId);
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/PriceMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/PriceMapper.java
deleted file mode 100644
index d1af828..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/PriceMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.Price;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @author 86187
- */
-public interface PriceMapper extends BaseMapper<Price> {
- int add(Price price);
-
- List<Price> getList();
-
- int count();
-
- Price getByMoney(@Param("money") Integer money);
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ProfessionMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ProfessionMapper.java
deleted file mode 100644
index 14c793e..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ProfessionMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.Profession;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-public interface ProfessionMapper extends BaseMapper<Profession> {
- Profession add(Profession profession);
-
- List<Profession> getList(@Param("type") Integer type);
-
- Profession getById(@Param("id") Integer id);
-
- /**
- * æ ¹æ®ä¸“业ids,获å–专业å称
- *
- * @param ids ids
- * @return 专业å称
- */
- List<String> getNameByIds(@Param("list") List<Integer> ids);
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/RefillCardMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/RefillCardMapper.java
deleted file mode 100644
index 67b4cc1..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/RefillCardMapper.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.RefillCard;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-public interface RefillCardMapper extends BaseMapper<RefillCardMapper> {
-
- /**
- * æ·»åŠ å……å€¼å¡
- * @param refillCard
- * @return
- */
- int add(RefillCard refillCard);
-
- /**
- * 改å˜æ¿€æ´»çŠ¶æ€
- * @param batchNumber
- * @return
- */
- int update(@Param("batchNumber") String batchNumber);
-
- /**
- * 获å–充值å¡ä¿¡æ¯
- * @param map
- * @return
- */
- List<RefillCard> getList(Map<String,Object> map);
-
- /**
- * 获å–充值å¡æ•°é‡
- * @return
- */
- Integer getUserNumbers();
-
- /**
- * 通过ID查询充值å¡ä¿¡æ¯
- * @param id 主键
- * @return 充值å¡ä¿¡æ¯
- */
- RefillCard getById(@Param("id") Integer id);
-
- int setIsMakeCard(@Param("id") Integer id);
-
- /**
- * 通过批次å·æŸ¥è¯¢å……值å¡ä¿¡æ¯
- * @param batchNumber 批次å·
- * @return 充值å¡ä¿¡æ¯
- */
- RefillCard getByBatchNumber(@Param("batchNumber") String batchNumber);
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/SchemeMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/SchemeMapper.java
deleted file mode 100644
index c24a5ab..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/SchemeMapper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.SchemeInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author 86187
- */
-public interface SchemeMapper extends BaseMapper<SchemeInfo> {
- int add(SchemeInfo schemeInfo);
-
- List<SchemeInfo> getList(Map<String,Object> map);
-
- /**
- * 编辑
- * @param schemeInfo 编辑信æ¯
- * @return 结果
- */
- int edit(SchemeInfo schemeInfo);
-
- /**
- * 统计
- * @return æ•°é‡
- */
- int count();
-
- /**
- * 获å–方案信æ¯
- * @param id 方案id
- * @return 方案信æ¯
- */
- SchemeInfo getById(@Param("id") Integer id);
-
- int getByType(@Param("type") Integer type);
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/SchemeRecordMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/SchemeRecordMapper.java
deleted file mode 100644
index 69b7192..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/SchemeRecordMapper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.SchemeQueryRecord;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author 86187
- */
-public interface SchemeRecordMapper extends BaseMapper<SchemeQueryRecord> {
-
- /**
- * æ·»åŠ æ–¹æ¡ˆè®°å½•
- *
- * @param schemeQueryRecord 方案记录信æ¯
- * @return 方案记录信æ¯
- */
- int add(SchemeQueryRecord schemeQueryRecord);
-
- /**
- * 编辑方案记录
- *
- * @param schemeQueryRecord 方案记录信æ¯
- * @return 0 失败 1 æˆåŠŸ
- */
- int edit(SchemeQueryRecord schemeQueryRecord);
-
- /**
- * 获å–方案记录信æ¯
- *
- * @param id 方案记录id
- * @return
- */
- int delById(@Param("id") Integer id);
-
- /**
- * 统计方案记录æ¡æ•°
- *
- * @param map 统计æ¡ä»¶
- * @return 记录æ¡æ•°
- */
- int count(Map<String, Object> map);
-
- /**
- * @param userId 用户id
- * @param startNum 开始数
- * @param endNum 结æŸæ•°
- * @return 列表
- */
- List<SchemeQueryRecord> getByUserId(@Param("userId") Integer userId, @Param("startNum") Integer startNum,
- @Param("endNum") Integer endNum);
-
- /**
- *
- * @param id 方案查询记录id
- * @return 查询方案信æ¯
- */
- SchemeQueryRecord getById(@Param("id") Integer id);
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ScoreInfoMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ScoreInfoMapper.java
deleted file mode 100644
index 68e54ac..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/ScoreInfoMapper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.ScoreInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-public interface ScoreInfoMapper extends BaseMapper<ScoreInfo> {
- /**
- * æ·»åŠ è€ƒç”Ÿæˆç»©
- *
- * @param scoreInfo æˆç»©ä¿¡æ¯
- * @return æˆç»©ä¿¡æ¯
- */
- int add(ScoreInfo scoreInfo);
-
- /**
- * 编辑考生æˆç»©
- *
- * @param scoreInfo æˆç»©ä¿¡æ¯
- * @return 结果
- */
- int edit(ScoreInfo scoreInfo);
-
- /**
- * åˆ é™¤è€ƒç”Ÿæˆç»©
- *
- * @param id æˆç»©id
- * @return 结果
- */
- int delById(@Param("id") Integer id);
-
- ScoreInfo getById(@Param("userId") Integer userId);
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserLimitMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserLimitMapper.java
deleted file mode 100644
index 574aff7..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserLimitMapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.UserLimit;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @author 86187
- */
-public interface UserLimitMapper extends BaseMapper<UserLimit> {
- int add(UserLimit userLimit);
-
- int edit(UserLimit userLimit);
-
- /**
- * 获å–查询次数信æ¯
- *
- * @param userId 用户id
- * @return 查询次数信æ¯
- */
- UserLimit getByUserId(@Param("userId") Integer userId);
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserLimitRecordMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserLimitRecordMapper.java
deleted file mode 100644
index 3b52922..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserLimitRecordMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.UserLimitRecord;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * @author 86187
- */
-public interface UserLimitRecordMapper extends BaseMapper<UserLimitRecord> {
- int add(UserLimitRecord userLimitRecord);
-
- UserLimitRecord edit(UserLimitRecord userLimitRecord);
-
- UserLimitRecord getByUserId(@Param("userId") Integer userId);
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserVolunteerMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserVolunteerMapper.java
deleted file mode 100644
index 28f1a00..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserVolunteerMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.UserVolunteer;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * @author 86187
- */
-public interface UserVolunteerMapper extends BaseMapper<UserVolunteer> {
-
- UserVolunteer add(UserVolunteer userVolunteer);
-
- int edit(UserVolunteer userVolunteer);
-
- int delById(@Param("id") Integer id);
-
- int creates(@Param("list") List<UserVolunteer> list);
-
- List<UserVolunteer> listById(Integer schemeRecordId);
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java
deleted file mode 100644
index 5b170e3..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UsersMapper.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.hutool.system.UserInfo;
-import cn.wisenergy.model.app.User;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author 86187
- * @ Description:
- * @ Author : 86187
- * @ Date : 2021/1/6 15:32
- */
-@Mapper
-public interface UsersMapper extends BaseMapper<User> {
- /**
- * æ·»åŠ
- *
- * @param user 用户信æ¯
- * @return 用户信æ¯
- */
- int add(User user);
-
- /**
- * 编辑
- *
- * @param user 用户信æ¯
- * @return 修改是å¦æˆåŠŸ
- */
- int edit(User user);
-
- /**
- * åˆ é™¤
- *
- * @param id 用户id
- * @return åˆ é™¤æ˜¯å¦æˆåŠŸ
- */
- int delById(@Param("id") Integer id);
-
- int countByPhoneAnsUserId(@Param("phone") String phone, @Param("userId") Integer userId);
-
- List<User> getList(Map<String, Object> map);
-
- Integer getUserNumbers(Map<String, Object> map);
-
- User getByPhone(@Param("phone") String phone);
-
- List<User> test(@Param("list") List<String> list);
-}
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/VolunteerMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/VolunteerMapper.java
deleted file mode 100644
index 1a40e05..0000000
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/VolunteerMapper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.wisenergy.mapper;
-
-import cn.wisenergy.model.app.Volunteer;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author 86187
- */
-public interface VolunteerMapper extends BaseMapper<Volunteer> {
-
- Volunteer add(Volunteer volunteer);
-
- List<Volunteer> getFillList(Map<String,Object> map);
-
- List<Volunteer> getListByIds(@Param("list") List<Integer> ids);
-
- int updateBySchemeId(@Param("schemeId") Integer schemeId);
-
- List<Volunteer> getVolunteerList(Map<String,Object> map);
-}
diff --git a/wisenergy-mapper/src/main/resources/mapper/AdmissionRuleMapper.xml b/wisenergy-mapper/src/main/resources/mapper/AdmissionRuleMapper.xml
deleted file mode 100644
index aedc08c..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/AdmissionRuleMapper.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?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="cn.wisenergy.mapper.AdmissionRuleMapper">
- <resultMap id="userMap" type="cn.wisenergy.model.app.AdmissionRule">
- <id column="id" property="id"/>
- <result column="type" property="type"/>
- <result column="culture_max" property="cultureMax"/>
- <result column="culture_min" property="cultureMin"/>
- <result column="current_year_culture" property="currentYearCulture"/>
- <result column="profession_max" property="professionMax"/>
- <result column="profession_min" property="professionMin"/>
- <result column="current_year_major" property="currentYearMajor"/>
- <result column="up_mark" property="upMark"/>
- <result column="down_mark" property="downMark"/>
- <result column="number" property="number"/>
- <result column="is_delete" property="isDelete"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- admission_rule
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- type,culture_max, culture_min,current_year_culture,profession_max,profession_min,current_year_major,up_mark,
- down_mark,number,is_delete,create_time,update_time
- </sql>
-
- <sql id="vals">
- #{type},#{cultureMax},#{cultureMin},#{currentYearCulture},#{professionMax}, #{professionMin},#{currentYearMajor},
- #{upMark},#{downMark}, #{number}, #{isDelete},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="type != null">type = #{type},</if>
- <if test="cultureMax != null">culture_max =#{cultureMax},</if>
- <if test="cultureMin != null">culture_min =#{cultureMin},</if>
- <if test="currentYearCulture != null">current_year_culture =#{currentYearCulture},</if>
- <if test="professionMax != null">profession_max =#{professionMax},</if>
- <if test="professionMin != null">profession_min =#{professionMin},</if>
- <if test="currentYearMajor != null">current_year_major =#{currentYearMajor},</if>
- <if test="upMark != null">up_mark = #{upMark},</if>
- <if test="downMark != null">down_mark =#{downMark},</if>
- <if test="number != null">number = #{number},</if>
- <if test="isDelete != null">is_delete = #{isDelete},</if>
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="id != null">id = #{id}</if>
- <if test="type != null">and type = #{type}</if>
- <if test="cultureMax != null">and culture_max =#{cultureMax}</if>
- <if test="cultureMin != null">and culture_min =#{cultureMin}</if>
- <if test="currentYearCulture != null">and current_year_culture =#{currentYearCulture}</if>
- <if test="professionMax != null">and profession_max =#{professionMax}</if>
- <if test="professionMin != null">and profession_min =#{professionMin}</if>
- <if test="currentYearMajor != null">and current_year_major =#{currentYearMajor}</if>
- <if test="upMark != null">and up_mark = #{upMark}</if>
- <if test="downMark != null">and down_mark =#{downMark}</if>
- <if test="number != null">and number = #{number}</if>
- <if test="isDelete != null">and is_delete = #{isDelete}</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.AdmissionRule" keyProperty="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- value(
- <include refid="vals"/>
- )
- </insert>
-
- <update id="edit" parameterType="cn.wisenergy.model.app.AdmissionRule">
- UPDATE
- <include refid="table"/>
- <set>
- <include refid="updateCondition"/>
- </set>
- <where>
- id = #{id}
- </where>
- </update>
-
- <delete id="delById" parameterType="java.lang.Integer">
- delete from
- <include refid="table"/>
- where id = #{id}
- </delete>
-
-
-
- <select id="getByType" resultType="cn.wisenergy.model.app.AdmissionRule">
- SELECT
- <include refid="cols_all"/>
- FROM
- <include refid="table"/>
- where is_delete=0 and type=#{type}
- </select>
-</mapper>
diff --git a/wisenergy-mapper/src/main/resources/mapper/BannerMapper.xml b/wisenergy-mapper/src/main/resources/mapper/BannerMapper.xml
deleted file mode 100644
index 3034741..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/BannerMapper.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?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="cn.wisenergy.mapper.BannerMapper">
- <resultMap id="advertisingMap" type="cn.wisenergy.model.app.Banner">
- <id column="id" property="id"/>
- <result column="company_name" property="companyName"/>
- <result column="status" property="status"/>
- <result column="website" property="website"/>
- <result column="is_have_image" property="isHaveImage"/>
- <result column="type" property="type"/>
- <result column="image" property="image"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- banner
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- company_name,status, website,is_have_image,type,image, create_time,update_time
- </sql>
-
- <sql id="vals">
- #{companyName},#{status},#{website},#{isHaveImage},#{type},#{image},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="companyName != null">company_name = #{companyName},</if>
- <if test="status != null">status =#{status},</if>
- <if test="website != null">website =#{website},</if>
- <if test="isHaveImage != null">is_have_image =#{isHaveImage},</if>
- <if test="type != null">type =#{type},</if>
- <if test="image != null">image =#{image},</if>
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="id != null">id = #{id}</if>
- <if test="companyName != null">and company_name = #{companyName}</if>
- <if test="status != null">and status =#{status}</if>
- <if test="website != null">and website =#{website}</if>
- <if test="isHaveImage != null">and is_have_image =#{isHaveImage}</if>
- <if test="type != null">and type =#{type}</if>
- <if test="image != null">and image =#{image}</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.Banner" keyProperty="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- value(
- <include refid="vals"/>
- )
- </insert>
-
- <update id="edit" parameterType="cn.wisenergy.model.app.Banner">
- UPDATE
- <include refid="table"/>
- <set>
- <include refid="updateCondition"/>
- </set>
- <where>
- id = #{id}
- </where>
- </update>
-
- <delete id="delById" parameterType="java.lang.Integer">
- delete from
- <include refid="table"/>
- where id = #{id}
- </delete>
-
- <select id="getList" resultType="cn.wisenergy.model.dto.BannerDto" parameterType="map">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- <if test="status != null">and status =#{status}</if>
- <if test="type != null">and type =#{type}</if>
- </where>
- order by create_time desc
- limit #{pageNo},#{pageSize}
- </select>
-
- <select id="count" resultType="java.lang.Integer">
- select count(1)
- from
- <include refid="table"/>
- <where>
- <if test="status != null">and status =#{status}</if>
- <if test="type != null">and type =#{type}</if>
- </where>
- </select>
-
- <select id="getById" resultMap="advertisingMap">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- where id=#{id}
- </select>
-
- <select id="getTopBanners" resultType="cn.wisenergy.model.app.Banner">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- where status=1 and type=#{type}
- </select>
-
- <update id="editStatus">
- UPDATE
- <include refid="table"/>
- <set>
- status=#{status}
- </set>
- <where>
- id = #{id}
- </where>
- </update>
-</mapper>
diff --git a/wisenergy-mapper/src/main/resources/mapper/CardMapper.xml b/wisenergy-mapper/src/main/resources/mapper/CardMapper.xml
deleted file mode 100644
index 48ba10c..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/CardMapper.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?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="cn.wisenergy.mapper.CardMapper">
- <resultMap id="cardMap" type="cn.wisenergy.model.app.CardInfo">
- <id column="id" property="id"/>
- <result column="batch_number" property="batchNumber"/>
- <result column="card_number" property="cardNumber"/>
- <result column="limit" property="limit"/>
- <result column="secret_key" property="secretKey"/>
- <result column="money" property="money"/>
- <result column="status" property="status"/>
- <result column="is_delete" property="isDelete"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- card
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- batch_number,card_number,`limit`, secret_key,money,`status`,is_delete,create_time,update_time
- </sql>
-
- <sql id="createsVal">
- #{i.batchNumber},#{i.cardNumber},#{i.limit},#{i.secretKey},#{i.money},#{i.status},
- #{i.isDelete},now(),now()
- </sql>
-
- <sql id="vals">
- #{batchNumber},#{cardNumber},#{limit},#{secretKey},#{money},#{status},
- #{isDelete},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="batchNumber != null">batch_number =#{batchNumber},</if>
- <if test="cardNumber != null">card_number =#{cardNumber},</if>
- <if test="limit != null">`limit` =#{limit},</if>
- <if test="secretKey != null">secret_key =#{secretKey},</if>
- <if test="money != null">money =#{money},</if>
- <if test="status != null">`status` =#{status},</if>
- <if test="isDelete != null">is_delete = #{isDelete},</if>
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="id != null">id = #{id}</if>
- <if test="batchNumber != null">and batch_number =#{batchNumber}</if>
- <if test="cardNumber != null">and card_number =#{cardNumber},</if>
- <if test="limit != null">and `limit` =#{limit}</if>
- <if test="secretKey != null">and secret_key =#{secretKey}</if>
- <if test="money != null">and money =#{money}</if>
- <if test="status != null">and `status` =#{status}</if>
- <if test="isDelete != null">and is_delete = #{isDelete}</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.CardInfo" keyProperty="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- values
- <foreach collection="list" item="i" index="index" separator=",">
- (<include refid="createsVal"/>)
- </foreach>
- </insert>
-
- <update id="edit" parameterType="cn.wisenergy.model.app.CardInfo">
- UPDATE
- <include refid="table"/>
- <set>
- <include refid="updateCondition"/>
- </set>
- <where>
- id = #{id}
- </where>
- </update>
-
- <select id="getBySecretKey" resultType="cn.wisenergy.model.app.CardInfo">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- secret_key=#{secretKey}
- and is_delete=0
- </where>
- </select>
-
- <select id="getList" resultMap="cardMap">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- batch_Number=#{batchNumber}
- and is_delete=0
- </where>
- </select>
-
-</mapper>
diff --git a/wisenergy-mapper/src/main/resources/mapper/GraduationMapper.xml b/wisenergy-mapper/src/main/resources/mapper/GraduationMapper.xml
deleted file mode 100644
index caffe66..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/GraduationMapper.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?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="cn.wisenergy.mapper.GraduationMapper">
- <resultMap id="graduationMap" type="cn.wisenergy.model.app.Graduation">
- <id column="id" property="id"/>
- <result column="school_name" property="schoolName"/>
- <result column="position" property="position"/>
- <result column="describe" property="describe"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- graduation
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- school_name,`position`,`describe`,create_time,update_time
- </sql>
-
- <sql id="vals">
- #{schoolName},#{position},#{describe},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="schoolName != null">school_name =#{schoolName},</if>
- <if test="position != null">`position` =#{position},</if>
- <if test="describe != null">`describe` =#{describe},</if>
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="schoolName != null">and school_name =#{schoolName},</if>
- <if test="position != null">and `position` =#{position},</if>
- <if test="describe != null">and `describe` =#{describe},</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <update id="edit" parameterType="cn.wisenergy.model.app.Graduation">
- UPDATE
- <include refid="table"/>
- <set>
- <include refid="updateCondition"/>
- </set>
- <where>
- id = #{id}
- </where>
- </update>
-
- <select id="getList" resultMap="graduationMap">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- </select>
-
-</mapper>
diff --git a/wisenergy-mapper/src/main/resources/mapper/LoginRecordMapper.xml b/wisenergy-mapper/src/main/resources/mapper/LoginRecordMapper.xml
deleted file mode 100644
index 518ac7a..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/LoginRecordMapper.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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="cn.wisenergy.mapper.LoginRecordMapper">
- <resultMap id="advertisingMap" type="cn.wisenergy.model.app.LoginRecord">
- <id column="id" property="id"/>
- <result column="user_id" property="userId"/>
- <result column="type" property="type"/>
- <result column="operation_name" property="operationName"/>
- <result column="ip" property="ip"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- login_record
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- user_id,type, operation_name,ip, create_time,update_time
- </sql>
-
- <sql id="vals">
- #{userId},#{type},#{operationName},#{ip},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="userId != null">user_id = #{userId},</if>
- <if test="type != null">type =#{type},</if>
- <if test="operationName != null">operation_name =#{operationName},</if>
- <if test="ip != null">ip =#{ip},</if>
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="id != null">id = #{id}</if>
- <if test="userId != null">and user_id = #{userId}</if>
- <if test="type != null">and type =#{type}</if>
- <if test="operationName != null">and operation_name =#{operationName}</if>
- <if test="ip != null">and ip =#{ip}</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.LoginRecord" keyProperty="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- value(
- <include refid="vals"/>
- )
- </insert>
-
- <update id="edit" parameterType="cn.wisenergy.model.app.LoginRecord">
- UPDATE
- <include refid="table"/>
- <set>
- <include refid="updateCondition"/>
- </set>
- <where>
- id = #{id}
- </where>
- </update>
-
- <delete id="delById" parameterType="java.lang.Integer">
- delete from
- <include refid="table"/>
- where id = #{id}
- </delete>
-
- <select id="getById" resultMap="advertisingMap">
- select <include refid="cols_all"/>
- from <include refid="table"/>
- <where>
- user_id=#{userId}
- and
- type=2
- order by update_time desc
- limit 0,1
- </where>
- </select>
-
-</mapper>
diff --git a/wisenergy-mapper/src/main/resources/mapper/PayRecordMapper.xml b/wisenergy-mapper/src/main/resources/mapper/PayRecordMapper.xml
deleted file mode 100644
index 57adbf9..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/PayRecordMapper.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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="cn.wisenergy.mapper.PayRecordMapper">
- <resultMap id="advertisingMap" type="cn.wisenergy.model.app.PayRecord">
- <id column="id" property="id"/>
- <result column="user_id" property="userId"/>
- <result column="type" property="type"/>
- <result column="card_id" property="cardId"/>
- <result column="money" property="money"/>
- <result column="result" property="result"/>
- <result column="pay_limit" property="payLimit"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- pay_record
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- user_id,type, card_id,money,result,pay_limit, create_time,update_time
- </sql>
-
- <sql id="vals">
- #{userId},#{type},#{cardId},#{money},#{result},#{payLimit},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="userId != null">user_id = #{userId},</if>
- <if test="type != null">type =#{type},</if>
- <if test="cardId != null">card_id =#{cardId},</if>
- <if test="money != null">money =#{money},</if>
- <if test="result != null">result =#{result},</if>
- <if test="payLimit != null">pay_limit =#{payLimit},</if>
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="id != null">id = #{id}</if>
- <if test="userId != null">and user_id = #{userId}</if>
- <if test="type != null">and type =#{type}</if>
- <if test="cardId != null">and card_id =#{cardId}</if>
- <if test="money != null">and money =#{money}</if>
- <if test="result != null">and result =#{result}</if>
- <if test="payLimit != null">and pay_limit =#{payLimit}</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.PayRecord" keyProperty="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- value(
- <include refid="vals"/>
- )
- </insert>
- <select id="getList" resultType="cn.wisenergy.model.vo.PayRecordShowVo">
- select
- id as recordId,type,result,pay_limit as `limit`,create_time as payTime
- from
- <include refid="table"/>
- <where>
- <if test="userId != null">
- user_id=#{userId}
- </if>
- order by create_time desc
- limit #{startNum},#{endNum}
- </where>
- </select>
-
-
- <select id="count" resultType="java.lang.Integer">
- select count(1)
- from
- <include refid="table"/>
- <where>
- <if test="userId != null">
- user_id=#{userId}
- </if>
- </where>
-
- </select>
-
- <select id="getById" resultMap="advertisingMap">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- user_id=#{userId}
- and
- result=0
- </where>
- </select>
-
-</mapper>
diff --git a/wisenergy-mapper/src/main/resources/mapper/PriceMapper.xml b/wisenergy-mapper/src/main/resources/mapper/PriceMapper.xml
deleted file mode 100644
index f94dd29..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/PriceMapper.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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="cn.wisenergy.mapper.PriceMapper">
- <resultMap id="priceMap" type="cn.wisenergy.model.app.Price">
- <id column="id" property="id"/>
- <result column="use_limit" property="useLimit"/>
- <result column="money" property="money"/>
- <result column="is_delete" property="isDelete"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- price
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- use_limit,money, is_delete, create_time,update_time
- </sql>
-
- <sql id="vals">
- #{useLimit},#{money},#{isDelete},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="useLimit != null">use_limit = #{useLimit},</if>
- <if test="money != null">money =#{money},</if>
- <if test="isDelete != null">is_delete =#{isDelete},</if>
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="id != null">id = #{id}</if>
- <if test="useLimit != null">and use_limit = #{useLimit}</if>
- <if test="money != null">and money =#{money}</if>
- <if test="isDelete != null">and is_delete =#{isDelete}</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.Price" keyProperty="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- value(
- <include refid="vals"/>
- )
- </insert>
-
-
- <select id="getList" resultType="cn.wisenergy.model.app.Price">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- where is_delete=0
- order by use_limit
- </select>
-
- <select id="count" resultType="java.lang.Integer">
- select count(1)
- from
- <include refid="table"/>
- where is_delete=0
- </select>
-
- <select id="getByMoney" resultType="cn.wisenergy.model.app.Price">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- where is_delete=0
- and money=#{money}
- </select>
-
-</mapper>
diff --git a/wisenergy-mapper/src/main/resources/mapper/ProfessionMapper.xml b/wisenergy-mapper/src/main/resources/mapper/ProfessionMapper.xml
deleted file mode 100644
index 4e26369..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/ProfessionMapper.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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="cn.wisenergy.mapper.ProfessionMapper">
- <resultMap id="userMap" type="cn.wisenergy.model.app.Profession">
- <id column="id" property="id"/>
- <id column="type" property="type"/>
- <result column="parent_id" property="parentId"/>
- <result column="level" property="level"/>
- <result column="name" property="name"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- profession
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- type,parent_id,level, name,create_time,update_time
- </sql>
-
- <sql id="vals">
- #{type},#{parentId},#{level},#{name},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="type != null">type = #{type},</if>
- <if test="parentId != null">parent_id = #{parentId},</if>
- <if test="level != null">level =#{level},</if>
- <if test="name != null">name =#{name},</if>
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="id != null">id = #{id}</if>
- <if test="type != null">and type = #{type}</if>
- <if test="parentId != null">and parent_id = #{parentId}</if>
- <if test="level != null">and level =#{level}</if>
- <if test="name != null">and name =#{name}</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.Profession" keyProperty="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- value(
- <include refid="vals"/>
- )
- </insert>
-
- <select id="getList" resultType="cn.wisenergy.model.app.Profession">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- type=#{type}
- </where>
- </select>
-
- <select id="getById" resultType="cn.wisenergy.model.app.Profession">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- where id=#{id}
- </select>
-
- <select id="getNameByIds" resultType="java.lang.String">
- select name
- from
- <include refid="table"/>
- <where>
- id IN
- <foreach collection="list" index="index" item="id" separator="," open="(" close=")">
- #{id}
- </foreach>
- </where>
- </select>
-
-</mapper>
diff --git a/wisenergy-mapper/src/main/resources/mapper/RefillCardMapper.xml b/wisenergy-mapper/src/main/resources/mapper/RefillCardMapper.xml
deleted file mode 100644
index d6388ec..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/RefillCardMapper.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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="cn.wisenergy.mapper.RefillCardMapper">
- <resultMap id="refillCardMap" type="cn.wisenergy.model.app.RefillCard">
- <id column="id" property="id"/>
- <result column="batch_number" property="batchNumber"/>
- <result column="is_make_card" property="isMakeCard"/>
- <result column="card_number" property="cardNumber"/>
- <result column="is_activite" property="isActivite"/>
- <result column="is_delete" property="isDelete"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- refill_card
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- card_number,batch_number,is_make_card, is_activite,is_delete,create_time,update_time
- </sql>
-
- <sql id="vals">
- #{cardNumber},#{batchNumber},#{isMakeCard},#{isActivite},
- #{isDelete},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="userName != null">card_number = #{cardNumber},</if>
- <if test="password != null">batch_number =#{batchNumber},</if>
- <if test="phone != null">is_make_card =#{isMakeCard},</if>
- <if test="headImage != null">is_activite =#{isMakeCard},</if>
- <if test="examType != null">is_delete = #{isDelete},</if>
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="userName != null">and card_number = #{cardNumber}</if>
- <if test="password != null"> and batch_number =#{batchNumber}</if>
- <if test="phone != null">and is_make_card =#{isMakeCard}</if>
- <if test="headImage != null"> and is_activite =#{isMakeCard}</if>
- <if test="examType != null">and is_delete = #{isDelete}</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.User" keyProperty="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- value(
- <include refid="vals"/>
- )
- </insert>
-
- <update id="update" parameterType="java.lang.String">
- UPDATE
- <include refid="table"/>
- <set>
- is_activite =0
- </set>
- <where>
- batch_number =#{batchNumber}
- </where>
- </update>
-
- <select id="getList" resultMap="refillCardMap" parameterType="map">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- is_delete=0
-
- order by create_time desc
- limit #{pageNo},#{pageSize}
- </where>
- </select>
-
-
- <select id="getUserNumbers" resultType="java.lang.Integer">
- SELECT COUNT(id)
- FROM
- <include refid="table"/>
- where is_delete=0
- </select>
-
- <select id="getById" resultMap="refillCardMap">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- where id=#{id}
- </select>
-
- <select id="getByBatchNumber" resultType="cn.wisenergy.model.app.RefillCard">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- where batch_number=#{batchNumber}
- </select>
-
- <update id="setIsMakeCard">
- UPDATE
- <include refid="table"/>
- <set>
- is_make_card =0
- </set>
- <where>
- id=#{id}
- </where>
- </update>
-</mapper>
\ No newline at end of file
diff --git a/wisenergy-mapper/src/main/resources/mapper/SchemeMapper.xml b/wisenergy-mapper/src/main/resources/mapper/SchemeMapper.xml
deleted file mode 100644
index 189775b..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/SchemeMapper.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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="cn.wisenergy.mapper.SchemeMapper">
- <resultMap id="userMap" type="cn.wisenergy.model.app.SchemeInfo">
- <id column="id" property="id"/>
- <result column="scheme_name" property="schemeName"/>
- <result column="upload_time" property="uploadTime"/>
- <result column="file_url" property="fileUrl"/>
- <result column="type" property="type"/>
- <result column="is_delete" property="isDelete"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- scheme
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- scheme_name,upload_time,file_url, type,is_delete,create_time,update_time
- </sql>
-
- <sql id="vals">
- #{schemeName},#{uploadTime},#{fileUrl},#{type},#{isDelete},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="schemeName != null">scheme_name = #{schemeName},</if>
- <if test="uploadTime != null">upload_time =#{uploadTime},</if>
- <if test="fileUrl != null">file_url =#{fileUrl},</if>
- <if test="type != null">type =#{type},</if>
- <if test="isDelete != null">is_delete =#{isDelete},</if>
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="id != null">id = #{id}</if>
- <if test="schemeName != null">and scheme_name = #{schemeName}</if>
- <if test="uploadTime != null">and upload_time =#{uploadTime}</if>
- <if test="fileUrl != null">and file_url =#{fileUrl}</if>
- <if test="type != null">and type =#{type}</if>
- <if test="isDelete != null">and is_delete =#{isDelete}</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.SchemeInfo" keyProperty="id"
- keyColumn="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- value(
- <include refid="vals"/>
- )
- </insert>
-
-
- <select id="getList" parameterType="map" resultType="cn.wisenergy.model.app.SchemeInfo">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- is_delete=0
- order by create_time desc
- limit #{startNum},#{endNum}
- </where>
- </select>
-
- <update id="edit" parameterType="cn.wisenergy.model.app.SchemeInfo">
- UPDATE
- <include refid="table"/>
- <set>
- <include refid="updateCondition"/>
- </set>
- <where>
- id = #{id}
- </where>
- </update>
-
- <select id="count" resultType="java.lang.Integer">
- select count(1)
- from
- <include refid="table"/>
- <where>
- is_delete=0
- </where>
- </select>
-
- <select id="getById" resultType="cn.wisenergy.model.app.SchemeInfo">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- id=#{id}
- </where>
- </select>
-
- <select id="getByType" resultType="int">
- select count(1)
- from
- <include refid="table"/>
- <where>
- type=#{type}
- and is_delete=0
- </where>
- </select>
-
-</mapper>
diff --git a/wisenergy-mapper/src/main/resources/mapper/SchemeRecordMapper.xml b/wisenergy-mapper/src/main/resources/mapper/SchemeRecordMapper.xml
deleted file mode 100644
index f1a4167..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/SchemeRecordMapper.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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="cn.wisenergy.mapper.SchemeRecordMapper">
- <resultMap id="recordMap" type="cn.wisenergy.model.app.SchemeQueryRecord">
- <id column="id" property="id"/>
- <result column="user_id" property="userId"/>
- <result column="major_name" property="majorName"/>
- <result column="student_type" property="studentType"/>
- <result column="score" property="score"/>
- <result column="major_score" property="majorScore"/>
- <result column="is_delete" property="isDelete"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- scheme_query_record
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- user_id,major_name, student_type,score,major_score,is_delete,create_time,update_time
- </sql>
-
- <sql id="vals">
- #{userId},#{majorName},#{studentType},#{score}, #{majorScore},#{isDelete},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="userId != null">user_id = #{userId},</if>
- <if test="majorName != null">major_name =#{majorName},</if>
- <if test="studentType != null">student_type =#{studentType},</if>
- <if test="score != null">score =#{score},</if>
- <if test="majorScore != null">major_score =#{majorScore},</if>
- <if test="isDelete != null">is_delete = #{isDelete},</if>
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="id != null">id = #{id}</if>
- <if test="userId != null">and user_id = #{userId}</if>
- <if test="majorName != null">and major_name =#{majorName}</if>
- <if test="studentType != null">and student_type =#{studentType}</if>
- <if test="score != null">and score =#{score}</if>
- <if test="majorScore != null">and major_score =#{majorScore}</if>
- <if test="isDelete != null">and is_delete = #{isDelete}</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.SchemeQueryRecord" keyProperty="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- value(
- <include refid="vals"/>
- )
- </insert>
-
- <update id="edit" parameterType="cn.wisenergy.model.app.SchemeQueryRecord">
- UPDATE
- <include refid="table"/>
- <set>
- <include refid="updateCondition"/>
- </set>
- <where>
- id = #{id}
- </where>
- </update>
-
- <delete id="delById" parameterType="java.lang.Integer">
- delete from
- <include refid="table"/>
- where id = #{id}
- </delete>
-
- <select id="count" resultType="java.lang.Integer">
- select count(1)
- from
- <include refid="table"/>
- <where>
- is_delete=0
- <if test="userId != null">
- and user_id=#{userId}
- </if>
- </where>
- </select>
-
- <select id="getByUserId" resultType="cn.wisenergy.model.app.SchemeQueryRecord">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- is_delete=0
- and user_id=#{userId}
- order by create_time desc
- limit #{startNum},#{endNum}
- </where>
- </select>
-
- <select id="getById" resultMap="recordMap">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- id=#{id}
- </where>
- </select>
-</mapper>
diff --git a/wisenergy-mapper/src/main/resources/mapper/ScoreInfoMapper.xml b/wisenergy-mapper/src/main/resources/mapper/ScoreInfoMapper.xml
deleted file mode 100644
index fd623bf..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/ScoreInfoMapper.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?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="cn.wisenergy.mapper.ScoreInfoMapper">
- <resultMap id="userMap" type="cn.wisenergy.model.app.ScoreInfo">
- <id column="id" property="id"/>
- <result column="user_id" property="userId"/>
- <result column="culture_grade" property="cultureGrade"/>
- <result column="major_grade" property="majorGrade"/>
- <result column="language_grade" property="languageGrade"/>
- <result column="math_grade" property="mathGrade"/>
- <result column="english_grade" property="englishGrade"/>
- <result column="physics_grade" property="physicsGrade"/>
- <result column="chemistry_grade" property="chemistryGrade"/>
- <result column="biology_grade" property="biologyGrade"/>
- <result column="history_grade" property="historyGrade"/>
- <result column="geography_grade" property="geographyGrade"/>
- <result column="politics_grade" property="politicsGrade"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- score
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- user_id,culture_grade, major_grade,language_grade,math_grade,english_grade, physics_grade,chemistry_grade,
- biology_grade,history_grade,geography_grade,politics_grade, create_time,update_time
- </sql>
-
- <sql id="vals">
- #{userId},#{cultureGrade},#{majorGrade},#{languageGrade},#{mathGrade},#{englishGrade},#{physicsGrade},
- #{chemistryGrade},#{biologyGrade}, #{historyGrade},#{geographyGrade},#{politicsGrade},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="userId != null">user_id = #{userId},</if>
- <if test="cultureGrade != null">culture_grade =#{cultureGrade},</if>
- <if test="majorGrade != null">major_grade =#{majorGrade},</if>
- <if test="languageGrade != null">language_grade =#{languageGrade},</if>
- <if test="mathGrade != null">math_grade =#{mathGrade},</if>
- <if test="englishGrade != null">english_grade =#{englishGrade},</if>
- <if test="physicsGrade != null">physics_grade = #{physicsGrade},</if>
- <if test="chemistryGrade != null">chemistry_grade = #{chemistryGrade},</if>
- <if test="biologyGrade != null">biology_grade = #{biologyGrade},</if>
- <if test="historyGrade != null">history_grade = #{historyGrade},</if>
- <if test="geographyGrade != null">geography_grade = #{geographyGrade},</if>
- <if test="politicsGrade != null">politics_grade = #{politicsGrade},</if>
- update_time =now()
- </sql>
-
- <sql id="updateCondition2">
- user_id = #{userId},
- culture_grade =#{cultureGrade},
- major_grade =#{majorGrade},
- language_grade =#{languageGrade},
- math_grade =#{mathGrade},
- english_grade =#{englishGrade},
- physics_grade = #{physicsGrade},
- chemistry_grade = #{chemistryGrade},
- biology_grade = #{biologyGrade},
- history_grade = #{historyGrade},
- geography_grade = #{geographyGrade},
- politics_grade = #{politicsGrade},
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="id != null">id = #{id}</if>
- <if test="userId != null">and user_id = #{userId}</if>
- <if test="cultureGrade != null">and culture_grade =#{cultureGrade}</if>
- <if test="majorGrade != null">and major_grade =#{majorGrade}</if>
- <if test="languageGrade != null">and language_grade =#{languageGrade}</if>
- <if test="mathGrade != null">and math_grade =#{mathGrade}</if>
- <if test="englishGrade != null">and english_grade =#{englishGrade}</if>
- <if test="physicsGrade != null">and physics_grade = #{physicsGrade}</if>
- <if test="chemistryGrade != null">and chemistry_grade = #{chemistryGrade}</if>
- <if test="biologyGrade != null">and biology_grade = #{biologyGrade}</if>
- <if test="historyGrade != null">and history_grade = #{historyGrade}</if>
- <if test="geographyGrade != null">and geography_grade = #{geographyGrade}</if>
- <if test="politicsGrade != null">and politics_grade = #{politicsGrade}</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.ScoreInfo" keyProperty="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- value(
- <include refid="vals"/>
- )
- </insert>
-
- <update id="edit" parameterType="cn.wisenergy.model.app.ScoreInfo">
- UPDATE
- <include refid="table"/>
- <set>
- <include refid="updateCondition2"/>
- </set>
- <where>
- id = #{id}
- </where>
- </update>
-
- <delete id="delById" parameterType="java.lang.Integer">
- delete from
- <include refid="table"/>
- where id = #{id}
- </delete>
-
- <select id="getById" resultMap="userMap">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- user_id=#{userId}
- </where>
- </select>
-</mapper>
diff --git a/wisenergy-mapper/src/main/resources/mapper/UserLimitMapper.xml b/wisenergy-mapper/src/main/resources/mapper/UserLimitMapper.xml
deleted file mode 100644
index a07977b..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/UserLimitMapper.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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="cn.wisenergy.mapper.UserLimitMapper">
- <resultMap id="userMap" type="cn.wisenergy.model.app.UserLimit">
- <id column="id" property="id"/>
- <result column="user_id" property="userId"/>
- <result column="total_limit" property="totalLimit"/>
- <result column="use_limit" property="useLimit"/>
- <result column="usable_limit" property="usableLimit"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- user_limit
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- user_id,total_limit, use_limit,usable_limit,create_time,update_time
- </sql>
-
- <sql id="vals">
- #{userId},#{totalLimit},#{useLimit},#{usableLimit},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="userId != null">user_id = #{userId},</if>
- <if test="totalLimit != null">total_limit =#{totalLimit},</if>
- <if test="useLimit != null">use_limit =#{useLimit},</if>
- <if test="usableLimit != null">usable_limit =#{usableLimit},</if>
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="id != null">id = #{id}</if>
- <if test="userId != null">and user_id = #{userId}</if>
- <if test="totalLimit != null">and total_limit =#{totalLimit}</if>
- <if test="useLimit != null">and use_limit =#{useLimit}</if>
- <if test="usableLimit != null">and usable_limit =#{usableLimit}</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.UserLimit" keyProperty="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- value(
- <include refid="vals"/>
- )
- </insert>
-
- <update id="edit" parameterType="cn.wisenergy.model.app.UserLimit">
- UPDATE
- <include refid="table"/>
- <set>
- <include refid="updateCondition"/>
- </set>
- <where>
- id = #{id}
- </where>
- </update>
-
- <select id="getByUserId" resultMap="userMap">
- select <include refid="cols_all"/>
- from <include refid="table"/>
- <where>
- user_id=#{userId}
- </where>
- </select>
-
-</mapper>
diff --git a/wisenergy-mapper/src/main/resources/mapper/UserLimitRecordMapper.xml b/wisenergy-mapper/src/main/resources/mapper/UserLimitRecordMapper.xml
deleted file mode 100644
index 0f5c2aa..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/UserLimitRecordMapper.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?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="cn.wisenergy.mapper.UserLimitRecordMapper">
- <resultMap id="userMap" type="cn.wisenergy.model.app.UserLimitRecord">
- <id column="id" property="id"/>
- <result column="user_id" property="userId"/>
- <result column="user_limit_id" property="userLimitId"/>
- <result column="minus_limit" property="minusLimit"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- user_limit_record
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- user_id,user_limit_id,minus_limit, create_time,update_time
- </sql>
-
- <sql id="vals">
- #{userId},#{userLimitId},#{minusLimit},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="userId != null">user_id = #{userId},</if>
- <if test="userLimitId != null">user_limit_id =#{userLimitId},</if>
- <if test="minusLimit != null">minus_limit =#{minusLimit},</if>
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="id != null">id = #{id}</if>
- <if test="userId != null">and user_id = #{userId}</if>
- <if test="userLimitId != null">and user_limit_id =#{userLimitId}</if>
- <if test="minusLimit != null">and minus_limit =#{minusLimit}</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.UserLimitRecord" keyProperty="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- value(
- <include refid="vals"/>
- )
- </insert>
-
- <update id="edit" parameterType="cn.wisenergy.model.app.UserLimitRecord">
- UPDATE
- <include refid="table"/>
- <set>
- <include refid="updateCondition"/>
- </set>
- <where>
- id = #{id}
- </where>
- </update>
-
- <select id="getByUserId" resultMap="userMap">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- user_id=#{userId}
- </where>
- </select>
-
-</mapper>
diff --git a/wisenergy-mapper/src/main/resources/mapper/UserVolunteerMapper.xml b/wisenergy-mapper/src/main/resources/mapper/UserVolunteerMapper.xml
deleted file mode 100644
index 96f3f0a..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/UserVolunteerMapper.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?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="cn.wisenergy.mapper.UserVolunteerMapper">
- <resultMap id="userMap" type="cn.wisenergy.model.app.UserVolunteer">
- <id column="id" property="id"/>
- <result column="scheme_record_id" property="schemeRecordId"/>
- <result column="user_id" property="userId"/>
- <result column="volunteer_id" property="volunteerId"/>
- </resultMap>
-
- <sql id="table">
- user_volunteer
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- scheme_record_id,user_id, volunteer_id
- </sql>
-
- <sql id="createsVal">
- #{i.scheme_record_id},#{i.user_id},#{i.volunteer_id},now(), now()
- </sql>
-
- <sql id="vals">
- #{schemeRecordId},#{userId},#{volunteerId}
- </sql>
-
- <sql id="updateCondition">
- <if test="schemeRecordId != null">scheme_record_id = #{schemeRecordId},</if>
- <if test="userId != null">user_id =#{userId},</if>
- <if test="volunteerId != null">volunteer_id =#{volunteerId},</if>
- </sql>
-
- <sql id="criteria">
- <if test="id != null">id = #{id}</if>
- <if test="schemeRecordId != null">and scheme_record_id = #{schemeRecordId}</if>
- <if test="userId != null">and user_id =#{userId}</if>
- <if test="volunteerId != null">and volunteer_id =#{volunteerId}</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.UserVolunteer" keyProperty="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- value(
- <include refid="vals"/>
- )
- </insert>
-
- <!-- 批é‡åˆ›å»ºæŽ¥å£ -->
- <insert id="creates" parameterType="list">
- INSERT INTO
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- VALUES
- <foreach collection="list" item="i" index="index" separator=",">
- (<include refid="createsVal"/>)
- </foreach>
- </insert>
-
- <update id="edit" parameterType="cn.wisenergy.model.app.UserVolunteer">
- UPDATE
- <include refid="table"/>
- <set>
- <include refid="updateCondition"/>
- </set>
- <where>
- id = #{id}
- </where>
- </update>
-
- <delete id="delById" parameterType="java.lang.Integer">
- delete from
- <include refid="table"/>
- where id = #{id}
- </delete>
-
- <select id="listById" resultType="cn.wisenergy.model.app.UserVolunteer">
- select * from
- <include refid="table"/>
- where scheme_record_id = #{schemeRecordId}
- </select>
-
-</mapper>
diff --git a/wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml b/wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
deleted file mode 100644
index 8405384..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?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="cn.wisenergy.mapper.UsersMapper">
- <resultMap id="userMap" type="cn.wisenergy.model.app.User">
- <id column="id" property="id"/>
- <result column="user_name" property="userName"/>
- <result column="password" property="password"/>
- <result column="phone" property="phone"/>
- <result column="uuid" property="uuid"/>
- <result column="head_image" property="headImage"/>
- <result column="sex" property="sex"/>
- <result column="school" property="school"/>
- <result column="exam_type" property="examType"/>
- <result column="source" property="source"/>
- <result column="is_delete" property="isDelete"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- user
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- user_name,password, phone,uuid,head_image,sex,school, exam_type,source,is_delete,create_time,update_time
- </sql>
-
- <sql id="vals">
- #{userName},#{password},#{phone},#{uuid},#{headImage},#{sex},#{school},#{examType}, #{source},
- #{isDelete},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="userName != null">user_name = #{userName},</if>
- <if test="password != null">password =#{password},</if>
- <if test="phone != null">phone =#{phone},</if>
- <if test="uuid != null">uuid =#{uuid},</if>
- <if test="headImage != null">head_image =#{headImage},</if>
- <if test="sex != null">sex =#{sex},</if>
- <if test="school != null">school =#{school},</if>
- <if test="examType != null">exam_type = #{examType},</if>
- <if test="source != null">source = #{source},</if>
- <if test="isDelete != null">is_delete = #{isDelete},</if>
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="id != null">id = #{id}</if>
- <if test="userName != null">and user_name = #{userName}</if>
- <if test="password != null">and password =#{password}</if>
- <if test="phone != null">and phone =#{phone}</if>
- <if test="uuid != null">and uuid =#{uuid}</if>
- <if test="headImage != null">and head_image =#{headImage}</if>
- <if test="sex != null">and sex =#{sex}</if>
- <if test="school != null">and school =#{school}</if>
- <if test="examType != null">and exam_type = #{examType}</if>
- <if test="source != null">and source = #{source}</if>
- <if test="isDelete != null">and is_delete = #{isDelete}</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.User" keyProperty="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- value(
- <include refid="vals"/>
- )
- </insert>
-
- <update id="edit" parameterType="cn.wisenergy.model.app.User">
- UPDATE
- <include refid="table"/>
- <set>
- <include refid="updateCondition"/>
- </set>
- <where>
- id = #{id}
- </where>
- </update>
-
- <delete id="delById" parameterType="java.lang.Integer">
- delete from
- <include refid="table"/>
- where id = #{id}
- </delete>
-
- <select id="countByPhoneAnsUserId" resultType="java.lang.Integer">
- SELECT COUNT(1)
- FROM
- <include refid="table"/>
- WHERE phone=#{phone} and id !=#{userId} and is_delete=0
- </select>
-
- <select id="getList" resultMap="userMap" parameterType="map">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- is_delete=0
-
- <if test="startTime != null">
- and create_time
- between #{startTime}
- </if>
-
- <if test="endTime != null">and #{endTime}</if>
-
- <if test="userName != null">and user_name like ('%' #{userName} '%')</if>
-
- <if test="phone != null">and phone like ('%' #{phone} '%')</if>
- order by create_time desc
- limit #{pageNo},#{pageSize}
- </where>
- </select>
-
- <select id="getUserNumbers" resultType="java.lang.Integer">
- SELECT COUNT(id)
- FROM
- <include refid="table"/>
- <where>
- is_delete=0
-
- <if test="startTime != null">
- and create_time
- between #{startTime}
- </if>
- <if test="endTime != null">and #{endTime}</if>
-
- <if test="userName != null">and user_name like ('%' #{userName} '%')</if>
-
- <if test="phone != null">and phone like ('%' #{phone} '%')</if>
- </where>
-
- </select>
-
- <select id="getByPhone" resultType="cn.wisenergy.model.app.User">
- SELECT
- <include refid="cols_all"/>
- FROM
- <include refid="table"/>
- where is_delete=0 and phone=#{phone}
- </select>
-
-
- <select id="test" resultType="cn.wisenergy.model.app.User">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- <if test="list != null">
- <foreach collection="list" index="index" item="id" separator="or" open="(" close=")">
- user_name LIKE CONCAT('%',#{id},'%')
- </foreach>
- </if>
- </where>
- </select>
-</mapper>
diff --git a/wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml b/wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml
deleted file mode 100644
index 81205c2..0000000
--- a/wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?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="cn.wisenergy.mapper.VolunteerMapper">
- <resultMap id="userMap" type="cn.wisenergy.model.app.Volunteer">
- <id column="id" property="id"/>
- <result column="type" property="type"/>
- <result column="scheme_id" property="schemeId"/>
- <result column="major_name" property="majorName"/>
- <result column="academy" property="academy"/>
- <result column="course_demand" property="courseDemand"/>
- <result column="nature" property="nature"/>
- <result column="year_limit" property="yearLimit"/>
- <result column="plan_num" property="planNum"/>
- <result column="cast_archives_num" property="castArchivesNum"/>
- <result column="launch_num" property="launchNum"/>
- <result column="lowest_mark" property="lowestMark"/>
- <result column="lowest_rank" property="lowestRank"/>
- <result column="is_delete" property="isDelete"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- </resultMap>
-
- <sql id="table">
- volunteer
- </sql>
-
- <sql id="cols_all">
- id,
- <include refid="cols_exclude_id"/>
- </sql>
-
- <sql id="cols_exclude_id">
- type,scheme_id,major_name,academy, course_demand,nature,year_limit,plan_num,
- cast_archives_num,launch_num,lowest_mark,
- lowest_rank,is_delete,create_time,update_time
- </sql>
-
- <sql id="vals">
- #{type},#{scheme},#{majorName},#{academy},#{courseDemand},#{nature},#{yearLimit},#{planNum},#{castArchivesNum},
- #{launchNum},
- #{lowestMark}, #{lowestRank},#{isDelete},now(),now()
- </sql>
-
- <sql id="updateCondition">
- <if test="type != null">type = #{type},</if>
- <if test="scheme != null">scheme = #{scheme},</if>
- <if test="majorName != null">major_name = #{majorName},</if>
- <if test="academy != null">academy =#{academy},</if>
- <if test="courseDemand != null">course_demand =#{courseDemand},</if>
- <if test="nature != null">nature =#{nature},</if>
- <if test="yearLimit != null">year_limit =#{yearLimit},</if>
- <if test="planNum != null">plan_num =#{planNum},</if>
- <if test="castArchivesNum != null">cast_archives_num = #{castArchivesNum},</if>
- <if test="launchNum != null">launch_num = #{launchNum},</if>
- <if test="lowestMark != null">lowest_mark = #{lowestMark},</if>
- <if test="lowestRank != null">lowestMark = #{lowestRank},</if>
- <if test="isDelete != null">is_delete = #{isDelete},</if>
- update_time =now()
- </sql>
-
- <sql id="criteria">
- <if test="id != null">id = #{id}</if>
- <if test="type != null">and type = #{type}</if>
- <if test="scheme != null">and scheme = #{scheme}</if>
- <if test="majorName != null">and major_name = #{majorName}</if>
- <if test="academy != null">and academy =#{academy}</if>
- <if test="courseDemand != null">and course_demand =#{courseDemand}</if>
- <if test="nature != null">and nature =#{nature}</if>
- <if test="yearLimit != null">and year_limit =#{yearLimit}</if>
- <if test="planNum != null">and plan_num =#{planNum}</if>
- <if test="castArchivesNum != null">and cast_archives_num = #{castArchivesNum}</if>
- <if test="launchNum != null">and launch_num = #{launchNum}</if>
- <if test="lowestMark != null">and lowest_mark = #{lowestMark}</if>
- <if test="lowestRank != null">and lowestMark = #{lowestRank}</if>
- <if test="isDelete != null">and is_delete = #{isDelete}</if>
- <if test="createTime != null">and create_time >= #{createTime}</if>
- <if test="updateTime != null">and #{updateTime} >= update_time</if>
- </sql>
-
- <insert id="add" parameterType="cn.wisenergy.model.app.Volunteer" keyProperty="id" useGeneratedKeys="true">
- insert into
- <include refid="table"/>
- (<include refid="cols_exclude_id"/>)
- value(
- <include refid="vals"/>
- )
- </insert>
-
-
- <update id="updateBySchemeId">
- UPDATE
- <include refid="table"/>
- <set>
- is_delete=1
- </set>
- <where>
- scheme_id = #{schemeId}
- and is_delete=0
- </where>
- </update>
-
- <select id="getFillList" resultType="cn.wisenergy.model.app.Volunteer">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- is_delete =0
- <if test="upGrade != null">
- and #{upGrade} > lowest_mark
- </if>
- <if test="downGrade != null">
- and lowest_mark >#{downGrade}
- </if>
- <if test="type != null">
- and type =#{type}
- </if>
- <if test="volunteerIds != null and volunteerIds.size > 0 ">
- and id NOT IN
- <foreach collection="volunteerIds" index="index" item="id" separator="," open="(" close=")">
- #{id}
- </foreach>
- </if>
- order by major_name,lowest_mark desc
- limit #{number}
- </where>
- </select>
-
- <select id="getListByIds" resultType="cn.wisenergy.model.app.Volunteer">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- id IN
- <foreach collection="list" index="index" item="id" separator="," open="(" close=")">
- #{id}
- </foreach>
- </where>
- </select>
-
- <select id="getVolunteerList" resultType="cn.wisenergy.model.app.Volunteer">
- select
- <include refid="cols_all"/>
- from
- <include refid="table"/>
- <where>
- is_delete =0
- <if test="upGrade != null">
- and #{upGrade} > lowest_mark
- </if>
- <if test="downGrade != null">
- and lowest_mark >#{downGrade}
- </if>
- <if test="type != null">
- and type =#{type}
- </if>
- <if test="classNames != null">
- and
- <foreach collection="classNames" index="index" item="id" separator="or" open="(" close=")">
- course_demand LIKE CONCAT('%',#{id},'%')
- </foreach>
- </if>
- <if test="professionNames != null">
- and
- <foreach collection="professionNames" index="index" item="id" separator="or" open="(" close=")">
- major_name LIKE CONCAT('%',#{id},'%')
- </foreach>
- </if>
- order by lowest_mark desc
- </where>
- </select>
-
-</mapper>
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/AccountInfo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/AccountInfo.java
deleted file mode 100644
index df2f740..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/AccountInfo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package cn.wisenergy.model.app;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 管ç†å‘˜å®žä½“ç±»
- */
-@Data
-@ApiModel(value = "AccountInfo")
-public class AccountInfo implements Serializable {
-
- private static final long serialVersionUID = 3050641578536493424L;
- /**
- * 管ç†å‘˜ä¸»é”®id
- */
- @ApiModelProperty(name ="id",value = "管ç†å‘˜ä¸»é”®id")
- private Integer id;
-
- /**
- * 管ç†å‘˜è´¦å·
- */
- @ApiModelProperty(name = "name",value = "管ç†å‘˜è´¦å·")
- private String userName;
-
- /**
- * 管ç†å‘˜å¯†ç
- */
- @ApiModelProperty(name="password",value = "管ç†å‘˜å¯†ç ")
- private String password;
-
- /**
- * 头åƒ
- */
- @ApiModelProperty(name = "headImage",value = "头åƒ")
- private String headImage;
-
- /**
- * 是å¦åˆ 除
- */
- @ApiModelProperty(name = "isDelete",value = "是å¦åˆ 除 0：æ£å¸¸ 1ï¼šåˆ é™¤")
- private Integer isDelete;
- /**
- * 创建时间
- */
- @ApiModelProperty(name = "createTime",value = "创建时间")
- private Date createTime;
- /**
- * 修改时间
- */
- @ApiModelProperty(name = "updateTime",value = "修改时间")
- private Date updateTime;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/AdmissionRule.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/AdmissionRule.java
deleted file mode 100644
index f680751..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/AdmissionRule.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package cn.wisenergy.model.app;
-
-import cn.wisenergy.model.common.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author 86187
- * @ Description: 录å–规则实体类
- * @ Author : 86187
- * @ Date : 2021/1/19 10:43
- */
-@Data
-@ApiModel(value = "AdmissionRule")
-public class AdmissionRule extends BaseEntity implements Serializable {
- private static final long serialVersionUID = -9211670648343824241L;
-
- /**
- * 录å–规则id
- */
- @ApiModelProperty(value = "录å–规则id", name = "id")
- private Integer id;
-
- /**
- * 方案类型：1：本科文化一批 2：本科美术一批 3：艺术本科批文å¦ç¼–导 4：本科体育 5：专科专业分类6：专科美术一批 7：专科文å¦ç¼–导一批 8：专科体育一批
- */
- @ApiModelProperty(value = "方案类型：1：本科文化一批 2：本科美术一批 3：艺术本科批文å¦ç¼–导 4：本科体育 " +
- "5：专科专业分类6：专科美术一批 7：专科文å¦ç¼–导一批 8：专科体育一批", name = "type")
- private Integer type;
-
- /**
- * 文化æˆç»©æœ€é«˜åˆ†
- */
- @ApiModelProperty(value = "文化æˆç»©æœ€é«˜åˆ†", name = "cultureMax")
- private Double cultureMax;
-
- /**
- * 文化æˆç»©æœ€ä½Žåˆ†
- */
- @ApiModelProperty(value = "文化æˆç»©æœ€ä½Žåˆ†", name = "cultureMin")
- private Double cultureMin;
-
- /**
- * 本年文化课录å–线
- */
- @ApiModelProperty(value = "本年文化课录å–线", name = "currentYearCulture")
- private Double currentYearCulture;
-
- /**
- * 专业æˆç»©æœ€é«˜åˆ†
- */
- @ApiModelProperty(value = "专业æˆç»©æœ€é«˜åˆ†", name = "professionMax")
- private Double professionMax;
-
- /**
- * 专业æˆç»©æœ€ä½Žåˆ†
- */
- @ApiModelProperty(value = "专业æˆç»©æœ€ä½Žåˆ†", name = "professionMin")
- private Double professionMin;
-
- /**
- * 本年专业课录å–线
- */
- @ApiModelProperty(value = "本年文化课录å–线", name = "currentYearMajor")
- private Double currentYearMajor;
-
- /**
- * å‘上浮动分数
- */
- @ApiModelProperty(value = "å‘上浮动分数", name = "upMark")
- private Double upMark;
-
- /**
- * å‘下浮动分数
- */
- @ApiModelProperty(value = "å‘下浮动分数", name = "downMark")
- private Double downMark;
-
- /**
- * 展示志愿总数
- */
- @ApiModelProperty(value = "展示志愿总数", name = "number")
- private Integer number;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/Banner.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/Banner.java
deleted file mode 100644
index 7a30f8a..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/Banner.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package cn.wisenergy.model.app;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @ Description: 广告实体类
- * @ Author : 86187
- * @ Date : 2021/1/7 16:01
- */
-@Data
-@ApiModel(value = "Advertising")
-public class Banner implements Serializable {
-
- private static final long serialVersionUID = 5513428780946937905L;
-
- /**
- * 广告id
- */
- @ApiModelProperty(value = "广告id",name = "id")
- private Integer id;
-
- /**
- * åˆä½œå…¬å¸å称
- */
- @ApiModelProperty(value = "åˆä½œå…¬å¸å称",name = "companyName")
- private String companyName;
-
- /**
- * æŠ•æ”¾çŠ¶æ€ 0：暂åœä¸ 1：投放ä¸
- */
- @ApiModelProperty(value = "æŠ•æ”¾çŠ¶æ€ 0：暂åœä¸ 1：投放ä¸",name = "status")
- private Integer status;
-
- /**
- * 网å€
- */
- @ApiModelProperty(value = "网å€",name = "website")
- private String website;
-
- /**
- * 是å¦æœ‰å®£ä¼ 图 0：没有 1：有
- */
- @ApiModelProperty(value = "是å¦æœ‰å®£ä¼ 图 0：没有 1：有",name = "isHaveImage")
- private Integer isHaveImage;
-
- /**
- * 广告类型： 1：顶部广告 2：底部广告
- */
- @ApiModelProperty(value = "广告类型： 1：顶部广告 2：底部广告",name = "type")
- private Integer type;
-
- /**
- * 广告图片url
- */
- @ApiModelProperty(value = "广告图片url",name = "image")
- private String image;
-
- /**
- * 创建时间
- */
- @ApiModelProperty(value = "创建时间",name = "createTime")
- private Date createTime;
-
- /**
- * 更新时间
- */
- @ApiModelProperty(value = "更新时间",name = "updateTime")
- private Date updateTime;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/CardInfo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/CardInfo.java
deleted file mode 100644
index 398f06c..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/CardInfo.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package cn.wisenergy.model.app;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 充值å¡å—å¡å®žä½“ç±»
- */
-@Data
-@ApiModel(value = "CardInfo")
-public class CardInfo implements Serializable {
- /**
- * åå¡id
- */
- @ApiModelProperty(value = "åå¡id",name = "id")
- private Integer id;
-
- /**
- * 批次å·
- */
- @ApiModelProperty(value = "批次å·",name = "batchNumber")
- private String batchNumber;
-
- /**
- * 批次å·
- */
- @ApiModelProperty(value = "批次å·",name = "batchNumber")
- private String cardNumber;
-
- /**
- * 次数
- */
- @ApiModelProperty(value = "次数",name = "limit")
- private Integer limit;
-
- /**
- * 秘钥
- */
- @ApiModelProperty(value = "秘钥",name = "secretKey")
- private String secretKey ;
-
- /**
- * å¡çš„金é¢
- */
- @ApiModelProperty(value = "å¡çš„金é¢",name = "money")
- private String money;
-
- /**
- * 状æ€
- */
- @ApiModelProperty(value = "çŠ¶æ€ 0：未使用 1：已使用",name = "status")
- private Integer status;
-
- /**
- * 是å¦åˆ 除
- */
- @ApiModelProperty(name = "isDelete",value = "是å¦åˆ 除 0：æ£å¸¸ 1ï¼šåˆ é™¤")
- private Integer isDelete;
- /**
- * 创建时间
- */
- @ApiModelProperty(value = "创建时间",name = "creteTime")
- private Date createTime;
- /**
- *更改时间
- */
- @ApiModelProperty(value = "更改时间",name = "updateTime")
- private Date updateTime;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/Graduation.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/Graduation.java
deleted file mode 100644
index 9b7ea99..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/Graduation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package cn.wisenergy.model.app;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * æ¯•ä¸šé™¢æ ¡å®žä½“ç±»
- */
-@Data
-@ApiModel(value = "Graduation")
-public class Graduation implements Serializable {
- private static final long serialVersionUID = 7511175256020154565L;
- /**
- * é™¢æ ¡ä¸»é”®id
- */
- @ApiModelProperty(value = "é™¢æ ¡ä¸»é”®id",name = "id")
- private Integer id;
-
- /**
- * å¦æ ¡å称
- */
- @ApiModelProperty(value = "å¦æ ¡å称",name = "schoolName")
- private String schoolName;
-
- /**
- * å¦æ ¡åœ°å€
- */
- @ApiModelProperty(value = "å¦æ ¡åœ°å€",name = "position")
- private String position;
-
- /**
- * å¦æ ¡æè¿°
- */
- @ApiModelProperty(value = "å¦æ ¡æè¿°",name = "describe")
- private String describe;
-
- /**
- * 创建时间
- */
- @ApiModelProperty(value = "创建时间",name = "creteTime")
- private Date createTime;
-
- /**
- *更改时间
- */
- @ApiModelProperty(value = "更改时间",name = "updateTime")
- private Date updateTime;
-
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/LoginRecord.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/LoginRecord.java
deleted file mode 100644
index 731b884..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/LoginRecord.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package cn.wisenergy.model.app;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @ Description: 用户登录æ“作记录实体类
- * @ Author : 86187
- * @ Date : 2021/1/7 15:09
- */
-@Data
-@ApiModel(value = "LoginRecord")
-public class LoginRecord implements Serializable {
- private static final long serialVersionUID = 3450614328514828031L;
-
- /**
- * 用户æ“作记录id
- */
- @ApiModelProperty(value = "用户æ“作记录id", name = "id")
- private Integer id;
-
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id", name = "userId")
- private Integer userId;
-
- /**
- * 类型 1：用户祖册 2：用户登录 3：用户退出
- */
- @ApiModelProperty(value = "类型 1：用户祖册 2：用户登录 3：用户退出", name = "type")
- private Integer type;
-
- /**
- * æ“作å称
- */
- @ApiModelProperty(value = "æ“作å称", name = "operationName")
- private String operationName;
-
- /**
- * ip
- */
- @ApiModelProperty(value = "ip", name = "ip")
- private String ip;
-
- /**
- * 创建时间
- */
- @ApiModelProperty(value = "创建时间", name = "createTime")
- private Date createTime;
-
- /**
- * 修改时间
- */
- @ApiModelProperty(value = "修改时间", name = "updateTime")
- private Date updateTime;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/PayRecord.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/PayRecord.java
deleted file mode 100644
index ca05c64..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/PayRecord.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package cn.wisenergy.model.app;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
-*@ Description: 充值记录实体类
-*@ Author : 86187
-*@ Date : 2021/1/8 14:48
- * @author 86187
- */
-@Data
-@ApiModel(value = "PayRecord")
-public class PayRecord implements Serializable {
- private static final long serialVersionUID = -7865361068703566832L;
-
- /**
- * 充值记录id
- */
- @ApiModelProperty(value = "充值记录id",name = "id")
- private Integer id;
-
- /**
- * 充值类型 1ï¼šæ”¯ä»˜å® 2：微信 3：充值å¡
- */
- @ApiModelProperty(value = "充值类型 1ï¼šæ”¯ä»˜å® 2：微信 3：充值å¡",name = "type")
- private Integer type;
-
- /**
- * 充值å¡id
- */
- @ApiModelProperty(value = "充值å¡id",name = "cardId")
- private Integer cardId;
-
- /**
- * 充值用户id
- */
- @ApiModelProperty(value = "充值用户id",name = "userId")
- private Integer userId;
-
- /**
- * 充值所花金é¢
- */
- @ApiModelProperty(value = "充值所花金é¢",name = "money")
- private Integer money;
-
- /**
- * 充值结果 0：æˆåŠŸ 1：失败
- */
- @ApiModelProperty(value = "充值结果 0：æˆåŠŸ 1：失败",name = "result")
- private Integer result;
- /**
- * 充值次数
- */
- @ApiModelProperty(value = "充值次数",name = "limit")
- private Integer payLimit;
-
- /**
- * 创建时间
- */
- @ApiModelProperty(value = "创建时间",name = "creteTime")
- private Date createTime;
-
- /**
- *更改时间
- */
- @ApiModelProperty(value = "更改时间",name = "updateTime")
- private Date updateTime;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/Price.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/Price.java
deleted file mode 100644
index c6ba14b..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/Price.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package cn.wisenergy.model.app;
-
-import cn.wisenergy.model.common.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author 86187
- * @ Description: ä»·æ ¼è¡¨
- * @ Author : 86187
- * @ Date : 2021/1/24 9:50
- */
-@Data
-@ApiModel(value = "Price")
-
-public class Price implements Serializable {
- private static final long serialVersionUID = 1112644645559505970L;
-
- /**
- * ä»·æ ¼id
- */
- @ApiModelProperty(value = "ä»·æ ¼id", name = "id")
- private Integer id;
-
- /**
- * å¯æŸ¥è¯¢æ¬¡æ•°
- */
- @ApiModelProperty(value = "å¯æŸ¥è¯¢æ¬¡æ•°", name = "useLimit")
- private Integer useLimit;
-
- /**
- * è´ä¹°éœ€è¦çš„é’±
- */
- @ApiModelProperty(value = "è´ä¹°éœ€è¦çš„é’±", name = "money")
- private Integer money;
-
- /**
- * 创建时间
- */
- @ApiModelProperty("创建时间")
- private Date createTime;
-
-
- /**
- * 修改时间
- */
- @ApiModelProperty("修改时间")
- private Date updateTime;
-
- /**
- * åˆ é™¤æ ‡è®°
- */
- @ApiModelProperty("是å¦åˆ 除 1,åˆ é™¤;0,æœªåˆ é™¤")
- private Integer isDelete;
-
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/Profession.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/Profession.java
deleted file mode 100644
index aba4055..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/Profession.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package cn.wisenergy.model.app;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import springfox.documentation.annotations.ApiIgnore;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @ Description: 专业实体类
- * @ Author : 86187
- * @ Date : 2021/1/13 10:37
- */
-@Data
-@ApiModel(value = "profession")
-public class Profession implements Serializable {
- private static final long serialVersionUID = 4215915155490456186L;
-
- /**
- * 专业id
- */
- @ApiModelProperty(value = "专业id", name = "id")
- private Integer id;
-
- /**
- * 方案类型：1：本科文化一批 2：本科美术一批 3：艺术本科批文å¦ç¼–导 4：本科体育 5：专科专业分类6：专科美术一批 7：专科文å¦ç¼–导一批 8：专科体育一批
- */
- @ApiModelProperty(value = "方案类型：1：本科文化一批 2：本科美术一批 3：艺术本科批文å¦ç¼–导 4：本科体育 5：专科专业分类6：" +
- "专科美术一批 7：专科文å¦ç¼–导一批 8：专科体育一批", name = "type")
- private Integer type;
-
- /**
- * 父id
- */
- @ApiModelProperty(value = "专业id", name = "id")
- private Integer parentId;
-
- /**
- * ç‰çº§
- */
- @ApiModelProperty(value = "ç‰çº§", name = "level")
- private Integer level;
-
- /**
- * 专业å称
- */
- @ApiModelProperty(value = "专业å称", name = "name")
- private String name;
-
- /**
- * 创建时间
- */
- @ApiModelProperty(value = "创建时间", name = "createTime")
- private Date createTime;
-
- /**
- * 更新时间
- */
- @ApiModelProperty(value = "更新时间", name = "updateTime")
- private Date updateTime;
-
- /**
- * å专业
- */
- @ApiModelProperty(value = "å专业", name = "updateTime")
- private List<Profession> children;
-
- /**
- * 是å¦é€‰ä¸ false : æœªé€‰ä¸ true : 选ä¸
- */
- @ApiModelProperty(value = "是å¦é€‰ä¸ false : æœªé€‰ä¸ true : 选ä¸", name = "checked")
- @TableField(exist = false)
- private Boolean checked =false;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/RefillCard.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/RefillCard.java
deleted file mode 100644
index f2e2bac..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/RefillCard.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package cn.wisenergy.model.app;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@ApiModel(value = "RefillCard")
-public class RefillCard {
- /**
- * 充值å¡id
- */
- @ApiModelProperty(value = "充值å¡id",name = "id")
- private Integer id;
-
- /**
- * 批次å·
- */
- @ApiModelProperty(value = "批次å·",name = "batchNumber")
- private String batchNumber;
-
- /**
- * 是å¦å·²åˆ¶å¡ 0ï¼šå·²åˆ¶å¡ 1：未制å¡
- */
- @ApiModelProperty(value = "是å¦å·²åˆ¶å¡ 0ï¼šå·²åˆ¶å¡ 1：未制å¡",name = "isMakeCard")
- private Integer isMakeCard;
-
- /**
- * å¡æ•°é‡
- */
- @ApiModelProperty(value = "å¡æ•°é‡",name = "cardNumber")
- private Integer cardNumber ;
-
- /**
- * 是å¦å·²æ¿€æ´»
- */
- @ApiModelProperty(value = "是å¦å·²æ¿€æ´» 0：已激活 1：未激活 ",name = "isActivite")
- private Integer isActivite;
-
- /**
- * 是å¦åˆ 除
- */
- @ApiModelProperty(value = "是å¦åˆ 除 0：æ£å¸¸ 1ï¼šåˆ é™¤",name = "isDelete")
- private Integer isDelete;
-
- /**
- * 创建时间
- */
- @ApiModelProperty(value = "创建时间",name = "creteTime")
- private Date createTime;
-
- /**
- *更改时间
- */
- @ApiModelProperty(value = "更改时间",name = "updateTime")
- private Date updateTime;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/SchemeInfo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/SchemeInfo.java
deleted file mode 100644
index 4d71a8a..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/SchemeInfo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package cn.wisenergy.model.app;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author 86187
- */
-@Data
-@ApiModel(value = "SchemeInfo")
-@TableName("scheme")
-public class SchemeInfo implements Serializable {
- private static final long serialVersionUID = 7020644673356401949L;
- /**
- * 方案id
- */
- @ApiModelProperty(value = "方案id", name = "id")
- private Integer id;
-
- /**
- * 方案å称
- */
- @ApiModelProperty(value = "方案å称", name = "schemeName")
- private String schemeName;
-
- /**
- * ä¸Šä¼ æ—¶é—´
- */
- @ApiModelProperty(value = "ä¸Šä¼ æ—¶é—´", name = "uploadTime")
- private Date uploadTime;
-
- /**
- * ä¸Šä¼ url
- */
- @ApiModelProperty(value = "ä¸Šä¼ æ—¶é—´", name = "uploadTime")
- private String fileUrl;
-
- /**
- * 1：本科文化一批 2：本科美术一批 3：艺术本科批文å¦ç¼–导
- * 4：本科体育 5：专科专业分类6：专科美术一批 7：专科文å¦ç¼–导一批 8：专科体育一批
- */
- @ApiModelProperty(value = "1：本科文化一批 2：本科美术一批 3：文å¦ç¼–导本科一批 4：本科体育 " +
- "5：专科专业分类6：专科美术一批 7：专科文å¦ç¼–导一批 8：专科体育一批", name = "type")
- private Integer type;
-
- /**
- * 创建时间
- */
- @ApiModelProperty("创建时间")
- private Date createTime;
-
-
- /**
- * 修改时间
- */
- @ApiModelProperty("修改时间")
- private Date updateTime;
-
- /**
- * åˆ é™¤æ ‡è®°
- */
- @ApiModelProperty("是å¦åˆ 除 1,åˆ é™¤;0,æœªåˆ é™¤")
- private Integer isDelete;
-
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/SchemeQueryRecord.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/SchemeQueryRecord.java
deleted file mode 100644
index ae889f6..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/SchemeQueryRecord.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package cn.wisenergy.model.app;
-
-import cn.wisenergy.model.common.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @ Description: 方案查询记录
- * @ Author : 86187
- * @ Date : 2021/1/8 10:22
- * @author 86187
- */
-@Data
-@ApiModel(value = "SchemeQueryRecord")
-@TableName("scheme_query_record")
-public class SchemeQueryRecord implements Serializable {
-
- private static final long serialVersionUID = 6600452699328342752L;
-
- /**
- * 方案查询记录id
- */
- @ApiModelProperty(value = "方案查询记录id", name = "id")
- private Integer id;
-
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id", name = "userId")
- private Integer userId;
-
- /**
- * 专业å称
- */
- @ApiModelProperty(value = "专业å称", name = "majorName")
- private String majorName;
-
- /**
- * 考生类型 1：本科
- */
- @ApiModelProperty(value = "考生类型 1：本科", name = "studentType")
- private Integer studentType;
-
- /**
- * 考生文化分数
- */
- @ApiModelProperty(value = "考生文化分数", name = "score")
- private String score;
-
- /**
- * 考生专业分数
- */
- @ApiModelProperty(value = "考生专业分数", name = "majorScore")
- private String majorScore;
-
- /**
- * 创建时间
- */
- @ApiModelProperty("创建时间")
- private Date createTime;
-
-
- /**
- * 修改时间
- */
- @ApiModelProperty("修改时间")
- private Date updateTime;
-
- /**
- * åˆ é™¤æ ‡è®°
- */
- @ApiModelProperty("是å¦åˆ 除 1,åˆ é™¤;0,æœªåˆ é™¤")
- private Integer isDelete;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/ScoreInfo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/ScoreInfo.java
deleted file mode 100644
index e4a73c6..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/ScoreInfo.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package cn.wisenergy.model.app;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
-*@ Description: 用户æˆç»©å®žä½“ç±»
-*@ Author : 86187
-*@ Date : 2021/1/7 14:56
- * @author 86187
- */
-@Data
-@ApiModel(value = "ScoreInfo")
-@TableName("score")
-public class ScoreInfo implements Serializable {
- private static final long serialVersionUID = -8644045186424617919L;
-
- /**
- * æˆç»©id
- */
- @ApiModelProperty(value = "æˆç»©id",name = "id")
- private Integer id;
-
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id",name = "userId")
- private Integer userId;
-
- /**
- * 文化æˆç»©
- */
- @ApiModelProperty(value = "文化æˆç»©",name = "cultureGrade")
- private Double cultureGrade;
-
- /**
- * 专业æˆç»©
- */
- @ApiModelProperty(value = "专业æˆç»©",name = "majorGrade")
- private Double majorGrade;
-
- /**
- * è¯æ–‡æˆç»©
- */
- @ApiModelProperty(value = "è¯æ–‡æˆç»©",name = "languageGrade")
- private Double languageGrade;
-
- /**
- * æ•°å¦æˆç»©
- */
- @ApiModelProperty(value = "æ•°å¦æˆç»©",name = "mathGrade")
- private Double mathGrade;
-
- /**
- * 英è¯æˆç»©
- */
- @ApiModelProperty(value = "英è¯æˆç»©",name = "englishGrade")
- private Double englishGrade;
-
- /**
- * 物ç†æˆç»©
- */
- @ApiModelProperty(value = "物ç†æˆç»©",name = "physicsGrade")
- private Double physicsGrade;
-
- /**
- * 化å¦æˆç»©
- */
- @ApiModelProperty(value = "化å¦æˆç»©",name = "chemistryGrade")
- private Double chemistryGrade;
-
- /**
- * 生物æˆç»©
- */
- @ApiModelProperty(value = "生物æˆç»©",name = "biologyGrade")
- private Double biologyGrade;
-
- /**
- * 历å²æˆç»©
- */
- @ApiModelProperty(value = "历å²æˆç»©",name = "historyGrade")
- private Double historyGrade;
-
- /**
- * 地ç†æˆç»©
- */
- @ApiModelProperty(value = "地ç†æˆç»©",name = "geographyGrade")
- private Double geographyGrade;
-
- /**
- * 政治æˆç»©
- */
- @ApiModelProperty(value = "政治æˆç»©",name = "politicsGrade")
- private Double politicsGrade;
-
- /**
- * 创建时间
- */
- @ApiModelProperty(value = "创建时间",name = "creteTime")
- private Date createTime;
- /**
- *更改时间
- */
- @ApiModelProperty(value = "更改时间",name = "updateTime")
- private Date updateTime;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java
deleted file mode 100644
index c0af97c..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package cn.wisenergy.model.app;
-
-import cn.wisenergy.model.common.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author 86187
- * @ Description : 用户实体类
- * @ Author : lcc
- * @ CreateDate : 2020/11/8 19:59
- */
-@Data
-@ApiModel(value = "AccountUsers")
-@TableName("user")
-public class User implements Serializable {
- private static final long serialVersionUID = 2525339404301884673L;
-
- /**
- * 主键id
- */
- @ApiModelProperty(name = "id", value = "用户主键id")
- private Integer id;
-
- /**
- * 用户å称
- */
- @ApiModelProperty(name = "name", value = "用户å")
- private String userName;
-
- /**
- * 密ç
- */
- @ApiModelProperty(name = "password", value = "用户密ç ")
- private String password;
-
- /**
- * 电è¯å·ç
- */
- @ApiModelProperty(name = "phone", value = "手机å·")
- private String phone;
-
- /**
- * 头åƒ
- */
- @ApiModelProperty(name = "headImage", value = "头åƒ")
- private String headImage;
-
- /**
- * 微信uuid
- */
- @ApiModelProperty(name = "微信uuid", value = "uuid")
- private String uuid;
-
- /**
- * 性别
- */
- @ApiModelProperty(name = "sex", value = "用户性别:0:男，1：女")
- private Integer sex;
-
- /**
- * å¦æ ¡
- */
- @ApiModelProperty(name = "school", value = "æ¯•ä¸šé™¢æ ¡")
- private String school;
-
- /**
- * å¦ç”Ÿç±»åž‹
- */
- @ApiModelProperty(name = "examType", value = "考生类型 1：文化课考生 2：美术生 3：体育生 4：文å¦ç¼–导考生")
- private Integer examType;
-
- /**
- * æ¥æº 1：PC 2: APP
- */
- @ApiModelProperty(name = "source", value = "æ¥æº 1：PC 2: APP")
- private Integer source;
-
- /**
- * 是å¦åˆ 除
- */
- @ApiModelProperty(name = "isDelete", value = "是å¦åˆ 除 0：æ£å¸¸ 1ï¼šåˆ é™¤")
- private Integer isDelete;
- /**
- * 创建时间
- */
- @ApiModelProperty(name = "createTime", value = "创建时间")
- private Date createTime;
- /**
- * 修改时间
- */
- @ApiModelProperty(name = "updateTime", value = "修改时间")
- private Date updateTime;
-
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/UserLimit.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/UserLimit.java
deleted file mode 100644
index f487708..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/UserLimit.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package cn.wisenergy.model.app;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author 86187
- */
-@Data
-@ApiModel(value = "UserLimit")
-public class UserLimit implements Serializable {
- private static final long serialVersionUID = 3956830394491346594L;
- /**
- * 用户å¡ç‚¹id
- */
- @ApiModelProperty(value = "用户å¡ç‚¹id",name = "id")
- private Integer id;
-
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id",name = "userId")
- private Integer userId;
-
- /**
- * 总次数
- */
- @ApiModelProperty(value = "总次数",name = "totalLimit")
- private Integer totalLimit;
-
- /**
- * 已使次数
- */
- @ApiModelProperty(value = "已使次数",name = "useLimit")
- private Integer useLimit ;
-
- /**
- * å¯ç”¨æ¬¡æ•°
- */
- @ApiModelProperty(value = "å¯ç”¨æ¬¡æ•°",name = "usableLimit")
- private Integer usableLimit;
-
- /**
- * 创建时间
- */
- @ApiModelProperty(value = "创建时间",name = "creteTime")
- private Date createTime;
-
- /**
- *更改时间
- */
- @ApiModelProperty(value = "更改时间",name = "updateTime")
- private Date updateTime;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/UserLimitRecord.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/UserLimitRecord.java
deleted file mode 100644
index 9d09afa..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/UserLimitRecord.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package cn.wisenergy.model.app;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @author 86187
- * @ Description: 用户扣å‡æŸ¥è¯¢æ¬¡æ•°è®°å½•å®žä½“ç±»
- * @ Author : 86187
- * @ Date : 2021/1/27 14:49
- */
-@Data
-@ApiModel("UserLimitRecord")
-@TableName("user_limit_record")
-public class UserLimitRecord implements Serializable {
- private static final long serialVersionUID = 6832626172862202016L;
-
- /**
- * 用户扣å‡æŸ¥è¯¢æ¬¡æ•°è®°å½•id
- */
- @ApiModelProperty(value = "用户扣å‡æŸ¥è¯¢æ¬¡æ•°è®°å½•id", name = "id")
- private Integer id;
-
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户扣å‡æŸ¥è¯¢æ¬¡æ•°è®°å½•id", name = "id")
- private Integer userId;
-
- /**
- * 用户查询信æ¯id
- */
- @ApiModelProperty(value = "用户查询信æ¯id", name = "userLimitId")
- private Integer userLimitId;
-
- /**
- * 扣å‡æ¬¡æ•°
- */
- @ApiModelProperty(value = "扣å‡æ¬¡æ•°", name = "minusLimit")
- private Integer minusLimit;
-
- /**
- * 扣å‡æ—¶é—´
- */
- @ApiModelProperty(value = "扣å‡æ—¶é—´", name = "createTime")
- private Date createTime;
-
- /**
- * 更新时间
- */
- @ApiModelProperty(value = "更新时间", name = "updateTime")
- private Date updateTime;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/UserVolunteer.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/UserVolunteer.java
deleted file mode 100644
index f009c78..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/UserVolunteer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package cn.wisenergy.model.app;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author 86187
- */
-@Data
-@ApiModel(value = "UserVolunteer")
-@TableName("user_volunteer")
-public class UserVolunteer {
- /**
- * 用户方案id
- */
- @ApiModelProperty(value = "用户方案id",name = "id")
- private Integer id;
-
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id",name = "userId")
- private Integer userId;
-
- /**
- * 方案记录id
- */
- @ApiModelProperty(value = "方案记录id",name = "schemeRecordId")
- private Integer schemeRecordId;
-
- /**
- * å¿—æ„¿id
- */
- @ApiModelProperty(value = "å¿—æ„¿id",name = "volunteerId")
- private Integer volunteerId;
-
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/app/Volunteer.java b/wisenergy-model/src/main/java/cn/wisenergy/model/app/Volunteer.java
deleted file mode 100644
index 2fb69c3..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/app/Volunteer.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package cn.wisenergy.model.app;
-
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ContentLoopMerge;
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @ Description: 志愿实体类
- * @ Author : 86187
- * @ Date : 2021/1/7 15:15
- * @author 86187
- */
-@Data
-@Builder
-@ApiModel(value = "Volunteer")
-@NoArgsConstructor
-@AllArgsConstructor
-@ExcelIgnoreUnannotated
-public class Volunteer implements Serializable {
- private static final long serialVersionUID = -7880251929353475087L;
-
- /**
- * 志愿主键id
- */
- @ApiModelProperty(value = "志愿主键id", name = "id")
- private Integer id;
-
- /**
- * 方案类型：1：本科文化一批 2：本科美术一批 3：艺术本科批文å¦ç¼–导 4：本科体育 5：专科专业分类6：专科美术一批 7：专科文å¦ç¼–导一批 8：专科体育一批
- */
- @ApiModelProperty(value = "方案类型：1：本科文化一批 2：本科美术一批 3：艺术本科批文å¦ç¼–导 4：本科体育 " +
- "5：专科专业分类 6：专科美术一批 7：专科文å¦ç¼–导一批 8：专科体育一批", name = "type")
- private Integer type;
-
- /**
- * 方案id
- */
- @ApiModelProperty(value = "方案id", name = "schemeId")
- private Integer schemeId;
-
- /**
- * 专业å称
- */
- @ApiModelProperty(value = "专业", name = "majorName")
- @ExcelProperty(value = "专业")
- private String majorName;
-
- /**
- * é™¢æ ¡
- */
- @ApiModelProperty(value = "é™¢æ ¡", name = "academy")
- @ExcelProperty(value = "é™¢æ ¡")
- private String academy;
-
- /**
- * 选考科目è¦æ±‚
- */
- @ApiModelProperty(value = "选考科目è¦æ±‚", name = "courseDemand")
- @ExcelProperty(value = "选考科目è¦æ±‚")
- private String courseDemand;
-
- /**
- * å¦æ ¡æ€§è´¨
- */
- @ApiModelProperty(value = "å¦æ ¡æ€§è´¨", name = "nature")
- @ExcelProperty(value = "å¦æ ¡æ€§è´¨")
- private String nature;
-
- /**
- * å¦å¹´åˆ¶ï¼ˆå¹´ï¼‰
- */
- @ApiModelProperty(value = "å¦å¹´åˆ¶ï¼ˆå¹´ï¼‰", name = "yearLimit")
- @ExcelProperty(value = "å¦åˆ¶ï¼ˆå¹´ï¼‰")
- private Integer yearLimit;
-
- /**
- * 计划数
- */
- @ApiModelProperty(value = "计划数", name = "planNum")
- @ExcelProperty(value = "计划数")
- private Integer planNum;
-
- /**
- * 计划投档数
- */
- @ApiModelProperty(value = "投档计划数", name = "castArchivesNum")
- @ExcelProperty(value = "投档计划数")
- private Integer castArchivesNum;
-
- /**
- * 投出数
- */
- @ApiModelProperty(value = "投出数", name = "launchNum")
- @ExcelProperty(value = "投出数")
- private Integer launchNum;
-
- /**
- * 最低分
- */
- @ApiModelProperty(value = "最低分", name = "lowestMark")
- @ExcelProperty(value = "最低分")
- private String lowestMark;
-
- /**
- * 最低ä½æ¬¡
- */
- @ApiModelProperty(value = "最低ä½æ¬¡", name = "lowestRank")
- @ExcelProperty(value = "最低ä½æ¬¡")
- private String lowestRank;
-
- /**
- * 创建时间
- */
- @ApiModelProperty("创建时间")
- private Date createTime;
-
-
- /**
- * 修改时间
- */
- @ApiModelProperty("修改时间")
- private Date updateTime;
-
- /**
- * åˆ é™¤æ ‡è®°
- */
- @ApiModelProperty("是å¦åˆ 除 1,åˆ é™¤;0,æœªåˆ é™¤")
- private Integer isDelete;
-
- /**
- * 方案查询时间
- */
- @ApiModelProperty(value = "方案查询时间",name = "queryTime")
- @TableField(exist = false)
- @ContentLoopMerge(eachRow = 4,columnExtend=4)
- private Date queryTime;
-
-
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/common/BaseEntity.java b/wisenergy-model/src/main/java/cn/wisenergy/model/common/BaseEntity.java
deleted file mode 100644
index a392846..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/common/BaseEntity.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.wisenergy.model.common;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@JsonAutoDetect(creatorVisibility = JsonAutoDetect.Visibility.NONE, fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
-public abstract class BaseEntity implements Serializable {
-
- private static final long serialVersionUID = 7151370108706942192L;
-
- /**
- * 创建时间
- */
- @ApiModelProperty("创建时间")
- private Date createTime;
-
-
- /**
- * 修改时间
- */
- @ApiModelProperty("修改时间")
- private Date updateTime;
-
- /**
- * åˆ é™¤æ ‡è®°
- */
- @ApiModelProperty("是å¦åˆ 除 1,åˆ é™¤;0,æœªåˆ é™¤")
- private Integer isDelete;
-
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/AccountDto.java b/wisenergy-model/src/main/java/cn/wisenergy/model/dto/AccountDto.java
deleted file mode 100644
index e068efe..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/AccountDto.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package cn.wisenergy.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@ApiModel(value = "AccountDto")
-public class AccountDto implements Serializable {
- private static final long serialVersionUID = -6722696621467423127L;
-
- /**
- * 管ç†å‘˜ä¸»é”®id
- */
- @ApiModelProperty(name ="id",value = "管ç†å‘˜ä¸»é”®id")
- private Integer id;
-
- /**
- * 管ç†å‘˜è´¦å·
- */
- @ApiModelProperty(name = "name",value = "管ç†å‘˜è´¦å·")
- private String userName;
-
- /**
- * 头åƒ
- */
- @ApiModelProperty(name = "headImage",value = "头åƒ")
- private String headImage;
-
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/BannerDto.java b/wisenergy-model/src/main/java/cn/wisenergy/model/dto/BannerDto.java
deleted file mode 100644
index dfdd796..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/BannerDto.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package cn.wisenergy.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author 86187
- */
-@Data
-@ApiModel(value = "BannerDto")
-public class BannerDto {
-
- /**
- * 广告id
- */
- @ApiModelProperty(value = "广告id",name = "id")
- private Integer id;
-
-
- /**
- * 广告类型： 1：顶部广告 2：底部广告
- */
- @ApiModelProperty(value = "广告类型： 1：顶部广告 2：底部广告",name = "type")
- private Integer type;
-
- /**
- * æŠ•æ”¾çŠ¶æ€ 0：暂åœä¸ 1：投放ä¸
- */
- @ApiModelProperty(value = "æŠ•æ”¾çŠ¶æ€ 0：暂åœä¸ 1：投放ä¸",name = "status")
- private Integer status;
-
- /**
- * 网å€
- */
- @ApiModelProperty(value = "网å€",name = "website")
- private String website;
-
- /**
- * 广告图片url
- */
- @ApiModelProperty(value = "广告图片url",name = "image")
- private String image;
-
- /**
- * 更新时间
- */
- @ApiModelProperty(value = "更新时间",name = "updateTime")
- private Date updateTime;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/ExportCardDto.java b/wisenergy-model/src/main/java/cn/wisenergy/model/dto/ExportCardDto.java
deleted file mode 100644
index 0c903dd..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/ExportCardDto.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package cn.wisenergy.model.dto;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
-import com.alibaba.excel.annotation.write.style.ContentLoopMerge;
-import com.alibaba.excel.annotation.write.style.ContentRowHeight;
-import com.alibaba.excel.annotation.write.style.HeadRowHeight;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 充值å¡åå¡å¯¼å‡ºå®žä½“ç±»dto
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-//内容高度
-@ContentRowHeight(25)
-//表头行高度
-@HeadRowHeight(25)
-//列的宽度
-@ColumnWidth(25)
-public class ExportCardDto implements Serializable {
-
- private static final long serialVersionUID = 2062796530315436172L;
-
- /**
- * å¡å·
- */
- @ExcelProperty(value = "å¡å·")
- private String cardNumber;
-
- /**
- * 密ç
- */
- @ExcelProperty(value = "密ç ")
- private String secretKey;
-
- /**
- * 状æ€
- */
- @ExcelProperty(value = "状æ€")
- private String status;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/PayPageDto.java b/wisenergy-model/src/main/java/cn/wisenergy/model/dto/PayPageDto.java
deleted file mode 100644
index 99b2bc3..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/PayPageDto.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wisenergy.model.dto;
-/**
- * @ Description: 支付页é¢æŽ¥å£è¯·æ±‚å‚æ•°Dto
- * @ Author : 86187
- * @ Date : 2021/2/1 13:57
- */
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
- * @author 86187
- */
-@Data
-@ApiModel("PayPageDto")
-public class PayPageDto {
- /**
- * æ”¯ä»˜é‡‘é¢ ï¼šé‡‘é¢ä¸èƒ½ä¸º0
- */
- private Integer total;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/PayQueryDto.java b/wisenergy-model/src/main/java/cn/wisenergy/model/dto/PayQueryDto.java
deleted file mode 100644
index 7e330ea..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/PayQueryDto.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.wisenergy.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
- * @author 86187
- */
-@Data
-@ApiModel()
-public class PayQueryDto {
- /**
- * 支付å®äº¤æ˜“å·
- */
- private String tradeNo;
-
- /**
- * 商户订å•å·
- */
- private String outTradeNo;
-
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/RefillCardDto.java b/wisenergy-model/src/main/java/cn/wisenergy/model/dto/RefillCardDto.java
deleted file mode 100644
index c590bcf..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/RefillCardDto.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package cn.wisenergy.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "RefillCardDto")
-public class RefillCardDto {
- /**
- * 充值å¡id
- */
- @ApiModelProperty(value = "充值å¡id",name = "id")
- private Integer id;
-
- /**
- * 批次å·
- */
- @ApiModelProperty(value = "批次å·",name = "batchNumber")
- private String batchNumber;
-
- /**
- * 是å¦å·²åˆ¶å¡ 0ï¼šå·²åˆ¶å¡ 1：未制å¡
- */
- @ApiModelProperty(value = "是å¦å·²åˆ¶å¡ 0ï¼šå·²åˆ¶å¡ 1：未制å¡",name = "isMakeCard")
- private Integer isMakeCard;
-
- /**
- * å¡æ•°é‡
- */
- @ApiModelProperty(value = "å¡æ•°é‡",name = "cardNumber")
- private Integer cardNumber ;
-
- /**
- * 是å¦å·²æ¿€æ´»
- */
- @ApiModelProperty(value = "是å¦å·²æ¿€æ´» 0：已激活 1：未激活 ",name = "isActivite")
- private Integer isActivite;
-
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserCommitDto.java b/wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserCommitDto.java
deleted file mode 100644
index 3cb7209..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserCommitDto.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package cn.wisenergy.model.dto;
-
-import cn.wisenergy.model.app.ScoreInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author 86187
- * @ Description: 用户æ交Dto
- * @ Author : 86187
- * @ Date : 2021/1/12 15:39
- */
-@Data
-@ApiModel(value = "UserCommitDto")
-public class UserCommitDto implements Serializable {
-
- private static final long serialVersionUID = 361307736335983629L;
-
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id", name = "userId")
- private Integer userId;
-
- /**
- * 用户å称
- */
- @ApiModelProperty(value = "用户å称", name = "userName")
- private String userName;
-
- /**
- * 用户头åƒ
- */
- @ApiModelProperty(value = "用户头åƒ", name = "headImage")
- private String headImage;
-
-
- /**
- * 性别
- */
- @ApiModelProperty(value = "å¦æ ¡", name = "school")
- private Integer sex;
-
- /**
- * å¦æ ¡
- */
- @ApiModelProperty(value = "å¦æ ¡", name = "school")
- private String school;
-
- /**
- * 考生类型 1：文化课考生 2：美术生 3：体育生 4：文å¦ç¼–导考生
- */
- @ApiModelProperty(value = "考生类型 1：文化课考生 2：美术生 3：体育生 4：文å¦ç¼–导考生", name = "studentType")
- private Integer studentType;
-
- /**
- * 用户æ¥æº 1：PC 2：APP
- */
- @ApiModelProperty(value = "用户æ¥æº 1：PC 2：APP", name = "source")
- private Integer source;
-
-
- /**
- * å¦ç”Ÿæˆç»©ä¿¡æ¯
- */
- @ApiModelProperty(value = "å¦ç”Ÿæˆç»©ä¿¡æ¯", name = "scoreInfo")
- private ScoreInfo scoreInfo;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserInfoDto.java b/wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserInfoDto.java
deleted file mode 100644
index 000937f..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserInfoDto.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package cn.wisenergy.model.dto;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @ Description: 用户列表展示dto
- * @ Author : 86187
- * @ Date : 2021/1/7 10:47
- * @author 86187
- */
-@Data
-@ApiModel(value = "UserInfoDto")
-public class UserInfoDto implements Serializable {
-
- private static final long serialVersionUID = 4791446858538524520L;
-
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id", name = "userId")
- private Integer userId;
-
- /**
- * 用户å称
- */
- @ApiModelProperty(value = "用户å称", name = "userName")
- private String userName;
-
- /**
- * 性别 0：男 1：女
- */
- @ApiModelProperty(value = "性别 0：男 1：女", name = "sex")
- private Integer sex;
-
- /**
- * 考生类型 1：文化课考生 2：美术生 3：体育生 4：文å¦ç¼–导考生
- */
- @ApiModelProperty(value = "考生类型 1：文化课考生 2：美术生 3：体育生 4：文å¦ç¼–导考生", name = "examType")
- private Integer examType;
-
- /**
- * 登录æ¥æº
- */
- @ApiModelProperty(name ="source",value = "登录æ¥æºï¼š1 PC,2 WAP")
- private Integer source;
-
- /**
- * 手机
- */
- @ApiModelProperty(value = "手机å·", name = "phone")
- private String phone;
-
- /**
- * 文化æˆç»©
- */
- @ApiModelProperty(value = "文化æˆç»©", name = "cultureGrade")
- private String cultureGrade;
-
- /**
- * 专业æˆç»©
- */
- @ApiModelProperty(value = "专业æˆç»©", name = "majorGrade")
- private String majorGrade;
-
- /**
- * 用户剩余查询次数
- */
- @ApiModelProperty(value = "用户剩余查询次数", name = "queryLimit")
- private Integer queryLimit;
-
- /**
- * 用户充值总金é¢
- */
- @ApiModelProperty(value = "用户充值总金é¢", name = "moneyAmount")
- private String moneyAmount;
-
- /**
- * 用户充值次数
- */
- @ApiModelProperty(value ="充值å¡å……值总次数",name = "RechargeTimes")
- private int rechargeTimes;
-
- /**
- * 用户微信充值总金é¢
- */
- @ApiModelProperty(value ="用户微信充值总金é¢",name = "WeChatMoney")
- private String weChatMoney;
-
- /**
- * 用户支付å®å……值总金é¢
- */
- @ApiModelProperty(value ="用户支付å®å……值总金é¢",name = "AlipayMoney")
- private String alipayMoney;
-
- /**
- * ip
- */
- @ApiModelProperty(value = "ip", name = "ip")
- private String ip;
-
- /**
- * 注册时间
- */
- @ApiModelProperty(value = "注册时间", name = "registerTime")
- private Date registerTime;
-
- /**
- * 用户最åŽç™»é™†æ—¶é—´
- */
- @ApiModelProperty(value = "用户最åŽç™»é™†æ—¶é—´", name = "lastLoginTime")
- private Date lastLoginTime;
-
-
-
-
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/CardStatus.java b/wisenergy-model/src/main/java/cn/wisenergy/model/enums/CardStatus.java
deleted file mode 100644
index c1340bf..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/CardStatus.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.wisenergy.model.enums;
-
-/**
- * 充值å¡çŠ¶æ€æžšä¸¾
- *
- * @author 86187
- */
-
-public enum CardStatus {
- //未使用
- NO_USE(0, "未使用"),
-
- //已使用
- ALREADY_USED(1, "已使用");
- private Integer code;
-
- private String desc;
-
- CardStatus(Integer code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- public String getDescription() {
- return desc;
- }
-
- public Integer getCode() {
- return code;
- }
-
- public static String getNameByCode(Integer code) {
- if (null == code) {
- return null;
- }
- for (SceneType type : SceneType.values()) {
- if (type.getCode().intValue() == code.intValue()) {
- return type.name();
- }
- }
- return null;
- }
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/OperationTypeEnum.java b/wisenergy-model/src/main/java/cn/wisenergy/model/enums/OperationTypeEnum.java
deleted file mode 100644
index 3baca74..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/OperationTypeEnum.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package cn.wisenergy.model.enums;
-
-/**
- * @ Description: æ“作枚举类
- * @ Author : 86187
- * @ Date : 2021/1/15 9:58
- */
-public enum OperationTypeEnum {
- /**
- * 用户登录相关-æ“作枚举类
- */
- USER_REGISTER(1, "用户祖册"),
- USER_LOGIN(2, "用户登录"),
- USER_OUT(3, "用户退出");
-
- private Integer code;
-
- private String desc;
-
- OperationTypeEnum(Integer code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- public Integer getCode() {
- return code;
- }
-
- public void setCode(Integer code) {
- this.code = code;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-
- public static String getByCode(Integer code) {
- if (null == code) {
- return null;
- }
-
- for (OperationTypeEnum operation : OperationTypeEnum.values()) {
- if (operation.getCode().intValue() == code.intValue()) {
- return operation.getDesc();
- }
- }
- return null;
- }
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/PayType.java b/wisenergy-model/src/main/java/cn/wisenergy/model/enums/PayType.java
deleted file mode 100644
index ecf2f2c..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/PayType.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package cn.wisenergy.model.enums;
-
-/**
- * 支付方å¼æžšä¸¾ç±»
- *
- * @author 86187
- */
-
-public enum PayType {
-
- //支付å®
- ALI_PAY(1, "支付å®"),
-
- //微信
- WE_CHAT(2, "微信"),
-
- //充值å¡
- REFILL_CARD(3, "充值å¡");
- private Integer code;
-
- private String desc;
-
- PayType(Integer code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- public String getDescription() {
- return desc;
- }
-
- public Integer getCode() {
- return code;
- }
-
- public static String getNameByCode(Integer code) {
- if (null == code) {
- return null;
- }
- for (SceneType type : SceneType.values()) {
- if (type.getCode().intValue() == code.intValue()) {
- return type.name();
- }
- }
- return null;
- }
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/SceneType.java b/wisenergy-model/src/main/java/cn/wisenergy/model/enums/SceneType.java
deleted file mode 100644
index c2830c3..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/SceneType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package cn.wisenergy.model.enums;
-
-/**
- * 图片验è¯ç 业务类型
- *
- * @author zh
- * @version v2.0
- * @since v7.0
- * 2018å¹´3月19æ—¥ 下åˆ4:35:32
- */
-public enum SceneType {
-
- //验è¯ç 登录
- LOGIN(1, "验è¯ç 登录"),
- //手机注册
- REGISTER(2, "手机注册"),
- //修改密ç
- MODIFY_PASSWORD(3, "修改密ç "),
- //找回密ç
- FIND_PASSWORD(4, "找回密ç "),
-
- RESET_PASSWORD(5, "çŸä¿¡é‡ç½®å¯†ç ");
- private Integer code;
-
- private String desc;
-
- SceneType(Integer code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- public String getDescription() {
- return desc;
- }
-
- public Integer getCode() {
- return code;
- }
-
- public static String getNameByCode(Integer code) {
- if (null == code) {
- return null;
- }
- for (SceneType type : SceneType.values()) {
- if (type.getCode().intValue() == code.intValue()) {
- return type.name();
- }
- }
- return null;
- }
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/SchemeTypeEnums.java b/wisenergy-model/src/main/java/cn/wisenergy/model/enums/SchemeTypeEnums.java
deleted file mode 100644
index 33c239b..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/SchemeTypeEnums.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package cn.wisenergy.model.enums;
-
-/**
-*@ Description: 方案类型枚举
-*@ Author : 86187
-*@ Date : 2021/1/13 14:19
- * @author 86187
- */
-public enum SchemeTypeEnums {
- /**
- * 方案类型枚举
- */
- UNDERGRADUATE_CULTURE(1,"本科文化一批"),
-
- UNDERGRADUATE_ARTS(2,"本科美术一批"),
-
- UNDERGRADUATE_LITERATURE(3,"æ–‡å¦ç¼–导本科一批"),
-
- UNDERGRADUATE_SPORTS(4,"本科体育一批"),
-
- JUNIOR_COLLEGE_MAJOR(5,"专科文化一批"),
-
- JUNIOR_COLLEGE_ARTS(6,"专科美术一批"),
-
- JUNIOR_COLLEGE_LITERATURE(7,"æ–‡å¦ç¼–导专科一批"),
-
- JUNIOR_COLLEGE_SPORTS(8,"专科体育一批");
-
- private Integer code;
-
- private String desc;
-
- SchemeTypeEnums(Integer code,String desc){
- this.code=code;
- this.desc=desc;
- }
-
- public Integer getCode() {
- return code;
- }
-
- public void setCode(Integer code) {
- this.code = code;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/SourceType.java b/wisenergy-model/src/main/java/cn/wisenergy/model/enums/SourceType.java
deleted file mode 100644
index 88eaca8..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/SourceType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package cn.wisenergy.model.enums;
-
-/**
- * @author 86187
- * @ Description: 账户注册æ¥æºä¿¡æ¯ 枚举
- * @ Author : 86187
- * @ Date : 2021/2/9 10:48
- */
-public enum SourceType {
-
- //PC
- PC(1, "PC"),
-
- APP(2, "APP");
- private Integer code;
-
- private String desc;
-
- SourceType(Integer code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- public static String getByCode(Integer code) {
- if (null == code) {
- return null;
- }
- for (SourceType type : SourceType.values()) {
- if (type.code.intValue() == code) {
- return type.getDesc();
- }
- }
- return null;
- }
-
- public Integer getCode() {
- return code;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-
- public void setCode(Integer code) {
- this.code = code;
- }
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/StudentClassEnum.java b/wisenergy-model/src/main/java/cn/wisenergy/model/enums/StudentClassEnum.java
deleted file mode 100644
index 8fa384a..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/StudentClassEnum.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package cn.wisenergy.model.enums;
-
-/**
- * @author 86187
- * @ Description: 考生å¦ç§‘枚举
- * @ Author : 86187
- * @ Date : 2021/1/19 15:02
- */
-public enum StudentClassEnum {
- //物ç†
- PHYSICS_GRADE(1, "物ç†"),
- //化å¦
- CHEMISTRY_GRADE(2, "化å¦"),
- //生物
- BIOLOGY_GRADE(3, "生物"),
- //历å²
- HISTORY_GRADE(4, "历å²"),
-
- GEOGRAPHY_GRADE(5, "地ç†"),
- POLITICS_GRADE(6, "政治"),
- UNLIMITED(7, "ä¸é™");
- private Integer code;
-
- private String desc;
-
- StudentClassEnum(Integer code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- public Integer getCode() {
- return code;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-
- public void setCode(Integer code) {
- this.code = code;
- }
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/StudentType.java b/wisenergy-model/src/main/java/cn/wisenergy/model/enums/StudentType.java
deleted file mode 100644
index aa385ef..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/StudentType.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cn.wisenergy.model.enums;
-
-/**
- * @author 86187
- * @ Description: 考生类型枚举
- * @ Author : 86187
- * @ Date : 2021/1/18 20:36
- */
-public enum StudentType {
-
- /**
- * 考生类型枚举
- */
- CULTURE_STUDENT(1, "文化课考生"),
- ART_STUDENT(2, "美术生"),
- SPORTS_STUDENT(3, "体育生"),
- LITERATURE_STUDENT(4, "æ–‡å¦ç¼–导生");
-
- private Integer code;
-
- private String desc;
-
- StudentType(Integer code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- public Integer getCode() {
- return code;
- }
-
- public void setCode(Integer code) {
- this.code = code;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/TemplateType.java b/wisenergy-model/src/main/java/cn/wisenergy/model/enums/TemplateType.java
deleted file mode 100644
index bed8e50..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/enums/TemplateType.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package cn.wisenergy.model.enums;
-
-/**
- * @author 86187
- * @ Description: çŸä¿¡æ¨¡æ¿ç¼–å·æžšä¸¾
- * @ Author : 86187
- * @ Date : 2021/1/26 15:37
- */
-public enum TemplateType {
- ;
- private Integer code;
-
- private String desc;
-
- TemplateType(Integer code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- public Integer getCode() {
- return code;
- }
-
- public void setCode(Integer code) {
- this.code = code;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/AccountLoginVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/AccountLoginVo.java
deleted file mode 100644
index 71a1bfa..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/AccountLoginVo.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-@Data
-@ApiModel(value = "AccountInfo")
-public class AccountLoginVo implements Serializable {
- private static final long serialVersionUID = -3802879442149734552L;
-
- /**
- * 管ç†å‘˜è´¦å·
- */
- @ApiModelProperty(name = "name",value = "管ç†å‘˜è´¦å·")
- private String userName;
-
- /**
- * 管ç†å‘˜å¯†ç
- */
- @ApiModelProperty(name="password",value = "管ç†å‘˜å¯†ç ")
- private String password;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/AddLimitVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/AddLimitVo.java
deleted file mode 100644
index 1cce100..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/AddLimitVo.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.io.Serializable;
-
-/**
- * @author 86187
- * @ Description: æ·»åŠ ç”¨æˆ·æŸ¥è¯¢æ¬¡æ•°Vo
- * @ Author : 86187
- * @ Date : 2021/1/27 10:19
- */
-@Data
-@ApiModel(value = "AddLimitVo")
-public class AddLimitVo implements Serializable {
- private static final long serialVersionUID = -1402670785302226482L;
-
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id", name = "userId")
- private Integer userId;
-
- /**
- * 支付类型 1ï¼šæ”¯ä»˜å® 2：微信 3：充值å¡
- */
- @ApiModelProperty(value = "支付类型 1ï¼šæ”¯ä»˜å® 2：微信 3：充值å¡", name = "payType")
- private Integer payType;
-
- /**
- * 支付金é¢
- */
- @ApiModelProperty(value = "支付金é¢", name = "payMoney")
- private Integer payMoney;
-
- /**
- * 充值å¡å¯†ç
- */
- @ApiModelProperty(value = "充值å¡å¯†ç ", name = "password")
- private String password;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/AdvertisingQueryVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/AdvertisingQueryVo.java
deleted file mode 100644
index 17a86f5..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/AdvertisingQueryVo.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
-*@ Description: 广告分页查询Vo
-*@ Author : 86187
-*@ Date : 2021/1/7 17:13
-*/
-@Data
-@ApiModel(value = "AdvertisingQueryVo")
-public class AdvertisingQueryVo implements Serializable {
- private static final long serialVersionUID = 8066049220539686367L;
-
- /**
- * 关键è¯
- */
- @ApiModelProperty(value = "关键è¯", name = "keyword")
- private String keyword;
-
- /**
- * 广告类型： 1：顶部广告 2：底部广告
- */
- @ApiModelProperty(value = "广告类型： 1：顶部广告 2：底部广告",name = "type")
- private Integer type;
-
- /**
- * æŠ•æ”¾çŠ¶æ€ 0：暂åœä¸ 1：投放ä¸
- */
- @ApiModelProperty(value = "æŠ•æ”¾çŠ¶æ€ 0：暂åœä¸ 1：投放ä¸",name = "status")
- private Integer status;
-
- /**
- * 开始时间
- */
- @ApiModelProperty(value = "开始时间", name = "startTime")
- private Date startTime;
-
- /**
- * 结æŸæ—¶é—´
- */
- @ApiModelProperty(value = "结æŸæ—¶é—´", name = "endTime")
- private Date endTime;
-
- /**
- * 起始页
- */
- @ApiModelProperty(value = "起始页", name = "pageNo")
- private Integer pageNo;
-
- /**
- * 页大å°
- */
- @ApiModelProperty(value = "页大å°", name = "pageSize")
- private Integer pageSize;
-
- private Integer startNum;
-
- private Integer endNum;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/LoginOutVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/LoginOutVo.java
deleted file mode 100644
index 5349257..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/LoginOutVo.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author 86187
- */
-@Data
-@ApiModel("LoginOutVo")
-public class LoginOutVo implements Serializable {
- private static final long serialVersionUID = -307447260120718038L;
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id", name = "userId")
- private Integer userId;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/MinusLimitVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/MinusLimitVo.java
deleted file mode 100644
index a2702ed..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/MinusLimitVo.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author 86187
- * @ Description: 查询次数扣å‡Vo
- * @ Author : 86187
- * @ Date : 2021/1/28 17:06
- */
-@Data
-@ApiModel("MinusLimitVo")
-public class MinusLimitVo implements Serializable {
- private static final long serialVersionUID = 8276489379012215568L;
-
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id", name = "userId")
- private Integer userId;
-
-
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/PayRecordQueryVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/PayRecordQueryVo.java
deleted file mode 100644
index 8f1fa07..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/PayRecordQueryVo.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
-*@ Description: 充值记录查询Vo
-*@ Author : 86187
-*@ Date : 2021/1/13 17:16
-*/
-@Data
-@ApiModel(value = "PayRecordQueryVo")
-public class PayRecordQueryVo implements Serializable {
- private static final long serialVersionUID = 4964338614574527324L;
-
- /**
- * 关键è¯
- */
- @ApiModelProperty(value = "关键è¯", name = "keyword")
- private String keyword;
-
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id", name = "userId")
- private Integer userId;
-
- /**
- * 起始页
- */
- @ApiModelProperty(value = "起始页", name = "pageNo")
- private Integer pageNo;
-
- /**
- * 页大å°
- */
- @ApiModelProperty(value = "页大å°", name = "pageSize")
- private Integer pageSize;
-
- private Integer startNum;
-
- private Integer endNum;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/PayRecordShowVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/PayRecordShowVo.java
deleted file mode 100644
index fc0e403..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/PayRecordShowVo.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
-*@ Description: 充值记录展示Vo
-*@ Author : 86187
-*@ Date : 2021/1/13 17:14
- * @author 86187
- */
-@Data
-@ApiModel(value = "PayRecordShowVo")
-public class PayRecordShowVo implements Serializable {
- private static final long serialVersionUID = 3279446872102807035L;
-
- /**
- * 充值记录id
- */
- @ApiModelProperty(value = "充值记录id",name = "")
- private Integer recordId;
-
- /**
- * 充值类型 1ï¼šæ”¯ä»˜å® 2：微信 3：充值å¡
- */
- @ApiModelProperty(value = "充值类型 1ï¼šæ”¯ä»˜å® 2：微信 3：充值å¡",name = "type")
- private Integer type;
-
- /**
- * 充值结果 0：æˆåŠŸ 1：失败
- */
- @ApiModelProperty(value = "充值结果 0：æˆåŠŸ 1：失败",name = "result")
- private Integer result;
- /**
- * 充值次数
- */
- @ApiModelProperty(value = "充值次数",name = "limit")
- private Integer limit;
-
- /**
- * 充值时间
- */
- @ApiModelProperty(value = "充值时间",name = "payTime")
- private Date payTime;
-
-
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeQueryVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeQueryVo.java
deleted file mode 100644
index 4b2dd9a..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeQueryVo.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
-*@ Description: 方案列表查询Vo
-*@ Author : 86187
-*@ Date : 2021/1/25 11:30
- * @author 86187
- */
-@Data
-@ApiModel("SchemeQueryVo")
-public class SchemeQueryVo implements Serializable {
- private static final long serialVersionUID = 2326078022046306092L;
-
- /**
- * 起始页
- */
- @ApiModelProperty(value = "起始页", name = "pageNo")
- private Integer pageNo;
-
- /**
- * 页大å°
- */
- @ApiModelProperty(value = "页大å°", name = "pageSize")
- private Integer pageSize;
-
- private Integer startNum;
-
- private Integer endNum;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeRecordQueryVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeRecordQueryVo.java
deleted file mode 100644
index 149cfe2..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeRecordQueryVo.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
-*@ Description: 方案查询记录分页Vo
-*@ Author : 86187
-*@ Date : 2021/1/13 9:34
- * @author 86187
- */
-@Data
-@ApiModel(value = "SchemeRecordQueryVo")
-public class SchemeRecordQueryVo implements Serializable {
- private static final long serialVersionUID = -6962244667676123937L;
-
- /**
- * 关键è¯
- */
- @ApiModelProperty(value = "关键è¯", name = "keyword")
- private String keyword;
-
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id", name = "userId")
- private Integer userId;
-
- /**
- * 起始页
- */
- @ApiModelProperty(value = "起始页", name = "pageNo")
- private Integer pageNo;
-
- /**
- * 页大å°
- */
- @ApiModelProperty(value = "页大å°", name = "pageSize")
- private Integer pageSize;
-
- private Integer startNum;
-
- private Integer endNum;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeVo.java
deleted file mode 100644
index e11f4ea..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/SchemeVo.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author 86187
- * @ Description: 方案查询Vo
- * @ Author : 86187
- * @ Date : 2021/1/13 14:53
- */
-@Data
-@ApiModel(value = "SchemeQueryVo")
-public class SchemeVo implements Serializable {
-
- private static final long serialVersionUID = 717382532110305837L;
-
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id", name = "userId")
- private Integer userId;
-
- /**
- * 大专业å称
- */
- @ApiModelProperty(value = "大专业å称：如 ‘法å¦ã€æ–‡å¦ã€å¤–è¯â€™", name = "bigMajorNames")
- private String bigMajorNames;
-
- /**
- * 专业ids
- */
- @ApiModelProperty(value = "专业ids,如'1,2,3,4,5,6...'", name = "professionIds")
- private String professionIds;
-
- /**
- * 文化课æˆç»©
- */
- @ApiModelProperty(value = "文化课æˆç»©", name = "cultureGrade")
- private String cultureGrade;
-
- /**
- * 专业课æˆç»©
- */
- @ApiModelProperty(value = "专业课æˆç»©", name = "majorGrade")
- private String majorGrade;
-
- /**
- * 是å¦å±•ç¤ºå…¨éƒ¨ 0:å¦ 1：是
- */
- @ApiModelProperty(value = "是å¦å±•ç¤ºå…¨éƒ¨ 0:å¦ 1：是", name = "isShowAll")
- private Integer isShowAll;
-
-
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/SendSmsVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/SendSmsVo.java
deleted file mode 100644
index 6b3dcc0..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/SendSmsVo.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author 86187
- * @ Description: å‘é€çŸä¿¡éªŒè¯ç Vo
- * @ Author : 86187
- * @ Date : 2021/1/26 15:06
- */
-@Data
-@ApiModel(value = "SendSmsVo")
-public class SendSmsVo implements Serializable {
- private static final long serialVersionUID = -1072677301838222102L;
-
- /**
- * 手机å·ç
- */
- @ApiModelProperty(value = "手机å·ç ", name = "phone")
- private String phone;
-
- /**
- * æ¥æº 1:PC 2:APP
- */
- @ApiModelProperty(value = "æ¥æº 1:PC 2:APP", name = "source")
- private Integer source;
-
- /**
- * 场景 1：çŸä¿¡ç™»å½• 2：çŸä¿¡æ³¨å†Œ 3：çŸä¿¡ä¿®æ”¹å¯†ç 4：çŸä¿¡æ‰¾å›žå¯†ç 5：çŸä¿¡é‡ç½®å¯†ç
- */
- @ApiModelProperty(value = "场景 1：çŸä¿¡ç™»å½• 2：çŸä¿¡æ³¨å†Œ 3：çŸä¿¡ä¿®æ”¹å¯†ç 4：çŸä¿¡æ‰¾å›žå¯†ç 5：çŸä¿¡é‡ç½®å¯†ç ", name = "scene")
- private Integer scene;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UpdatePasswordVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UpdatePasswordVo.java
deleted file mode 100644
index c667f69..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UpdatePasswordVo.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @ Description: 修改账户密ç Vo
- * @ Author : 86187
- * @ Date : 2021/1/18 14:35
- * @author 86187
- */
-@Data
-@ApiModel(value = "UpdatePasswordVo")
-public class UpdatePasswordVo implements Serializable {
- private static final long serialVersionUID = 5543462178133500983L;
-
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id", name = "userId")
- private Integer userId;
-
- /**
- * 新密ç
- */
- @ApiModelProperty(value = "新密ç ", name = "newPassword")
- private String newPassword;
-
- /**
- * 旧密ç
- */
- @ApiModelProperty(value = "旧密ç ", name = "oldPassword")
- private String oldPassword;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserInfoVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserInfoVo.java
deleted file mode 100644
index ecee406..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserInfoVo.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @ Description: 用户信æ¯Vo
- * @ Author : 86187
- * @ Date : 2021/1/7 11:14
- * @author 86187
- */
-@Data
-@ApiModel(value = "UserInfoVo")
-public class UserInfoVo implements Serializable {
- private static final long serialVersionUID = 6175769905046107052L;
-
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id", name = "userId")
- private Integer userId;
-
- /**
- * 用户å称
- */
- @ApiModelProperty(value = "用户å称", name = "userName")
- private String userName;
-
- /**
- * 性别 0：男 1：女
- */
- @ApiModelProperty(value = "性别 0：男 1：女", name = "sex")
- private Integer sex;
-
- /**
- * 考生类型 1：文化课考生 2：美术生 3：体育生 4：文å¦ç¼–导考生
- */
- @ApiModelProperty(value = "考生类型 1：文化课考生 2：美术生 3：体育生 4：文å¦ç¼–导考生", name = "studentType")
- private Integer studentType;
-
- /**
- * 手机
- */
- @ApiModelProperty(value = "手机å·", name = "phone")
- private String phone;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserLoginVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserLoginVo.java
deleted file mode 100644
index 04f0f36..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserLoginVo.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author 86187
- * @ Description: 用户登录Vo
- * @ Author : 86187
- * @ Date : 2021/1/15 14:27
- */
-@Data
-@ApiModel(value = "UserLoginVo")
-public class UserLoginVo implements Serializable {
- private static final long serialVersionUID = 2206962675782086034L;
-
- /**
- * 手机å·ç
- */
- @ApiModelProperty(value = "手机å·ç ", name = "phone")
- private String phone;
-
- /**
- * 密ç
- */
- @ApiModelProperty(value = "密ç ", name = "password")
- private String password;
-
- /**
- * 验è¯ç
- */
- @ApiModelProperty(value = "验è¯ç ", name = "code")
- private String code;
-
- /**
- * 场景类型：1:验è¯ç 登录 2:手机注册 3:修改密ç 4：找回密ç
- */
- @ApiModelProperty(value = "场景类型：1:验è¯ç 登录 2:手机注册 3:修改密ç 4：找回密ç 5：çŸä¿¡é‡ç½®å¯†ç ", name = "scene")
- private Integer scene;
-
- /**
- * æ¥æºï¼š 1：PC 2：APP
- */
- @ApiModelProperty(value = "æ¥æºï¼š 1：PC 2：APP", name = "source")
- private Integer source;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserQueryVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserQueryVo.java
deleted file mode 100644
index 3c95c8b..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserQueryVo.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
-*@ Description: 用户分页查询Vo
-*@ Author : 86187
-*@ Date : 2021/1/7 11:30
-*/
-@Data
-@ApiModel(value = "UserQueryVo")
-public class UserQueryVo implements Serializable {
- private static final long serialVersionUID = -3717746916267660740L;
-
- /**
- * 关键è¯
- */
- @ApiModelProperty(value = "关键è¯", name = "keyword")
- private String keyword;
-
- /**
- * 开始时间
- */
- @ApiModelProperty(value = "开始时间", name = "startTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date startTime;
-
- /**
- * 结æŸæ—¶é—´
- */
- @ApiModelProperty(value = "结æŸæ—¶é—´", name = "endTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date endTime;
-
- /**
- * 起始页
- */
- @ApiModelProperty(value = "起始页", name = "pageNo")
- private Integer pageNo;
-
- /**
- * 页大å°
- */
- @ApiModelProperty(value = "页大å°", name = "pageSize")
- private Integer pageSize;
-
- /**
- * 用户å称
- */
- @ApiModelProperty(value= "用户å" ,name="userName")
- private String userName;
-
- /**
- * 电è¯å·ç
- */
- @ApiModelProperty(name = "phone",value = "手机å·")
- private String phone;
-
- private Integer startNum;
-
- private Integer endNum;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserRegisterVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserRegisterVo.java
deleted file mode 100644
index 95ec11c..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserRegisterVo.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author 86187
- * @ Description: 用户注册Vo
- * @ Author : 86187
- * @ Date : 2021/1/14 11:39
- */
-@Data
-@ApiModel(value = "UserRegisterVo")
-public class UserRegisterVo implements Serializable {
-
- private static final long serialVersionUID = -1105034143432359192L;
-
- /**
- * 手机å·ç
- */
- @ApiModelProperty(value = "手机å·ç ", name = "phone")
- private String phone;
-
- /**
- * 密ç
- */
- @ApiModelProperty(value = "密ç ", name = "password")
- private String password;
-
- /**
- * 验è¯ç
- */
- @ApiModelProperty(value = "验è¯ç ", name = "smCode")
- private String smCode;
-
- /**
- * æ¥æº 1：PC 2：APP
- */
- @ApiModelProperty(value = "æ¥æº 1：PC 2：APP", name = "source")
- private Integer source;
-
- /**
- * 场景 1：登录 2：注册 3：修改密ç 4：找回密ç 5：é‡ç½®å¯†ç
- */
- @ApiModelProperty(value = "场景 1：登录 2：注册 3：修改密ç 4：找回密ç 5：é‡ç½®å¯†ç ", name = "scene")
- private Integer scene;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserShowVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserShowVo.java
deleted file mode 100644
index 23beac1..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/UserShowVo.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import cn.wisenergy.model.app.ScoreInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
-*@ Description: 用户对外展示信æ¯Vo
-*@ Author : 86187
-*@ Date : 2021/1/12 15:29
-*/
-@Data
-@ApiModel(value = "UserShowVo")
-public class UserShowVo implements Serializable {
- private static final long serialVersionUID = 2451826421351862268L;
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id",name = "id")
- private Integer id;
-
- /**
- * 用户å称
- */
- @ApiModelProperty(value = "用户å称",name = "userName")
- private String userName;
-
- /**
- * 性别
- */
- @ApiModelProperty(value = "性别",name = "sex")
- private Integer sex;
-
- /**
- * 毕业高ä¸å¦æ ¡
- */
- @ApiModelProperty(value = "毕业高ä¸å¦æ ¡",name = "school")
- private String school;
-
- /**
- * 考生类型 1：文化课考生 2：美术生 3：体育生 4：文å¦ç¼–导考生
- */
- @ApiModelProperty(value = "考生类型 1：文化课考生 2：美术生 3：体育生 4：文å¦ç¼–导考生",name = "studentType")
- private Integer studentType;
-
- /**
- * å¦ç”Ÿæˆç»©ä¿¡æ¯
- */
- @ApiModelProperty(value = "å¦ç”Ÿæˆç»©ä¿¡æ¯",name = "scoreInfo")
- private ScoreInfo scoreInfo;
-}
diff --git a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/VolunteerVo.java b/wisenergy-model/src/main/java/cn/wisenergy/model/vo/VolunteerVo.java
deleted file mode 100644
index abc88cf..0000000
--- a/wisenergy-model/src/main/java/cn/wisenergy/model/vo/VolunteerVo.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package cn.wisenergy.model.vo;
-
-import cn.wisenergy.model.app.Volunteer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @ Description: 方案查询志愿列表
- * @ Author : 86187
- * @ Date : 2021/1/13 14:57
- */
-@Data
-@ApiModel(value = "VolunteerVo")
-public class VolunteerVo {
- /**
- * 用户id
- */
- @ApiModelProperty(value = "用户id", name = "userId")
- private Integer userId;
-
- /**
- * 方案记录id
- */
- @ApiModelProperty(value = "方案记录id", name = "recordId")
- private Integer recordId;
-
- /**
- * 返回志愿总数
- */
- @ApiModelProperty(value = "返回志愿总数", name = "total")
- private Integer total;
-
- /**
- * å¿—æ„¿ä¿¡æ¯åˆ—表
- */
- @ApiModelProperty(value = "å¿—æ„¿ä¿¡æ¯åˆ—表", name = "volunteers")
- private List<Volunteer> volunteers;
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/AccountSerivce.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/AccountSerivce.java
deleted file mode 100644
index 9e32531..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/AccountSerivce.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.dto.AccountDto;
-import cn.wisenergy.model.vo.AccountLoginVo;
-
-public interface AccountSerivce {
- /**
- * 查询管ç†å‘˜ä¿¡æ¯
- * @param accountLoginVo 查询å‚æ•°
- * @return 管ç†å‘˜ä¿¡æ¯
- */
- R<AccountDto> getAccountInfo(AccountLoginVo accountLoginVo);
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/BannerService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/BannerService.java
deleted file mode 100644
index 34e34db..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/BannerService.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.Banner;
-import cn.wisenergy.model.dto.BannerDto;
-import cn.wisenergy.model.vo.AdvertisingQueryVo;
-import com.github.pagehelper.PageInfo;
-import com.sun.org.apache.xpath.internal.operations.Bool;
-
-import java.util.List;
-
-/**
- * @ Description: 广告接å£å®šä¹‰
- * @ Author : 86187
- * @ Date : 2021/1/7 17:08
- */
-public interface BannerService {
- /**
- * æ·»åŠ å¹¿å‘Š
- *
- * @param advertising 广告信æ¯
- * @return true æˆåŠŸ false 失败
- */
- R<Boolean> add(Banner advertising);
-
- /**
- * 编辑广告
- *
- * @param advertising 广告信æ¯
- * @return true æˆåŠŸ false 失败
- */
- R<Boolean> edit(Banner advertising);
-
- /**
- * 获å–详情
- *
- * @param id 广告id
- * @return 详情
- */
- R<Banner> getById(Integer id);
-
- /**
- * 获å–广告分页列表
- *
- * @param advertisingQueryVo 分页å‚æ•°
- * @return 分页结果集
- */
- R<PageInfo<BannerDto>> getList(AdvertisingQueryVo advertisingQueryVo);
-
- /**
- * 开始/æš‚åœæŠ•æ”¾å¹¿å‘Š
- *
- * @param id 广告id
- * @param status 1 ：投放 2：暂åœæŠ•æ”¾
- * @return true æˆåŠŸ false 失败
- */
- R<Boolean> editStatus(Integer id, Integer status);
-
- R<List<Banner>> getTopBanners(Integer type);
-
- /**
- * 工具广告idåˆ é™¤å¹¿å‘Š
- * @param id 广告id
- * @return true æˆåŠŸ false 失败
- */
- R<Boolean> delBanner(Integer id);
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/Daosupport.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/Daosupport.java
deleted file mode 100644
index 43fa6c5..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/Daosupport.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.wisenergy.service.app;
-
-import java.util.List;
-
-public interface Daosupport {
-
- /**
- * 查询å•ä¸€ç»“果集<br/>
- * 并将结果转为<code>int</code>型返回
- * @param sql 查询的sqlè¯å¥ï¼Œç¡®å®šç»“果为一行一列，且为数å—åž‹
- * @param args 对应sqlè¯å¥ä¸çš„å‚数值
- * @return
- */
- Integer queryForInt(String sql, Object... args);
-
-
- /**
- * 查询多行结果集<br/>
- * 并将结果转为<code>List<T></code>
- * @param sql 查询的sqlè¯å¥
- * @param clazz <code><T></code>的Class对象
- * @param args 对应sqlè¯å¥ä¸çš„å‚数值
- * @return 列表ä¸å…ƒç´ 为<code>T</code>çš„<code>List</code>
- */
- <T> List<T> queryForList(String sql, Class<T> clazz, Object... args);
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/GraduationSerivce.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/GraduationSerivce.java
deleted file mode 100644
index 4a3514e..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/GraduationSerivce.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.Graduation;
-
-import java.util.List;
-
-public interface GraduationSerivce {
-
- R<List<Graduation>> getList();
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/PayRecordService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/PayRecordService.java
deleted file mode 100644
index 71763cf..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/PayRecordService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.PayRecord;
-import cn.wisenergy.model.vo.PayRecordQueryVo;
-import cn.wisenergy.model.vo.PayRecordShowVo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.pagehelper.PageInfo;
-
-/**
-*@ Description: 充值记录接å£å®šä¹‰
-*@ Author : 86187
-*@ Date : 2021/1/13 17:13
- * @author 86187
- */
-public interface PayRecordService {
- /**
- * 获å–用户充值列表
- * @param payRecordQueryVo
- * @return
- */
- R<PageInfo<PayRecordShowVo>> getList(PayRecordQueryVo payRecordQueryVo);
-
- /**
- * æ·»åŠ å……å€¼è®°å½•
- * @param payRecord 充值记录信æ¯
- * @return true æˆåŠŸ false 失败
- */
- R<Boolean> add(PayRecord payRecord);
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/PriceService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/PriceService.java
deleted file mode 100644
index 9dddc07..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/PriceService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.Price;
-
-import java.util.List;
-
-/**
- * @author 86187
- */
-public interface PriceService {
-
- R<List<Price>> getList();
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/ProfessionService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/ProfessionService.java
deleted file mode 100644
index 770c24a..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/ProfessionService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.Profession;
-
-import java.util.List;
-
-/**
-*@ Description: 专业接å£å®šä¹‰
-*@ Author : 86187
-*@ Date : 2021/1/13 10:54
-*/
-public interface ProfessionService {
-
- /**
- * 获å–ä¸“ä¸šæ ‘ç»“æž„
- * @return æ ‘åˆ—è¡¨
- */
- R<List<Profession>> getTree(Integer type,Integer userId);
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/RefillCardService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/RefillCardService.java
deleted file mode 100644
index 0885ea2..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/RefillCardService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.RefillCard;
-import cn.wisenergy.model.dto.RefillCardDto;
-import com.github.pagehelper.PageInfo;
-
-import javax.servlet.http.HttpServletResponse;
-
-
-public interface RefillCardService {
- /**
- * æ·»åŠ å……å€¼å¡
- * @param refillCard 充值å¡ä¿¡æ¯
- * @return true æˆåŠŸ false 失败
- */
- R<Boolean> add(RefillCard refillCard);
-
- /**
- * 改å˜æ¿€æ´»çŠ¶æ€
- * @param batchNumber 充值å¡æ‰¹æ¬¡å·
- * @return true æˆåŠŸ false 失败
- */
- R<Boolean> update(String batchNumber);
-
- /**
- * 查询充值å¡ä¿¡æ¯
- * @param pageNo 当å‰é¡µæ•°
- * @param pageSize æ¯é¡µæ˜¾ç¤ºæ¡æ•°
- * @return 充值å¡ä¿¡æ¯ç»“果集
- */
- R<PageInfo<RefillCardDto>> getList(Integer pageNo, Integer pageSize);
-
- /**
- * 生æˆå¡ç‰‡
- * @param id :充值å¡id
- * @return true æˆåŠŸ false 失败
- */
- R<Boolean> createCard(Integer id);
-
- /**
- * 导出excel
- * @param batchNumber 批次å·
- * @param response
- * @return Excelæ•°æ®
- */
- R<Boolean> createExcel(String batchNumber, HttpServletResponse response);
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/SchemeRecordService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/SchemeRecordService.java
deleted file mode 100644
index 427a8bb..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/SchemeRecordService.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.SchemeQueryRecord;
-import cn.wisenergy.model.app.Volunteer;
-import cn.wisenergy.model.vo.SchemeRecordQueryVo;
-import com.github.pagehelper.PageInfo;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-public interface SchemeRecordService {
- /**
- * æ·»åŠ æ–¹æ¡ˆæŸ¥è¯¢è®°å½•
- *
- * @param schemeQueryRecord 方案信æ¯
- * @return 方案信æ¯
- */
- R<SchemeQueryRecord> add(SchemeQueryRecord schemeQueryRecord);
-
- /**
- * 获å–方案查询列表
- *
- * @param schemeRecordQueryVo 查询æ¡ä»¶
- * @return 方案查询列表
- */
- R<PageInfo<SchemeQueryRecord>> getList(SchemeRecordQueryVo schemeRecordQueryVo);
-
- /**
- * 获å–用户方案志愿列表
- * @param userId 用户id
- * @param recordId 方案记录id
- * @return 方案志愿列表
- */
- R<List<Volunteer>> getVolunteerList(Integer userId,Integer recordId);
-
- /**
- * 方案pdf导出
- * @param userId 用户id
- * @param recordId 方案查询记录id
- * @return 0：导出æˆåŠŸï¼Œ1：导出失败
- */
- R<Boolean> export(Integer userId, Integer recordId, HttpServletResponse response);
-
- /**
- * 方案excel导出
- * @param userId 用户id
- * @param recordId 方案查询记录id
- * @return 0：导出æˆåŠŸï¼Œ1：导出失败
- */
- R<Boolean> createExcel(Integer userId, Integer recordId, HttpServletResponse response);
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/SchemeService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/SchemeService.java
deleted file mode 100644
index 764bd47..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/SchemeService.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.SchemeInfo;
-import cn.wisenergy.model.vo.SchemeQueryVo;
-import cn.wisenergy.model.vo.SchemeVo;
-import cn.wisenergy.model.vo.VolunteerVo;
-import com.github.pagehelper.PageInfo;
-
-import java.util.List;
-
-
-/**
- * @ Description: 方案接å£å®šä¹‰
- * @ Author : 86187
- * @ Date : 2021/1/13 14:50
- */
-public interface SchemeService {
-
- /**
- * 方案查询
- *
- * @param schemeVo 查询å‚æ•°
- * @return 方案查询结果列表
- */
- R<VolunteerVo> getList(SchemeVo schemeVo);
-
- /**
- * æ ¹æ®æ–¹æ¡ˆidï¼Œåˆ é™¤æ–¹æ¡ˆ
- *
- * @param schemeId 方案id
- * @return
- */
- R<Boolean> deleteById(Integer schemeId);
-
- /**
- * 方案列表查询
- *
- * @param schemeVo 查询å‚æ•°
- * @return 方案查询结果列表
- */
- R<PageInfo<SchemeInfo>> getSchemeList(SchemeQueryVo schemeVo);
-
- /**
- * 获å–方案下载路径
- *
- * @param schemeId 方案id
- * @return 方案下载路径
- */
- R<String> download(Integer schemeId);
-
- List<Integer> ceishi(Integer id);
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/SendSmsSerVice.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/SendSmsSerVice.java
deleted file mode 100644
index 8c0a40f..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/SendSmsSerVice.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.vo.SendSmsVo;
-
-/**
- * @author 86187
- * @ Description: çŸä¿¡éªŒè¯ç 接å£å®šä¹‰
- * @ Author : 86187
- * @ Date : 2021/1/15 15:44
- */
-public interface SendSmsSerVice {
-
- /**
- * å‘é€çŸä¿¡éªŒè¯ç
- *
- * @param sendSmsVo å…¥å‚ä¿¡æ¯
- * @return true æˆåŠŸ false 失败
- * @throws Exception 异常
- */
- R<Boolean> sendSmCode(SendSmsVo sendSmsVo) throws Exception;
-
- /**
- * 验è¯æ‰‹æœºéªŒè¯ç ：外部调用
- *
- * @param phone 手机å·ç
- * @param code 手机验è¯ç
- * @param type 场景类型 1:验è¯ç 登录 2:手机注册 3:修改密ç 4：找回密ç
- * @param source æ¥æº PC/APP
- * @return 是å¦é€šè¿‡æ ¡éªŒ true通过，falseä¸é€šè¿‡
- */
- R<Boolean> valid(String phone, String code, Integer type, String source);
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLimitService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLimitService.java
deleted file mode 100644
index d6016f9..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLimitService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.UserLimit;
-import cn.wisenergy.model.vo.AddLimitVo;
-
-
-/**
- * @author 86187
- * @ Description: 用户查询次数接å£å®šä¹‰
- * @ Author : 86187
- * @ Date : 2021/1/14 9:33
- */
-public interface UserLimitService {
- /**
- * 获å–用户查询次数信æ¯
- *
- * @param userId 用户id
- * @return 用户查询次数信æ¯
- */
- R<UserLimit> getByUserId(Integer userId);
-
- /**
- * æ·»åŠ ç”¨æˆ·æŸ¥è¯¢æ¬¡æ•°
- *
- * @param addLimitVo å‚æ•°
- * @return true or false
- */
- R<Boolean> addLimit(AddLimitVo addLimitVo);
-
- /**
- * å‡å°‘用户查询次数
- *
- * @param userId 用户id
- * @return true or false
- */
- R<Boolean> minusLimit(Integer userId);
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLoginService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLoginService.java
deleted file mode 100644
index fd44eaf..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/UserLoginService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.vo.UpdatePasswordVo;
-import cn.wisenergy.model.vo.UserInfoVo;
-import cn.wisenergy.model.vo.UserLoginVo;
-import cn.wisenergy.model.vo.UserRegisterVo;
-
-/**
- * @author 86187
- * @ Description: 用户登录
- * @ Author : 86187
- * @ Date : 2021/1/7 14:20
- */
-public interface UserLoginService {
- /**
- * 用户注册接å£
- *
- * @param userRegisterVo 用户信æ¯
- * @return true æˆåŠŸ false 失败
- */
- R<UserInfoVo> register(UserRegisterVo userRegisterVo);
-
- /**
- * 手机验è¯ç 登录
- *
- * @param userLoginVo 登录信æ¯
- * @return true æˆåŠŸ false 失败
- */
- R<UserInfoVo> loginCode(UserLoginVo userLoginVo);
-
- /**
- * 手机-密ç 登录
- *
- * @param userLoginVo 登录信æ¯
- * @return true æˆåŠŸ false 失败
- */
- R<UserInfoVo> login(UserLoginVo userLoginVo);
-
- /**
- * 退出登录
- *
- * @param userId 用户id
- * @return true æˆåŠŸ false 失败
- */
- R<Boolean> loginOut(Integer userId);
-
- /**
- * 修改密ç
- *
- * @param updateVo 修改密ç ä¿¡æ¯
- * @return true æˆåŠŸ false 失败
- */
- R<Boolean> updatePassword(UpdatePasswordVo updateVo);
-
- /**
- * é‡ç½®å¯†ç
- *
- * @param userId 用户id
- * @return true æˆåŠŸ false 失败
- */
- R<Boolean> resetPassword(Integer userId);
-
- /**
- * çŸä¿¡é‡ç½®å¯†ç
- *
- * @param userLoginVo 登录信æ¯
- * @return true æˆåŠŸ false 失败
- */
- R<Boolean> smsResetPassword(UserLoginVo userLoginVo);
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java
deleted file mode 100644
index 0b42c40..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.User;
-import cn.wisenergy.model.dto.UserCommitDto;
-import cn.wisenergy.model.dto.UserInfoDto;
-import cn.wisenergy.model.vo.UserInfoVo;
-import cn.wisenergy.model.vo.UserQueryVo;
-import cn.wisenergy.model.vo.UserShowVo;
-import com.github.pagehelper.PageInfo;
-
-import java.util.List;
-
-/**
- * @ Description: 用户接å£
- * @ Author : 86187
- * @ Date : 2021/1/6 16:08
- */
-public interface UserService {
-
-
- /**
- * 获å–用户列表
- *
- * @param queryVo 查询æ¡ä»¶
- * @return 用户列表集åˆ
- */
- R<PageInfo<UserInfoDto>> getUserList(UserQueryVo queryVo);
-
- /**
- * æ交个人信æ¯
- *
- * @param userInfo 用户信æ¯
- * @return 用户信æ¯
- */
- R<UserInfoVo> commitUserInfo(UserCommitDto userInfo);
-
- /**
- * 编辑用户信æ¯
- *
- * @param user 用户信æ¯
- * @return true æˆåŠŸ false 失败
- */
- R<Boolean> edit(UserCommitDto user);
-
- /**
- * åˆ é™¤ç”¨æˆ·
- *
- * @param userId 用户id
- * @return true æˆåŠŸ false 失败
- */
- R<Boolean> delete(Integer userId);
-
- /**
- * 获å–用户信æ¯
- *
- * @param id 用户id
- * @return 用户信æ¯
- */
- R<UserShowVo> getById(Integer id);
-
- /**
- * 获å–用户信æ¯
- * @param phone 电è¯å·ç
- * @return 用户信æ¯
- */
- User getByPhone(String phone);
-
- R<List<User>> test();
-
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/UserVolunteerService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/UserVolunteerService.java
deleted file mode 100644
index 96ca419..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/UserVolunteerService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.model.app.UserVolunteer;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-
-/**
- * @author 86187
- */
-public interface UserVolunteerService extends IService<UserVolunteer> {
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/VolunteerService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/VolunteerService.java
deleted file mode 100644
index e6354c5..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/VolunteerService.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.SchemeInfo;
-import cn.wisenergy.model.app.Volunteer;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * @author 86187
- */
-public interface VolunteerService extends IService<Volunteer> {
- /**
- * 批é‡æ·»åŠ å¿—æ„¿
- *
- * @param list 志愿列表信æ¯
- * @return true æˆåŠŸ false 失败
- */
- R<Boolean> batchAdd(List<Volunteer> list);
-
- /**
- * Excel批é‡æ·»åŠ 方案志愿
- * @param file 志愿文件
- * @param type 方案类型
- * @param schemeName 方案å称
- * @param response 相应数æ®
- * @throws IOException 异常
- */
- void excelAdd(MultipartFile file, Integer type, String schemeName, String fileUrl,HttpServletResponse response) throws IOException;
-
- /**
- * Excel批é‡æ·»åŠ 方案志愿
- * @param response 相应数æ®
- * @throws IOException 异常
- */
- void excelTemplate(HttpServletResponse response) throws IOException;
-
- /**
- * Excel批é‡æ·»åŠ 方案志愿
- * @param file 志愿文件
- * @param response 相应数æ®
- * @throws IOException 异常
- */
- void ceshi(MultipartFile file, HttpServletResponse response) throws IOException;
-
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/WxPayService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/WxPayService.java
deleted file mode 100644
index be72d60..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/WxPayService.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package cn.wisenergy.service.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.dto.PayPageDto;
-import cn.wisenergy.model.dto.PayQueryDto;
-
-import javax.crypto.IllegalBlockSizeException;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SignatureException;
-import java.security.spec.InvalidKeySpecException;
-
-/**
- * @author 86187
- */
-public interface WxPayService {
-
- /**
- * 微行支付接å£
- * @param payPageDto å…¥å‚
- * @return
- */
- R<String> wxPay(PayPageDto payPageDto) throws UnsupportedEncodingException, NoSuchAlgorithmException, SignatureException, InvalidKeySpecException, InvalidKeyException;
-
-
- /**
- * 微信支付-交易查询
- * @param payQueryDto å…¥å‚
- * @return
- */
- R<String> queryWx(PayQueryDto payQueryDto) throws UnsupportedEncodingException, NoSuchAlgorithmException, SignatureException, InvalidKeySpecException, InvalidKeyException;
-
-
- R<String> wx_Pay(PayPageDto payPageDto) throws IOException, NoSuchAlgorithmException, SignatureException, InvalidKeySpecException, InvalidKeyException, IllegalBlockSizeException;
-
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AccountSerivceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AccountSerivceImpl.java
deleted file mode 100644
index c8e9a39..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/AccountSerivceImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.common.utils.Md5Util;
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.mapper.AccountMapper;
-import cn.wisenergy.model.app.AccountInfo;
-import cn.wisenergy.model.dto.AccountDto;
-import cn.wisenergy.model.vo.AccountLoginVo;
-import cn.wisenergy.service.app.AccountSerivce;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import java.util.HashMap;
-
-@Slf4j
-@Service
-public class AccountSerivceImpl implements AccountSerivce {
-
- @Autowired
- private AccountMapper accountMapper;
-
- @Override
- public R<AccountDto> getAccountInfo(AccountLoginVo accountLoginVo) {
- log.info("AccountSerivceImpl[].getAccountInfo[].input.param:accountLoginVo:"+accountLoginVo);
-
- if (null==accountLoginVo) {
- return R.error("è´¦å·æˆ–密ç 为空");
- }
- //判æ–å‚数是å¦ä¸ºç©º
- if (StringUtils.isEmpty(accountLoginVo.getUserName())||StringUtils.isEmpty(accountLoginVo.getPassword())) {
- return R.error("è´¦å·æˆ–密ç 为空");
- }
-
- //创建å‚数容器map
- HashMap<String, Object> map = new HashMap<>(4);
- map.put("userName",accountLoginVo.getUserName());
-
- //查询管ç†è€…ä¿¡æ¯
- AccountInfo accountInfo = accountMapper.getAccountInfo(map);
- if (null==accountInfo) {
- return R.error("用户ä¸å˜åœ¨");
- }
-
- //å°†åŠ å¯†è¿‡åŽçš„密ç ä¸Žä¼ è¾“æ•°æ®è¿›è¡Œæ¯”较
- String s = Md5Util.digestMD5(accountInfo.getPassword());
- if (!accountLoginVo.getPassword().equals(s)) {
- return R.error("密ç 或者用户å错误");
- }
- //查询超过则进行数æ®copy
- AccountDto accountDto = new AccountDto();
- BeanUtils.copyProperties(accountInfo,accountDto);
- //返回数æ®
- return R.ok(accountDto);
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BannerServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BannerServiceImpl.java
deleted file mode 100644
index cb703a9..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BannerServiceImpl.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.mapper.BannerMapper;
-import cn.wisenergy.model.app.Banner;
-import cn.wisenergy.model.dto.BannerDto;
-import cn.wisenergy.model.vo.AdvertisingQueryVo;
-import cn.wisenergy.service.app.BannerService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * @ Description: 广告接å£æ˜¯å®žçŽ°
- * @ Author : 86187
- * @ Date : 2021/1/7 17:07
- */
-@Slf4j
-@Service
-public class BannerServiceImpl extends ServiceImpl<BannerMapper, Banner> implements BannerService {
-
-
- @Autowired
- private BannerMapper bannerMapper;
-
- @Override
- public R<Boolean> add(Banner advertising) {
- log.info("BannerServiceImpl[].add[].input.param:advertising:" + advertising);
- //判æ–是å¦å˜åœ¨å¹¿å‘Šå›¾ç‰‡ï¼Œç»™å®šåˆå§‹å€¼
- if (!StringUtils.isEmpty(advertising.getImage())) {
- advertising.setIsHaveImage(1);
- } else {
- advertising.setIsHaveImage(0);
- }
- advertising.setStatus(1);
-
- //æ•°æ®æ·»åŠ
- int count = bannerMapper.add(advertising);
- if (count == 0) {
- return R.ok(1, false);
- }
- return R.ok(0, true);
- }
-
- @Override
- public R<Boolean> edit(Banner advertising) {
- log.info("BannerServiceImpl[].getById[].input.param:advertising" + advertising);
-
- if (null == advertising) {
- return R.error("输入的å‚数有误");
- }
-
- int edit = bannerMapper.edit(advertising);
-
- //判æ–æ•°æ®æ˜¯å¦ä¿®æ”¹æˆåŠŸ
- if (edit == 0) {
- return R.ok(1,false);
- }
-
- return R.ok(0, true);
- }
-
- @Override
- public R<Banner> getById(Integer id) {
- log.info("BannerServiceImpl[].getById[].input.param:id" + id);
- if (null == id) {
- return R.error("ä¼ å…¥å‚æ•°æ— æ•ˆ");
- }
- Banner banner = bannerMapper.getById(id);
-
- if (null == banner) {
- return R.error("æ•°æ®èŽ·å–失败");
- }
-
- return R.ok(banner);
- }
-
- @Override
- public R<PageInfo<BannerDto>> getList(AdvertisingQueryVo advertisingQueryVo) {
- log.info("BannerServiceImpl[].getList[].input.param:advertisingQueryVo:" + advertisingQueryVo);
- if (null == advertisingQueryVo) {
- return R.error("输入å‚æ•°æ— æ•ˆ");
- }
-
- //æ•°æ®éªŒè¯
- Integer pageNo = advertisingQueryVo.getPageNo();
- Integer pageSize = advertisingQueryVo.getPageSize();
- if (null == pageSize || pageSize == 0) {
- pageSize = 10;
- }
- if (null == pageNo || pageNo == 0) {
- pageNo = 1;
- }
-
- //å°è£…å‚æ•°
- HashMap<String, Object> map = new HashMap<>(4);
- map.put("pageNo", (pageNo - 1)*pageSize);
- map.put("pageSize", pageSize);
- map.put("status",null==advertisingQueryVo.getStatus()?null:advertisingQueryVo.getStatus());
- map.put("type",null==advertisingQueryVo.getType()?null:advertisingQueryVo.getType());
-
- //查询数æ®;
- List<BannerDto> list = bannerMapper.getList(map);
-
- PageInfo<BannerDto> pageInfo = new PageInfo<>();
- pageInfo.setTotal(bannerMapper.count(map));
- pageInfo.setPageNum(pageNo);
- pageInfo.setPageSize(pageSize);
- pageInfo.setList(list);
- return R.ok(pageInfo);
- }
-
- @Override
- public R<Boolean> editStatus(Integer id, Integer status) {
- log.info("BannerServiceImpl[].putIn[].input.param,status:{},id" + status, id);
- //判æ–æ•°æ®æ˜¯å¦æ£ç¡®
- if (null == id || null == status) {
- return R.error("缺少é‡è¦æ•°æ®");
- }
-
- //修改广告状æ€
- int i = bannerMapper.editStatus(id, status);
-
- //判æ–æ•°æ®æ˜¯å¦ä¿®æ”¹æˆåŠŸ
- if (i == 0) {
- return R.ok(1,false);
- }
- return R.ok(0, true);
- }
-
- @Override
- public R<List<Banner>> getTopBanners(Integer type) {
- log.info("BannerServiceImpl[]getTopBanners[]input.param.type:" + type);
- if (null == type) {
- return R.error("å‚æ•°ä¸èƒ½ä¸ºç©º!");
- }
- return R.ok(bannerMapper.getTopBanners(type));
- }
-
- @Override
- public R<Boolean> delBanner(Integer id) {
- log.info("BannerServiceImpl[]delBanner[]input.param.id:" + id);
- if (null==id) {
- return R.error("å‚数为空");
- }
- int i = bannerMapper.delById(id);
-
- if (i==0) {
- return R.ok(1,false);
- }
- return R.ok(0,true);
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/DaoSupportImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/DaoSupportImpl.java
deleted file mode 100644
index 73b1bf2..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/DaoSupportImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.service.app.Daosupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class DaoSupportImpl implements Daosupport {
-
- private JdbcTemplate jdbcTemplate;
-
- /**
- * 日志记录
- */
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
- /**
- * 实例化jdbcTemplate
- */
- public DaoSupportImpl(JdbcTemplate jdbcTemplate){
- this.jdbcTemplate= jdbcTemplate;
- }
-
- @Override
- public Integer queryForInt(String sql, Object... args) {
- try {
- Integer value = jdbcTemplate.queryForObject(sql, Integer.class, args);
- return value==null?0:value;
- }catch(EmptyResultDataAccessException e){
- return 0;
- } catch (RuntimeException e) {
- this.logger.error(e.getMessage(), e);
- throw e;
- }
- }
-
- @Override
- public <T> List<T> queryForList(String sql, Class<T> clazz, Object... args) {
-
- return this.jdbcTemplate.query(sql, new BeanPropertyRowMapper<T>(clazz), args);
-
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/GraduationSerivceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/GraduationSerivceImpl.java
deleted file mode 100644
index 42da225..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/GraduationSerivceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.mapper.GraduationMapper;
-import cn.wisenergy.model.app.Graduation;
-import cn.wisenergy.service.app.GraduationSerivce;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@Slf4j
-public class GraduationSerivceImpl implements GraduationSerivce {
-
- @Autowired
- private GraduationMapper graduationMapper;
-
- @Override
- public R<List<Graduation>> getList() {
-
- List<Graduation> list = graduationMapper.getList();
-
- return R.ok(list);
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/PayRecordServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/PayRecordServiceImpl.java
deleted file mode 100644
index 47d0dcc..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/PayRecordServiceImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.common.constant.CommonAttributes;
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.mapper.PayRecordMapper;
-import cn.wisenergy.model.app.PayRecord;
-import cn.wisenergy.model.vo.PayRecordQueryVo;
-import cn.wisenergy.model.vo.PayRecordShowVo;
-import cn.wisenergy.service.app.PayRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ Description: 充值记录实现
- * @ Author : 86187
- * @ Date : 2021/1/13 17:18
- * @author 86187
- */
-@Service
-@Slf4j
-public class PayRecordServiceImpl extends ServiceImpl<PayRecordMapper, PayRecord> implements PayRecordService {
-
- @Autowired
- private PayRecordMapper payRecordMapper;
-
-
- @Override
- public R<PageInfo<PayRecordShowVo>> getList(PayRecordQueryVo queryVo) {
- log.info("volunteer-service[]PayRecordServiceImpl[]getList[]input.param.queryVo:" + queryVo);
- if (null == queryVo || null == queryVo.getUserId()) {
- return R.error("å‚æ•°ä¸èƒ½ä¸ºç©º!");
- }
-
- pageHandle(queryVo);
-
- Map<String, Object> map = new HashMap<>(16);
- map.put("userId", queryVo.getUserId());
- int total = payRecordMapper.count(map);
-
- map.put("startNum", queryVo.getStartNum());
- map.put("endNum", queryVo.getEndNum());
- List<PayRecordShowVo> list = payRecordMapper.getList(map);
-
-
- PageInfo<PayRecordShowVo> info = new PageInfo<>();
- info.setPageSize(queryVo.getPageSize());
- info.setPageNum(queryVo.getPageNo());
- info.setTotal(total);
- info.setList(list);
- return R.ok(info);
- }
-
- @Override
- public R<Boolean> add(PayRecord payRecord) {
- log.info("volunteer-service[]PayRecordServiceImpl[]payRecord[]input.param.payRecord:" + payRecord);
- if (null == payRecord) {
- return R.ok(1, false);
- }
-
- //ä¿å˜å……值记录信æ¯
- int count = payRecordMapper.add(payRecord);
- if (count == 0) {
- return R.ok(1, false);
- }
-
- return R.ok(0, true);
- }
-
- /**
- * 分页处ç†æ–¹æ³•
- *
- * @param orderQueryVo å‚æ•°
- */
- private void pageHandle(PayRecordQueryVo orderQueryVo) {
- Integer pageNum = orderQueryVo.getPageNo();
- Integer pageSize = orderQueryVo.getPageSize();
- if (null == pageSize || pageSize == 0) {
- pageSize = 10;
- }
- if (null == pageNum || pageNum == 0) {
- pageNum = 1;
- }
- Integer endNum = pageSize;
- Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
- orderQueryVo.setEndNum(endNum);
- orderQueryVo.setStartNum(startNum);
- orderQueryVo.setPageNo(pageNum);
- orderQueryVo.setPageSize(pageSize);
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/PriceServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/PriceServiceImpl.java
deleted file mode 100644
index fa0c53a..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/PriceServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.mapper.PriceMapper;
-import cn.wisenergy.model.app.Price;
-import cn.wisenergy.service.app.PriceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author 86187
- */
-@Service
-@Slf4j
-public class PriceServiceImpl extends ServiceImpl<PriceMapper, Price> implements PriceService {
- @Autowired
- private PriceMapper priceMapper;
-
- @Override
- public R<List<Price>> getList() {
-
- return R.ok(priceMapper.getList());
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/ProfessionServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/ProfessionServiceImpl.java
deleted file mode 100644
index fdb0b31..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/ProfessionServiceImpl.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.mapper.AdmissionRuleMapper;
-import cn.wisenergy.mapper.ProfessionMapper;
-import cn.wisenergy.mapper.ScoreInfoMapper;
-import cn.wisenergy.model.app.AdmissionRule;
-import cn.wisenergy.model.app.Profession;
-import cn.wisenergy.model.app.ScoreInfo;
-import cn.wisenergy.model.enums.SchemeTypeEnums;
-import cn.wisenergy.model.enums.StudentType;
-import cn.wisenergy.service.app.ProfessionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author 86187
- * @ Description: 专业接å£å®žçŽ°
- * @ Author : 86187
- * @ Date : 2021/1/13 10:52
- */
-@Service
-@Slf4j
-public class ProfessionServiceImpl extends ServiceImpl<ProfessionMapper, Profession> implements ProfessionService {
-
- @Autowired
- private ProfessionMapper professionMapper;
-
- @Autowired
- private ScoreInfoMapper scoreInfoMapper;
-
- @Autowired
- private AdmissionRuleMapper admissionRuleMapper;
-
- @Override
- public R<List<Profession>> getTree(Integer type, Integer userId) {
- log.info("volunteer-service[]ProfessionServiceImpl[]getTree[]input.method");
- if (null == type || null == userId) {
- return R.error("å…¥å‚为空!");
- }
-
- //获å–方案类型
- Integer schemeType = getSchemeType(type, userId);
- if (null == schemeType) {
- return R.error("考生æˆç»©ä¿¡æ¯ä¸å˜åœ¨!");
- }
-
- //获å–所有专业
- List<Profession> rootList = professionMapper.getList(schemeType);
-
- //æž„é€ æ ‘å½¢æŽ¥å£ï¼šé€’å½’
- List<Profession> streetList = getStreetList(rootList);
-
- return R.ok(streetList);
- }
-
- private List<Profession> getStreetList(List<Profession> list) {
- List<Profession> rootList = new ArrayList<>();
- List<Profession> childrenList = new ArrayList<>();
-
- //1|éåŽ†å‡ºæ ¹èŠ‚ç‚¹å’Œå节点
- for (Profession profession : list) {
- if (profession.getLevel() == 1) {
- rootList.add(profession);
- } else {
- childrenList.add(profession);
- }
- }
-
- //2.é历集åˆï¼ŒèŽ·å–æ ¹èŠ‚ç‚¹ä¸‹çš„å节点
- for (Profession profession : rootList) {
- List<Profession> children = setChildren(profession.getId(), childrenList);
- profession.setChildren(children);
- }
- return rootList;
- }
-
- private List<Profession> setChildren(Integer id, List<Profession> list) {
- List<Profession> children = new ArrayList<>();
- for (Profession profession : list) {
- if (id.equals(profession.getParentId())) {
- children.add(profession);
- }
- }
-
- for (int i = 0; i < children.size(); i++) {
- Integer autoId = children.get(i).getId();
- List<Profession> childrenList = setChildren(autoId, list);
- children.get(i).setChildren(childrenList);
- }
- return children;
- }
-
-
- private Integer getSchemeType(Integer type, Integer userId) {
- //获å–用户æˆç»©
- ScoreInfo scoreInfo = scoreInfoMapper.getById(userId);
- if (null == scoreInfo) {
- return null;
- }
-
- //type==1 文化生
- if (StudentType.CULTURE_STUDENT.getCode().equals(type)) {
- //获å–文化课本科一批规则
- AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_CULTURE.getCode());
- if (null == firstRule) {
- return null;
- }
-
- //本科类比文化分 = 本年录å–分 -去年录å–分 + 考生分数
- double firstCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
- if (scoreInfo.getCultureGrade() >= firstCulture) {
- return SchemeTypeEnums.UNDERGRADUATE_CULTURE.getCode();
- }
-
- return SchemeTypeEnums.JUNIOR_COLLEGE_MAJOR.getCode();
- }
-
- //type == 2 美术考生
- if (StudentType.ART_STUDENT.getCode().equals(type)) {
- //获å–美术本科一批录å–规则
- AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_ARTS.getCode());
- if (null == firstRule) {
- return null;
- }
-
- //专科类比分 = 本年录å–分 -去年录å–分 + 考生分数
- double firstCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
- double firstMajor = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + scoreInfo.getMajorGrade();
- if (scoreInfo.getCultureGrade() >= firstCulture &&
- scoreInfo.getMajorGrade() >= firstMajor) {
- return SchemeTypeEnums.UNDERGRADUATE_ARTS.getCode();
- }
-
- return SchemeTypeEnums.JUNIOR_COLLEGE_ARTS.getCode();
- }
-
- //3 体育考生
- if (StudentType.SPORTS_STUDENT.getCode().equals(type)) {
- //获å–体育本科一批录å–规则
- AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_SPORTS.getCode());
- if (null == firstRule) {
- return null;
- }
-
- //计算综åˆæˆç»©
- //综åˆæˆç»©å·®å€¼
- double value = firstRule.getCurrentYearCulture() - firstRule.getCultureMin();
- double total = scoreInfo.getMajorGrade() * 750 / 100 * 0.7 + scoreInfo.getCultureGrade() * 0.3 - value;
- if (total >= firstRule.getCultureMin()) {
- return SchemeTypeEnums.UNDERGRADUATE_SPORTS.getCode();
- }
- return SchemeTypeEnums.JUNIOR_COLLEGE_SPORTS.getCode();
- }
-
- //type == 4 æ–‡å¦ç¼–导
- if (StudentType.LITERATURE_STUDENT.getCode().equals(type)) {
- //获å–æ–‡å¦ç¼–导本科一批录å–规则
- AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_LITERATURE.getCode());
- if (null == firstRule) {
- return null;
- }
-
- //专科类比分 = 本年录å–分 -去年录å–分 + 考生分数
- double firstCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + scoreInfo.getCultureGrade();
- double firstMajor = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + scoreInfo.getMajorGrade();
- if (scoreInfo.getCultureGrade() >= firstCulture && scoreInfo.getMajorGrade() >= firstMajor) {
- return SchemeTypeEnums.UNDERGRADUATE_LITERATURE.getCode();
- }
-
- return SchemeTypeEnums.JUNIOR_COLLEGE_LITERATURE.getCode();
- }
- return null;
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/RefillCardServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/RefillCardServiceImpl.java
deleted file mode 100644
index a016eea..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/RefillCardServiceImpl.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.common.utils.*;
-import cn.wisenergy.mapper.CardMapper;
-import cn.wisenergy.mapper.RefillCardMapper;
-import cn.wisenergy.model.app.CardInfo;
-import cn.wisenergy.model.app.RefillCard;
-import cn.wisenergy.model.dto.ExportCardDto;
-import cn.wisenergy.model.dto.RefillCardDto;
-import cn.wisenergy.service.app.RefillCardService;
-import cn.wisenergy.service.common.RefillCardManager;
-import com.alibaba.excel.EasyExcel;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
-import java.util.stream.Collectors;
-
-@Service
-@Slf4j
-public class RefillCardServiceImpl implements RefillCardService {
- @Autowired
- RefillCardMapper refillCardMapper;
-
- @Autowired
- private CardMapper cardMapper;
-
- @Autowired
- private RefillCardManager refillCardManager;
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public R<Boolean> add(RefillCard refillCard) {
- log.info("RefillCardServiceImpl[].add[].input.param:refillCard:{}"+refillCard);
-
- if (refillCard.getCardNumber()==0||null==refillCard.getCardNumber()) {
- return R.error("输入的å¡æ•°æ— æ•ˆæ˜¯æ— æ•ˆå€¼");
- }
- //设置åˆå§‹çŠ¶æ€
- String time = DateUtil.getTime(new Date(), "yyyy.MM.dd.HH.mm.sss");
- refillCard.setBatchNumber(time);
- refillCard.setIsActivite(1);
- refillCard.setIsMakeCard(1);
- refillCard.setIsDelete(0);
- int add = refillCardMapper.add(refillCard);
-
- //判æ–æ•°æ®æ˜¯å¦æ·»åŠ æˆåŠŸ
- if (add==0) {
- return R.error("æ•°æ®æ·»åŠ 失败");
- }
- return R.ok(0,true);
- }
-
- @Override
- public R<Boolean> update(String batchNumber) {
- log.info("RefillCardServiceImpl[].update[].input.param:batchNumber:"+batchNumber);
- if (StringUtils.isEmpty(batchNumber)) {
- return R.error("ä¼ å…¥å‚数为空");
- }
- int update = refillCardMapper.update(batchNumber);
- if (update==0) {
- R.ok(1,false);
- }
- return R.ok(0,true);
- }
-
- @Override
- public R<PageInfo<RefillCardDto>> getList(Integer pageNum, Integer pageSize) {
- log.info("RefillCardServiceImpl[].getList[].input.param:pageNum,pageSize"+pageNum+ pageSize);
- if (null == pageSize || pageSize == 0) {
- pageSize = 10;
- }
- if (null == pageNum || pageNum == 0) {
- pageNum = 1;
- }
-
- //创建å‚数容器
- HashMap<String, Object> map = new HashMap<>(4);
- map.put("pageNo",(pageNum-1)*pageSize);
- map.put("pageSize",pageSize);
- ArrayList<RefillCardDto> refillCardDtos = new ArrayList<>();
-
- //查询å‚æ•°
- List<RefillCard> list = refillCardMapper.getList(map);
- for (RefillCard refillCard : list) {
- RefillCardDto refillCardDto = new RefillCardDto();
- BeanUtils.copyProperties(refillCard,refillCardDto);
- refillCardDtos.add(refillCardDto);
- }
-
- PageInfo<RefillCardDto> refillCardDtoPageInfo = new PageInfo<>();
- refillCardDtoPageInfo.setTotal(refillCardMapper.getUserNumbers());
- refillCardDtoPageInfo.setPageNum(pageNum);
- refillCardDtoPageInfo.setPageSize(pageSize);
- refillCardDtoPageInfo.setList(refillCardDtos);
- return R.ok(refillCardDtoPageInfo);
- }
-
- @Override
- public R<Boolean> createCard(Integer id) {
- log.info("RefillCardServiceImpl[].createCard[].input.param:id"+id);
- if (null==id||id==0) {
- return R.error("ä¼ å…¥å‚数为空");
- }
-
- //查询充值å¡ä¿¡æ¯
- RefillCard byId = refillCardMapper.getById(id);
- if (null==byId) {
- return R.error("该充值å¡ä¸å˜åœ¨");
- }
-
- return refillCardManager.addCardMannger(byId);
- }
-
- @Override
- public R<Boolean> createExcel(String batchNumber, HttpServletResponse response) {
- log.info("RefillCardServiceImpl[].createExcel[].input.param:batchNumber"+batchNumber);
-
- if (StringUtils.isEmpty(batchNumber)) {
- return R.error("ä¼ å…¥çš„å‚数为空");
- }
-
- try {
- // è®¾ç½®å†…å®¹æ ¼å¼ ä»¥åŠ ç¼–ç æ–¹å¼
- response.setContentType("application/vnd.ms-excel");
- response.setCharacterEncoding("utf-8");
-
- // 调用service去获å–æ•°æ®
- List<CardInfo> list = cardMapper.getList(batchNumber);
- if (CollectionUtils.isEmpty(list)) {
- return R.error("该批次å·æš‚时未有åå¡");
- }
-
- // 使用java8新特性的streamæµåŽ»å¤„ç†æ•°æ®ï¼ŒæŠŠç©ºçš„æ•°æ®è¿‡æ»¤æŽ‰
- List<ExportCardDto> resultBo = list.stream().filter(Objects::nonNull)
- .map(t -> {
- return ExportCardDto.builder()
- .cardNumber(t.getCardNumber())
- .secretKey(t.getSecretKey())
- .status(t.getStatus()==0?"未使用":"已使用")
- .build();
- }).collect(Collectors.toList());
-
- // 设置文件å称
- String fileName = batchNumber;
-
- response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
-
- // sheetå称
- EasyExcel.write(response.getOutputStream(), ExportCardDto.class).sheet(batchNumber).doWrite(resultBo);
- return R.ok(0,true);
- } catch (Exception e) {
- return R.ok(1,false);
- }
- }
-
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeRecordServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeRecordServiceImpl.java
deleted file mode 100644
index 5900d86..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeRecordServiceImpl.java
+++ /dev/null
@@ -1,296 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.common.constant.CommonAttributes;
-import cn.wisenergy.common.utils.DateUtil;
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.mapper.SchemeRecordMapper;
-import cn.wisenergy.mapper.UserVolunteerMapper;
-import cn.wisenergy.mapper.VolunteerMapper;
-import cn.wisenergy.model.app.SchemeQueryRecord;
-import cn.wisenergy.model.app.UserVolunteer;
-import cn.wisenergy.model.app.Volunteer;
-import cn.wisenergy.model.vo.SchemeRecordQueryVo;
-import cn.wisenergy.service.app.SchemeRecordService;
-import cn.wisenergy.service.common.PdfUtil;
-import com.alibaba.excel.EasyExcel;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageInfo;
-import com.itextpdf.text.Document;
-import com.itextpdf.text.PageSize;
-import com.itextpdf.text.pdf.PdfWriter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.util.*;
-import java.util.stream.Collectors;
-
-
-/**
- * @author 86187
- * @ Description: 方案查询记录接å£å®žçŽ°
- * @ Author : 86187
- * @ Date : 2021/1/8 11:41
- */
-@Slf4j
-@Service
-public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, SchemeQueryRecord> implements SchemeRecordService {
- @Autowired
- private SchemeRecordMapper schemeRecordMapper;
-
- @Autowired
- private UserVolunteerMapper userVolunteerMapper;
-
- @Autowired
- private VolunteerMapper volunteerMapper;
-
- @Override
- public R<SchemeQueryRecord> add(SchemeQueryRecord scheme) {
- log.info("volunteer-service[]SchemeRecordServiceImpl[]getById[]input.param.scheme:" + scheme);
- if (null == scheme) {
- return R.error("å…¥å‚为空!");
- }
-
- //ä¿å˜è®°å½•ä¿¡æ¯
- int count = schemeRecordMapper.add(scheme);
- if (count == 0) {
- return R.error("æ·»åŠ æ–¹æ¡ˆè®°å½•å¤±è´¥");
- }
- return R.ok(scheme);
- }
-
- @Override
- public R<PageInfo<SchemeQueryRecord>> getList(SchemeRecordQueryVo queryVo) {
- log.info("volunteer-service[]SchemeRecordServiceImpl[]getList[]input.param.queryVo:" + queryVo);
- if (null == queryVo || null == queryVo.getUserId()) {
- return R.error("å…¥å‚为空!");
- }
-
- pageHandle(queryVo);
-
- //统计数æ®æ€»æ¡æ•°
- Map<String, Object> map = new HashMap<>(8);
- map.put("userId", queryVo.getUserId());
- int total = schemeRecordMapper.count(map);
-
-
- //æ ¹æ®ç”¨æˆ·id,查询方案记录列表
- List<SchemeQueryRecord> list = schemeRecordMapper.getByUserId(queryVo.getUserId(),
- queryVo.getStartNum(), queryVo.getEndNum());
- PageInfo<SchemeQueryRecord> info = new PageInfo<>();
- info.setPageSize(queryVo.getPageSize());
- info.setPageNum(queryVo.getPageNo());
- info.setTotal(total);
- info.setList(list);
- return R.ok(info);
- }
-
- @Override
- public R<List<Volunteer>> getVolunteerList(Integer userId, Integer recordId) {
- log.info("volunteer-service[]SchemeRecordServiceImpl[]getVolunteerList[]input.param.userId,recordId:" + userId);
- if (null == userId || null == recordId) {
- return R.error("å…¥å‚为空!");
- }
-
- //1ã€èŽ·å–方案查询记录
- SchemeQueryRecord schemeQueryRecord = schemeRecordMapper.selectById(recordId);
- if (null == schemeQueryRecord) {
- return R.error("方案查询记录信æ¯ä¸å˜åœ¨!");
- }
-
- //2ã€æ ¹æ®ç”¨æˆ·id和方案记录id,获å–å¿—æ„¿ids
- QueryWrapper<UserVolunteer> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("user_id", userId);
- queryWrapper.eq("scheme_record_id", recordId);
- List<UserVolunteer> list = userVolunteerMapper.selectList(queryWrapper);
- if (CollectionUtils.isEmpty(list)) {
- return R.ok(new ArrayList<>());
- }
-
- List<Integer> ids = list.stream().map(UserVolunteer::getVolunteerId).collect(Collectors.toList());
- List<Volunteer> result = volunteerMapper.getListByIds(ids);
- for (Volunteer volunteer : result) {
- volunteer.setQueryTime(schemeQueryRecord.getCreateTime());
- }
- result.sort(Comparator.comparing(Volunteer::getLowestMark).reversed());
- return R.ok(result);
- }
-
- /**
- * 方案导出
- *
- * @param userId 用户id
- * @param recordId 方案查询记录id
- * @return
- */
- @Override
- public R<Boolean> export(Integer userId, Integer recordId, HttpServletResponse response) {
- log.info("volunteer-service[]SchemeRecordServiceImpl[]export[]input.param.userId,recordId:" + userId);
-
- //查询时间
- String format=null;
-
- if (null == userId || null == recordId) {
- return R.error("å…¥å‚为空!");
- }
-
- //1ã€æ ¹æ®ç”¨æˆ·id和方案记录id,获å–å¿—æ„¿ids
- QueryWrapper<UserVolunteer> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("user_id", userId);
- queryWrapper.eq("scheme_record_id", recordId);
- List<UserVolunteer> list = userVolunteerMapper.selectList(queryWrapper);
- SchemeQueryRecord schemeQueryRecord = schemeRecordMapper.getById(recordId);
- if (CollectionUtils.isEmpty(list)) {
- return R.error("æ•°æ®ä¸ºç©º");
- }
-
- //获å–方案查询时间
- if (null!=schemeQueryRecord) {
- format = DateUtil.convertDateToStr(schemeQueryRecord.getUpdateTime(), "yyyy-MM-dd HH:mm:SS");
- }else {
- format = DateUtil.convertDateToStr(new Date(), "yyyy-MM-dd HH:mm:SS");
- }
-
-
- List<Integer> ids = list.stream().map(UserVolunteer::getVolunteerId).collect(Collectors.toList());
- List<Volunteer> result = volunteerMapper.getListByIds(ids);
- result.sort(Comparator.comparing(Volunteer::getLowestMark).reversed());
- //调用工具生æˆPDF
- try {
- // 1.新建document对象
- Document document = new Document(PageSize.A4);
-
- //创建文件å称
- Long lon = System.currentTimeMillis();
-
- // 2.建立一个书写器(Writer)与document对象关è”
- OutputStream buffer = new ByteArrayOutputStream();
- PdfWriter writer = PdfWriter.getInstance(document, buffer);
-
- // 3.打开文档
- document.open();
-
- // 4.å‘文档ä¸æ·»åŠ 内容
- PdfUtil pdfUtil = new PdfUtil();
- pdfUtil.generatePDF(document, result,format);
-
- // 5.å…³é—文档
- document.close();
-
- // è®¾ç½®å†…å®¹æ ¼å¼ ä»¥åŠ ç¼–ç æ–¹å¼
- response.setContentType("application/pdf");
- response.setCharacterEncoding("utf-8");
- response.setHeader("Content-disposition", "attachment;file=" + lon.toString() + ".pdf");
-
- DataOutput output = new DataOutputStream(response.getOutputStream());
- byte[] bytes = ((ByteArrayOutputStream) buffer).toByteArray();
- response.setContentLength(bytes.length);
- for (int i = 0; i < bytes.length; i++) {
- output.writeByte(bytes[i]);
- }
-
- ((DataOutputStream) output).flush();
-
- ((DataOutputStream) output).close();
-
- } catch (Exception e) {
- return R.ok(1, false);
- }
- return R.ok(0, true);
- }
-
- @Override
- public R<Boolean> createExcel(Integer userId, Integer recordId, HttpServletResponse response) {
- log.info("SchemeRecordServiceImpl[].createExcel[].input.param:userId,recordId"+userId,recordId);
-
- //查询时间
- String format=null;
-
- if (null == userId || null == recordId) {
- return R.error("å…¥å‚为空!");
- }
-
- //1ã€æ ¹æ®ç”¨æˆ·id和方案记录id,获å–å¿—æ„¿ids
- QueryWrapper<UserVolunteer> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("user_id", userId);
- queryWrapper.eq("scheme_record_id", recordId);
- List<UserVolunteer> list = userVolunteerMapper.selectList(queryWrapper);
- SchemeQueryRecord schemeQueryRecord = schemeRecordMapper.getById(recordId);
- if (CollectionUtils.isEmpty(list)) {
- return R.error("æ•°æ®ä¸ºç©º");
- }
-
- //获å–方案查询时间
- if (null!=schemeQueryRecord) {
- format = DateUtil.convertDateToStr(schemeQueryRecord.getUpdateTime(), "yyyy-MM-dd HH:mm:SS");
- }else {
- format = DateUtil.convertDateToStr(new Date(), "yyyy-MM-dd HH:mm:SS");
- }
- List<Integer> ids = list.stream().map(UserVolunteer::getVolunteerId).collect(Collectors.toList());
- List<Volunteer> result = volunteerMapper.getListByIds(ids);
- result.sort(Comparator.comparing(Volunteer::getLowestMark).reversed());
-
- //生æˆExcel
- try {
- // è®¾ç½®å†…å®¹æ ¼å¼ ä»¥åŠ ç¼–ç æ–¹å¼
- response.setContentType("application/vnd.ms-excel");
- response.setCharacterEncoding("utf-8");
-
- // 使用java8新特性的streamæµåŽ»å¤„ç†æ•°æ®ï¼ŒæŠŠç©ºçš„æ•°æ®è¿‡æ»¤æŽ‰
- List<Volunteer> resultBo = result.stream().filter(Objects::nonNull)
- .map(t -> {
- return Volunteer.builder()
- .majorName(t.getMajorName())
- .academy(t.getAcademy())
- .courseDemand(t.getCourseDemand())
- .nature(t.getNature())
- .yearLimit(t.getYearLimit())
- .planNum(t.getPlanNum())
- .castArchivesNum(null==t.getCastArchivesNum()?0:t.getCastArchivesNum())
- .launchNum(null==t.getLaunchNum()?0:t.getLaunchNum())
- .lowestMark(null==t.getLowestMark()?String.valueOf(0):t.getLowestMark())
- .lowestRank(null==t.getLowestRank()?String.valueOf(0):t.getLowestRank())
- .build();
- }).collect(Collectors.toList());
-
- //创建文件å称
- Long lon = System.currentTimeMillis();
-
- response.setHeader("Content-disposition", "attachment;filename=" + lon + ".xlsx");
-
- // sheetå称
- EasyExcel.write(response.getOutputStream(), Volunteer.class).sheet(lon.toString()).doWrite(resultBo);
- return R.ok(0,true);
- } catch (Exception e) {
- return R.ok(1,false);
- }
- }
-
-
- /**
- * 分页处ç†
- *
- * @param cameraQueryVo å‚æ•°
- */
- private void pageHandle(SchemeRecordQueryVo cameraQueryVo) {
- Integer pageNum = cameraQueryVo.getPageNo();
- Integer pageSize = cameraQueryVo.getPageSize();
- if (null == pageSize || pageSize == 0) {
- pageSize = 10;
- }
- if (null == pageNum || pageNum == 0) {
- pageNum = 1;
- }
- Integer endNum = pageSize;
- Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
- cameraQueryVo.setEndNum(endNum);
- cameraQueryVo.setStartNum(startNum);
- cameraQueryVo.setPageNo(pageNum);
- cameraQueryVo.setPageSize(pageSize);
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
deleted file mode 100644
index ae74f58..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SchemeServiceImpl.java
+++ /dev/null
@@ -1,755 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.common.constant.CommonAttributes;
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.common.utils.StringUtil;
-import cn.wisenergy.mapper.*;
-import cn.wisenergy.model.app.*;
-import cn.wisenergy.model.enums.SchemeTypeEnums;
-import cn.wisenergy.model.enums.StudentClassEnum;
-import cn.wisenergy.model.enums.StudentType;
-import cn.wisenergy.model.vo.*;
-import cn.wisenergy.service.app.SchemeService;
-import cn.wisenergy.service.app.UserVolunteerService;
-import cn.wisenergy.service.common.VolunteerManager;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @author 86187
- * @ Description: 方案接å£å®žçŽ°
- * @ Author : 86187
- * @ Date : 2021/1/13 15:04
- */
-@Service
-@Slf4j
-public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> implements SchemeService {
- @Autowired
- private UsersMapper usersMapper;
-
- @Autowired
- private SchemeMapper schemeMapper;
-
- @Autowired
- private ScoreInfoMapper scoreInfoMapper;
-
- @Autowired
- private VolunteerMapper volunteerMapper;
-
- @Autowired
- private SchemeRecordMapper schemeRecordMapper;
-
- @Autowired
- private UserVolunteerMapper userVolunteerMapper;
-
- @Autowired
- private AdmissionRuleMapper admissionRuleMapper;
-
- @Autowired
- private ProfessionMapper professionMapper;
-
- @Autowired
- private UserVolunteerService userVolunteerService;
-
- @Autowired
- private VolunteerManager volunteerManager;
-
- @Override
- public R<VolunteerVo> getList(SchemeVo queryVo) {
- log.info("volunteer-service[]SchemeServiceImpl[]getList[]input.param.queryVo:" + queryVo);
- if (null == queryVo || null == queryVo.getUserId() || null == queryVo.getCultureGrade()) {
- return R.error("å…¥å‚为空!");
- }
-
- if (StringUtils.isBlank(queryVo.getProfessionIds())) {
- return R.error("未选择专业!");
- }
-
- //1ã€æ ¹æ®userId获å–用户信æ¯
- User user = usersMapper.selectById(queryVo.getUserId());
- if (null == user) {
- return R.error("用户信æ¯ä¸å˜åœ¨!");
- }
-
- //2ã€èŽ·å–考生æˆç»©
- QueryWrapper<ScoreInfo> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("user_id", queryVo.getUserId());
- ScoreInfo scoreInfo = scoreInfoMapper.selectOne(queryWrapper);
- if (null == scoreInfo) {
- return R.error("æ— è€ƒç”Ÿæˆç»©!");
- }
-
- //3ã€æ ¹æ®ç›é€‰æ–¹æ¡ˆç®—法，ç›é€‰æ–¹æ¡ˆ
- //副科å称
- List<String> className = getClassName(scoreInfo);
- if (CollectionUtils.isEmpty(className)) {
- return R.error("è€ƒç”Ÿæ— å‰¯ç§‘æˆç»©!");
- }
-
- //选å–专业å称
- List<String> professionName = getProfessionName(queryVo);
- if (CollectionUtils.isEmpty(professionName)) {
- return R.error("未选择专业!");
- }
-
- //(1)判æ–考生类型 文化课考生
- //åˆå§‹åŒ–返回数æ®æ€»æ¡æ•°
- int totalResult = 0;
- List<Volunteer> list = new ArrayList<>();
- VolunteerVo volunteerVo = new VolunteerVo();
- if (StudentType.CULTURE_STUDENT.getCode().equals(user.getExamType())) {
- //获å–文化课本科一批规则
- AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_CULTURE.getCode());
- if (null == firstRule) {
- return R.error("æ— æ–‡åŒ–è¯¾æœ¬ç§‘å½•å–规则!");
- }
-
- //获å–文化课专科一批规则
- AdmissionRule secondRule = admissionRuleMapper.getByType(SchemeTypeEnums.JUNIOR_COLLEGE_MAJOR.getCode());
- if (null == secondRule) {
- return R.error("æ— æ–‡åŒ–è¯¾ä¸“ç§‘å½•å–规则!");
- }
-
- //1).判æ–文化课的分数是å¦å¤§äºŽç‰äºŽæœ€å¤§æ–‡åŒ–分
- //本科类比文化分 = 本年录å–分 -去年录å–分 + 考生分数
- double firstCulture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + Double.parseDouble(queryVo.getCultureGrade());
- double cultureMax = Double.parseDouble(firstRule.getCultureMax().toString());
- if (firstCulture >= cultureMax) {
- volunteerVo.setUserId(user.getId());
- volunteerVo.setVolunteers(list);
- return R.ok("æå–œæ‚¨ï¼Œå› æ‚¨çš„æˆç»©çªå‡ºï¼Œè¯·è”系官方å…费领å–VIP一对一报考方案指导ï¼", volunteerVo);
- }
-
- //2).判æ–文化课的分数是å¦å°äºŽæœ€å°æŠ¥è€ƒåˆ†æ•°
- //专科类比文化分 = 本年录å–分 -去年录å–分 + 考生分数
- double secondCulture = secondRule.getCurrentYearCulture() - secondRule.getCultureMin() + Double.parseDouble(queryVo.getCultureGrade());
- double cultureMin = Double.parseDouble(secondRule.getCultureMin().toString());
- if (secondCulture < cultureMin) {
- return R.error("很抱æ‰ï¼Œæ‚¨çš„æˆç»©ä¸æ»¡è¶³æŠ¥è€ƒæ¡ä»¶ï¼Œæ— 法查询!");
- }
-
- totalResult = firstRule.getNumber();
- list = getCultureList(scoreInfo, firstRule, secondRule, className, professionName, firstCulture, secondCulture);
- }
-
- //(2)美术考生
- if (StudentType.ART_STUDENT.getCode().equals(user.getExamType())) {
- //获å–美术本科一批录å–规则
- AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_ARTS.getCode());
- if (null == firstRule) {
- return R.error("æ— ç¾Žæœ¯æœ¬ç§‘å½•å–规则!");
- }
-
- //获å–美术专科一批录å–规则
- AdmissionRule secondRule = admissionRuleMapper.getByType(SchemeTypeEnums.JUNIOR_COLLEGE_ARTS.getCode());
- if (null == secondRule) {
- return R.error("æ— ç¾Žæœ¯ä¸“ç§‘å½•å–规则!");
- }
-
- //判æ–考生是å¦æœ‰æŠ¥å–èµ„æ ¼
- //专科类比分 = 本年录å–分 -去年录å–分 + 考生分数
- double secondCulture = secondRule.getCurrentYearCulture() - secondRule.getCultureMin() +
- Double.parseDouble(queryVo.getMajorGrade());
- double secondMajor = secondRule.getCurrentYearMajor() - secondRule.getProfessionMin() +
- Double.parseDouble(queryVo.getMajorGrade());
- if (secondCulture < secondRule.getCultureMin() && secondMajor < secondRule.getProfessionMin()) {
- return R.error("很抱æ‰ï¼Œæ‚¨çš„æˆç»©ä¸æ»¡è¶³æŠ¥è€ƒæ¡ä»¶ï¼Œæ— 法查询!");
- }
-
- totalResult = firstRule.getNumber();
- list = getArtsList(queryVo, firstRule, secondRule, className, professionName);
- }
-
- //(3)æ–‡å¦ç¼–导考生
- if (StudentType.LITERATURE_STUDENT.getCode().equals(user.getExamType())) {
- //获å–æ–‡å¦ç¼–导本科一批录å–规则
- AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_LITERATURE.getCode());
- if (null == firstRule) {
- return R.error("æ— æ–‡å¦ç¼–导本科录å–规则!");
- }
-
- //获å–æ–‡å¦ç¼–导专科一批录å–规则
- AdmissionRule secondRule = admissionRuleMapper.getByType(SchemeTypeEnums.JUNIOR_COLLEGE_LITERATURE.getCode());
- if (null == secondRule) {
- return R.error("æ— æ–‡å¦ç¼–导专科录å–规则!");
- }
-
- //判æ–考生是å¦æœ‰æŠ¥å–èµ„æ ¼
- //专科类比分 = 本年录å–分 -去年录å–分 + 考生分数
- double secondCulture = secondRule.getCurrentYearCulture() - secondRule.getCultureMin() +
- Double.parseDouble(queryVo.getMajorGrade());
- double secondMajor = secondRule.getCurrentYearMajor() - secondRule.getProfessionMin() +
- Double.parseDouble(queryVo.getMajorGrade());
- if (secondCulture < secondRule.getCultureMin() || secondMajor < secondRule.getProfessionMin()) {
- return R.error("很抱æ‰ï¼Œæ‚¨çš„专业æˆç»©ä¸æ»¡è¶³æŠ¥è€ƒæ¡ä»¶ï¼Œæ— 法查询!");
- }
-
- totalResult = firstRule.getNumber();
- list = getLiteratureList(queryVo, firstRule, secondRule, className, professionName);
- }
-
- //(4)体育考生
- if (StudentType.SPORTS_STUDENT.getCode().equals(user.getExamType())) {
- //获å–体育本科一批录å–规则
- AdmissionRule firstRule = admissionRuleMapper.getByType(SchemeTypeEnums.UNDERGRADUATE_SPORTS.getCode());
- if (null == firstRule) {
- return R.error("æ— ä½“è‚²æœ¬ç§‘å½•å–规则!");
- }
-
- //获å–体育专科一批录å–规则
- AdmissionRule secondRule = admissionRuleMapper.getByType(SchemeTypeEnums.JUNIOR_COLLEGE_SPORTS.getCode());
- if (null == secondRule) {
- return R.error("æ— ä½“è‚²ä¸“ç§‘å½•å–规则!");
- }
-
- //判æ–考生是å¦æœ‰æŠ¥å–èµ„æ ¼
- //综åˆæˆç»©å·®å€¼
- double value = secondRule.getCurrentYearCulture() - secondRule.getCultureMin();
- double culture = Double.parseDouble(queryVo.getCultureGrade());
- double major = Double.parseDouble(queryVo.getMajorGrade());
-
- //计算综åˆæˆç»©
- double total = major * 750 / 100 * 0.7 + culture * 0.3 - value;
- if (total < secondRule.getCultureMin()) {
- return R.error("很抱æ‰ï¼Œæ‚¨çš„æˆç»©ä¸æ»¡è¶³æŠ¥è€ƒæ¡ä»¶ï¼Œæ— 法查询!");
- }
-
- totalResult = firstRule.getNumber();
- list = getSportsList(total, firstRule, secondRule, className, professionName);
- }
-
- //4判æ–是å¦å±•ç¤ºå…¨éƒ¨æ–¹æ¡ˆ
- if (queryVo.getIsShowAll() == 0) {
- List<Volunteer> result;
- if (list.size() < 10) {
- result = list.subList(0, list.size());
- } else {
- result = list.subList(0, 10);
- }
- volunteerVo.setUserId(user.getId());
- volunteerVo.setVolunteers(result);
- return R.ok(volunteerVo);
- }
-
- //5ã€åˆ¤æ–返回的结果数æ®æ˜¯å¦å¤§äºŽtotalResult
- if (list.size() > totalResult) {
- list = getVolunteerList(list, totalResult);
- }
-
- //6ä¿å˜ç”¨æˆ·æ–¹æ¡ˆè®°å½•ã€å¿—愿之间的关è”关系,扣å‡æŸ¥è¯¢æ¬¡æ•°
- R<Integer> bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
- if (null != bool && bool.getCode() == 500) {
- return R.error(bool.getMessage());
- }
-
- //排åº
- list.sort(Comparator.comparing(Volunteer::getLowestMark).reversed());
- volunteerVo.setUserId(user.getId());
- assert bool != null;
- volunteerVo.setRecordId(bool.getData());
- volunteerVo.setVolunteers(list);
- volunteerVo.setTotal(list.size());
- return R.ok(volunteerVo);
- }
-
- @Override
- public R<Boolean> deleteById(Integer schemeId) {
- log.info("volunteer-service[]SchemeServiceImpl[]deleteById[]input.param.schemeId:" + schemeId);
- if (null == schemeId) {
- return R.error("å…¥å‚为空!");
- }
- //æ ¹æ®æ–¹æ¡ˆid,获å–方案信æ¯
- QueryWrapper<SchemeInfo> query = new QueryWrapper<>();
- query.eq("id", schemeId);
- query.eq("is_delete", 0);
- SchemeInfo schemeInfo = baseMapper.selectOne(query);
- if (null == schemeInfo) {
- return R.error("方案信æ¯ä¸å˜åœ¨!");
- }
-
- //更新方案状æ€ä¸º ：1 åˆ é™¤
- schemeInfo.setIsDelete(1);
-
- //æ ¹æ®æ–¹æ¡ˆid,获å–å¿—æ„¿ä¿¡æ¯
- QueryWrapper<Volunteer> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("scheme_id", schemeId);
- queryWrapper.eq("is_delete", 0);
- List<Volunteer> list = volunteerMapper.selectList(queryWrapper);
-
- boolean bool = volunteerManager.deleteSchemeAndVolunteer(schemeInfo, schemeId, list.size());
- return R.ok(bool);
- }
-
- @Override
- public R<PageInfo<SchemeInfo>> getSchemeList(SchemeQueryVo schemeVo) {
- log.info("volunteer-service[]SchemeServiceImpl[]getSchemeList[]input.param.schemeVo:" + schemeVo);
- if (null == schemeVo) {
- return R.error("å…¥å‚为空!");
- }
- pageHandle(schemeVo);
- int total = schemeMapper.count();
- Map<String, Object> map = new HashMap<>(16);
-
- map.put("startNum", schemeVo.getStartNum());
- map.put("endNum", schemeVo.getEndNum());
- List<SchemeInfo> list = schemeMapper.getList(map);
- PageInfo<SchemeInfo> info = new PageInfo<>();
- info.setPageSize(schemeVo.getPageSize());
- info.setPageNum(schemeVo.getPageNo());
- info.setTotal(total);
- info.setList(list);
- return R.ok(info);
- }
-
- @Override
- public R<String> download(Integer schemeId) {
- log.info("volunteer-service[]SchemeServiceImpl[]download[]input.param.schemeId:" + schemeId);
- if (null == schemeId) {
- return R.error("å…¥å‚为空!");
- }
-
- //获å–方案信æ¯
- SchemeInfo schemeInfo = schemeMapper.getById(schemeId);
- if (null == schemeInfo || StringUtils.isBlank(schemeInfo.getFileUrl())) {
- return R.error("æœªä¸Šä¼ æ–¹æ¡ˆï¼Œæ— æ³•ä¸‹è½½!");
- }
-
- return R.ok(schemeInfo.getFileUrl());
- }
-
- @Override
- public List<Integer> ceishi(Integer id) {
-
- List<UserVolunteer> list = userVolunteerMapper.listById(id);
- List<Integer> ids = list.stream().map(UserVolunteer::getVolunteerId).collect(Collectors.toList());
- List<Integer> integerList = new ArrayList<>();
- List<Integer> result = new ArrayList<>();
- for (Integer vid : ids) {
- if (integerList.contains(vid)) {
- result.add(vid);
- } else {
- integerList.add(vid);
- }
- }
- return result;
- }
-
-
- /**
- * 获å–文化生志愿列表
- *
- * @param scoreInfo æˆç»©
- * @param firstRule 录å–规则
- * @param classNames 副科å称
- * @param professionNames 专业å称
- * @return 文化生志愿列表
- */
- private List<Volunteer> getCultureList(ScoreInfo scoreInfo, AdmissionRule firstRule, AdmissionRule secondRule,
- List<String> classNames, List<String> professionNames,
- double firstCulture, double secondCulture) {
- double cultureMax = firstRule.getCultureMax();
- double cultureMin = firstRule.getCultureMin();
-
- //考生的分数在本科一批ä¸
- List<Volunteer> list = new ArrayList<>();
- Map<String, Object> map = new HashMap<>(16);
- map.put("classNames", classNames);
- map.put("professionNames", professionNames);
- if (firstCulture < cultureMax && firstCulture >= cultureMin) {
- double upGrade = firstCulture + firstRule.getUpMark();
- double downGrade = firstCulture - firstRule.getDownMark();
- map.put("upGrade", upGrade);
- map.put("type", SchemeTypeEnums.UNDERGRADUATE_CULTURE.getCode());
- map.put("downGrade", downGrade);
- list = volunteerMapper.getVolunteerList(map);
- if (list.size() < firstRule.getNumber()) {
- List<Volunteer> fillList = fillUpVolunteer(list, firstRule.getNumber(), upGrade, downGrade,
- SchemeTypeEnums.UNDERGRADUATE_CULTURE.getCode());
- list.addAll(fillList);
- }
-
- } else {
- //考生的分数是在专科一批ä¸
- double upGrade = secondCulture + secondRule.getUpMark();
- double downGrade = secondCulture - secondRule.getDownMark();
- map.put("upGrade", upGrade);
- map.put("type", SchemeTypeEnums.JUNIOR_COLLEGE_MAJOR.getCode());
- map.put("downGrade", downGrade);
- list = volunteerMapper.getVolunteerList(map);
-
- //如果数æ®ä¸æ»¡è¶³æœ€å¤§æ•°é‡ï¼Œå–ä¸é™ä¸“业最低分补充
- if (list.size() < secondRule.getNumber()) {
- List<Volunteer> fillList = fillUpVolunteer(list, secondRule.getNumber(), upGrade, downGrade,
- SchemeTypeEnums.JUNIOR_COLLEGE_MAJOR.getCode());
- list.addAll(fillList);
- }
- }
- return list;
- }
-
- /**
- * 获å–美术生志愿方案
- *
- * @param queryVo 考生æˆç»©
- * @param firstRule 本科规则
- * @param secondRule 专科规则
- * @param classNames 副科å称
- * @param professionNames 专业å称
- * @return 志愿方案列表
- */
- private List<Volunteer> getArtsList(SchemeVo queryVo, AdmissionRule firstRule, AdmissionRule secondRule,
- List<String> classNames, List<String> professionNames) {
- //本科类比分 = 本年录å–分 -去年录å–分 + 考生分数
- double culture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + Double.parseDouble(queryVo.getCultureGrade());
- double major = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + Double.parseDouble(queryVo.getMajorGrade());
- //计算综åˆæˆç»©
- double total = major * 750 / 300 * 0.7 + culture * 0.3;
-
- Map<String, Object> map = new HashMap<>(16);
- map.put("number", firstRule.getNumber());
- map.put("classNames", classNames);
- map.put("professionNames", professionNames);
-
- //1ã€è€ƒç”Ÿæ˜¯å¦èƒ½æŠ¥å–美术本科
- List<Volunteer> list = new ArrayList<>();
- if (culture >= firstRule.getCultureMin() && major >= firstRule.getProfessionMin()) {
- //浮动分数
- double upGrade = total + firstRule.getUpMark();
- double downGrade = total - firstRule.getDownMark();
- map.put("upGrade", upGrade);
- map.put("downGrade", downGrade);
- map.put("type", SchemeTypeEnums.UNDERGRADUATE_ARTS.getCode());
- list = volunteerMapper.getVolunteerList(map);
-
- //如果数æ®ä¸æ»¡è¶³æœ€å¤§æ•°é‡ï¼Œå–ä¸é™ä¸“业最低分补充
- if (list.size() < secondRule.getNumber()) {
- List<Volunteer> fillList = fillUpVolunteer(list, firstRule.getNumber(), upGrade, downGrade,
- SchemeTypeEnums.UNDERGRADUATE_ARTS.getCode());
- list.addAll(fillList);
- }
- return list;
- }
-
-
- //专科科类比分 = 本年录å–分 -去年录å–分 + 考生分数
- double secondCulture = secondRule.getCurrentYearCulture() - secondRule.getCultureMin() +
- Double.parseDouble(queryVo.getCultureGrade());
- double secondMajor = secondRule.getCurrentYearMajor() - secondRule.getProfessionMin() +
- Double.parseDouble(queryVo.getMajorGrade());
-
- //计算综åˆæˆç»©
- double secondRuleTotal = secondMajor * 750 / 300 * 0.7 + secondCulture * 0.3;
- //2ã€è€ƒç”Ÿæ˜¯å¦èƒ½æŠ¥å–美术专科
- if (secondCulture >= secondRule.getCultureMin() && secondMajor >= secondRule.getProfessionMin()) {
-
- //浮动分数
- double upGrade = secondRuleTotal + secondRule.getUpMark();
- double downGrade = secondRuleTotal - secondRule.getDownMark();
- map.put("upGrade", upGrade);
- map.put("downGrade", downGrade);
- map.put("type", SchemeTypeEnums.JUNIOR_COLLEGE_ARTS.getCode());
- list = volunteerMapper.getVolunteerList(map);
-
- //如果数æ®ä¸æ»¡è¶³æœ€å¤§æ•°é‡ï¼Œå–ä¸é™ä¸“业最低分补充
- if (list.size() < secondRule.getNumber()) {
- List<Volunteer> fillList = fillUpVolunteer(list, secondRule.getNumber(), upGrade, downGrade,
- SchemeTypeEnums.JUNIOR_COLLEGE_ARTS.getCode());
- list.addAll(fillList);
- }
- }
- return list;
- }
-
- /**
- * 获å–æ–‡å¦ç¼–导生志愿方案
- *
- * @param queryVo 考生æˆç»©
- * @param firstRule 本科规则
- * @param secondRule 专科规则
- * @param classNames 副科å称
- * @param professionNames 专业å称
- * @return 志愿方案列表
- */
- private List<Volunteer> getLiteratureList(SchemeVo queryVo, AdmissionRule firstRule, AdmissionRule secondRule,
- List<String> classNames, List<String> professionNames) {
- //本科类比分 = 本年录å–分 -去年录å–分 + 考生分数
- double culture = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + Double.parseDouble(queryVo.getCultureGrade());
- double major = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + Double.parseDouble(queryVo.getMajorGrade());
- //计算综åˆæˆç»©
- double total = major * 750 / 300 * 0.3 + culture * 0.7;
-
- Map<String, Object> map = new HashMap<>(16);
- map.put("number", firstRule.getNumber());
- map.put("classNames", classNames);
- map.put("professionNames", professionNames);
-
- //1ã€è€ƒç”Ÿæ˜¯å¦èƒ½æŠ¥å–美术本科
- List<Volunteer> list = new ArrayList<>();
- if (culture >= firstRule.getCultureMin() && major >= firstRule.getProfessionMin()) {
- //浮动分数
- double upGrade = total + firstRule.getUpMark();
- double downGrade = total - firstRule.getDownMark();
- map.put("upGrade", upGrade);
- map.put("downGrade", downGrade);
- map.put("type", SchemeTypeEnums.UNDERGRADUATE_LITERATURE.getCode());
- list = volunteerMapper.getVolunteerList(map);
-
- //如果数æ®ä¸æ»¡è¶³æœ€å¤§æ•°é‡ï¼Œå–ä¸é™ä¸“业最低分补充
- if (list.size() < secondRule.getNumber()) {
- List<Volunteer> fillList = fillUpVolunteer(list, secondRule.getNumber(), upGrade, downGrade,
- SchemeTypeEnums.UNDERGRADUATE_LITERATURE.getCode());
- list.addAll(fillList);
- }
- return list;
- }
-
-
- //专科类比分 = 本年录å–分 -去年录å–分 + 考生分数
- double cultureSecond = firstRule.getCurrentYearCulture() - firstRule.getCultureMin() + Double.parseDouble(queryVo.getCultureGrade());
- double majorSecond = firstRule.getCurrentYearMajor() - firstRule.getProfessionMin() + Double.parseDouble(queryVo.getMajorGrade());
- //计算综åˆæˆç»©
- double totalSecond = majorSecond * 750 / 300 * 0.3 + cultureSecond * 0.7;
- //2ã€è€ƒç”Ÿæ˜¯å¦èƒ½æŠ¥å–美术专科
- if (cultureSecond >= secondRule.getCultureMin() && majorSecond >= secondRule.getProfessionMin()) {
- //浮动分数
- double upGrade = totalSecond + secondRule.getUpMark();
- double downGrade = totalSecond - secondRule.getDownMark();
- map.put("upGrade", upGrade);
- map.put("downGrade", downGrade);
- map.put("type", SchemeTypeEnums.JUNIOR_COLLEGE_LITERATURE.getCode());
- list = volunteerMapper.getVolunteerList(map);
-
- //如果数æ®ä¸æ»¡è¶³æœ€å¤§æ•°é‡ï¼Œå–ä¸é™ä¸“业最低分补充
- if (list.size() < secondRule.getNumber()) {
- List<Volunteer> fillList = fillUpVolunteer(list, secondRule.getNumber(), upGrade, downGrade,
- SchemeTypeEnums.JUNIOR_COLLEGE_LITERATURE.getCode());
- list.addAll(fillList);
- }
- }
-
- return list;
- }
-
- /**
- * 获å–体育生生志愿方案
- *
- * @param total 考生综åˆæˆç»©
- * @param firstRule 本科规则
- * @param secondRule 专科规则
- * @param classNames 副科å称
- * @param professionNames 专业å称
- * @return 志愿方案列表
- */
- private List<Volunteer> getSportsList(double total, AdmissionRule firstRule, AdmissionRule secondRule,
- List<String> classNames, List<String> professionNames) {
- Map<String, Object> map = new HashMap<>(16);
- map.put("number", firstRule.getNumber());
- map.put("classNames", classNames);
- map.put("professionNames", professionNames);
-
- //1ã€è€ƒç”Ÿæ˜¯å¦èƒ½æŠ¥å–体育本科
- List<Volunteer> list = new ArrayList<>();
- if (total >= firstRule.getCultureMin()) {
- //浮动分数
- double upGrade = total + firstRule.getUpMark();
- double downGrade = total - firstRule.getDownMark();
- if (downGrade < firstRule.getCultureMin()) {
- downGrade = firstRule.getCultureMin();
- }
- map.put("upGrade", upGrade);
- map.put("downGrade", downGrade);
- map.put("type", SchemeTypeEnums.UNDERGRADUATE_SPORTS.getCode());
- list = volunteerMapper.getVolunteerList(map);
-
- //如果数æ®ä¸æ»¡è¶³æœ€å¤§æ•°é‡ï¼Œå–ä¸é™ä¸“业最低分补充
- if (list.size() < secondRule.getNumber()) {
- List<Volunteer> fillList = fillUpVolunteer(list, secondRule.getNumber(), upGrade, downGrade,
- SchemeTypeEnums.UNDERGRADUATE_SPORTS.getCode());
- list.addAll(fillList);
- }
- return list;
- }
-
- //2ã€è€ƒç”Ÿæ˜¯å¦èƒ½æŠ¥å–体育专科
- if (total >= secondRule.getCultureMin()) {
- //浮动分数
- double upGrade = total + secondRule.getUpMark();
- double downGrade = total - secondRule.getDownMark();
- if (downGrade < secondRule.getCultureMin()) {
- downGrade = secondRule.getCultureMin();
- }
- map.put("upGrade", upGrade);
- map.put("downGrade", downGrade);
- map.put("type", SchemeTypeEnums.JUNIOR_COLLEGE_SPORTS.getCode());
- list = volunteerMapper.getVolunteerList(map);
-
- //如果数æ®ä¸æ»¡è¶³æœ€å¤§æ•°é‡ï¼Œå–ä¸é™ä¸“业最低分补充
- if (list.size() < secondRule.getNumber()) {
- List<Volunteer> fillList = fillUpVolunteer(list, secondRule.getNumber(), upGrade, downGrade,
- SchemeTypeEnums.JUNIOR_COLLEGE_SPORTS.getCode());
- list.addAll(fillList);
- }
- }
-
- return list;
- }
-
- /**
- * 获å–副科的å称
- *
- * @param scoreInfo æˆç»©ä¿¡æ¯
- * @return 副科列表
- */
- private List<String> getClassName(ScoreInfo scoreInfo) {
- List<String> name = new ArrayList<>();
- name.add(StudentClassEnum.UNLIMITED.getDesc());
- if (null != scoreInfo.getPhysicsGrade() && scoreInfo.getPhysicsGrade() >= 0) {
- name.add(StudentClassEnum.PHYSICS_GRADE.getDesc());
- }
-
- if (null != scoreInfo.getChemistryGrade() && scoreInfo.getChemistryGrade() >= 0) {
- name.add(StudentClassEnum.CHEMISTRY_GRADE.getDesc());
- }
-
- if (null != scoreInfo.getBiologyGrade() && scoreInfo.getBiologyGrade() >= 0) {
- name.add(StudentClassEnum.BIOLOGY_GRADE.getDesc());
- }
-
- if (null != scoreInfo.getHistoryGrade() && scoreInfo.getHistoryGrade() >= 0) {
- name.add(StudentClassEnum.HISTORY_GRADE.getDesc());
- }
-
- if (null != scoreInfo.getGeographyGrade() && scoreInfo.getGeographyGrade() >= 0) {
- name.add(StudentClassEnum.GEOGRAPHY_GRADE.getDesc());
- }
-
- if (null != scoreInfo.getPoliticsGrade() && scoreInfo.getPoliticsGrade() >= 0) {
- name.add(StudentClassEnum.POLITICS_GRADE.getDesc());
- }
-
- return name;
- }
-
- /**
- * 获å–专业å称
- *
- * @param schemeVo 专业å‚æ•°
- * @return 专业å称列表
- */
- private List<String> getProfessionName(SchemeVo schemeVo) {
- //把å—符专ids业转为数组
- List<Integer> professionIds = StringUtil.strToArray(schemeVo.getProfessionIds());
- return professionMapper.getNameByIds(professionIds);
- }
-
- /**
- * 补充ä¸è¶³æ•°é‡çš„å¿—æ„¿æ•°
- *
- * @param list å¿—æ„¿ids
- * @param number 差的数é‡
- * @param max 最高分
- * @param min 最低分
- * @return 集åˆ
- */
- private List<Volunteer> fillUpVolunteer(List<Volunteer> list, Integer number, double max, double min, Integer type) {
- //å·²å˜åœ¨çš„å¿—æ„¿ids
- List<Integer> volunteerIds = list.stream().map(Volunteer::getId).collect(Collectors.toList());
-
- //需è¦è¡¥å……çš„å¿—æ„¿æ¡æ•°
- int totalNumber = number - list.size();
-
- Map<String, Object> map = new HashMap<>(16);
- map.put("volunteerIds", volunteerIds);
- map.put("number", totalNumber);
- map.put("upGrade", max);
- map.put("downGrade", min);
- map.put("type", type);
- return volunteerMapper.getFillList(map);
- }
-
- /**
- * 分页处ç†æ–¹æ³•
- *
- * @param schemeVo å‚æ•°
- */
- private void pageHandle(SchemeQueryVo schemeVo) {
- Integer pageNum = schemeVo.getPageNo();
- Integer pageSize = schemeVo.getPageSize();
- if (null == pageSize || pageSize == 0) {
- pageSize = 10;
- }
- if (null == pageNum || pageNum == 0) {
- pageNum = 1;
- }
- Integer endNum = pageSize;
- Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
- schemeVo.setEndNum(endNum);
- schemeVo.setStartNum(startNum);
- schemeVo.setPageNo(pageNum);
- schemeVo.setPageSize(pageSize);
- }
-
-
- /**
- * 超过é™å®šå±•ç¤ºæ–¹æ¡ˆæ¡æ•°ï¼Œè¦å¸…选
- *
- * @param list 所以方案数æ®
- * @param total é™å®šå±•ç¤ºæ–¹æ¡ˆæ¡æ•°
- * @return ç›é€‰ç»“æžœ
- */
- private List<Volunteer> getVolunteerList(List<Volunteer> list, Integer total) {
- List<Volunteer> result = new ArrayList<>();
- List<Volunteer> otherList = new ArrayList<>();
-
- //分组，æ¯ç»„æ•°é‡å¤§äºŽ2的，å–两æ¡ï¼Œå°äºŽç‰äºŽåˆ™å…¨å–
- Map<String, List<Volunteer>> map = list.stream().collect(Collectors.groupingBy(Volunteer::getLowestMark
- ));
-
- for (Map.Entry<String, List<Volunteer>> entry : map.entrySet()) {
- List<Volunteer> volunteers = entry.getValue();
- if (volunteers.size() > 2) {
- for (int i = 0; i < 2; i++) {
- Random mRandom = new Random();
- int number = mRandom.nextInt(volunteers.size());
- result.add(volunteers.get(number));
- volunteers.remove(number);
- }
- otherList.addAll(volunteers);
- } else {
- result.addAll(volunteers);
- }
-
- if (result.size() >= total) {
- return result.subList(0, total);
- }
- }
-
- //从剩下的数æ®ä¸éšæœºæŠ½å–，添满数组
- if (result.size() < total) {
- int number = total - result.size();
- List<Volunteer> volunteers = new ArrayList<>();
- for (int i = 0; i < number; i++) {
- Random mRandom = new Random();
- int count = mRandom.nextInt(otherList.size());
- if (result.contains(otherList.get(count))) {
- otherList.remove(count);
- continue;
- }
- volunteers.add(otherList.get(count));
- otherList.remove(count);
- }
- result.addAll(volunteers);
- }
- return result;
- }
-
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SendSmsSerViceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SendSmsSerViceImpl.java
deleted file mode 100644
index 682a2c4..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/SendSmsSerViceImpl.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.mapper.UsersMapper;
-import cn.wisenergy.model.enums.SceneType;
-import cn.wisenergy.model.enums.SourceType;
-import cn.wisenergy.model.vo.SendSmsVo;
-import cn.wisenergy.service.app.SendSmsSerVice;
-import cn.wisenergy.service.cache.RedisService;
-import cn.wisenergy.service.common.CachePrefix;
-import cn.wisenergy.service.common.Common;
-import com.alibaba.fastjson.JSON;
-import com.aliyuncs.CommonRequest;
-import com.aliyuncs.CommonResponse;
-import com.aliyuncs.DefaultAcsClient;
-import com.aliyuncs.IAcsClient;
-import com.aliyuncs.exceptions.ClientException;
-import com.aliyuncs.http.MethodType;
-import com.aliyuncs.profile.DefaultProfile;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author 86187
- * @ Description: çŸä¿¡éªŒè¯ç 接å£å®žçŽ°
- * @ Author : 86187
- * @ Date : 2021/1/15 15:45
- */
-@Service
-@Slf4j
-public class SendSmsSerViceImpl implements SendSmsSerVice {
-
- @Autowired
- private RedisService redisService;
-
- @Autowired
- private RestTemplate restTemplate;
-
- @Autowired
- private UsersMapper usersMapper;
-
- private static final String SMS_RESULT = "OK";
-
- @Override
- public R<Boolean> sendSmCode(SendSmsVo sendSmsVo) throws Exception {
- log.info("volunteer-service[]SendSmsSerViceImpl[]sendSmCode[]input.param.sendSmsVo:" + sendSmsVo);
- if (null == sendSmsVo || StringUtils.isBlank(sendSmsVo.getPhone()) ||
- null == sendSmsVo.getSource() || null == sendSmsVo.getScene()) {
- return R.error("å…¥å‚ä¸èƒ½ä¸ºç©º!");
- }
-
- DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", Common.ACCESS_KEY_ID, Common.SMS_SECRET);
- IAcsClient client = new DefaultAcsClient(profile);
-
- CommonRequest request = new CommonRequest();
- request.setSysMethod(MethodType.POST);
- request.setSysDomain("dysmsapi.aliyuncs.com");
- request.setSysVersion("2017-05-25");
- request.setSysAction("SendSms");
-
- //生æˆå…ä½éšæœºæ•°ä½œä¸ºçŸä¿¡éªŒè¯ç
- int code = (int) ((Math.random() * 9 + 1) * 100000);
-
- //ä¿å˜éªŒè¯åˆ°ç¼“å˜ï¼Œä»¥ä¾¿åšéªŒè¯
- String source = SourceType.getByCode(sendSmsVo.getSource());
- String scene = SceneType.getNameByCode(sendSmsVo.getScene());
- boolean bool = redisService.set(CachePrefix.SMS_CODE.getPrefix() + scene + "_" +
- source + "_" + sendSmsVo.getPhone(), code, Common.SMS_TIMEOUT);
-
- if (!bool) {
- return R.error("缓å˜éªŒè¯ç 失败!");
- }
- Map<String, Object> map = new HashMap<>(4);
- map.put("code", code);
- request.putQueryParameter("RegionId", "cn-hangzhou");
- request.putQueryParameter("PhoneNumbers", sendSmsVo.getPhone());
- request.putQueryParameter("SignName", "éµä¹‰ç¾¤æ™ºç§‘技有é™å…¬å¸");
- request.putQueryParameter("TemplateCode", "SMS_157970381");
- request.putQueryParameter("TemplateParam", JSON.toJSONString(map));
- try {
- //å‘é€éªŒè¯ç
- CommonResponse response = client.getCommonResponse(request);
- log.info("输出çŸä¿¡è¿”回å‚æ•°:" + response);
- } catch (ClientException e) {
- e.printStackTrace();
- }
-
- return R.ok(0, true);
- }
-
- @Override
- public R<Boolean> valid(String phone, String code, Integer type, String source) {
- String value = SceneType.getNameByCode(type);
- //获å–çŸä¿¡éªŒè¯ç key
- String key = CachePrefix.SMS_CODE.getPrefix() + value + "_" + source + "_" + phone;
-
- //判æ–缓å˜æ˜¯å¦è¿‡æœŸ
- long time = redisService.getExpire(key);
- if (time < 0) {
- //return R.error(1, "验è¯ç 已过期!", false);
- return R.ok(0, true);
- }
-
- //redisä¸èŽ·å–验è¯ç
- Object obj = redisService.get(key);
- if (obj != null) {
- String smCode = obj.toString();
- if (code.equals(smCode)) {
- //验è¯ç å˜åœ¨ï¼Œæ ¡éªŒé€šè¿‡ï¼Œæ¸…除验è¯ç 缓å˜
- redisService.del(key);
- return R.ok(0, true);
- } else {
- //return R.error(1, "验è¯ç 错误!", false);
- return R.ok(0, true);
- }
- }
- //return R.ok(1, false);
- return R.ok(0, true);
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLimitServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLimitServiceImpl.java
deleted file mode 100644
index 0d0afd5..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLimitServiceImpl.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.mapper.*;
-import cn.wisenergy.model.app.*;
-import cn.wisenergy.model.enums.CardStatus;
-import cn.wisenergy.model.enums.PayType;
-import cn.wisenergy.model.vo.AddLimitVo;
-import cn.wisenergy.service.app.UserLimitService;
-import cn.wisenergy.service.common.VolunteerManager;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * @author 86187
- */
-@Service
-@Slf4j
-public class UserLimitServiceImpl extends ServiceImpl<UserLimitMapper, UserLimit> implements UserLimitService {
-
- @Autowired
- private PriceMapper priceMapper;
-
- @Autowired
- private UserLimitMapper userLimitMapper;
-
- @Autowired
- private PayRecordMapper payRecordMapper;
-
- @Autowired
- private CardMapper cardMapper;
-
- @Autowired
- private UserLimitRecordMapper userLimitRecordMapper;
-
- @Autowired
- private VolunteerManager volunteerManager;
-
- @Autowired
- private RefillCardMapper refillCardMapper;
-
- @Override
- public R<UserLimit> getByUserId(Integer userId) {
- log.info("volunteer-service[]UserLimitServiceImpl[]getByUserId[]input.param.userId:" + userId);
- if (null == userId) {
- return R.error("å…¥å‚ä¸èƒ½ä¸ºç©º!");
- }
-
- //由用户id,获å–用户查询次数信æ¯
- QueryWrapper<UserLimit> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("user_id", userId);
- UserLimit userLimit = baseMapper.selectOne(queryWrapper);
-
- return R.ok(userLimit);
- }
-
- @Override
- public R<Boolean> addLimit(AddLimitVo addLimitVo) {
- log.info("volunteer-service[]UserLimitServiceImpl[]addLimit[]input.param.addLimitVo:" + addLimitVo);
- if (null == addLimitVo || null == addLimitVo.getUserId() || null == addLimitVo.getPayType()) {
- return R.error("å…¥å‚ä¸èƒ½ä¸ºç©º!");
- }
-
- Integer userId = addLimitVo.getUserId();
- //判æ–用户查询次数信æ¯æ˜¯å¦å˜åœ¨
- UserLimit userLimit = userLimitMapper.getByUserId(userId);
- if (null == userLimit) {
- return R.error("用户查询信æ¯ä¸å˜åœ¨!");
- }
-
- //1ã€å……值å¡
- if (PayType.REFILL_CARD.getCode().equals(addLimitVo.getPayType())) {
- if (StringUtils.isBlank(addLimitVo.getPassword())) {
- return R.error(1,"充值å¡å¯†ç ä¸èƒ½ä¸ºç©º!",false);
- }
-
- //æ ¹æ®å¯†ç 获å–充值å¡ä¿¡æ¯
- CardInfo cardInfo = cardMapper.getBySecretKey(addLimitVo.getPassword());
- if (null == cardInfo || StringUtils.isBlank(cardInfo.getBatchNumber())) {
- return R.error(1,"充值å¡ä¿¡æ¯ä¸å˜åœ¨!",false);
- }
-
- if (cardInfo.getStatus().equals(CardStatus.ALREADY_USED.getCode())) {
- return R.error(1,"充值å¡å·²ä½¿ç”¨ï¼Œè¯·è´ä¹°æ–°å¡!",false);
- }
-
- //获å–主å¡ä¿¡æ¯
- RefillCard refillCard = refillCardMapper.getByBatchNumber(cardInfo.getBatchNumber());
- if (null == refillCard) {
- return R.error(1,"充值å¡ä¿¡æ¯ä¸å˜åœ¨!",false);
- }
-
- if (refillCard.getIsActivite() == 1) {
- return R.error(1,"充值å¡æœªæ¿€æ´»ï¼Œè¯·è”系管ç†å‘˜æ¿€æ´»!",false);
- }
-
- //å¢žåŠ ç”¨æˆ·å¯ç”¨æŸ¥è¯¢æ¬¡æ•°
- Integer usableNumber = userLimit.getUsableLimit() + cardInfo.getLimit();
-
- //å¢žåŠ ç”¨æˆ·æ€»æŸ¥è¯¢æ¬¡æ•°
- Integer total = userLimit.getTotalLimit() + cardInfo.getLimit();
- userLimit.setUsableLimit(usableNumber);
- userLimit.setTotalLimit(total);
-
- //更新充值å¡çŠ¶æ€å’Œç”¨æˆ·æŸ¥è¯¢æ¬¡æ•°åŠå¢žåŠ 充值记录
- boolean bool = volunteerManager.updateLimitAndRecord(new Price(), cardInfo, userLimit, addLimitVo);
- return R.ok(bool);
-
- } else {
- //2ã€å¾®ä¿¡æˆ–者支付å®
- if (null == addLimitVo.getPayMoney()) {
- return R.error(1,"支付金é¢ä¸èƒ½ä¸ºç©º!",false);
- }
-
- //æ ¹æ®æ”¯ä»˜çš„金é¢ï¼ŒæŸ¥è¯¢ç”¨æˆ·æ–°å¢žæŸ¥è¯¢æ¬¡æ•°
- Price price = priceMapper.getByMoney(addLimitVo.getPayMoney());
-
- //å¢žåŠ ç”¨æˆ·å¯ç”¨æŸ¥è¯¢æ¬¡æ•°
- Integer usableNumber = userLimit.getUsableLimit() + price.getUseLimit();
-
- //å¢žåŠ ç”¨æˆ·æ€»æŸ¥è¯¢æ¬¡æ•°
- Integer total = userLimit.getTotalLimit() + price.getUseLimit();
- userLimit.setUseLimit(usableNumber);
- userLimit.setTotalLimit(total);
-
- //更新充值å¡çŠ¶æ€å’Œç”¨æˆ·æŸ¥è¯¢æ¬¡æ•°åŠå¢žåŠ 充值记录
- boolean bool = volunteerManager.updateLimitAndRecord(price, new CardInfo(), userLimit, addLimitVo);
- return R.ok(bool);
- }
- }
-
- @Override
- public R<Boolean> minusLimit(Integer userId) {
- log.info("volunteer-service[]UserLimitServiceImpl[]minusLimit[]input.param.userId:" + userId);
- if (null == userId) {
- return R.error("å…¥å‚ä¸èƒ½ä¸ºç©º!");
- }
-
- //获å–用户查询次数信æ¯
- UserLimit userLimit = userLimitMapper.getByUserId(userId);
- if (null == userLimit) {
- return R.error("用户查询信æ¯ä¸å˜åœ¨!");
- }
-
- if (userLimit.getUsableLimit() == 0) {
- return R.error(1, "您的查询次数已使用完了，请充值!", false);
- }
-
- //扣å‡ç”¨æˆ·å¯ç”¨æŸ¥è¯¢æ¬¡æ•°
- int usableLimit = userLimit.getUsableLimit() - 1;
-
- //å¢žåŠ ç”¨æˆ·å·²ä½¿æ¬¡æ•°
- int useLimit = userLimit.getUseLimit() + 1;
- userLimit.setUsableLimit(usableLimit);
- userLimit.setUseLimit(useLimit);
-
- //更新用户查询信æ¯å¹¶ä¿å˜æ‰£å‡è®°å½•
- boolean bool = volunteerManager.updateLimitSaveRecord(userLimit);
- if (bool) {
- return R.ok(0, true);
- }
- return R.ok(1, false);
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java
deleted file mode 100644
index 942a3e8..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLoginServiceImpl.java
+++ /dev/null
@@ -1,300 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.common.utils.Md5Util;
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.mapper.LoginRecordMapper;
-import cn.wisenergy.mapper.UserLimitMapper;
-import cn.wisenergy.mapper.UsersMapper;
-import cn.wisenergy.model.app.LoginRecord;
-import cn.wisenergy.model.app.User;
-import cn.wisenergy.model.enums.OperationTypeEnum;
-import cn.wisenergy.model.enums.SourceType;
-import cn.wisenergy.model.vo.UpdatePasswordVo;
-import cn.wisenergy.model.vo.UserInfoVo;
-import cn.wisenergy.model.vo.UserLoginVo;
-import cn.wisenergy.model.vo.UserRegisterVo;
-import cn.wisenergy.service.app.SendSmsSerVice;
-import cn.wisenergy.service.app.UserLoginService;
-import cn.wisenergy.service.common.Common;
-import cn.wisenergy.service.common.VolunteerManager;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * @author 86187
- * @ Description: 用户登录相关接å£å®žçŽ°
- * @ Author : 86187
- * @ Date : 2021/1/7 14:22
- */
-@Service
-@Slf4j
-public class UserLoginServiceImpl extends ServiceImpl<UsersMapper, User> implements UserLoginService {
- @Autowired
- private UsersMapper usersMapper;
-
- @Autowired
- private LoginRecordMapper loginRecordMapper;
-
- @Autowired
- private SendSmsSerVice sendSmsSerVice;
-
- @Autowired
- private UserLimitMapper userLimitMapper;
-
- @Autowired
- private VolunteerManager volunteerManager;
-
- private static final int ERROR_CODE = 1;
-
- @Transactional(rollbackFor = Exception.class)
- @Override
- public R<UserInfoVo> register(UserRegisterVo userVo) {
- log.info("volunteer-service[]UserLoginServiceImpl[]register[]input.param.userVo:" + userVo);
- if (null == userVo || StringUtils.isBlank(userVo.getPhone()) || StringUtils.isBlank(userVo.getPassword())) {
- return R.error("å…¥å‚为空!");
- }
-
- String phone = userVo.getPhone();
- String password = userVo.getPassword();
-
- //1.检查å·ç 是å¦é‡å¤
- Integer userId = null;
- Boolean bool = checkPhone(phone, userId);
- if (!bool) {
- return R.error("该电è¯å·ç " + phone + "已被使用!");
- }
-
- //2ã€åˆ¤æ–验è¯ç 是å¦æ£ç¡®
- String source = SourceType.getByCode(userVo.getSource());
- R<Boolean> result = sendSmsSerVice.valid(userVo.getPhone(), userVo.getSmCode(),
- userVo.getScene(), source);
- if (null != result && result.getCode() == ERROR_CODE) {
- return R.error(result.getMessage());
- }
-
- //3ã€ç»™å¯†ç åŠ å¯† åŠ å¯†è§„åˆ™ï¼Œç”µè¯å·ç +明文密ç
- String secret = Md5Util.digestMD5(password + phone);
- return volunteerManager.saveUserAndLimit(phone, secret, userVo.getSource());
- }
-
- @Override
- public R<UserInfoVo> loginCode(UserLoginVo userVo) {
- log.info("volunteer-service[]UserLoginServiceImpl[]loginCode[]input.param.userVo:" + userVo);
- if (null == userVo || StringUtils.isBlank(userVo.getPhone()) || StringUtils.isBlank(userVo.getCode()) ||
- null == userVo.getSource() || null == userVo.getScene()) {
- return R.error("å…¥å‚为空!");
- }
-
- //1ã€åˆ¤æ–手机å·è´¦æˆ·æ˜¯å¦å˜åœ¨
- QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("phone", userVo.getPhone());
- queryWrapper.eq("is_delete", 0);
- User user = baseMapper.selectOne(queryWrapper);
- if (null == user) {
- return R.error("该手机å·æœªæ³¨å†Œ,请先注册!");
- }
-
- //2ã€åˆ¤æ–验è¯ç 是å¦æ£ç¡®
- String source = SourceType.getByCode(userVo.getSource());
- R<Boolean> result = sendSmsSerVice.valid(userVo.getPhone(), userVo.getCode(), userVo.getScene(), source);
-
- if (null != result && result.getCode() == ERROR_CODE) {
- return R.error(result.getMessage());
- }
-
- //3ã€ä¿å˜ç™»å½•ä¿¡æ¯
- LoginRecord loginRecord = new LoginRecord();
- loginRecord.setType(OperationTypeEnum.USER_LOGIN.getCode());
- loginRecord.setUserId(user.getId());
- String name = OperationTypeEnum.getByCode(OperationTypeEnum.USER_LOGIN.getCode());
- loginRecord.setOperationName(name);
- loginRecordMapper.add(loginRecord);
-
- //4ã€æž„é€ è¿”å›žå‚æ•°
- UserInfoVo userInfoVo = new UserInfoVo();
- userInfoVo.setUserId(user.getId());
- userInfoVo.setUserName(user.getUserName());
- userInfoVo.setPhone(user.getPhone());
- return R.ok(userInfoVo);
- }
-
- @Override
- public R<UserInfoVo> login(UserLoginVo userVo) {
- log.info("volunteer-service[]UserLoginServiceImpl[]login[]input.param.userVo:" + userVo);
- if (null == userVo || StringUtils.isBlank(userVo.getPhone()) || StringUtils.isBlank(userVo.getPassword())) {
- return R.error("å…¥å‚为空!");
- }
-
- //1ã€æ ¹æ®æ‰‹æœºå·ï¼ŒèŽ·å–用户信æ¯
- QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("phone", userVo.getPhone());
- queryWrapper.eq("is_delete", 0);
- User user = usersMapper.selectOne(queryWrapper);
- if (null == user) {
- return R.error("该用户ä¸å˜åœ¨ï¼Œè¯·æ‚¨æ³¨å†Œè´¦å·!");
- }
-
- //2ã€åˆ¤æ–密ç 是å¦æ£ç¡®
- //MD5åŠ å¯†
- String secret = Md5Util.digestMD5(userVo.getPassword() + userVo.getPhone());
-
- if (!user.getPassword().equals(secret)) {
- return R.error("密ç 错误，请您输入æ£ç¡®å¯†ç !");
- }
-
- //3ã€æž„é€ è¿”å›žå‚æ•°
- UserInfoVo userInfoVo = new UserInfoVo();
- userInfoVo.setUserId(user.getId());
- userInfoVo.setUserName(user.getUserName());
- userInfoVo.setPhone(user.getPhone());
-
- //3ã€ä¿å˜æ“作记录
- LoginRecord loginRecord = new LoginRecord();
- loginRecord.setType(OperationTypeEnum.USER_LOGIN.getCode());
- loginRecord.setUserId(user.getId());
- String name = OperationTypeEnum.getByCode(OperationTypeEnum.USER_LOGIN.getCode());
- loginRecord.setOperationName(name);
- int sum = loginRecordMapper.add(loginRecord);
- if (sum == 0) {
- return R.error("ä¿å˜æ“作记录失败!");
- }
- return R.ok(userInfoVo);
- }
-
- @Override
- public R<Boolean> loginOut(Integer userId) {
- log.info("volunteer-service[]UserLoginServiceImpl[]loginOut[]input.param.userId:" + userId);
- if (null == userId) {
- return R.error("å…¥å‚为空!");
- }
-
- //ä¿å˜ç”¨æˆ·é€€å‡ºæ“作
- LoginRecord loginRecord = new LoginRecord();
- loginRecord.setType(OperationTypeEnum.USER_OUT.getCode());
- loginRecord.setUserId(userId);
- String name = OperationTypeEnum.getByCode(OperationTypeEnum.USER_OUT.getCode());
- loginRecord.setOperationName(name);
- int sum = loginRecordMapper.add(loginRecord);
- if (sum == 0) {
- return R.ok(1, false);
- }
- return R.ok(0, true);
- }
-
- @Override
- public R<Boolean> updatePassword(UpdatePasswordVo updateVo) {
- log.info("volunteer-service[]UserLoginServiceImpl[]loginOut[]input.param.updateVo:" + updateVo);
- if (null == updateVo || null == updateVo.getUserId() || StringUtils.isBlank(updateVo.getNewPassword()) ||
- StringUtils.isBlank(updateVo.getOldPassword())) {
- return R.error("å…¥å‚为空!");
- }
-
- //1ã€èŽ·å–用户信æ¯
- User user = usersMapper.selectById(updateVo.getUserId());
- if (null == user) {
- return R.error("用户信æ¯ä¸å˜åœ¨,æ— æ³•ä¿®æ”¹å¯†ç !");
- }
-
- //2ã€åˆ¤æ–旧密ç 是å¦æ£ç¡®
- String password = Md5Util.digestMD5(updateVo.getOldPassword() + user.getPhone());
- if (!user.getPassword().equals(password)) {
- return R.error("旧密ç ä¸æ£ç¡®,请从新输入!");
- }
-
- //3ã€ä¿®æ”¹ç”¨æˆ·å¯†ç 为新密ç
- String newPassword = Md5Util.digestMD5(updateVo.getNewPassword() + user.getPhone());
- user.setPassword(newPassword);
- int count = usersMapper.edit(user);
- if (count == 0) {
- return R.ok(1, false);
- }
- return R.ok(0, true);
- }
-
- @Override
- public R<Boolean> resetPassword(Integer userId) {
- log.info("volunteer-service[]UserLoginServiceImpl[]resetPassword[]input.param.userId:" + userId);
- if (null == userId) {
- return R.error("å…¥å‚为空!");
- }
-
- //获å–用户信æ¯
- User user = usersMapper.selectById(userId);
-
- //åŠ å¯†é‡ç½®å¯†ç
- String password = Md5Util.digestMD5(Common.RESET_PASSWORD_VALUE + user.getPhone());
- user.setPassword(password);
-
- int count = usersMapper.edit(user);
- if (count == 0) {
- return R.ok(1, false);
- }
- return R.ok(0, true);
- }
-
- @Override
- public R<Boolean> smsResetPassword(UserLoginVo userVo) {
- log.info("volunteer-service[]UserLoginServiceImpl[]smsResetPassword[]input.param.userVo:" + userVo);
- if (null == userVo || StringUtils.isBlank(userVo.getPhone()) || StringUtils.isBlank(userVo.getCode()) ||
- StringUtils.isBlank(userVo.getPassword()) || null == userVo.getScene()) {
- return R.error("å…¥å‚为空!");
- }
-
- //获å–用户信æ¯
- QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("phone", userVo.getPhone());
- queryWrapper.eq("is_delete", 0);
- User user = baseMapper.selectOne(queryWrapper);
- if (null == user) {
- return R.error("用户信æ¯ä¸å˜åœ¨ï¼Œæ— 法é‡ç½®å¯†ç !");
- }
-
- //验è¯éªŒè¯ç
- String source = SourceType.getByCode(userVo.getSource());
- R<Boolean> bool = sendSmsSerVice.valid(userVo.getPhone(), userVo.getCode(), userVo.getScene(), source);
- if (null != bool && bool.getCode() == ERROR_CODE) {
- return R.error(1, bool.getMessage(), false);
- }
-
- //3ã€è®¾ç½®æ–°å¯†ç
- String password = Md5Util.digestMD5(userVo.getPassword() + userVo.getPhone());
- user.setPassword(password);
- int count = usersMapper.edit(user);
- if (count == 0) {
- return R.ok(1, false);
- }
- return R.ok(0, true);
- }
-
- private Boolean checkPhone(String phone, Integer userId) {
- //判æ–是注册还是编辑
- //1ã€æ³¨å†Œ-新增
- if (null == userId) {
- //æ ¹æ®ç”µè¯å·ç 查询用户
- QueryWrapper<User> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("phone", phone);
- queryWrapper.eq("is_delete", 0);
- User user = usersMapper.selectOne(queryWrapper);
- if (null != user) {
- return false;
- }
- }
-
- //2ã€ç¼–辑
- if (null != userId) {
- //æ ¹æ®ç”µè¯å·ç 和用户id,统计å·ç 是å¦é‡å¤
- int count = usersMapper.countByPhoneAnsUserId(phone, userId);
- if (count > 0) {
- return false;
- }
- }
-
- return true;
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
deleted file mode 100644
index 5af67d3..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
+++ /dev/null
@@ -1,296 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.hutool.system.UserInfo;
-import cn.wisenergy.common.constant.CommonAttributes;
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.mapper.*;
-import cn.wisenergy.model.app.*;
-import cn.wisenergy.model.dto.UserCommitDto;
-import cn.wisenergy.model.dto.UserInfoDto;
-import cn.wisenergy.model.vo.UserInfoVo;
-import cn.wisenergy.model.vo.UserQueryVo;
-import cn.wisenergy.model.vo.UserShowVo;
-import cn.wisenergy.service.app.UserService;
-import cn.wisenergy.service.common.VolunteerManager;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ Description: 用户接å£å®žçŽ°
- * @ Author : 86187
- * @ Date : 2021/1/6 16:11
- */
-@Service
-@Slf4j
-public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements UserService {
-
- @Autowired
- private UsersMapper usersMapper;
-
- @Autowired
- private ScoreInfoMapper scoreInfoMapper;
-
- @Autowired
- private LoginRecordMapper loginRecordMapper;
-
- @Autowired
- private UserLimitMapper userLimitMapper;
-
- @Autowired
- private PayRecordMapper payRecordMapper;
-
- @Autowired
- protected VolunteerManager volunteerManager;
-
- @Override
- public R<PageInfo<UserInfoDto>> getUserList(UserQueryVo queryVo) {
- log.info("volunteer_service[]UserServiceImpl[]getUserList[]input.param.queryVo:" + queryVo);
-
- //创建å‚数容器
- Map<String, Object> map = new HashMap<>(4);
-
- //å°†å‚数放入容器ä¸
- map.put("pageNo", (queryVo.getPageNo() - 1) * queryVo.getPageSize());
- map.put("pageSize", queryVo.getPageSize());
- map.put("startTime", queryVo.getStartTime());
- map.put("endTime", queryVo.getEndTime());
- map.put("userName", queryVo.getUserName());
- map.put("phone", queryVo.getPhone());
-
- //查询用户数æ®
- List<User> list1 = usersMapper.getList(map);
- List<UserInfoDto> list = new ArrayList<>();
-
- //将集åˆé历拿出用户id查询æˆç»©ä¿¡æ¯
- for (User user : list1) {
- UserInfoDto userInfoDto = new UserInfoDto();
-
- //查询相关信æ¯
- ScoreInfo scoreInfo = scoreInfoMapper.getById(user.getId());
- if (null != scoreInfo) {
- userInfoDto.setCultureGrade(scoreInfo.getCultureGrade().toString());
- userInfoDto.setMajorGrade(null==scoreInfo.getMajorGrade()?"":scoreInfo.getMajorGrade().toString());
- }
- LoginRecord loginRecord = loginRecordMapper.getById(user.getId());
- if (null != loginRecord) {
- userInfoDto.setLastLoginTime(loginRecord.getUpdateTime());
- userInfoDto.setIp(loginRecord.getIp());
- }
- UserLimit userLimit = userLimitMapper.getByUserId(user.getId());
-
- if (null != userLimit) {
- userInfoDto.setQueryLimit(userLimit.getUsableLimit());
- }
- List<PayRecord> byId = payRecordMapper.getById(user.getId());
-
- //计算充值å¡å……值次数
- Integer rechargeTimes = 0;
-
- //支付å®å……值总金é¢
- Integer alipayMoney = 0;
-
- //微信充值总金é¢
- Integer weChatMoney = 0;
-
- if (!CollectionUtils.isEmpty(byId)) {
-
- for (PayRecord payRecord : byId) {
- if (payRecord.getType() == 1) {
- alipayMoney += Integer.valueOf(null == payRecord.getMoney() ? 0 : payRecord.getMoney());
- }
-
- if (payRecord.getType() == 2) {
- weChatMoney += Integer.valueOf(null == payRecord.getMoney() ? 0 : payRecord.getMoney());
- }
-
- if (payRecord.getType() == 3) {
- rechargeTimes += 1;
- }
- }
- }
- userInfoDto.setWeChatMoney(String.valueOf(weChatMoney));
- userInfoDto.setAlipayMoney(String.valueOf(alipayMoney));
- userInfoDto.setRechargeTimes(rechargeTimes);
-
- //将消æ¯è¿›è¡ŒåŒæ¥
- BeanUtils.copyProperties(user, userInfoDto);
- userInfoDto.setUserId(user.getId());
- userInfoDto.setRegisterTime(user.getCreateTime());
- list.add(userInfoDto);
- }
-
- PageInfo<UserInfoDto> info = new PageInfo<>();
- info.setPageSize(queryVo.getPageSize());
- info.setPageNum(queryVo.getPageNo());
- info.setTotal(usersMapper.getUserNumbers(map));
- info.setList(list);
-
- return R.ok(info);
- }
-
-
- @Override
- public R<UserInfoVo> commitUserInfo(UserCommitDto userInfo) {
- log.info("volunteer-service[]UserServiceImpl[]commitUserInfo[]input.param.userInfo:" + userInfo);
- if (null == userInfo) {
- return R.error("å…¥å‚为空!");
- }
-
- //1ã€æ ¹æ®ç”¨æˆ·id,获å–用户信æ¯
- User user = usersMapper.selectById(userInfo.getUserId());
- if (null == user) {
- return R.error("用户信æ¯ä¸å˜åœ¨!");
- }
-
- //2ã€è¦æ交的用户信æ¯
- user.setSchool(userInfo.getSchool());
- user.setSex(userInfo.getSex());
- user.setExamType(userInfo.getStudentType());
- user.setUserName(userInfo.getUserName());
- user.setIsDelete(0);
- user.setSource(userInfo.getSource());
-
- //3ã€è¦æ交的用户的æˆç»©ä¿¡æ¯
- ScoreInfo scoreInfo = userInfo.getScoreInfo();
-
- //4ã€æ›´æ–°ç”¨æˆ·ä¿¡æ¯å’Œä¿å˜ç”¨æˆ·æˆç»©
- boolean bool = volunteerManager.updateAndSaveUserInfo(user, scoreInfo);
- if (!bool) {
- return R.error("æ·»åŠ ç”¨æˆ·ä¿¡æ¯å¤±è´¥!");
- }
-
- //返回信æ¯
- UserInfoVo userInfoVo = new UserInfoVo();
- userInfoVo.setUserId(userInfo.getUserId());
- userInfoVo.setUserName(userInfo.getUserName());
- userInfoVo.setPhone(user.getPhone());
- userInfoVo.setSex(userInfo.getSex());
- userInfoVo.setStudentType(userInfo.getStudentType());
- userInfoVo.setUserName(userInfo.getUserName());
- return R.ok(userInfoVo);
- }
-
- @Override
- public R<Boolean> edit(UserCommitDto userDto) {
- if (null == userDto) {
- return R.error("å…¥å‚为空!");
- }
-
- //1ã€æ ¹æ®ç”¨æˆ·id,获å–用户信æ¯
- User user = usersMapper.selectById(userDto.getUserId());
- if (null == user) {
- return R.error("用户信æ¯ä¸å˜åœ¨!");
- }
-
- //2ã€è¦æ交的用户信æ¯
- user.setSchool(userDto.getSchool());
- user.setSex(userDto.getSex());
- user.setExamType(userDto.getStudentType());
- user.setUserName(userDto.getUserName());
-
-
- //3ã€è¦æ交的用户的æˆç»©ä¿¡æ¯
- ScoreInfo scoreInfo = scoreInfoMapper.getById(userDto.getUserId());
- scoreInfo.setUserId(userDto.getUserId());
- scoreInfo.setBiologyGrade(userDto.getScoreInfo().getBiologyGrade());
- scoreInfo.setChemistryGrade(userDto.getScoreInfo().getChemistryGrade());
- scoreInfo.setCultureGrade(userDto.getScoreInfo().getCultureGrade());
- scoreInfo.setEnglishGrade(userDto.getScoreInfo().getEnglishGrade());
- scoreInfo.setGeographyGrade(userDto.getScoreInfo().getGeographyGrade());
- scoreInfo.setHistoryGrade(userDto.getScoreInfo().getHistoryGrade());
- scoreInfo.setLanguageGrade(userDto.getScoreInfo().getLanguageGrade());
- scoreInfo.setMajorGrade(userDto.getScoreInfo().getMajorGrade());
- scoreInfo.setMathGrade(userDto.getScoreInfo().getMathGrade());
- scoreInfo.setPhysicsGrade(userDto.getScoreInfo().getPhysicsGrade());
- scoreInfo.setPoliticsGrade(userDto.getScoreInfo().getPoliticsGrade());
-
- //4ã€æ›´æ–°ç”¨æˆ·ä¿¡æ¯å’Œä¿å˜ç”¨æˆ·æˆç»©
- boolean bool = volunteerManager.updateAndUserInfo(user, scoreInfo);
-
- return R.ok(bool);
- }
-
- @Override
- public R<Boolean> delete(Integer userId) {
- return null;
- }
-
- @Override
- public R<UserShowVo> getById(Integer id) {
- log.info("volunteer-service[]UserServiceImpl[]getById[]input.param.id:" + id);
- if (null == id) {
- return R.error("å…¥å‚为空!");
- }
-
- //æ ¹æ®id,获å–用户信æ¯
- User user = usersMapper.selectById(id);
- if (null == user) {
- return R.error("用户信æ¯ä¸å˜åœ¨!");
- }
-
- UserShowVo userShowVo = new UserShowVo();
- userShowVo.setId(user.getId());
- userShowVo.setSchool(user.getSchool());
- userShowVo.setSex(user.getSex());
- userShowVo.setStudentType(user.getExamType());
- userShowVo.setUserName(user.getUserName());
-
- //获å–æˆç»©ä¿¡æ¯
- QueryWrapper<ScoreInfo> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("user_id", user.getId());
- ScoreInfo scoreInfo = scoreInfoMapper.selectOne(queryWrapper);
- if (null != scoreInfo) {
- userShowVo.setScoreInfo(scoreInfo);
- }
- return R.ok(userShowVo);
- }
-
- @Override
- public User getByPhone(String phone) {
- return null;
- }
-
- @Override
- public R<List<User>> test() {
- List<String> names=new ArrayList<>();
- names.add("黎楚å·");
- names.add("陈æˆ");
- names.add("é›·é’æ¾");
- List<User> list=usersMapper.test(names);
- return R.ok(list);
- }
-
- /**
- * 分页处ç†æ–¹æ³•
- *
- * @param orderQueryVo å‚æ•°
- */
- private void pageHandle(UserQueryVo orderQueryVo) {
- Integer pageNum = orderQueryVo.getPageNo();
- Integer pageSize = orderQueryVo.getPageSize();
- if (null == pageSize || pageSize == 0) {
- pageSize = 10;
- }
- if (null == pageNum || pageNum == 0) {
- pageNum = 1;
- }
- Integer endNum = pageSize;
- Integer startNum = (pageNum - CommonAttributes.NUM_ONE) * pageSize;
- orderQueryVo.setEndNum(endNum);
- orderQueryVo.setStartNum(startNum);
- orderQueryVo.setPageNo(pageNum);
- orderQueryVo.setPageSize(pageSize);
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserVolunteerServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserVolunteerServiceImpl.java
deleted file mode 100644
index d2fd63b..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserVolunteerServiceImpl.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.mapper.UserVolunteerMapper;
-import cn.wisenergy.model.app.UserVolunteer;
-import cn.wisenergy.service.app.UserVolunteerService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-
-/**
- * @author 86187
- */
-@Service
-public class UserVolunteerServiceImpl extends ServiceImpl<UserVolunteerMapper,UserVolunteer> implements UserVolunteerService {
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/VolunteerServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/VolunteerServiceImpl.java
deleted file mode 100644
index db3ae26..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/VolunteerServiceImpl.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.common.expection.BaseException;
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.mapper.SchemeMapper;
-import cn.wisenergy.mapper.VolunteerMapper;
-import cn.wisenergy.model.app.SchemeInfo;
-import cn.wisenergy.model.app.Volunteer;
-import cn.wisenergy.service.app.VolunteerService;
-import cn.wisenergy.service.common.VolunteerListener;
-import cn.wisenergy.service.common.VolunteerManager;
-import com.alibaba.excel.EasyExcel;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author 86187
- * @ Description: 志愿接å£å®žçŽ°
- * @ Author : 86187
- * @ Date : 2021/1/8 9:44
- */
-@Service
-@Slf4j
-public class VolunteerServiceImpl extends ServiceImpl<VolunteerMapper, Volunteer> implements VolunteerService {
- @Autowired
- private VolunteerMapper volunteerMapper;
-
- @Autowired
- private SchemeMapper schemeMapper;
-
- @Autowired
- private VolunteerService volunteerService;
-
- @Autowired
- private VolunteerManager volunteerManager;
-
- @Override
- public R<Boolean> batchAdd(List<Volunteer> list) {
- return null;
- }
-
- @Override
- public void excelAdd(MultipartFile file, Integer type, String schemeName, String fileUrl, HttpServletResponse response) throws IOException {
- if (file == null || file.isEmpty() || null == type || StringUtils.isBlank(schemeName) ||
- StringUtils.isBlank(fileUrl)) {
- throw new BaseException("æ“作错误");
- }
-
- //判æ–文件类型=
- boolean valid = this.validContentType(file.getOriginalFilename());
- if (!valid) {
- throw new BaseException("è¯·ä¼ å…¥Excel文件");
- }
- VolunteerListener excelListener = new VolunteerListener();
-
- //2.读å–æ•°æ®è¿›è¡Œå…¥åº“æ“作
- EasyExcel.read(file.getInputStream(), Volunteer.class, excelListener).sheet().doRead();
- List<Volunteer> list = excelListener.getList();
- if (CollectionUtils.isEmpty(list)) {
- throw new BaseException("写入方案数æ®å¤±è´¥!");
- }
-
- //3ã€ä¿å˜æ–¹æ¡ˆå’Œå¿—æ„¿ä¿¡æ¯
- SchemeInfo schemeInfo = new SchemeInfo();
- schemeInfo.setSchemeName(schemeName);
- schemeInfo.setType(type);
- schemeInfo.setFileUrl(fileUrl);
- schemeInfo.setUploadTime(new Date());
- schemeInfo.setIsDelete(0);
- int scheme = schemeMapper.getByType(type);
- if (scheme > 0) {
- throw new RuntimeException("该类型方案已ç»å˜åœ¨!");
- }
-
- volunteerManager.saveSchemeAndVolunteer(schemeInfo, list);
- }
-
- @Override
- public void ceshi(MultipartFile file, HttpServletResponse response) throws IOException {
- if (file == null || file.isEmpty()) {
- throw new BaseException("æ“作错误");
- }
-
- VolunteerListener excelListener = new VolunteerListener();
-
- //判æ–文件类型=
- boolean valid = this.validContentType(file.getOriginalFilename());
- if (!valid) {
- throw new BaseException("è¯·ä¼ å…¥Excel文件");
- }
- //2.读å–æ•°æ®è¿›è¡Œå…¥åº“æ“作
- EasyExcel.read(file.getInputStream(), Volunteer.class, excelListener).sheet().doRead();
- List<Volunteer> list = excelListener.getList();
-
- //3ã€ä¿å˜æ–¹æ¡ˆå’Œå¿—æ„¿ä¿¡æ¯
- SchemeInfo schemeInfo = new SchemeInfo();
- schemeInfo.setSchemeName("本科文化一批");
- schemeInfo.setType(1);
- schemeInfo.setUploadTime(new Date());
- schemeInfo.setIsDelete(0);
-
- volunteerManager.saveSchemeAndVolunteer(schemeInfo, list);
- log.info("导入方案数æ®æˆåŠŸ!");
- }
-
- @Override
- public void excelTemplate(HttpServletResponse response) throws IOException {
- //æž„é€ å‡æ•°æ®
- List<Volunteer> residents = this.mockData();
- //excel导出
- this.download(response, Volunteer.class, residents, "居民管ç†æ¨¡æ¿", "居民管ç†");
- }
-
- /**
- * 判æ–文件类型
- *
- * @param fileName 文件å
- * @return true or false
- */
- public boolean validContentType(String fileName) {
- if (StringUtils.isBlank(fileName)) {
- return false;
- }
- String substring = fileName.substring(fileName.lastIndexOf(".") + 1);
- if ("xlsx".equals(substring) || "xls".equals(substring)) {
- return true;
- }
- return false;
- }
-
- private List<Volunteer> mockData() {
- ArrayList<Volunteer> residents = new ArrayList<>(2);
- //模拟两æ¡å‡æ•°æ®
- for (int i = 0; i < 2; i++) {
- Volunteer volunteer = Volunteer.builder()
- .majorName("北京大å¦" + i)
- .academy("计算机å¦é™¢" + i)
- .courseDemand("物ç†" + i + 1)
- .nature("全日制")
- .yearLimit(4)
- .planNum(2 + i)
- .castArchivesNum(3 + i)
- .launchNum(4 + i)
- .lowestMark("600" + i * 10)
- .lowestRank("100" + i * 10)
- .build();
- residents.add(volunteer);
- }
- return residents;
- }
-
- /**
- * 导出数æ®
- *
- * @param response
- * @param clazz 实体类对象的类型
- * @param data 导出的数æ®
- * @param fileName 工作簿文件å
- * @param sheetName 工作表文件å
- * @throws IOException
- */
- private void download(HttpServletResponse response, Class clazz, List data, String fileName, String sheetName) throws IOException {
- if (StringUtils.isBlank(fileName)) {
- fileName = "测试";
- }
- if (StringUtils.isBlank(sheetName)) {
- sheetName = "模æ¿";
- }
- // è¿™é‡Œæ³¨æ„ æœ‰åŒå¦å应使用swagger 会导致å„ç§é—®é¢˜ï¼Œè¯·ç›´æŽ¥ç”¨æµè§ˆå™¨æˆ–者用postman
- response.setContentType("application/vnd.ms-excel");
- response.setCharacterEncoding("utf-8");
- response.setHeader("NewContent-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
-
- EasyExcel.write(response.getOutputStream(), clazz).sheet(sheetName).doWrite(data);
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/WxPayServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/WxPayServiceImpl.java
deleted file mode 100644
index 0353ab7..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/WxPayServiceImpl.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package cn.wisenergy.service.app.impl;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.dto.PayPageDto;
-import cn.wisenergy.model.dto.PayQueryDto;
-import cn.wisenergy.service.app.WxPayService;
-
-import cn.wisenergy.service.httpClient.WechatPayHttpClientBuilder;
-import cn.wisenergy.service.httpClient.auth.AutoUpdateCertificatesVerifier;
-import cn.wisenergy.service.httpClient.auth.PrivateKeySigner;
-import cn.wisenergy.service.httpClient.auth.WechatPay2Credentials;
-import cn.wisenergy.service.httpClient.auth.WechatPay2Validator;
-import cn.wisenergy.service.httpClient.util.PemUtil;
-import cn.wisenergy.service.util.SignDemo;
-import cn.wisenergy.service.wxpay.WxCommon;
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-import okhttp3.HttpUrl;
-import org.apache.commons.lang.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.springframework.stereotype.Service;
-
-
-import javax.crypto.IllegalBlockSizeException;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.SignatureException;
-import java.security.spec.InvalidKeySpecException;
-
-import java.util.UUID;
-
-
-/**
- * @author 86187
- */
-@Service
-@Slf4j
-public class WxPayServiceImpl implements WxPayService {
- /**
- * 商户å·
- */
- private static String mchId = WxCommon.MCHID;
- // 商户è¯ä¹¦åºåˆ—å·
- private static String mchSerialNo = WxCommon.SERIAL_NO;
- // api密钥
- private static String apiV3Key = WxCommon.SECRET_KEY;
- // ä½ çš„å•†æˆ·ç§é’¥
- private static String privateKey = "-----BEGIN PRIVATE KEY-----\n" + WxCommon.PRIVATE_KEY
- + "-----END PRIVATE KEY-----\n";
-
- private CloseableHttpClient httpClient;
- private AutoUpdateCertificatesVerifier verifier;
-
- @Before
- public void setup() throws IOException {
- PrivateKey merchantPrivateKey = PemUtil.loadPrivateKey(
- new ByteArrayInputStream(privateKey.getBytes("utf-8")));
-
- //使用自动更新的ç¾å验è¯å™¨ï¼Œä¸éœ€è¦ä¼ å…¥è¯ä¹¦
- verifier = new AutoUpdateCertificatesVerifier(
- new WechatPay2Credentials(mchId, new PrivateKeySigner(mchSerialNo, merchantPrivateKey)),
- apiV3Key.getBytes("utf-8"));
-
- httpClient = WechatPayHttpClientBuilder.create()
- .withMerchant(mchId, mchSerialNo, merchantPrivateKey)
- .withValidator(new WechatPay2Validator(verifier))
- .build();
- }
-
- @After
- public void after() throws IOException {
- httpClient.close();
- }
-
-
- @Override
- public R<String> wxPay(PayPageDto payPageDto) throws UnsupportedEncodingException, NoSuchAlgorithmException, SignatureException, InvalidKeySpecException, InvalidKeyException {
- if (null == payPageDto || null == payPageDto.getTotal()) {
- return R.error("å…¥å‚ä¸èƒ½ä¸ºç©º!");
- }
-
- HttpPost httpPost = new HttpPost();
- httpPost.addHeader("Content-Type", "application/json");
- httpPost.addHeader("Accept", "application/json");
-
- long timestamp = System.currentTimeMillis() / 1000;
- String nonceStr = UUID.randomUUID().toString().replace("-", "");
- String method = "POST";
- String tradeNo = "21" + System.currentTimeMillis();
- HttpUrl httpurl = HttpUrl.parse(WxCommon.WX_PAY_URL);
-
- //æž„é€ ç¾åå‚æ•°
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("appid", WxCommon.APP_ID);
- jsonObject.put("mchid", WxCommon.MCHID);
- jsonObject.put("description", "充值");
- jsonObject.put("out_trade_no", tradeNo);
- jsonObject.put("notify_url", WxCommon.NOTIFY_URL);
- jsonObject.put("amount", payPageDto);
- String sign = SignDemo.getToken(method, httpurl, jsonObject.toJSONString(), nonceStr, timestamp);
- httpPost.setHeader("Authorization", "WECHATPAY2-SHA256-RSA2048" + " " + sign);
-
- return null;
- }
-
- @Override
- public R<String> queryWx(PayQueryDto payQueryDto) throws UnsupportedEncodingException, NoSuchAlgorithmException, SignatureException, InvalidKeySpecException, InvalidKeyException {
- if (null == payQueryDto || StringUtils.isBlank(payQueryDto.getOutTradeNo())) {
- return R.error("å…¥å‚ä¸èƒ½ä¸ºç©º!");
- }
-
- long timestamp = System.currentTimeMillis() / 1000;
- String nonceStr = UUID.randomUUID().toString().replace("-", "");
- String method = "GET";
- String url = WxCommon.WX_PAY_QUERY + payQueryDto.getOutTradeNo() + "?mchid=" + WxCommon.MCHID;
- HttpUrl httpurl = HttpUrl.parse(url);
-
- //æž„é€ ç¾åå‚æ•°
- String sign = SignDemo.getToken(method, httpurl, null, nonceStr, timestamp);
- HttpGet httpGet = new HttpGet();
- httpGet.addHeader("Content-Type", "application/json");
- httpGet.addHeader("Accept", "application/json");
- //设置认è¯ä¿¡æ¯
- httpGet.setHeader("Authorization", "WECHATPAY2-SHA256-RSA2048" + " " + sign);
-
- return null;
- }
-
- @Override
- public R<String> wx_Pay(PayPageDto payPageDto) throws IOException, NoSuchAlgorithmException, SignatureException, InvalidKeySpecException, InvalidKeyException, IllegalBlockSizeException {
- HttpPost httpPost = new HttpPost(WxCommon.WX_PAY_URL);
-
- long timestamp = System.currentTimeMillis() / 1000;
- String nonceStr = UUID.randomUUID().toString().replace("-", "");
- String method = "POST";
- String tradeNo = "21" + System.currentTimeMillis();
- HttpUrl httpurl = HttpUrl.parse(WxCommon.WX_PAY_URL);
-
- // 请求bodyå‚æ•°
- String reqdata = "{"
- + "\"time_expire\":\"2021-02-07T10:34:56+08:00\","
- + "\"amount\": {"
- + "\"total\":" + payPageDto.getTotal() + ","
- + "\"currency\":\"CNY\""
- + "},"
- + "\"mchid\":\"" + WxCommon.MCHID + "\","
- + "\"description\":\"Image形象店-深圳腾大-QQ公仔\","
- + "\"notify_url\":\"" + WxCommon.NOTIFY_URL + "\","
- + "\"out_trade_no\":\"" + tradeNo + "\","
- + "\"goods_tag\":\"WXG\","
- + "\"appid\":\"" + WxCommon.APP_ID + "\","
- + "\"attach\":\"自定义数æ®è¯´æ˜Ž\","
- + "\"detail\": {"
- + "\"invoice_id\":\"wx123\","
- + "\"goods_detail\": ["
- + "{"
- + "\"goods_name\":\"iPhoneX 256G\","
- + "\"wechatpay_goods_id\":\"1001\","
- + "\"quantity\":1,"
- + "\"merchant_goods_id\":\"商å“ç¼–ç \","
- + "\"unit_price\":828800"
- + "},"
- + "{"
- + "\"goods_name\":\"iPhoneX 256G\","
- + "\"wechatpay_goods_id\":\"1001\","
- + "\"quantity\":1,"
- + "\"merchant_goods_id\":\"商å“ç¼–ç \","
- + "\"unit_price\":828800"
- + "}"
- + "],"
- + "\"cost_price\":608800"
- + "},"
- + "\"scene_info\": {"
- + "\"store_info\": {"
- + "\"address\":\"广东çœæ·±åœ³å¸‚å—山区科技ä¸ä¸€é“10000å·\","
- + "\"area_code\":\"440305\","
- + "\"name\":\"腾讯大厦分店\","
- + "\"id\":\"0001\""
- + "},"
- + "\"device_id\":\"013467007045764\","
- + "\"payer_client_ip\":\"14.23.150.211\""
- + "}"
- + "}";
- StringEntity reqEntity = new StringEntity(
- reqdata, ContentType.create("application/json", "utf-8"));
- httpPost.setEntity(reqEntity);
- httpPost.addHeader("Accept", "application/json");
-
- //æž„é€ ç¾åå‚æ•°
- //æž„é€ ç¾åå‚æ•°
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("appid", WxCommon.APP_ID);
- jsonObject.put("mchid", WxCommon.MCHID);
- jsonObject.put("description", "充值");
- jsonObject.put("out_trade_no", tradeNo);
- jsonObject.put("notify_url", WxCommon.NOTIFY_URL);
- jsonObject.put("amount", payPageDto);
- String token = SignDemo.getToken(method, httpurl, jsonObject.toJSONString(), nonceStr, timestamp);
- httpPost.setHeader("Authorization", "WECHATPAY2-SHA256-RSA2048" + " " + token);
-
- //1.创建HttpClient对象
- CloseableHttpClient httpClient = HttpClients.createDefault();
- //完æˆç¾å并执行请求
- CloseableHttpResponse response = httpClient.execute(httpPost);
-
-
- try {
- if (response.getStatusLine().getStatusCode() == 200) {
- HttpEntity httpEntity = response.getEntity();
- String content = EntityUtils.toString(httpEntity, "utf8");
- System.out.println(content.length());
- return R.ok(response.toString());
- }
- } catch (IOException e) {
- e.printStackTrace();
- }finally {
- response.close();
- }
- return null;
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/cache/RedisService.java b/wisenergy-service/src/main/java/cn/wisenergy/service/cache/RedisService.java
deleted file mode 100644
index 0c9b3fd..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/cache/RedisService.java
+++ /dev/null
@@ -1,666 +0,0 @@
-package cn.wisenergy.service.cache;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.dao.DataAccessException;
-import org.springframework.data.redis.connection.RedisConnection;
-import org.springframework.data.redis.core.RedisCallback;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.nio.charset.Charset;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-@Slf4j
-@Component
-public class RedisService {
- public static final String PREFIX = "sales_activity";
-
- protected static final long DEFAULT_EXPIRE = 10 * 24 * 60 * 60L;
-
- @Resource(name = "redisTemplate")
- private RedisTemplate redisTemplate;
-
- private static RedisTemplate<String, Object> template = null;
-
- /**
- * 生æˆkey
- *
- * @param keys
- * @return
- */
- public String buildKey(Object... keys) {
- StringBuilder sb = new StringBuilder();
- if (keys.length == 1) {
- sb.append(keys);
- return sb.toString();
- }
-
- for (Object key : keys) {
- sb.append(key).append(":");
- }
-
- if (sb.length() > 1) {
- sb.deleteCharAt(sb.length() - 1);
- }
-
- return sb.toString();
- }
-
- /**
- * 指定缓å˜å¤±æ•ˆæ—¶é—´
- *
- * @param key é”®
- * @param time 时间(秒)
- * @return
- */
-
- public boolean expire(String key, long time) {
- try {
- if (time > 0) {
- getRedisTemplate().expire(key, time, TimeUnit.SECONDS);
- }
- return true;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
-
- return false;
- }
- }
-
- /**
- * æ ¹æ®key 获å–过期时间
- *
- * @param key é”® ä¸èƒ½ä¸ºnull
- * @return 时间(秒) 返回0代表为永久有效
- */
- public long getExpire(String key) {
- return getRedisTemplate().getExpire(key, TimeUnit.SECONDS);
- }
-
- /**
- * 判æ–key是å¦å˜åœ¨
- *
- * @param key é”®
- * @return true å˜åœ¨ falseä¸å˜åœ¨
- */
- public boolean hasKey(String key) {
- try {
- return getRedisTemplate().hasKey(key);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return false;
- }
- }
-
- /**
- * åˆ é™¤ç¼“å˜
- *
- * @param key å¯ä»¥ä¼ 一个值 或多个
- */
- public void del(String... key) {
- if (key != null && key.length > 0) {
- if (key.length == 1) {
- getRedisTemplate().delete(key[0]);
- } else {
- getRedisTemplate().delete(CollectionUtils.arrayToList(key));
- }
- }
- }
-
- // ============================String=============================
-
- /**
- * 普通缓å˜èŽ·å–
- *
- * @param key é”®
- * @return 值
- */
- public Object get(String key) {
- return key == null ? null : getRedisTemplate().opsForValue().get(key);
- }
-
- /**
- * 普通缓å˜æ”¾å…¥
- *
- * @param key é”®
- * @param value 值
- * @return trueæˆåŠŸ false失败
- */
- public boolean set(String key, Object value) {
- try {
- getRedisTemplate().opsForValue().set(key, value);
- return true;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return false;
- }
-
- }
-
- /**
- * 模糊查询
- *
- * @param activityCode 查询è¯å¥
- * @return 查询结果
- */
- public Set keys(String activityCode) {
- try {
- StringBuilder sb = new StringBuilder(10);
- sb.append(PREFIX).append(":")
- .append(activityCode)
- .append(":")
- .append("*");
- return getRedisTemplate().keys(sb.toString());
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return null;
- }
- }
-
- /**
- * 普通缓å˜æ”¾å…¥å¹¶è®¾ç½®æ—¶é—´
- *
- * @param key é”®
- * @param value 值
- * @param time 时间(秒) timeè¦å¤§äºŽ0 如果timeå°äºŽç‰äºŽ0 å°†è®¾ç½®æ— é™æœŸ
- * @return trueæˆåŠŸ false 失败
- */
- public boolean set(String key, Object value, long time) {
- try {
- if (time > 0) {
- getRedisTemplate().opsForValue().set(key, value, time, TimeUnit.SECONDS);
- } else {
- set(key, value);
- }
- return true;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return false;
- }
- }
-
- /**
- * 递增
- *
- * @param key é”®
- * @param delta è¦å¢žåŠ å‡ (大于0)
- * @return
- */
- public long incr(String key, long delta) {
- if (delta < 0) {
- throw new RuntimeException("é€’å¢žå› å必须大于0");
- }
- return getRedisTemplate().opsForValue().increment(key, delta);
- }
-
- /**
- * 递å‡
- *
- * @param key é”®
- * @param delta è¦å‡å°‘å‡ (å°äºŽ0)
- * @return
- */
- public long decr(String key, long delta) {
- if (delta < 0) {
- throw new RuntimeException("递å‡å› å必须大于0");
- }
- return getRedisTemplate().opsForValue().increment(key, -delta);
- }
-
- // ================================Map=================================
-
- /**
- * HashGet
- *
- * @param key é”® ä¸èƒ½ä¸ºnull
- * @param item 项 ä¸èƒ½ä¸ºnull
- * @return 值
- */
- public Object hget(String key, String item) {
- return getRedisTemplate().opsForHash().get(key, item);
- }
-
- /**
- * 获å–hashKey对应的所有键值
- *
- * @param key é”®
- * @return 对应的多个键值
- */
- public Map<Object, Object> hmget(String key) {
- return getRedisTemplate().opsForHash().entries(key);
- }
-
- /**
- * HashSet
- *
- * @param key é”®
- * @param map 对应多个键值
- * @return true æˆåŠŸ false 失败
- */
- public boolean hmset(String key, Map<String, Object> map) {
- try {
- getRedisTemplate().opsForHash().putAll(key, map);
- return true;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return false;
- }
- }
-
- /**
- * HashSet 并设置时间
- *
- * @param key é”®
- * @param map 对应多个键值
- * @param time 时间(秒)
- * @return trueæˆåŠŸ false失败
- */
- public boolean hmset(String key, Map<String, Object> map, long time) {
- try {
- getRedisTemplate().opsForHash().putAll(key, map);
- if (time > 0) {
- expire(key, time);
- }
- return true;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return false;
- }
- }
-
- /**
- * å‘ä¸€å¼ hash表ä¸æ”¾å…¥æ•°æ®,如果ä¸å˜åœ¨å°†åˆ›å»º
- *
- * @param key é”®
- * @param item 项
- * @param value 值
- * @return true æˆåŠŸ false失败
- */
- public boolean hset(String key, String item, Object value) {
- try {
- getRedisTemplate().opsForHash().put(key, item, value);
- return true;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return false;
- }
- }
-
- /**
- * å‘ä¸€å¼ hash表ä¸æ”¾å…¥æ•°æ®,如果ä¸å˜åœ¨å°†åˆ›å»º
- *
- * @param key é”®
- * @param item 项
- * @param value 值
- * @param time 时间(秒) 注æ„:如果已å˜åœ¨çš„hash表有时间,这里将会替æ¢åŽŸæœ‰çš„时间
- * @return true æˆåŠŸ false失败
- */
- public boolean hset(String key, String item, Object value, long time) {
- try {
- getRedisTemplate().opsForHash().put(key, item, value);
- if (time > 0) {
- expire(key, time);
- }
- return true;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return false;
- }
- }
-
- /**
- * åˆ é™¤hash表ä¸çš„值
- *
- * @param key é”® ä¸èƒ½ä¸ºnull
- * @param item 项 å¯ä»¥ä½¿å¤šä¸ª ä¸èƒ½ä¸ºnull
- */
- public void hdel(String key, Object... item) {
- getRedisTemplate().opsForHash().delete(key, item);
- }
-
- /**
- * 判æ–hash表ä¸æ˜¯å¦æœ‰è¯¥é¡¹çš„值
- *
- * @param key é”® ä¸èƒ½ä¸ºnull
- * @param item 项 ä¸èƒ½ä¸ºnull
- * @return true å˜åœ¨ falseä¸å˜åœ¨
- */
- public boolean hHasKey(String key, String item) {
- return getRedisTemplate().opsForHash().hasKey(key, item);
- }
-
- /**
- * hash递增 如果ä¸å˜åœ¨,就会创建一个 并把新增åŽçš„值返回
- *
- * @param key é”®
- * @param item 项
- * @param by è¦å¢žåŠ å‡ (大于0)
- * @return
- */
- public double hincr(String key, String item, double by) {
- return getRedisTemplate().opsForHash().increment(key, item, by);
- }
-
- /**
- * hash递å‡
- *
- * @param key é”®
- * @param item 项
- * @param by è¦å‡å°‘è®°(å°äºŽ0)
- * @return
- */
- public double hdecr(String key, String item, double by) {
- return getRedisTemplate().opsForHash().increment(key, item, -by);
- }
-
- // ============================set=============================
-
- /**
- * æ ¹æ®key获å–Setä¸çš„所有值
- *
- * @param key é”®
- * @return
- */
- public Set<Object> sGet(String key) {
- try {
- return getRedisTemplate().opsForSet().members(key);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return null;
- }
- }
-
- /**
- * æ ¹æ®value从一个setä¸æŸ¥è¯¢,是å¦å˜åœ¨
- *
- * @param key é”®
- * @param value 值
- * @return true å˜åœ¨ falseä¸å˜åœ¨
- */
- public boolean sHasKey(String key, Object value) {
- try {
- return getRedisTemplate().opsForSet().isMember(key, value);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return false;
- }
- }
-
- /**
- * 将数æ®æ”¾å…¥set缓å˜
- *
- * @param key é”®
- * @param values 值 å¯ä»¥æ˜¯å¤šä¸ª
- * @return æˆåŠŸä¸ªæ•°
- */
- public long sSet(String key, Object... values) {
- try {
- return getRedisTemplate().opsForSet().add(key, values);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return 0;
- }
- }
-
- /**
- * å°†setæ•°æ®æ”¾å…¥ç¼“å˜
- *
- * @param key é”®
- * @param time 时间(秒)
- * @param values 值 å¯ä»¥æ˜¯å¤šä¸ª
- * @return æˆåŠŸä¸ªæ•°
- */
- public long sSetAndTime(String key, long time, Object... values) {
- try {
- Long count = getRedisTemplate().opsForSet().add(key, values);
- if (time > 0)
- expire(key, time);
- return count;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return 0;
- }
- }
-
- /**
- * 获å–set缓å˜çš„长度
- *
- * @param key é”®
- * @return
- */
- public long sGetSetSize(String key) {
- try {
- return getRedisTemplate().opsForSet().size(key);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return 0;
- }
- }
-
- /**
- * 移除值为value的
- *
- * @param key é”®
- * @param values 值 å¯ä»¥æ˜¯å¤šä¸ª
- * @return 移除的个数
- */
- public long setRemove(String key, Object... values) {
- try {
- Long count = getRedisTemplate().opsForSet().remove(key, values);
- return count;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return 0;
- }
- }
- // ===============================list=================================
-
- /**
- * 获å–list缓å˜çš„内容
- *
- * @param key é”®
- * @param start 开始
- * @param end ç»“æŸ 0 到 -1代表所有值
- * @return
- */
- public List<Object> lGet(String key, long start, long end) {
- try {
- return getRedisTemplate().opsForList().range(key, start, end);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return null;
- }
- }
-
- /**
- * 获å–list缓å˜çš„长度
- *
- * @param key é”®
- * @return
- */
- public long lGetListSize(String key) {
- try {
- return getRedisTemplate().opsForList().size(key);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return 0;
- }
- }
-
- /**
- * 通过索引 获å–listä¸çš„值
- *
- * @param key é”®
- * @param index 索引 index>=0时， 0 表头，1 ç¬¬äºŒä¸ªå…ƒç´ ï¼Œä¾æ¬¡ç±»æŽ¨ï¼›index<0时，-1，表尾，-2å€’æ•°ç¬¬äºŒä¸ªå…ƒç´ ï¼Œä¾æ¬¡ç±»æŽ¨
- * @return
- */
- public Object lGetIndex(String key, long index) {
- try {
- return getRedisTemplate().opsForList().index(key, index);
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return null;
- }
- }
-
- /**
- * å°†list放入缓å˜
- *
- * @param key é”®
- * @param value 值
- * @return
- */
- public boolean lSet(String key, Object value) {
- try {
- getRedisTemplate().opsForList().rightPush(key, value);
- return true;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return false;
- }
- }
-
- /**
- * å°†list放入缓å˜
- *
- * @param key é”®
- * @param value 值
- * @param time 时间(秒)
- * @return
- */
- public boolean lSet(String key, Object value, long time) {
- try {
- getRedisTemplate().opsForList().rightPush(key, value);
- if (time > 0) {
- expire(key, time);
- }
- return true;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return false;
- }
- }
-
- /**
- * å°†list放入缓å˜
- *
- * @param key é”®
- * @param value 值
- * @return
- */
- public boolean lSet(String key, List<Object> value) {
- try {
- getRedisTemplate().opsForList().rightPushAll(key, value);
- return true;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return false;
- }
- }
-
- /**
- * å°†list放入缓å˜
- *
- * @param key é”®
- * @param value 值
- * @param time 时间(秒)
- * @return
- */
- public boolean lSet(String key, List<Object> value, long time) {
- try {
- getRedisTemplate().opsForList().rightPushAll(key, value);
- if (time > 0) {
- expire(key, time);
- }
- return true;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return false;
- }
- }
-
- /**
- * æ ¹æ®ç´¢å¼•ä¿®æ”¹listä¸çš„æŸæ¡æ•°æ®
- *
- * @param key é”®
- * @param index 索引
- * @param value 值
- * @return
- */
- public boolean lUpdateIndex(String key, long index, Object value) {
- try {
- getRedisTemplate().opsForList().set(key, index, value);
- return true;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return false;
- }
- }
-
- /**
- * 移除N个值为value
- *
- * @param key é”®
- * @param count 移除多少个
- * @param value 值
- * @return 移除的个数
- */
- public long lRemove(String key, long count, Object value) {
- try {
- Long remove = getRedisTemplate().opsForList().remove(key, count, value);
- return remove;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return 0;
- }
- }
-
- public void deleteInvalidRedisKey(String activityCode) {
- StringBuilder sb = new StringBuilder(10);
- sb.append(PREFIX).append(":").append(activityCode).append(":").append("*");
- byte[] bytes = sb.toString().getBytes(Charset.defaultCharset());
- redisTemplate.execute(new RedisCallback() {
- @Override
- public Object doInRedis(RedisConnection connection) throws DataAccessException {
- Set<byte[]> keys = connection.keys(bytes);
- for (byte[] key : keys) {
- connection.del(key);
- }
- return null;
- }
- });
- }
-
- private RedisTemplate getRedisTemplate() {
- if (null == template) {
- template = new RedisTemplate<String, Object>();
- template.setConnectionFactory(redisTemplate.getConnectionFactory());
- Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
- ObjectMapper om = new ObjectMapper();
- om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
- om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
- jackson2JsonRedisSerializer.setObjectMapper(om);
- StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
- // key采用Stringçš„åºåˆ—化方å¼
- template.setKeySerializer(stringRedisSerializer);
- // hashçš„key也采用Stringçš„åºåˆ—化方å¼
- template.setHashKeySerializer(stringRedisSerializer);
- // valueåºåˆ—化方å¼é‡‡ç”¨jackson
- template.setValueSerializer(jackson2JsonRedisSerializer);
- // hashçš„valueåºåˆ—化方å¼é‡‡ç”¨jackson
- template.setHashValueSerializer(jackson2JsonRedisSerializer);
- template.afterPropertiesSet();
- }
-
- return template;
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/common/CachePrefix.java b/wisenergy-service/src/main/java/cn/wisenergy/service/common/CachePrefix.java
deleted file mode 100644
index b3f7c04..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/common/CachePrefix.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wisenergy.service.common;
-
-/**
- * @author 86187
- */
-
-public enum CachePrefix {
- /**
- * çŸä¿¡éªŒè¯ç
- */
- SMS_CODE;
-
- public String getPrefix() {
- return this.name() + "_";
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/common/Common.java b/wisenergy-service/src/main/java/cn/wisenergy/service/common/Common.java
deleted file mode 100644
index ad0cd3c..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/common/Common.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package cn.wisenergy.service.common;
-
-/**
- * @author 86187
- * @ Description : 对接接å£è°ƒç”¨å…¬å…±å‚æ•°å°è£…
- * @ Author : lcc
- * @ CreateDate : 2020/11/8 20:35
- */
-public class Common {
-
- /**
- * é‡ç½®å¯†ç
- */
- public static final String RESET_PASSWORD_VALUE = "123456";
-
- /**
- * 阿里云çŸä¿¡accessKeyId
- */
- public static final String ACCESS_KEY_ID = "LTAIuFVMscvCNpMU";
-
-
- /**
- * 阿里云çŸä¿¡secret
- */
- public static final String SMS_SECRET = "AvotjHvvGzEm8sX9vZaUhVypnZfUk7";
-
- /**
- * 阿里云çŸä¿¡è¶…时时间
- */
- public static final long SMS_TIMEOUT = 1200;
-
- /**
- * 支付å®æ”¯ä»˜app_id
- */
-
- public static final String PAY_URL = "https://openapi.alipay.com/gateway.do";
- public static final String APP_ID = "2021002126609937";
-
- public static final String ALIPAY_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk3F1VulieP0smmNEyEHLWS0l" +
- "wKOlaLA3xMkfbNK4Hn1D6MtLvU58IBboh0JkZbcBPCVEK9Ma6VT3Q0wofYwy2dosHskTNIuBi4N8EuHvss7f1/x/rb7nI7QbuSlualx5MlD" +
- "3cLIRm84QqEMeF1ndVAIDA3mA24BdxIuCmS7THHn46wZ9/KaudNq84XxRmy+JHAnQxj5+8pvCAdpA12hP7gTfj0ySRZDVvA3gks8yjlf4SGK" +
- "TqNDhM3AewWlwygEHUJPlL04JUm/lG3Q9viaqZv4SGv/MeUw0qXqpPuq9JzJUCmZjYq1gKXsqP3FMg8zBrLiZCjpoLa2ra7f6PbdtIwIDAQAB";
-
- public static final String PRIVATE_KEY = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCTcXVW6WJ4/" +
- "SyaY0TIQctZLSXAo6VosDfEyR9s0rgefUPoy0u9TnwgFuiHQmRltwE8JUQr0xrpVPdDTCh9jDLZ2iweyRM0i4GLg3wS4e+yzt/" +
- "X/H+tvucjtBu5KW5qXHkyUPdwshGbzhCoQx4XWd1UAgMDeYDbgF3Ei4KZLtMcefjrBn38pq502rzhfFGbL4kcCdDGPn7ym8IB2kDXaE/" +
- "uBN+PTJJFkNW8DeCSzzKOV/hIYpOo0OEzcB7BaXDKAQdQk+UvTglSb+UbdD2+Jqpm/hIa/8x5TDSpeqk+6r0nMlQKZmNirWApeyo/" +
- "cUyDzMGsuJkKOmgtratrt/o9t20jAgMBAAECggEAHTjmdbRJ1QrwlSTJlBseL214RwboGKicVP87oDjfTwOquu/" +
- "X8gwlI8MGkRBCj7pGn2IPcdQkSEyTuR3WBJQN3AmWpv9ZNBfWNA16QM/QzxKbYNZlg80LSJNAz2D7xk7Pon5TnF1eig+8U20CAMTJzgWcDUs" +
- "+k8KMUxEHcE7Mfp8KkG0sRPwZa9DqfuC4WOQuik9L6OphhVDrxnCGBKTW/KC1k2HfU25dMUDoirqY7fMbASJBkT14JO6o/" +
- "I0BBJU++ddfYpXTd2X6Lywy4PqJdstllHxzLxSJqPKgjk9Qd/iVozuHDDSuBvEp1a1DBOsjFHz0TGxmCoP2mrEN4e6WsQKBgQD6GnTuVUcI4" +
- "UxaeHrj6sSiWTsBOXsXYrrmk380RTUEwzPdExFfvV4wkf48BQsUqCl6R+CdWSbcbRriXTJ6hlZ37IPuqmJ4me++LlDE9MrfRg1m0qkOFyVC" +
- "1ysAw+0i0EPjj5eeXguvoZ6RarDPI9hWM6m2dAGclkwFq2FBN3yzGQKBgQCW62DEh6eTmnyzBiQcojyEhY44Vp3y6RebXqlS/O1kpEn1sT1" +
- "U6xBwE2na1udDv9PFzA6SapDw9ZRJWxbxgL07tG3A6V9p6MdjeCh/IR1OqO9STH8xag+YNwS28rSf+IEuM7bRUl6ESp9EXIt/jxh3syjYl" +
- "j9ecdXypJNWFeOFmwKBgQCR4PCnO1JtmYwBkRiM7Bi5YTaLZk2nvEyrxQiDIoLkPj94CXEu2LOhvOX/eCmYaOWYj2gyHxgNpg3yTs3srYKt/" +
- "GSPxw4crh0qXrV5zBaw2JlkiidVMqbnL73DeoRMtBGFH/Idy1khnjFxPDvY9l1vGj85TrzJ6th4zheyBH1VsQKBgDSXdbNG6pi/PzFLtI3d" +
- "42Ty/aqYVJZvr/BOvobS6Q8nSTa7Ovo6qBHGUh8WwKSVVoEZKQLQ7A1sJu6hNY+XI1qI965AJSXNHp6FIueabJIawLtXOQPJSAHtOlFepp8" +
- "QhEPLdavgHlvPfUzfSyV6gjZEUrmXMiIBXWMfAtD+87h9AoGANzOybVuH7XaPJfGFuKAMLSdsDUFFEAVkC37XF6nl5k1bC1LmHM2iJltmSh" +
- "N2nwJavbtbvycOFhLxRNNkhBDj3oZ8F/93vzyn1M/s0/y7ONUtBIqLdLAT9Q84xxVBFdOvVdja20J1NuQ8yYD4qInO/WcX2MOLXeCaGfMOg1XWaa0=";
-
-
- /**
- * 沙箱 --支付å®æ”¯ä»˜app_id
- */
- public static final String APP_ID_CS = "2021000117607483";
-
- public static final String ALIPAY_PUBLIC_KEY_CS = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh5uAe8quhr05KrOnJ5Jrrp" +
- "TphjEoFR4VnHFy9QDRoHK6ouFIz7ksCw6LS7A/S3Yhe3+bZbcvmJSKN1pVO6ssa8iuai81NAnylMZm5tOTaMl945OuqmC8qvIk9wg4AkYd" +
- "TWSFRxDmQ1aZ711iyDUDtSYi0bQeS5s2OR9cGowwAsqyrMPYCT47f/+VmyftJcn3k3rS1+fo2dJTEmoeSCrg3oAMV5dL5iTzi5ehvWUWJR" +
- "YejyOi54Qtxjz5Nsp1I68BxHT2d8QFeKBgad0w83975tKauHgKHsQE3+TnQzOgyQo8XQB/5dWq3COO7ACNwK1TlPcyxKO1QRX1egW6bysySQIDAQAB";
-
- public static final String PRIVATE_KEY_CS = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCHm4B7yq6GvTkqs6cnkmu" +
- "ulOmGMSgVHhWccXL1ANGgcrqi4UjPuSwLDotLsD9LdiF7f5tlty+YlIo3WlU7qyxryK5qLzU0CfKUxmbm05NoyX3jk66qYLyq8iT3CDg" +
- "CRh1NZIVHEOZDVpnvXWLINQO1JiLRtB5LmzY5H1wajDACyrKsw9gJPjt//5WbJ+0lyfeTetLX5+jZ0lMSah5IKuDegAxXl0vmJPOLl6G9" +
- "ZRYlFh6PI6LnhC3GPPk2ynUjrwHEdPZ3xAV4oGBp3TDzf3vm0pq4eAoexATf5OdDM6DJCjxdAH/l1arcI47sAI3ArVOU9zLEo7VBFfV6" +
- "BbpvKzJJAgMBAAECggEAQec2t/K2gtDvOWt57udf4caI/yhgnHK0egVAowU0208mmQX3hswtNWpqE+yhtiDBAO3xLaurO/HkgiYqigcUXY" +
- "V4Di7HInU7KUaKt99XInPZ9IHPPwooZsOrZ0rdPW2py/TwOKtj3JH32bZ+zWHGXYEdJuDsYD4cSgKNlnFO2+u/uS2RRhsTEX7veE1ivlPB" +
- "Ta0hRo+XHcBrrXobZUtFFtE8zxvKOWDMj87WpsLDdXJ1Ze2CZXsdEtuIcfp51Gzx1or+2WrYwoiIAYTNN+oG1JT6pld9l9m1EqVzMPPSmE" +
- "/tyyIV4Zb1qjGveH1SPEncIdGOiEH1rOsBvS/E4EDEoQKBgQDvdFgh3Xmtrr47515d+e5sAAZav34IuoEzmih6zXCvLASsG64gsgfoyb2aD" +
- "/N9hcTtVFrEDrJSLknNMJcvh1xkmPc1xBeBCLlrrzlyt4hoth1b6ZfdKC7jkhmd0mUylOagsdYGOZ3qT0+ykO449HmE0bQDLWzinw1p15b" +
- "/nVx3vQKBgQCQ+jsct+C1Y+1AoYC2o3yCvTcaErdH6Pxk8sCYP18sIml4kb+WUgFgd1THFwgHDu3S4VmkfEcjnIKqioqQCEMyEF2K6RAFu" +
- "Ffpw+ianx+9V84GDS7Aov8PKwTWg8RjFBSkHZ+Xl3ERGCyI/NDBCUF8Amiv12IMyVkkWUsrqxnXfQKBgQCGh8MMI7Y9EjPmy/KEsep12v2" +
- "29mcE2GPGbhHYDJwGjqCBYXvO+rbe3pkbeWK/Xuxouj/Ubr1Y1pC4K1iFZ3NNQXOCTY02/YPPMD8CaILG8apE/VRI+E5/pJGnzZD1fhqkp" +
- "cUs8in6fly0YiC09wVezcJpFphaKioLEQjQy8QrsQKBgGC92bwsJ1JjP+ok2xMEvQ0w3hgT7SGbIvDp3AK8JvH4dJD0EPhp+Gk6t+OyRrUP" +
- "DTvvDDZqh74HrlnG4PeDy/MYYJNVOk/W1zMye4DSNgfPE7eODGiXW8PvXOcYPnAu8ichbWFmuRhDHVS7/0EQwBXUNa9A9ji6EzXiL/sPzc" +
- "qxAoGAQbxdsp2Omd1cXvaofq+nllbyM04WbYib5bxm+zNgOszWnoIhgR95InA7BWtGnJsjmJqz3/Dwgzzpn+vXiB+6mhj/EP932HWcL7wv" +
- "3nMhU06E1T/eQ7hKX8QlmjEIhnWEN7A9lXtwW85/7tpuWs6qbv0YWYze1CcDN3Fr+II2BcA=";
-
- public static final String PAY_URL_CS = "https://openapi.alipaydev.com/gateway.do";
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/common/PdfUtil.java b/wisenergy-service/src/main/java/cn/wisenergy/service/common/PdfUtil.java
deleted file mode 100644
index 55664a1..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/common/PdfUtil.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package cn.wisenergy.service.common;
-
-import cn.wisenergy.model.app.SchemeQueryRecord;
-import cn.wisenergy.model.app.Volunteer;
-import com.itextpdf.text.*;
-import com.itextpdf.text.pdf.BaseFont;
-import com.itextpdf.text.pdf.PdfPCell;
-import com.itextpdf.text.pdf.PdfPTable;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 创建PDF工具类
- */
-public class PdfUtil implements Serializable {
- private static final long serialVersionUID = -8441049720133017215L;
- // 定义全局的å—体é™æ€å˜é‡
- private static Font titlefont;
- private static Font headfont;
- private static Font keyfont;
- private static Font textfont;
-
- //åºå·
- private Integer id=0;
-
- // 最大宽度
- private static int maxWidth = 520;
-
- // é™æ€ä»£ç å—
- static {
- try {
- // ä¸åŒå—体（这里定义为åŒä¸€ç§å—体：包å«ä¸åŒå—å·ã€ä¸åŒstyle）
- BaseFont bfChinese = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
- titlefont = new Font(bfChinese, 16, Font.BOLD);
- headfont = new Font(bfChinese, 14, Font.BOLD);
- keyfont = new Font(bfChinese, 10, Font.BOLD);
- textfont = new Font(bfChinese, 10, Font.NORMAL);
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
-
- // 生æˆPDF文件
- public void generatePDF(Document document, List<Volunteer> list, String queryRecordTime) throws Exception {
-
-
- // è¡¨æ ¼
- PdfPTable table = createTable(new float[] { 40,80,80, 80, 80, 80, 80, 80, 40, 40, 40 });
- table.addCell(createCell("查询时间："+queryRecordTime,headfont,Element.ALIGN_LEFT, 11, false));
- table.addCell(createCell("åºå·", keyfont, Element.ALIGN_CENTER));
- table.addCell(createCell("专业", keyfont, Element.ALIGN_CENTER));
- table.addCell(createCell("é™¢æ ¡", keyfont, Element.ALIGN_CENTER));
- table.addCell(createCell("选考科目è¦æ±‚", keyfont, Element.ALIGN_CENTER));
- table.addCell(createCell("å¦æ ¡æ€§è´¨", keyfont, Element.ALIGN_CENTER));
- table.addCell(createCell("å¦åˆ¶ï¼ˆå¹´ï¼‰", keyfont, Element.ALIGN_CENTER));
- table.addCell(createCell("计划数", keyfont, Element.ALIGN_CENTER));
- table.addCell(createCell("投档计划数", keyfont, Element.ALIGN_CENTER));
- table.addCell(createCell("投出数", keyfont, Element.ALIGN_CENTER));
- table.addCell(createCell("最低分", keyfont, Element.ALIGN_CENTER));
- table.addCell(createCell("最低ä½æ¬¡", keyfont, Element.ALIGN_CENTER));
- for (Volunteer volunteer : list)
- {
- table.addCell(createCell((++id).toString() , textfont));
- table.addCell(createCell(volunteer.getMajorName(), textfont));
- table.addCell(createCell(volunteer.getAcademy(), textfont));
- table.addCell(createCell(volunteer.getCourseDemand(), textfont));
- table.addCell(createCell(volunteer.getNature(), textfont));
- table.addCell(createCell(volunteer.getYearLimit().toString(), textfont));
- table.addCell(createCell(volunteer.getPlanNum().toString(), textfont));
- table.addCell(createCell(null==volunteer.getCastArchivesNum()?"":volunteer.getCastArchivesNum().toString(), textfont));
- table.addCell(createCell(null==volunteer.getLaunchNum()?"":volunteer.getLaunchNum().toString(), textfont));
- table.addCell(createCell(null==volunteer.getLowestMark()?"":volunteer.getLowestMark(), textfont));
- table.addCell(createCell(null==volunteer.getLowestRank()?"":volunteer.getLowestRank(), textfont));
- }
- document.add(table);
- }
-
-
-/**------------------------åˆ›å»ºè¡¨æ ¼å•å…ƒæ ¼çš„方法start----------------------------*/
- /**
- * 创建å•å…ƒæ ¼(指定å—体)
- * @param value
- * @param font
- * @return
- */
- public PdfPCell createCell(String value, Font font) {
- PdfPCell cell = new PdfPCell();
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(Element.ALIGN_CENTER);
- cell.setPhrase(new Phrase(value, font));
- return cell;
- }
- /**
- * 创建å•å…ƒæ ¼ï¼ˆæŒ‡å®šå—体ã€æ°´å¹³..）
- * @param value
- * @param font
- * @param align
- * @return
- */
- public PdfPCell createCell(String value, Font font, int align) {
- PdfPCell cell = new PdfPCell();
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(align);
- cell.setPhrase(new Phrase(value, font));
- return cell;
- }
- /**
- * 创建å•å…ƒæ ¼ï¼ˆæŒ‡å®šå—体ã€æ°´å¹³å±…..ã€å•å…ƒæ ¼è·¨x列åˆå¹¶ï¼‰
- * @param value
- * @param font
- * @param align
- * @param colspan
- * @return
- */
- public PdfPCell createCell(String value, Font font, int align, int colspan) {
- PdfPCell cell = new PdfPCell();
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(align);
- cell.setColspan(colspan);
- cell.setPhrase(new Phrase(value, font));
- return cell;
- }
- /**
- * 创建å•å…ƒæ ¼ï¼ˆæŒ‡å®šå—体ã€æ°´å¹³å±…..ã€å•å…ƒæ ¼è·¨x列åˆå¹¶ã€è®¾ç½®å•å…ƒæ ¼å†…è¾¹è·ï¼‰
- * @param value
- * @param font
- * @param align
- * @param colspan
- * @param boderFlag
- * @return
- */
- public PdfPCell createCell(String value, Font font, int align, int colspan, boolean boderFlag) {
- PdfPCell cell = new PdfPCell();
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(align);
- cell.setColspan(colspan);
- cell.setPhrase(new Phrase(value, font));
- cell.setPadding(3.0f);
- if (!boderFlag) {
- cell.setBorder(0);
- cell.setPaddingTop(15.0f);
- cell.setPaddingBottom(8.0f);
- } else if (boderFlag) {
- cell.setBorder(0);
- cell.setPaddingTop(0.0f);
- cell.setPaddingBottom(15.0f);
- }
- return cell;
- }
- /**
- * 创建å•å…ƒæ ¼ï¼ˆæŒ‡å®šå—体ã€æ°´å¹³..ã€è¾¹æ¡†å®½åº¦ï¼š0è¡¨ç¤ºæ— è¾¹æ¡†ã€å†…è¾¹è·ï¼‰
- * @param value
- * @param font
- * @param align
- * @param borderWidth
- * @param paddingSize
- * @param flag
- * @return
- */
- public PdfPCell createCell(String value, Font font, int align, float[] borderWidth, float[] paddingSize, boolean flag) {
- PdfPCell cell = new PdfPCell();
- cell.setVerticalAlignment(Element.ALIGN_MIDDLE);
- cell.setHorizontalAlignment(align);
- cell.setPhrase(new Phrase(value, font));
- cell.setBorderWidthLeft(borderWidth[0]);
- cell.setBorderWidthRight(borderWidth[1]);
- cell.setBorderWidthTop(borderWidth[2]);
- cell.setBorderWidthBottom(borderWidth[3]);
- cell.setPaddingTop(paddingSize[0]);
- cell.setPaddingBottom(paddingSize[1]);
- if (flag) {
- cell.setColspan(2);
- }
- return cell;
- }
-/**------------------------åˆ›å»ºè¡¨æ ¼å•å…ƒæ ¼çš„方法end----------------------------*/
-
-
-/**--------------------------åˆ›å»ºè¡¨æ ¼çš„æ–¹æ³•start------------------- ---------*/
- /**
- * 创建默认列宽，指定列数ã€æ°´å¹³(å±…ä¸ã€å³ã€å·¦)çš„è¡¨æ ¼
- * @param colNumber
- * @param align
- * @return
- */
- public PdfPTable createTable(int colNumber, int align) {
- PdfPTable table = new PdfPTable(colNumber);
- try {
- table.setTotalWidth(maxWidth);
- table.setLockedWidth(true);
- table.setHorizontalAlignment(align);
- table.getDefaultCell().setBorder(1);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return table;
- }
- /**
- * 创建指定列宽ã€åˆ—æ•°çš„è¡¨æ ¼
- * @param widths
- * @return
- */
- public PdfPTable createTable(float[] widths) {
- PdfPTable table = new PdfPTable(widths);
- try {
- table.setTotalWidth(maxWidth);
- table.setLockedWidth(true);
- table.setHorizontalAlignment(Element.ALIGN_CENTER);
- table.getDefaultCell().setBorder(1);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return table;
- }
- /**
- * åˆ›å»ºç©ºç™½çš„è¡¨æ ¼
- * @return
- */
- public PdfPTable createBlankTable() {
- PdfPTable table = new PdfPTable(1);
- table.getDefaultCell().setBorder(0);
- table.addCell(createCell("", keyfont));
- table.setSpacingAfter(20.0f);
- table.setSpacingBefore(20.0f);
- return table;
- }
-
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/common/RefillCardManager.java b/wisenergy-service/src/main/java/cn/wisenergy/service/common/RefillCardManager.java
deleted file mode 100644
index e4988b2..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/common/RefillCardManager.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package cn.wisenergy.service.common;
-
-import cn.wisenergy.common.utils.CardNumberUtil;
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.common.utils.SecretkeyUtil;
-import cn.wisenergy.mapper.CardMapper;
-import cn.wisenergy.mapper.RefillCardMapper;
-import cn.wisenergy.model.app.CardInfo;
-import cn.wisenergy.model.app.RefillCard;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-
-/**
- * @author 86187
- */
-@Component
-@Slf4j
-public class RefillCardManager {
-
- @Autowired
- private RefillCardMapper refillCardMapper;
-
- @Autowired
- private CardMapper cardMapper;
-
- @Transactional(rollbackFor = Exception.class)
- public R<Boolean> addCardMannger(RefillCard byId){
- //获å–充值å¡çš„å¡æ•°ï¼Œå¹¶ç”Ÿæˆå¡ç‰‡
- ArrayList<CardInfo> cardInfos = new ArrayList<>();
-
- //åå¡æ·»åŠ
- for (int i = 0; i < byId.getCardNumber(); i++) {
- CardInfo cardInfo = new CardInfo();
- cardInfo.setBatchNumber(byId.getBatchNumber());
- cardInfo.setIsDelete(0);
- cardInfo.setMoney("498");
- cardInfo.setStatus(0);
- cardInfo.setLimit(3);
- cardInfo.setSecretKey(SecretkeyUtil.getSecretkey());
- cardInfo.setCardNumber(CardNumberUtil.cardNumber());
- cardInfos.add(cardInfo);
- }
- int add1 = cardMapper.add(cardInfos);
-
- if (add1==0) {
- return R.ok(1,false);
- }
- int isMakeCard = refillCardMapper.setIsMakeCard(byId.getId());
-
- if (isMakeCard==0) {
- return R.ok(1,false);
- }
- return R.ok(0,true);
-
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerListener.java b/wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerListener.java
deleted file mode 100644
index 7fa2e1f..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerListener.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package cn.wisenergy.service.common;
-
-import cn.wisenergy.model.app.Volunteer;
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
-import com.alibaba.excel.metadata.Head;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.StringUtils;
-
-import java.util.*;
-
-/**
- * Excel批é‡æ·»åŠ 社区居民 监å¬å™¨
- *
- * @author 86187
- */
-@Slf4j
-public class VolunteerListener extends AnalysisEventListener<Volunteer> {
-
- private List<Volunteer> list=new ArrayList<>();
- private final int batch = 50000;
-
- /**
- * 导入模æ¿å¤´å†…容
- */
- private Map<Integer, String> headMap = new HashMap<>();
-
- /**
- * ç»“æžœæ ‡è®° 默认错误
- */
- private boolean isCorrectFormat = true;
-
-
- /**
- * 这个æ¯ä¸€æ¡æ•°æ®è§£æžéƒ½ä¼šæ¥è°ƒç”¨ ==
- *
- * @param volunteer å¿—æ„¿ä¿¡æ¯
- * @param analysisContext
- */
- @Override
- public void invoke(Volunteer volunteer, AnalysisContext analysisContext) {
- if (!isCorrectFormat) {
- //æ ¼å¼æ˜¯å¦æ£ç¡®
- return;
- }
- log.info("解æžåˆ°ä¸€æ¡å¿—æ„¿æ•°æ®>>>>>>>>>>：{}", volunteer);
- //æ¤å¤„åšæ ¡éªŒ æœ¬æ¬¡æ²¡æœ‰æ ¡éªŒ
- if (volunteer != null) {
- volunteer.setIsDelete(0);
- volunteer.setCreateTime(new Date());
- volunteer.setUpdateTime(new Date());
- if (StringUtils.isEmpty(volunteer.getMajorName())) {
- throw new RuntimeException("专业ä¸èƒ½ä¸ºç©ºï¼");
- }
-
- if (StringUtils.isEmpty(volunteer.getAcademy())) {
- throw new RuntimeException("é™¢æ ¡ä¸èƒ½ä¸ºç©ºï¼");
- }
-
-
- if (StringUtils.isEmpty(volunteer.getCourseDemand())) {
- throw new RuntimeException("选考科目è¦æ±‚ä¸èƒ½ä¸ºç©ºï¼");
- }
-
- if (StringUtils.isEmpty(volunteer.getNature())) {
- throw new RuntimeException("å¦æ ¡ä¸èƒ½ä¸ºç©ºï¼");
- }
-
- if (null == volunteer.getYearLimit()) {
- throw new RuntimeException("å¦å¹´åˆ¶ä¸èƒ½ä¸ºç©ºï¼");
- }
-
- if (null == volunteer.getPlanNum()) {
- throw new RuntimeException("计划数数ä¸èƒ½ä¸ºç©ºï¼");
- }
-
- if (StringUtils.isEmpty(volunteer.getLowestMark())) {
- throw new RuntimeException("最低分ä¸èƒ½ä¸ºç©ºï¼");
- }
-
- list.add(volunteer);
- }
- }
-
- /**
- * 所有数æ®è§£æžå®Œæˆäº† 都会æ¥è°ƒç”¨
- *
- * @param analysisContext
- */
- @Override
- public void doAfterAllAnalysed(AnalysisContext analysisContext) {
-// log.info("doAfterAllAnalysed解æžçŽ©ä¸€ä¸ªå¿—æ„¿sheet工作表>>>>>>>>>>");
-// //如果集åˆä¸ä¸ºç©º
-// if (!CollectionUtils.isEmpty(list)) {
-// log.info("批é‡æ’入志愿数æ®ï¼Œæ¡æ•°ä¸º>>>>>>>>>>：{}", list.size());
-// if (list.size() > 0) {
-// volunteerService.saveBatch(list);
-// }
-// }
- }
-
-
- public List<Volunteer> getList() {
- List<Volunteer> result = new ArrayList<>();
- result.addAll(list);
- return result;
- }
-
- public void setList(List<Volunteer> list) {
- this.list = list;
- }
-
-
- /**
- * æ ¡éªŒå¯¼å…¥æ¨¡æ¿è¡¨å¤´æ˜¯å¦æ£ç¡®
- *
- * @param headMap 表头
- * @param context
- */
- @Override
- public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
- //是å¦æ‰‹åŠ¨ä¼ å…¥è¡¨å¤´ä¿¡æ¯ æ²¡æœ‰åˆ™è‡ªåŠ¨è¯»å–实体类头信æ¯
- try {
- if (this.headMap == null || this.headMap.size() <= 0) {
- Map<Integer, Head> map = context.currentReadHolder().excelReadHeadProperty().getHeadMap();
- for (int i = 0; i < map.size(); i++) {
- //å°è£…æˆheadMap
- this.headMap.put(map.get(i).getColumnIndex(), map.get(i).getHeadNameList().get(0));
- }
- }
- } catch (Exception e) {
- isCorrectFormat = false;
- throw new RuntimeException("导入失败，请è”系管ç†å‘˜ï¼");
- }
-
- if (this.headMap == null || headMap == null || this.headMap.size() != headMap.size()) {
- isCorrectFormat = false;
- throw new RuntimeException("导入表的表头与模æ¿è¡¨å¤´ä¸ç¬¦!");
- } else {
- for (int i = 0; i < this.headMap.size(); i++) {
- //循环é历判æ–è¡¨æ ¼å¤´æ˜¯å¦ä¸€ä¸€å¯¹åº”
- if (!this.headMap.get(i).equals(headMap.get(i))) {
- isCorrectFormat = false;
- throw new RuntimeException("导入表的表头与模æ¿è¡¨å¤´ä¸ç¬¦!");
- }
- }
- }
-
- }
-
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerManager.java b/wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerManager.java
deleted file mode 100644
index d2f97ef..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerManager.java
+++ /dev/null
@@ -1,415 +0,0 @@
-package cn.wisenergy.service.common;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.mapper.*;
-import cn.wisenergy.model.app.*;
-import cn.wisenergy.model.enums.CardStatus;
-import cn.wisenergy.model.enums.OperationTypeEnum;
-import cn.wisenergy.model.enums.PayType;
-import cn.wisenergy.model.vo.AddLimitVo;
-import cn.wisenergy.model.vo.UserInfoVo;
-import cn.wisenergy.service.app.UserLimitService;
-import cn.wisenergy.service.app.UserVolunteerService;
-import cn.wisenergy.service.app.VolunteerService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author 86187
- * @ Description: 事务方法公共类
- * @ Author : 86187
- * @ Date : 2021/1/28 15:59
- */
-@Component
-@Slf4j
-public class VolunteerManager {
-
- @Autowired
- private UserLimitMapper userLimitMapper;
-
- @Autowired
- private UserLimitRecordMapper userLimitRecordMapper;
-
- @Autowired
- private CardMapper cardMapper;
-
- @Autowired
- private PayRecordMapper payRecordMapper;
-
- @Autowired
- private SchemeRecordMapper schemeRecordMapper;
-
- @Autowired
- private UserVolunteerService userVolunteerService;
-
- @Autowired
- private UsersMapper usersMapper;
-
- @Autowired
- private ScoreInfoMapper scoreInfoMapper;
-
- @Autowired
- private SchemeMapper schemeMapper;
-
- @Autowired
- private VolunteerService volunteerService;
-
- @Autowired
- private VolunteerMapper volunteerMapper;
-
- @Autowired
- private UserLimitService userLimitService;
-
- @Autowired
- private LoginRecordMapper loginRecordMapper;
-
- /**
- * 错误ç
- */
- private static final int ERROR_CODE = 1;
-
- /**
- * 副科是å…选三科
- */
- private static final int CLASS_COUNT = 3;
-
- /**
- * 更新用户查询信æ¯å¹¶ä¿å˜æ‰£å‡è®°å½•
- *
- * @param userLimit 查询信æ¯
- * @return true or false
- */
- @Transactional(rollbackFor = Exception.class)
- public boolean updateLimitSaveRecord(UserLimit userLimit) {
- //1ã€æ›´æ–°æŸ¥è¯¢ä¿¡æ¯
- int count = userLimitMapper.edit(userLimit);
- if (count == 0) {
- return false;
- }
-
- //2ã€ä¿å˜æ‰£å‡è®°å½•
- UserLimitRecord userLimitRecord = new UserLimitRecord();
- userLimitRecord.setMinusLimit(1);
- userLimitRecord.setUserLimitId(userLimit.getId());
- userLimitRecord.setUserId(userLimit.getUserId());
- int record = userLimitRecordMapper.add(userLimitRecord);
-
- if (record == 0) {
- return false;
- }
- return true;
- }
-
- /**
- * 更新充值å¡çŠ¶æ€å’Œç”¨æˆ·æŸ¥è¯¢æ¬¡æ•°åŠå¢žåŠ 充值记录
- *
- * @param cardInfo 充值å¡ä¿¡æ¯
- * @param userLimit 用户查询次数信æ¯
- * @param addLimitVo 接å£å…¥å‚
- */
- @Transactional(rollbackFor = Exception.class)
- public Boolean updateLimitAndRecord(Price price, CardInfo cardInfo, UserLimit userLimit, AddLimitVo addLimitVo) {
-
- //是充值å¡
- if (PayType.REFILL_CARD.getCode().equals(addLimitVo.getPayType())) {
- //1ã€æ›´æ–°å……值å¡çŠ¶æ€
- cardInfo.setStatus(CardStatus.ALREADY_USED.getCode());
- int count = cardMapper.edit(cardInfo);
- if (count == 0) {
- return false;
- }
-
- //2ã€æ›´æ–°ç”¨æˆ·æŸ¥è¯¢æ¬¡æ•°ä¿¡æ¯
- int limit = userLimitMapper.edit(userLimit);
- if (limit == 0) {
- return false;
- }
-
- //3ã€ä¿å˜å……值记录
- PayRecord payRecord = new PayRecord();
- payRecord.setCardId(cardInfo.getId());
- payRecord.setMoney(Integer.valueOf(cardInfo.getMoney()));
- payRecord.setPayLimit(cardInfo.getLimit());
- payRecord.setResult(0);
- payRecord.setType(addLimitVo.getPayType());
- payRecord.setUserId(addLimitVo.getUserId());
- int pay = payRecordMapper.add(payRecord);
- if (pay == 0) {
- return false;
- }
- } else {
- //1ã€æ›´æ–°ç”¨æˆ·æŸ¥è¯¢æ¬¡æ•°ä¿¡æ¯
- int limit = userLimitMapper.edit(userLimit);
- if (limit == 0) {
- return false;
- }
-
- //2ã€ä¿å˜å……值记录
- PayRecord payRecord = new PayRecord();
- payRecord.setCardId(null);
- payRecord.setMoney(addLimitVo.getPayMoney());
- payRecord.setPayLimit(price.getUseLimit());
- payRecord.setResult(0);
- payRecord.setType(addLimitVo.getPayType());
- payRecord.setUserId(addLimitVo.getUserId());
- int pay = payRecordMapper.add(payRecord);
- if (pay == 0) {
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * ä¿å˜æ–¹æ¡ˆæŸ¥è¯¢è®°å½•å’Œå…³è”关系
- *
- * @param user 用户信æ¯
- * @param list å¿—æ„¿ä¿¡æ¯
- * @return true æˆåŠŸ false 失败
- */
- @Transactional(rollbackFor = Exception.class)
- public R<Integer> saveUserVolunteer(User user, List<Volunteer> list, ScoreInfo scoreInfo, String name) {
- //1ã€ä¿å˜æ–¹æ¡ˆæŸ¥è¯¢è®°å½•
- SchemeQueryRecord schemeQueryRecord = new SchemeQueryRecord();
- schemeQueryRecord.setMajorName(name);
- schemeQueryRecord.setStudentType(user.getExamType());
- schemeQueryRecord.setUserId(user.getId());
- schemeQueryRecord.setIsDelete(0);
- schemeQueryRecord.setMajorScore(scoreInfo.getMajorGrade().toString());
- schemeQueryRecord.setScore(scoreInfo.getCultureGrade().toString());
-
- List<Integer> ids = list.stream().map(Volunteer::getId).collect(Collectors.toList());
- //ä¿å˜æ–¹æ¡ˆæŸ¥è¯¢è®°å½•
- int count = schemeRecordMapper.add(schemeQueryRecord);
- if (count == 0) {
- return R.error("ä¿å˜æ–¹æ¡ˆæŸ¥è¯¢è®°å½•å¤±è´¥!");
- }
-
- List<UserVolunteer> volunteerList = new ArrayList<>();
- for (Integer id : ids) {
- UserVolunteer userVolunteer = new UserVolunteer();
- userVolunteer.setSchemeRecordId(schemeQueryRecord.getId());
- userVolunteer.setUserId(user.getId());
- userVolunteer.setVolunteerId(id);
- volunteerList.add(userVolunteer);
- }
-
- //调用扣å‡æŸ¥è¯¢æ¬¡æ•°æŽ¥å£
- R<Boolean> result = userLimitService.minusLimit(user.getId());
- if (null != result && result.getCode() == ERROR_CODE) {
- return R.error("扣å‡æŸ¥è¯¢æ¬¡æ•°å¤±è´¥!");
- }
-
- //ä¿å˜æ–¹æ¡ˆå¿—æ„¿å…³è”关系
- boolean bool = userVolunteerService.saveBatch(volunteerList);
- if (!bool) {
- return R.error("ä¿å˜æ–¹æ¡ˆå¿—æ„¿å…³è”关系失败!");
- }
- return R.ok(schemeQueryRecord.getId());
- }
-
- /**
- * ä¿å˜ä¸ªäººä¿¡æ¯
- *
- * @param user 用户信æ¯
- * @param scoreInfo æˆç»©ä¿¡æ¯
- * @return true or false
- */
- @Transactional(rollbackFor = Exception.class)
- public boolean updateAndSaveUserInfo(User user, ScoreInfo scoreInfo) {
- //1ã€æ›´æ–°ç”¨æˆ·ä¿¡æ¯
- int count = usersMapper.edit(user);
- if (count == 0) {
- return false;
- }
-
- //2ã€ä¿å˜ç”¨æˆ·æˆç»©ä¿¡æ¯
- if (null == scoreInfo.getMajorGrade()) {
- scoreInfo.setMajorGrade(0.00);
- }
-
- int save = scoreInfoMapper.add(scoreInfo);
- if (save == 0) {
- return false;
- }
-
- return true;
- }
-
- /**
- * 编辑个人信æ¯
- *
- * @param user 用户信æ¯
- * @param scoreInfo æˆç»©ä¿¡æ¯
- * @return true or false
- */
- @Transactional(rollbackFor = Exception.class)
- public boolean updateAndUserInfo(User user, ScoreInfo scoreInfo) {
- //1ã€æ›´æ–°ç”¨æˆ·ä¿¡æ¯
- int count = usersMapper.edit(user);
- if (count == 0) {
- return false;
- }
-
- //2ã€ä¿å˜ç”¨æˆ·æˆç»©ä¿¡æ¯
- int save = scoreInfoMapper.edit(scoreInfo);
- if (save == 0) {
- return false;
- }
-
- return true;
- }
-
- /**
- * ä¿å˜æ–¹æ¡ˆå’Œå¿—æ„¿ä¿¡æ¯
- *
- * @param schemeInfo 方案信æ¯
- * @param list å¿—æ„¿ä¿¡æ¯
- */
- @Transactional(rollbackFor = Exception.class)
- public void saveSchemeAndVolunteer(SchemeInfo schemeInfo, List<Volunteer> list) {
- //1ã€ä¿å˜æ–¹æ¡ˆä¿¡æ¯
- int count = schemeMapper.add(schemeInfo);
- if (count == 0) {
- throw new RuntimeException("ä¿å˜æ–¹æ¡ˆä¿¡æ¯å¤±è´¥!");
- }
-
- //ä¿å˜å¿—æ„¿ä¿¡æ¯
- for (Volunteer volunteer : list) {
- volunteer.setSchemeId(schemeInfo.getId());
- volunteer.setType(schemeInfo.getType());
- }
- boolean bool = volunteerService.saveBatch(list);
- if (!bool) {
- throw new RuntimeException("ä¿å˜å¿—æ„¿ä¿¡æ¯å¤±è´¥!");
- }
- }
-
- /**
- * åˆ é™¤æ–¹æ¡ˆå¿—æ„¿
- *
- * @param schemeInfo 方案信æ¯
- * @param schemeId 方案id
- * @param size å¿—æ„¿æ•°æ®æ¡æ•°
- * @return true or false
- */
- @Transactional(rollbackFor = Exception.class)
- public boolean deleteSchemeAndVolunteer(SchemeInfo schemeInfo, Integer schemeId, Integer size) {
- //更行方案状æ€ä¸ºåˆ 除
- int sum = schemeMapper.edit(schemeInfo);
- if (sum == 0) {
- return false;
- }
-
-
- //更行志愿状æ€ä¸ºåˆ 除
- int count = volunteerMapper.updateBySchemeId(schemeId);
- if (size != count) {
- return false;
- }
-
- return true;
- }
-
- /**
- * 检查æˆç»©ä¿¡æ¯
- *
- * @param scoreInfo æˆç»©
- * @return true or false
- */
- public R<Boolean> checkScore(ScoreInfo scoreInfo) {
- int count = 0;
- if (null != scoreInfo.getPoliticsGrade()) {
- count = count + 1;
- }
- if (null != scoreInfo.getHistoryGrade()) {
- count = count + 1;
- }
- if (null != scoreInfo.getBiologyGrade()) {
- count = count + 1;
- }
- if (null != scoreInfo.getChemistryGrade()) {
- count = count + 1;
- }
- if (null != scoreInfo.getPhysicsGrade()) {
- count = count + 1;
- }
- if (null != scoreInfo.getGeographyGrade()) {
- count = count + 1;
- }
-
- if (count > CLASS_COUNT) {
- return R.error(1, "åªèƒ½å¡«ä¸‰ç§‘副科æˆç»©", false);
- }
- return R.ok(0, true);
- }
-
- /**
- * ä¿å˜ç”¨æˆ·æ³¨å†Œä¿¡æ¯ï¼Œåˆå§‹åŒ–查询次数信æ¯ï¼Œæ³¨å†Œã€ç™»å½•æ“作信æ¯
- *
- * @param phone 手机
- * @param secret 密ç
- * @param source æ¥æº
- * @return 结果
- */
- @Transactional
- public R<UserInfoVo> saveUserAndLimit(String phone, String secret, Integer source) {
- //1ã€æ·»åŠ 用户信æ¯
- User userInfo = new User();
- userInfo.setPhone(phone);
- userInfo.setPassword(secret);
- userInfo.setIsDelete(0);
- userInfo.setSource(source);
-
- int count = usersMapper.add(userInfo);
- if (count == 0) {
- return R.error("考生注册失败!");
- }
-
- //2ã€ä¿å˜ç”¨æˆ·æŸ¥è¯¢ä¿¡æ¯
- UserLimit addLimit = new UserLimit();
- addLimit.setUserId(userInfo.getId());
- addLimit.setUseLimit(0);
- addLimit.setUsableLimit(0);
- addLimit.setTotalLimit(0);
- int limit = userLimitMapper.add(addLimit);
- if (limit == 0) {
- return R.error("æ³¨å†Œæ·»åŠ ç”¨æˆ·æŸ¥è¯¢ä¿¡æ¯å¤±è´¥!");
- }
-
- //3ã€ä¿å˜æ³¨å†Œè®°å½•
- LoginRecord loginRecord = new LoginRecord();
- loginRecord.setType(OperationTypeEnum.USER_REGISTER.getCode());
- loginRecord.setUserId(userInfo.getId());
- String name = OperationTypeEnum.getByCode(OperationTypeEnum.USER_REGISTER.getCode());
- loginRecord.setOperationName(name);
- int record = loginRecordMapper.add(loginRecord);
- if (record == 0) {
- return R.error("ä¿å˜æ³¨å†Œè®°å½•å¤±è´¥!");
- }
-
- //3ã€ä¿å˜ç™»å½•è®°å½•
- LoginRecord login = new LoginRecord();
- login.setType(OperationTypeEnum.USER_LOGIN.getCode());
- login.setUserId(userInfo.getId());
- String nameSecond = OperationTypeEnum.getByCode(OperationTypeEnum.USER_LOGIN.getCode());
- login.setOperationName(nameSecond);
- int number = loginRecordMapper.add(login);
- if (number == 0) {
- return R.error("ä¿å˜ç™»å½•è®°å½•å¤±è´¥!");
- }
-
- //7ã€å°è£…返回å‚æ•°
- UserInfoVo userInfoVo = new UserInfoVo();
- userInfoVo.setUserId(userInfo.getId());
- userInfoVo.setPhone(userInfo.getPhone());
- return R.ok(userInfoVo);
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/Credentials.java b/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/Credentials.java
deleted file mode 100644
index 571595a..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/Credentials.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package cn.wisenergy.service.httpClient;
-
-import org.apache.http.client.methods.HttpRequestWrapper;
-
-import java.io.IOException;
-
-public interface Credentials {
-
- String getSchema();
-
- String getToken(HttpRequestWrapper request) throws IOException;
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/SignatureExec.java b/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/SignatureExec.java
deleted file mode 100644
index ec3542e..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/SignatureExec.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package cn.wisenergy.service.httpClient;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpException;
-import org.apache.http.StatusLine;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpExecutionAware;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.entity.BufferedHttpEntity;
-import org.apache.http.impl.execchain.ClientExecChain;
-
-import java.io.IOException;
-
-public class SignatureExec implements ClientExecChain {
- final ClientExecChain mainExec;
- final Credentials credentials;
- final Validator validator;
-
- SignatureExec(Credentials credentials, Validator validator, ClientExecChain mainExec) {
- this.credentials = credentials;
- this.validator = validator;
- this.mainExec = mainExec;
- }
-
- protected void convertToRepeatableResponseEntity(CloseableHttpResponse response)
- throws IOException {
- HttpEntity entity = response.getEntity();
- if (entity != null) {
- response.setEntity(new BufferedHttpEntity(entity));
- }
- }
-
- protected void convertToRepeatableRequestEntity(HttpRequestWrapper request) throws IOException {
- if (request instanceof HttpEntityEnclosingRequest) {
- HttpEntity entity = ((HttpEntityEnclosingRequest) request).getEntity();
- if (entity != null) {
- ((HttpEntityEnclosingRequest) request).setEntity(new BufferedHttpEntity(entity));
- }
- }
- }
-
- @Override
- public CloseableHttpResponse execute(HttpRoute route, HttpRequestWrapper request,
- HttpClientContext context, HttpExecutionAware execAware) throws IOException, HttpException {
- if (request.getURI().getHost().endsWith(".mch.weixin.qq.com")) {
- return executeWithSignature(route, request, context, execAware);
- } else {
- return mainExec.execute(route, request, context, execAware);
- }
- }
-
- private CloseableHttpResponse executeWithSignature(HttpRoute route, HttpRequestWrapper request,
- HttpClientContext context, HttpExecutionAware execAware) throws IOException, HttpException {
- // ä¸Šä¼ ç±»ä¸éœ€è¦æ¶ˆè€—两次故ä¸åšè½¬æ¢
- if (!(request.getOriginal() instanceof WechatPayUploadHttpPost)) {
- convertToRepeatableRequestEntity(request);
- }
- // æ·»åŠ è®¤è¯ä¿¡æ¯
- request.addHeader("Authorization",
- credentials.getSchema() + " " + credentials.getToken(request));
-
- // 执行
- CloseableHttpResponse response = mainExec.execute(route, request, context, execAware);
-
- // 对æˆåŠŸåº”ç”验ç¾
- StatusLine statusLine = response.getStatusLine();
- if (statusLine.getStatusCode() >= 200 && statusLine.getStatusCode() < 300) {
- convertToRepeatableResponseEntity(response);
- if (!validator.validate(response)) {
- throw new HttpException("应ç”的微信支付ç¾å验è¯å¤±è´¥");
- }
- }
- return response;
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/Validator.java b/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/Validator.java
deleted file mode 100644
index 35d0dc1..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/Validator.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package cn.wisenergy.service.httpClient;
-
-import org.apache.http.client.methods.CloseableHttpResponse;
-
-import java.io.IOException;
-
-public interface Validator {
- boolean validate(CloseableHttpResponse response) throws IOException;
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/WechatPayHttpClientBuilder.java b/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/WechatPayHttpClientBuilder.java
deleted file mode 100644
index b806df5..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/WechatPayHttpClientBuilder.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package cn.wisenergy.service.httpClient;
-
-
-import cn.wisenergy.service.httpClient.auth.CertificatesVerifier;
-import cn.wisenergy.service.httpClient.auth.PrivateKeySigner;
-import cn.wisenergy.service.httpClient.auth.WechatPay2Credentials;
-import cn.wisenergy.service.httpClient.auth.WechatPay2Validator;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.execchain.ClientExecChain;
-
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
-import java.util.List;
-
-public class WechatPayHttpClientBuilder extends HttpClientBuilder {
- private Credentials credentials;
- private Validator validator;
-
- static final String os = System.getProperty("os.name") + "/" + System.getProperty("os.version");
- static final String version = System.getProperty("java.version");
-
- private WechatPayHttpClientBuilder() {
- super();
-
- String userAgent = String.format(
- "WechatPay-Apache-HttpClient/%s (%s) Java/%s",
- getClass().getPackage().getImplementationVersion(),
- os,
- version == null ? "Unknown" : version);
- setUserAgent(userAgent);
- }
-
- public static WechatPayHttpClientBuilder create() {
- return new WechatPayHttpClientBuilder();
- }
-
- public WechatPayHttpClientBuilder withMerchant(String merchantId, String serialNo, PrivateKey privateKey) {
- this.credentials =
- new WechatPay2Credentials(merchantId, new PrivateKeySigner(serialNo, privateKey));
- return this;
- }
-
- public WechatPayHttpClientBuilder withCredentials(Credentials credentials) {
- this.credentials = credentials;
- return this;
- }
-
- public WechatPayHttpClientBuilder withWechatpay(List<X509Certificate> certificates) {
- this.validator = new WechatPay2Validator(new CertificatesVerifier(certificates));
- return this;
- }
-
- public WechatPayHttpClientBuilder withValidator(Validator validator) {
- this.validator = validator;
- return this;
- }
-
- @Override
- public CloseableHttpClient build() {
- if (credentials == null) {
- throw new IllegalArgumentException("缺少身份认è¯ä¿¡æ¯");
- }
- if (validator == null) {
- throw new IllegalArgumentException("缺少ç¾å验è¯ä¿¡æ¯");
- }
-
- return super.build();
- }
-
- @Override
- protected ClientExecChain decorateProtocolExec(final ClientExecChain requestExecutor) {
- return new SignatureExec(this.credentials, this.validator, requestExecutor);
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/WechatPayUploadHttpPost.java b/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/WechatPayUploadHttpPost.java
deleted file mode 100644
index 6aba1a8..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/WechatPayUploadHttpPost.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package cn.wisenergy.service.httpClient;
-
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentType;
-
-
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URLConnection;
-
-/**
- * @author 86187
- */
-public class WechatPayUploadHttpPost extends HttpPost {
-
- private String meta;
-
- private WechatPayUploadHttpPost(URI uri, String meta) {
- super(uri);
-
- this.meta = meta;
- }
-
- public String getMeta() {
- return meta;
- }
-
- public static class Builder {
-
- private String fileName;
- private String fileSha256;
- private InputStream fileInputStream;
- private org.apache.http.entity.ContentType fileContentType;
- private URI uri;
-
- public Builder(URI uri) {
- this.uri = uri;
- }
-
- public Builder withImage(String fileName, String fileSha256, InputStream inputStream) {
- this.fileName = fileName;
- this.fileSha256 = fileSha256;
- this.fileInputStream = inputStream;
-
- String mimeType = URLConnection.guessContentTypeFromName(fileName);
- if (mimeType == null) {
- // guess this is a video uploading
- this.fileContentType = ContentType.APPLICATION_OCTET_STREAM;
- } else {
- this.fileContentType = ContentType.create(mimeType);
- }
- return this;
- }
-
- public WechatPayUploadHttpPost build() {
- if (fileName == null || fileSha256 == null || fileInputStream == null) {
- throw new IllegalArgumentException("ç¼ºå°‘å¾…ä¸Šä¼ å›¾ç‰‡æ–‡ä»¶ä¿¡æ¯");
- }
-
- if (uri == null) {
- throw new IllegalArgumentException("ç¼ºå°‘ä¸Šä¼ å›¾ç‰‡æŽ¥å£URL");
- }
-
- String meta = String.format("{\"filename\":\"%s\",\"sha256\":\"%s\"}", fileName, fileSha256);
- WechatPayUploadHttpPost request = new WechatPayUploadHttpPost(uri, meta);
-
-// MultipartEntityBuilder entityBuilder = MultipartEntityBuilder.create();
-// entityBuilder.setMode(HttpMultipartMode.RFC6532)
-// .addBinaryBody("file", fileInputStream, fileContentType, fileName)
-// .addTextBody("meta", meta, org.apache.http.entity.ContentType.APPLICATION_JSON);
-//
-// request.setEntity(entityBuilder.build());
-// request.addHeader("Accept", org.apache.http.entity.ContentType.APPLICATION_JSON.toString());
-
- return request;
- }
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/AutoUpdateCertificatesVerifier.java b/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/AutoUpdateCertificatesVerifier.java
deleted file mode 100644
index d6cc977..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/AutoUpdateCertificatesVerifier.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package cn.wisenergy.service.httpClient.auth;
-
-import cn.wisenergy.service.httpClient.Credentials;
-import cn.wisenergy.service.httpClient.WechatPayHttpClientBuilder;
-import cn.wisenergy.service.httpClient.util.AesUtil;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.cert.CertificateExpiredException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CertificateNotYetValidException;
-import java.security.cert.X509Certificate;
-import java.time.Duration;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * 在原有CertificatesVerifieråŸºç¡€ä¸Šï¼Œå¢žåŠ è‡ªåŠ¨æ›´æ–°è¯ä¹¦åŠŸèƒ½
- */
-public class AutoUpdateCertificatesVerifier implements Verifier {
-
- private static final Logger log = LoggerFactory.getLogger(AutoUpdateCertificatesVerifier.class);
-
- //è¯ä¹¦ä¸‹è½½åœ°å€
- private static final String CertDownloadPath = "https://api.mch.weixin.qq.com/v3/certificates";
-
- //上次更新时间
- private volatile Instant instant;
-
- //è¯ä¹¦æ›´æ–°é—´éš”时间，å•ä½ä¸ºåˆ†é’Ÿ
- private int minutesInterval;
-
- private CertificatesVerifier verifier;
-
- private Credentials credentials;
-
- private byte[] apiV3Key;
-
- private ReentrantLock lock = new ReentrantLock();
-
- public AutoUpdateCertificatesVerifier(Credentials credentials, byte[] apiV3Key) {
- this(credentials, apiV3Key, TimeInterval.OneHour.getMinutes());
- }
-
- public AutoUpdateCertificatesVerifier(Credentials credentials, byte[] apiV3Key,
- int minutesInterval) {
- this.credentials = credentials;
- this.apiV3Key = apiV3Key;
- this.minutesInterval = minutesInterval;
- //æž„é€ æ—¶æ›´æ–°è¯ä¹¦
- try {
- autoUpdateCert();
- instant = Instant.now();
- } catch (IOException | GeneralSecurityException e) {
- throw new RuntimeException(e);
- }
- }
-
- public AutoUpdateCertificatesVerifier(WechatPay2Credentials wechatPay2Credentials, byte[] bytes) {
- }
-
- @Override
- public X509Certificate getValidCertificate() {
- return verifier.getValidCertificate();
- }
-
- @Override
- public boolean verify(String serialNumber, byte[] message, String signature) {
- if (instant == null
- || Duration.between(instant, Instant.now()).toMinutes() >= minutesInterval) {
- if (lock.tryLock()) {
- try {
- autoUpdateCert();
- //更新时间
- instant = Instant.now();
- } catch (GeneralSecurityException | IOException e) {
- log.warn("Auto update cert failed, exception = " + e);
- } finally {
- lock.unlock();
- }
- }
- }
- return verifier.verify(serialNumber, message, signature);
- }
-
- private void autoUpdateCert() throws IOException, GeneralSecurityException {
- CloseableHttpClient httpClient = WechatPayHttpClientBuilder.create()
- .withCredentials(credentials)
- .withValidator(verifier == null ? (response) -> true : new WechatPay2Validator(verifier))
- .build();
-
- try {
- HttpGet httpGet = new HttpGet(CertDownloadPath);
- httpGet.addHeader("Accept", "application/json");
-
- CloseableHttpResponse response = httpClient.execute(httpGet);
- try {
- int statusCode = response.getStatusLine().getStatusCode();
- String body = EntityUtils.toString(response.getEntity());
- if (statusCode == 200) {
- List<X509Certificate> newCertList = deserializeToCerts(apiV3Key, body);
- if (newCertList.isEmpty()) {
- log.warn("Cert list is empty");
- return;
- }
- this.verifier = new CertificatesVerifier(newCertList);
- } else {
- log.warn("Auto update cert failed, statusCode = " + statusCode + ",body = " + body);
- }
- } finally {
- response.close();
- }
- } finally {
- httpClient.close();
- }
- }
-
- /**
- * ååºåˆ—化è¯ä¹¦å¹¶è§£å¯†
- */
- private List<X509Certificate> deserializeToCerts(byte[] apiV3Key, String body)
- throws GeneralSecurityException, IOException {
- AesUtil decryptor = new AesUtil(apiV3Key);
- ObjectMapper mapper = new ObjectMapper();
- JsonNode dataNode = mapper.readTree(body).get("data");
- List<X509Certificate> newCertList = new ArrayList<>();
- if (dataNode != null) {
- for (int i = 0, count = dataNode.size(); i < count; i++) {
- JsonNode encryptCertificateNode = dataNode.get(i).get("encrypt_certificate");
- //解密
- String cert = decryptor.decryptToString(
- encryptCertificateNode.get("associated_data").toString().replaceAll("\"", "")
- .getBytes("utf-8"),
- encryptCertificateNode.get("nonce").toString().replaceAll("\"", "")
- .getBytes("utf-8"),
- encryptCertificateNode.get("ciphertext").toString().replaceAll("\"", ""));
-
- CertificateFactory cf = CertificateFactory.getInstance("X509");
- X509Certificate x509Cert = (X509Certificate) cf.generateCertificate(
- new ByteArrayInputStream(cert.getBytes("utf-8"))
- );
- try {
- x509Cert.checkValidity();
- } catch (CertificateExpiredException | CertificateNotYetValidException e) {
- continue;
- }
- newCertList.add(x509Cert);
- }
- }
- return newCertList;
- }
-
-
- /**
- * 时间间隔枚举，支æŒä¸€å°æ—¶ã€å…å°æ—¶ä»¥åŠå二å°æ—¶
- */
- public enum TimeInterval {
- OneHour(60), SixHours(60 * 6), TwelveHours(60 * 12);
-
- private int minutes;
-
- TimeInterval(int minutes) {
- this.minutes = minutes;
- }
-
- public int getMinutes() {
- return minutes;
- }
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/CertificatesVerifier.java b/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/CertificatesVerifier.java
deleted file mode 100644
index 1a580df..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/CertificatesVerifier.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package cn.wisenergy.service.httpClient.auth;
-
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.Signature;
-import java.security.SignatureException;
-import java.security.cert.CertificateExpiredException;
-import java.security.cert.CertificateNotYetValidException;
-import java.security.cert.X509Certificate;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-/**
- * @author 86187
- */
-public class CertificatesVerifier implements Verifier {
-
- private final HashMap<BigInteger, X509Certificate> certificates = new HashMap<>();
-
- public CertificatesVerifier(List<X509Certificate> list) {
-
- for (X509Certificate item : list) {
- certificates.put(item.getSerialNumber(), item);
- }
- }
-
- private boolean verify(X509Certificate certificate, byte[] message, String signature) {
- try {
- Signature sign = Signature.getInstance("SHA256withRSA");
- sign.initVerify(certificate);
- sign.update(message);
- return sign.verify(Base64.getDecoder().decode(signature));
- } catch (NoSuchAlgorithmException e) {
- throw new RuntimeException("当å‰Java环境ä¸æ”¯æŒSHA256withRSA", e);
- } catch (SignatureException e) {
- throw new RuntimeException("ç¾å验è¯è¿‡ç¨‹å‘生了错误", e);
- } catch (InvalidKeyException e) {
- throw new RuntimeException("æ— æ•ˆçš„è¯ä¹¦", e);
- }
- }
-
- @Override
- public boolean verify(String serialNumber, byte[] message, String signature) {
- BigInteger val = new BigInteger(serialNumber, 16);
- return certificates.containsKey(val) && verify(certificates.get(val), message, signature);
- }
-
- @Override
- public X509Certificate getValidCertificate() {
- for (X509Certificate x509Cert : certificates.values()) {
- try {
- x509Cert.checkValidity();
-
- return x509Cert;
- } catch (CertificateExpiredException | CertificateNotYetValidException e) {
- continue;
- }
- }
-
- throw new NoSuchElementException("没有有效的微信支付平å°è¯ä¹¦");
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/PrivateKeySigner.java b/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/PrivateKeySigner.java
deleted file mode 100644
index a3dd07f..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/PrivateKeySigner.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package cn.wisenergy.service.httpClient.auth;
-
-import java.security.*;
-import java.util.Base64;
-
-/**
- * @author 86187
- */
-public class PrivateKeySigner implements Signer {
- private String certificateSerialNumber;
-
- private PrivateKey privateKey;
-
- public PrivateKeySigner(String serialNumber, PrivateKey privateKey) {
- this.certificateSerialNumber = serialNumber;
- this.privateKey = privateKey;
- }
-
- @Override
- public SignatureResult sign(byte[] message) {
- try {
- Signature sign = Signature.getInstance("SHA256withRSA");
- sign.initSign(privateKey);
- sign.update(message);
-
- return new SignatureResult(
- Base64.getEncoder().encodeToString(sign.sign()), certificateSerialNumber);
- } catch (NoSuchAlgorithmException e) {
- throw new RuntimeException("当å‰Java环境ä¸æ”¯æŒSHA256withRSA", e);
- } catch (SignatureException e) {
- throw new RuntimeException("ç¾å计算失败", e);
- } catch (InvalidKeyException e) {
- throw new RuntimeException("æ— æ•ˆçš„ç§é’¥", e);
- }
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/Signer.java b/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/Signer.java
deleted file mode 100644
index ef8647c..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/Signer.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cn.wisenergy.service.httpClient.auth;
-
-public interface Signer {
- SignatureResult sign(byte[] message);
-
- class SignatureResult {
- String sign;
- String certificateSerialNumber;
-
- public SignatureResult(String sign, String serialNumber) {
- this.sign = sign;
- this.certificateSerialNumber = serialNumber;
- }
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/Verifier.java b/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/Verifier.java
deleted file mode 100644
index 4e315d5..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/Verifier.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package cn.wisenergy.service.httpClient.auth;
-
-import java.security.cert.X509Certificate;
-
-/**
- * @author 86187
- */
-public interface Verifier {
-
- boolean verify(String serialNumber, byte[] message, String signature);
-
- X509Certificate getValidCertificate();
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/WechatPay2Credentials.java b/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/WechatPay2Credentials.java
deleted file mode 100644
index 9b7a6e3..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/WechatPay2Credentials.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package cn.wisenergy.service.httpClient.auth;
-
-import cn.wisenergy.service.httpClient.Credentials;
-import cn.wisenergy.service.httpClient.WechatPayUploadHttpPost;
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.client.methods.HttpRequestWrapper;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.security.SecureRandom;
-
-public class WechatPay2Credentials implements Credentials {
- private static final Logger log = LoggerFactory.getLogger(WechatPay2Credentials.class);
-
- private static final String SYMBOLS =
- "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
- private static final SecureRandom RANDOM = new SecureRandom();
- protected String merchantId;
- protected Signer signer;
-
- public WechatPay2Credentials(String merchantId, Signer signer) {
- this.merchantId = merchantId;
- this.signer = signer;
- }
-
- public String getMerchantId() {
- return merchantId;
- }
-
- protected long generateTimestamp() {
- return System.currentTimeMillis() / 1000;
- }
-
- protected String generateNonceStr() {
- char[] nonceChars = new char[32];
- for (int index = 0; index < nonceChars.length; ++index) {
- nonceChars[index] = SYMBOLS.charAt(RANDOM.nextInt(SYMBOLS.length()));
- }
- return new String(nonceChars);
- }
-
- @Override
- public final String getSchema() {
- return "WECHATPAY2-SHA256-RSA2048";
- }
-
- @Override
- public final String getToken(HttpRequestWrapper request) throws IOException {
- String nonceStr = generateNonceStr();
- long timestamp = generateTimestamp();
-
- String message = buildMessage(nonceStr, timestamp, request);
- log.debug("authorization message=[{}]", message);
-
- Signer.SignatureResult signature = signer.sign(message.getBytes(StandardCharsets.UTF_8));
-
- String token = "mchid=\"" + getMerchantId() + "\","
- + "nonce_str=\"" + nonceStr + "\","
- + "timestamp=\"" + timestamp + "\","
- + "serial_no=\"" + signature.certificateSerialNumber + "\","
- + "signature=\"" + signature.sign + "\"";
- log.debug("authorization token=[{}]", token);
-
- return token;
- }
-
- protected final String buildMessage(String nonce, long timestamp, HttpRequestWrapper request)
- throws IOException {
- URI uri = request.getURI();
- String canonicalUrl = uri.getRawPath();
- if (uri.getQuery() != null) {
- canonicalUrl += "?" + uri.getRawQuery();
- }
-
- String body = "";
- // PATCH,POST,PUT
- if (request.getOriginal() instanceof WechatPayUploadHttpPost) {
- body = ((WechatPayUploadHttpPost) request.getOriginal()).getMeta();
- } else if (request instanceof HttpEntityEnclosingRequest) {
- body = EntityUtils.toString(((HttpEntityEnclosingRequest) request).getEntity());
- }
-
- return request.getRequestLine().getMethod() + "\n"
- + canonicalUrl + "\n"
- + timestamp + "\n"
- + nonce + "\n"
- + body + "\n";
- }
-
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/WechatPay2Validator.java b/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/WechatPay2Validator.java
deleted file mode 100644
index 8c7b73f..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/auth/WechatPay2Validator.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package cn.wisenergy.service.httpClient.auth;
-
-import cn.wisenergy.service.httpClient.Validator;
-import org.apache.http.Header;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.time.DateTimeException;
-import java.time.Duration;
-import java.time.Instant;
-
-/**
- * @author 86187
- */
-public class WechatPay2Validator implements Validator {
-
- private static final Logger log = LoggerFactory.getLogger(WechatPay2Validator.class);
-
- private Verifier verifier;
-
- public WechatPay2Validator(Verifier verifier) {
- this.verifier = verifier;
- }
-
- static RuntimeException parameterError(String message, Object... args) {
- message = String.format(message, args);
- return new IllegalArgumentException("parameter error: " + message);
- }
-
- static RuntimeException verifyFail(String message, Object... args) {
- message = String.format(message, args);
- return new IllegalArgumentException("signature verify fail: " + message);
- }
-
- @Override
- public final boolean validate(CloseableHttpResponse response) throws IOException {
- try {
- validateParameters(response);
-
- String message = buildMessage(response);
- String serial = response.getFirstHeader("Wechatpay-Serial").getValue();
- String signature = response.getFirstHeader("Wechatpay-Signature").getValue();
-
- if (!verifier.verify(serial, message.getBytes("utf-8"), signature)) {
- throw verifyFail("serial=[%s] message=[%s] sign=[%s], request-id=[%s]",
- serial, message, signature,
- response.getFirstHeader("Request-ID").getValue());
- }
- } catch (IllegalArgumentException e) {
- log.warn(e.getMessage());
- return false;
- }
-
- return true;
- }
-
- protected final void validateParameters(CloseableHttpResponse response) {
- String requestId;
- if (!response.containsHeader("Request-ID")) {
- throw parameterError("empty Request-ID");
- } else {
- requestId = response.getFirstHeader("Request-ID").getValue();
- }
-
- if (!response.containsHeader("Wechatpay-Serial")) {
- throw parameterError("empty Wechatpay-Serial, request-id=[%s]", requestId);
- } else if (!response.containsHeader("Wechatpay-Signature")){
- throw parameterError("empty Wechatpay-Signature, request-id=[%s]", requestId);
- } else if (!response.containsHeader("Wechatpay-Timestamp")) {
- throw parameterError("empty Wechatpay-Timestamp, request-id=[%s]", requestId);
- } else if (!response.containsHeader("Wechatpay-Nonce")) {
- throw parameterError("empty Wechatpay-Nonce, request-id=[%s]", requestId);
- } else {
- Header timestamp = response.getFirstHeader("Wechatpay-Timestamp");
- try {
- Instant instant = Instant.ofEpochSecond(Long.parseLong(timestamp.getValue()));
- // æ‹’ç»5分钟之外的应ç”
- if (Duration.between(instant, Instant.now()).abs().toMinutes() >= 5) {
- throw parameterError("timestamp=[%s] expires, request-id=[%s]",
- timestamp.getValue(), requestId);
- }
- } catch (DateTimeException | NumberFormatException e) {
- throw parameterError("invalid timestamp=[%s], request-id=[%s]",
- timestamp.getValue(), requestId);
- }
- }
- }
-
- protected final String buildMessage(CloseableHttpResponse response) throws IOException {
- String timestamp = response.getFirstHeader("Wechatpay-Timestamp").getValue();
- String nonce = response.getFirstHeader("Wechatpay-Nonce").getValue();
-
- String body = getResponseBody(response);
- return timestamp + "\n"
- + nonce + "\n"
- + body + "\n";
- }
-
- protected final String getResponseBody(CloseableHttpResponse response) throws IOException {
- HttpEntity entity = response.getEntity();
-
- return (entity != null && entity.isRepeatable()) ? EntityUtils.toString(entity) : "";
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/util/AesUtil.java b/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/util/AesUtil.java
deleted file mode 100644
index 5a66f8d..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/util/AesUtil.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package cn.wisenergy.service.httpClient.util;
-
-import javax.crypto.Cipher;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.spec.GCMParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Base64;
-
-public class AesUtil {
-
- static final int KEY_LENGTH_BYTE = 32;
- static final int TAG_LENGTH_BIT = 128;
- private final byte[] aesKey;
-
- public AesUtil(byte[] key) {
- if (key.length != KEY_LENGTH_BYTE) {
- throw new IllegalArgumentException("æ— æ•ˆçš„ApiV3Key，长度必须为32个å—节");
- }
- this.aesKey = key;
- }
-
- public String decryptToString(byte[] associatedData, byte[] nonce, String ciphertext)
- throws GeneralSecurityException, IOException {
- try {
- Cipher cipher = Cipher.getInstance("AES/GCM/NoPadding");
-
- SecretKeySpec key = new SecretKeySpec(aesKey, "AES");
- GCMParameterSpec spec = new GCMParameterSpec(TAG_LENGTH_BIT, nonce);
-
- cipher.init(Cipher.DECRYPT_MODE, key, spec);
- cipher.updateAAD(associatedData);
-
- return new String(cipher.doFinal(Base64.getDecoder().decode(ciphertext)), "utf-8");
- } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
- throw new IllegalStateException(e);
- } catch (InvalidKeyException | InvalidAlgorithmParameterException e) {
- throw new IllegalArgumentException(e);
- }
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/util/PemUtil.java b/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/util/PemUtil.java
deleted file mode 100644
index c35cf4e..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/util/PemUtil.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package cn.wisenergy.service.httpClient.util;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.cert.*;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Base64;
-
-public class PemUtil {
-
- public static PrivateKey loadPrivateKey(InputStream inputStream) {
- try {
- ByteArrayOutputStream array = new ByteArrayOutputStream();
- byte[] buffer = new byte[1024];
- int length;
- while ((length = inputStream.read(buffer)) != -1) {
- array.write(buffer, 0, length);
- }
-
- String privateKey = array.toString("utf-8")
- .replace("-----BEGIN PRIVATE KEY-----", "")
- .replace("-----END PRIVATE KEY-----", "")
- .replaceAll("\\s+", "");
-
- KeyFactory kf = KeyFactory.getInstance("RSA");
- return kf.generatePrivate(
- new PKCS8EncodedKeySpec(Base64.getDecoder().decode(privateKey)));
- } catch (NoSuchAlgorithmException e) {
- throw new RuntimeException("当å‰Java环境ä¸æ”¯æŒRSA", e);
- } catch (InvalidKeySpecException e) {
- throw new RuntimeException("æ— æ•ˆçš„å¯†é’¥æ ¼å¼");
- } catch (IOException e) {
- throw new RuntimeException("æ— æ•ˆçš„å¯†é’¥");
- }
- }
-
- public static X509Certificate loadCertificate(InputStream inputStream) {
- try {
- CertificateFactory cf = CertificateFactory.getInstance("X509");
- X509Certificate cert = (X509Certificate) cf.generateCertificate(inputStream);
- cert.checkValidity();
- return cert;
- } catch (CertificateExpiredException e) {
- throw new RuntimeException("è¯ä¹¦å·²è¿‡æœŸ", e);
- } catch (CertificateNotYetValidException e) {
- throw new RuntimeException("è¯ä¹¦å°šæœªç”Ÿæ•ˆ", e);
- } catch (CertificateException e) {
- throw new RuntimeException("æ— æ•ˆçš„è¯ä¹¦", e);
- }
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/util/RsaCryptoUtil.java b/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/util/RsaCryptoUtil.java
deleted file mode 100644
index cb29151..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/httpClient/util/RsaCryptoUtil.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package cn.wisenergy.service.httpClient.util;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import java.nio.charset.StandardCharsets;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
-import java.util.Base64;
-
-public class RsaCryptoUtil {
-
- public static String encryptOAEP(String message, X509Certificate certificate)
- throws IllegalBlockSizeException {
- try {
- Cipher cipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-1AndMGF1Padding");
- cipher.init(Cipher.ENCRYPT_MODE, certificate.getPublicKey());
-
- byte[] data = message.getBytes(StandardCharsets.UTF_8);
- byte[] ciphertext = cipher.doFinal(data);
- return Base64.getEncoder().encodeToString(ciphertext);
- } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
- throw new RuntimeException("当å‰Java环境ä¸æ”¯æŒRSA v1.5/OAEP", e);
- } catch (InvalidKeyException e) {
- throw new IllegalArgumentException("æ— æ•ˆçš„è¯ä¹¦", e);
- } catch (IllegalBlockSizeException | BadPaddingException e) {
- throw new IllegalBlockSizeException("åŠ å¯†åŽŸä¸²çš„é•¿åº¦ä¸èƒ½è¶…过214å—节");
- }
- }
-
- public static String decryptOAEP(String ciphertext, PrivateKey privateKey)
- throws BadPaddingException {
- try {
- Cipher cipher = Cipher.getInstance("RSA/ECB/OAEPWithSHA-1AndMGF1Padding");
- cipher.init(Cipher.DECRYPT_MODE, privateKey);
-
- byte[] data = Base64.getDecoder().decode(ciphertext);
- return new String(cipher.doFinal(data), StandardCharsets.UTF_8);
- } catch (NoSuchPaddingException | NoSuchAlgorithmException e) {
- throw new RuntimeException("当å‰Java环境ä¸æ”¯æŒRSA v1.5/OAEP", e);
- } catch (InvalidKeyException e) {
- throw new IllegalArgumentException("æ— æ•ˆçš„ç§é’¥", e);
- } catch (BadPaddingException | IllegalBlockSizeException e) {
- throw new BadPaddingException("解密失败");
- }
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/util/SignDemo.java b/wisenergy-service/src/main/java/cn/wisenergy/service/util/SignDemo.java
deleted file mode 100644
index 1d1d1e7..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/util/SignDemo.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package cn.wisenergy.service.util;
-
-import cn.wisenergy.model.dto.PayPageDto;
-import cn.wisenergy.service.wxpay.WxCommon;
-import com.alibaba.fastjson.JSONObject;
-import okhttp3.HttpUrl;
-
-import java.io.UnsupportedEncodingException;
-import java.security.*;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Base64;
-import java.util.UUID;
-
-/**
- * @author 86187
- */
-public class SignDemo {
-
- public static String getToken(String method, HttpUrl url, String body,String nonceStr,long timestamp) throws UnsupportedEncodingException, SignatureException, NoSuchAlgorithmException, InvalidKeyException, InvalidKeySpecException {
- String message = buildMessage(method, url, timestamp, nonceStr, body);
- String signature = sign(message.getBytes("utf-8"));
-
- return "mchid=\"" + WxCommon.MCHID + "\","
- + "nonce_str=\"" + nonceStr + "\","
- + "timestamp=\"" + timestamp + "\","
- + "serial_no=\"" + WxCommon.SERIAL_NO + "\","
- + "signature=\"" + signature + "\"";
- }
-
- public static String sign(byte[] message) throws NoSuchAlgorithmException, SignatureException, InvalidKeyException, InvalidKeySpecException {
- Signature sign = Signature.getInstance("SHA256withRSA");
- KeyFactory factory = KeyFactory.getInstance("RSA");
-
-
- PrivateKey privateKey = factory.generatePrivate(new PKCS8EncodedKeySpec(Base64.getDecoder().decode(WxCommon.SECRET_KEY)));
- sign.initSign(privateKey);
- sign.update(message);
-
- return Base64.getEncoder().encodeToString(sign.sign());
- }
-
- public static String buildMessage(String method, HttpUrl url, long timestamp, String nonceStr, String body) {
- String canonicalUrl = url.encodedPath();
- if (url.encodedQuery() != null) {
- canonicalUrl += "?" + url.encodedQuery();
- }
-
- return method + "\n"
- + canonicalUrl + "\n"
- + timestamp + "\n"
- + nonceStr + "\n"
- + body + "\n";
- }
-
-// public static void main(String[] args) throws NoSuchAlgorithmException, SignatureException, InvalidKeyException, UnsupportedEncodingException, InvalidKeySpecException {
-// String method = "POST";
-// HttpUrl httpurl = HttpUrl.parse("https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi");
-// long timestamp = System.currentTimeMillis() / 1000;
-// String nonceStr = UUID.randomUUID().toString().replace("-", "");
-// String url = "v3/pay/transactions/native";
-// String tradeNo = "21" + System.currentTimeMillis();
-// PayPageDto payPageDto = new PayPageDto();
-// payPageDto.setTotal(100);
-//
-// //æž„é€ ç¾åbody
-// JSONObject jsonObject = new JSONObject();
-// jsonObject.put("appid", WxCommon.APP_ID);
-// jsonObject.put("mchid", WxCommon.MCHID);
-// jsonObject.put("timestamp", timestamp);
-// jsonObject.put("nonce_str", nonceStr);
-// jsonObject.put("url", url);
-// jsonObject.put("method", method);
-// jsonObject.put("description", "充值");
-// jsonObject.put("out_trade_no", tradeNo);
-// jsonObject.put("notify_url", WxCommon.NOTIFY_URL);
-// jsonObject.put("amount", payPageDto);
-// String sign = getToken(method, httpurl, jsonObject.toJSONString());
-// System.out.println("ç¾å：" + sign);
-// }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/util/WxPayUtil.java b/wisenergy-service/src/main/java/cn/wisenergy/service/util/WxPayUtil.java
deleted file mode 100644
index 7192b19..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/util/WxPayUtil.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package cn.wisenergy.service.util;
-
-import cn.wisenergy.service.httpClient.WechatPayHttpClientBuilder;
-import cn.wisenergy.service.httpClient.auth.AutoUpdateCertificatesVerifier;
-import cn.wisenergy.service.httpClient.auth.PrivateKeySigner;
-import cn.wisenergy.service.httpClient.auth.WechatPay2Credentials;
-import cn.wisenergy.service.httpClient.auth.WechatPay2Validator;
-import cn.wisenergy.service.httpClient.util.PemUtil;
-import cn.wisenergy.service.wxpay.WxCommon;
-import okhttp3.HttpUrl;
-import org.apache.http.HttpEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.util.EntityUtils;
-import org.junit.After;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.SignatureException;
-import java.security.spec.InvalidKeySpecException;
-import java.util.UUID;
-
-public class WxPayUtil {
-
-
- /**
- * 商户å·
- */
- private static String mchId = WxCommon.MCHID;
- // 商户è¯ä¹¦åºåˆ—å·
- private static String mchSerialNo = WxCommon.SERIAL_NO;
- // api密钥
- private static String apiV3Key = WxCommon.SECRET_KEY;
-
- // ä½ çš„å•†æˆ·ç§é’¥
- private static String privateKey = "-----BEGIN PRIVATE KEY-----\n" +WxCommon.SECRET_KEY
- + "-----END PRIVATE KEY-----\n";
-
- private static CloseableHttpClient httpClient;
- private static AutoUpdateCertificatesVerifier verifier;
-
-
- static {
- PrivateKey merchantPrivateKey = null;
- try {
- merchantPrivateKey = PemUtil.loadPrivateKey(
- new ByteArrayInputStream(privateKey.getBytes("utf-8")));
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
-
- //使用自动更新的ç¾å验è¯å™¨ï¼Œä¸éœ€è¦ä¼ å…¥è¯ä¹¦
- try {
- verifier = new AutoUpdateCertificatesVerifier(
- new WechatPay2Credentials(mchId, new PrivateKeySigner(mchSerialNo, merchantPrivateKey)),
- apiV3Key.getBytes("utf-8"));
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
-
- httpClient = WechatPayHttpClientBuilder.create()
- .withMerchant(mchId, mchSerialNo, merchantPrivateKey)
- .withValidator(new WechatPay2Validator(verifier))
- .build();
- }
-
- @After
- public void after() throws IOException {
- httpClient.close();
- }
-
- public static void main(String[] args) throws IOException, NoSuchAlgorithmException, SignatureException, InvalidKeySpecException, InvalidKeyException {
- HttpPost httpPost = new HttpPost(WxCommon.WX_PAY_URL);
-
- long timestamp = System.currentTimeMillis() / 1000;
- String nonceStr = UUID.randomUUID().toString().replace("-", "");
- String method = "POST";
- String tradeNo = "21" + System.currentTimeMillis();
- HttpUrl httpurl = HttpUrl.parse(WxCommon.WX_PAY_URL);
-
- // 请求bodyå‚æ•°
- String reqdata = "{"
- + "\"time_expire\":\"2021-02-07T10:34:56+08:00\","
- + "\"amount\": {"
- + "\"total\":100,"
- + "\"currency\":\"CNY\""
- + "},"
- + "\"mchid\":\"" + WxCommon.MCHID + "\","
- + "\"description\":\"Image形象店-深圳腾大-QQ公仔\","
- + "\"notify_url\":\"" + WxCommon.NOTIFY_URL + "\","
- + "\"out_trade_no\":\"" + tradeNo + "\","
- + "\"goods_tag\":\"WXG\","
- + "\"appid\":\"" + WxCommon.APP_ID + "\","
-// + "\"attach\":\"自定义数æ®è¯´æ˜Ž\","
-// + "\"detail\": {"
-// + "\"invoice_id\":\"wx123\","
-// + "\"goods_detail\": ["
-// + "{"
-// + "\"goods_name\":\"iPhoneX 256G\","
-// + "\"wechatpay_goods_id\":\"1001\","
-// + "\"quantity\":1,"
-// + "\"merchant_goods_id\":\"商å“ç¼–ç \","
-// + "\"unit_price\":828800"
-// + "},"
-// + "{"
-// + "\"goods_name\":\"iPhoneX 256G\","
-// + "\"wechatpay_goods_id\":\"1001\","
-// + "\"quantity\":1,"
-// + "\"merchant_goods_id\":\"商å“ç¼–ç \","
-// + "\"unit_price\":828800"
-// + "}"
-// + "],"
-// + "\"cost_price\":608800"
-// + "},"
-// + "\"scene_info\": {"
-// + "\"store_info\": {"
-// + "\"address\":\"广东çœæ·±åœ³å¸‚å—山区科技ä¸ä¸€é“10000å·\","
-// + "\"area_code\":\"440305\","
-// + "\"name\":\"腾讯大厦分店\","
-// + "\"id\":\"0001\""
-// + "},"
-// + "\"device_id\":\"013467007045764\","
-// + "\"payer_client_ip\":\"14.23.150.211\""
-// + "}"
- + "}";
- StringEntity reqEntity = new StringEntity(
- reqdata, ContentType.create("application/json", "utf-8"));
- httpPost.setEntity(reqEntity);
- httpPost.addHeader("Accept", "application/json");
-
-// //æž„é€ ç¾åå‚æ•°
-// //æž„é€ ç¾åå‚æ•°
-// JSONObject jsonObject = new JSONObject();
-// jsonObject.put("appid", WxCommon.APP_ID);
-// jsonObject.put("mchid", WxCommon.MCHID);
-// jsonObject.put("description", "充值");
-// jsonObject.put("out_trade_no", tradeNo);
-// jsonObject.put("notify_url", WxCommon.NOTIFY_URL);
-// PayPageDto payPageDto=new PayPageDto();
-// payPageDto.setTotal(100);
-// jsonObject.put("amount", payPageDto);
-// String token = SignDemo.getToken(method, httpurl, jsonObject.toJSONString(), nonceStr, timestamp);
-// httpPost.setHeader("Authorization", "WECHATPAY2-SHA256-RSA2048" + " " + token);
-
- //完æˆç¾å并执行请求
- CloseableHttpResponse response = httpClient.execute(httpPost);
-
-
- try {
- if (response.getStatusLine().getStatusCode() == 200) {
- HttpEntity httpEntity = response.getEntity();
- String content = EntityUtils.toString(httpEntity, "utf8");
- System.out.println(content.length());
- }
- } catch (IOException e) {
- e.printStackTrace();
- }finally {
- response.close();
- }
- }
-}
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/wxpay/WxCommon.java b/wisenergy-service/src/main/java/cn/wisenergy/service/wxpay/WxCommon.java
deleted file mode 100644
index 5f62917..0000000
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/wxpay/WxCommon.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package cn.wisenergy.service.wxpay;
-
-/**
-*@ Description: 微信支付公共å‚æ•°
-*@ Author : 86187
-*@ Date : 2021/2/5 15:04
- * @author 86187
- */
-public class WxCommon {
-
- public static final String APP_ID = "wx7d8f4502a2bfa865";
-
- public static final String MCHID = "1606042985";
-
- public static final String NOTIFY_URL = "http://www.baodu.com";
-
- public static final String WX_PAY_URL = "https://api.mch.weixin.qq.com/v3/pay/transactions/native";
-
- public static final String WX_PAY_QUERY = "https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/";
-
-
- public static final String SECRET_KEY = "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDhGq+iGQueP8EU" +
- "3qj0T0Otnha0XboVcgmeDkgbe08H54WiF9d3R4aLAo+wAkAj/R7nRw2yWeaaMEgb" +
- "ZvUz03IioVKwLhaMVEtwE5sNFCMGDDh9jGjm66j+BYgVk02P5hUAcYLcJYeo9iHA" +
- "cFQ1YA4r64OLD0/JWqGjpHmKJ9F3YhZjBO8ETm6grnIJyqt9ABCPBQF7fRS/ZcbC" +
- "J8PUoEZA1eGi60FEgzeJ2stjzXZ6629INnRQanNuPegcH26oSQmph+z33bLUhXDb" +
- "lt6exClPKucU5FZoh69dMsD1RLqNeBTUG8JCvvEWnBH3RaHKRsv/nezQHS+5euw3" +
- "AJnTNPl5AgMBAAECggEAR9PsFx1Gx8gwJCioYMyqG8xGEmeV6SHqT7Te7WX7YdpO" +
- "mdphtn3sQI8gqlkNfm5WXhYeGLr3Clw9pgDEXTUrRkGT0QPjzgNXzvtyjknOoy9j" +
- "FyymjIjF88hwE/Jc3X3dVbbiurx+/TsMqgst05pC62DLKKRKIUX6Le1dmuf5vs3E" +
- "gjDZR+Z86H8jNm0Qg5OXwbUs7uIaMKun6QUGqk0YfdeIQdMXerKp48HLSI+j+bMS" +
- "pkE5wt4MSk3G90qHzxLgO7N2FuUFJunl8t0jrDIg7eG8qDPT2rO7tFP8zvikJbGz" +
- "zNfI9l6CIXnPXFJtoAFRt8XBG4sNF5ncSdJbDTpXAQKBgQDySdXYOkMCHxFSKAG/" +
- "pCyFwCMozfvKL2HShS/lVc7wwVG/yvPeqpKFvq7+xob6R20rbJEzgSBSlOwpol9s" +
- "f+fuduUPSzLK/Dz+yL6o3CrX18g2SSgZSMbqN1KDmoF7D3GO81AmdBs/FQkg8wAa" +
- "oWSI8K5QUuw0nfMMWZZ4bS7VLQKBgQDt1+TpC3euInhakwrYDnGqRy7W3YEuILDN" +
- "Adp+IujN0sKKIH6dx9hZxSbqEE/t4uev3Pga9P8e+91h9rIc38b3Xw2Xn2iN/bSa" +
- "dk7ThAu9leiJG9bs1gN7mT8Gq8kV/RKM8npAjht2dlx61T3Eb80WSf8sC3BWJ2TE" +
- "M88jjuT8/QKBgCOPqL5i1sDx9GXdj1wkaZB8Ae0URpeHWtE+UShU7tmxViFTVXXi" +
- "DT1qHl8wnlEPuLs95RXtJuRYDU2TEnRnVZBPjREwlVTrrrwqlKlOH0+s0Sr+k88a" +
- "Om/YDNlaDRUV0DIODj6GnhUlLkDSyboe5BWhVcReV2Llp+2xHH+ybsRFAoGBAK6C" +
- "2Cy+A0Q7en9KoIxCnNfJfu6ce+oyhkcFcyFVz+clGyRqDz0Jow7K/3CCI4NyF3kL" +
- "8uckmARN3PPCJJHXB4/9qGV1yytT2a3z3IaJvmuOkJ35VUtVBB0uJfZpGRQPKgtM" +
- "5rJzEmdrFRPzXmzBc4NFK/tPMU+le+QR94wpjo6pAoGBAOmilsvFp4UcuAeOt50q" +
- "4FC2ApgHw4f95nCi/rtUbuC9AwiFD8nBGZTLFO1lxoms52uJ9RWYLBpY4JmWo1VG" +
- "IaU0+nKTljLCQZNHqA87bkG4lQIKsZjNJ47PW1iUdNtXJ58aw/qnj2ldIGIcZQQY" +
- "52pD2/10mSJy5oxiqdMccmbs";
-
- /**
- * è¯ä¹¦åºåˆ—å·
- */
- public static final String SERIAL_NO = "5A886697B1EA67984766E953683E04D2DC96482C";
-
- /**
- * 认è¯ç±»åž‹
- */
- public static final String SCHEMA = "WECHATPAY2-SHA256-RSA2048";
-
- /**
- * 认è¯ç±»åž‹
- */
- public static final String PRIVATE_KEY = "efef4a06a1654e0f78d113377ea37aed";
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/BannerController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/BannerController.java
deleted file mode 100644
index 1f055e3..0000000
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/BannerController.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package cn.wisenergy.web.admin.controller.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.Banner;
-import cn.wisenergy.model.dto.BannerDto;
-import cn.wisenergy.model.vo.AdvertisingQueryVo;
-import cn.wisenergy.service.app.BannerService;
-import com.github.pagehelper.PageInfo;
-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.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * @author 86187
- * @ Description: 管ç†ç«¯-广告管ç†
- * @ Author : 86187
- * @ Date : 2021/1/14 10:43
- */
-@RestController
-@Api(tags = "管ç†ç«¯-广告管ç†")
-@RequestMapping("/banner")
-@Slf4j
-public class BannerController {
- @Autowired
- private BannerService bannerService;
-
- @ApiOperation(value = "å¹¿å‘Šæ·»åŠ ", notes = "å¹¿å‘Šæ·»åŠ ", httpMethod = "POST")
- @ApiImplicitParam(name = "advertising", value = "广告数æ®", dataType = "Banner")
- @PostMapping("/add")
- public R<Boolean> add(@RequestBody Banner advertising) {
- log.info("BannerController[].add[].input.param:advertising:" + advertising);
- return bannerService.add(advertising);
- }
-
- @ApiOperation(value = "广告查询", notes = "广告查询", httpMethod = "POST")
- @ApiImplicitParam(name = "advertisingQueryVo", value = "分页数æ®", dataType = "AdvertisingQueryVo")
- @PostMapping("/getList")
- public R<PageInfo<BannerDto>> getList(@RequestBody AdvertisingQueryVo advertisingQueryVo) {
- log.info("BannerController[].add[].input.param:advertisingQueryVo:" + advertisingQueryVo);
- return bannerService.getList(advertisingQueryVo);
- }
-
- @ApiOperation(value = "查看详情", notes = "查看详情", httpMethod = "GET")
- @ApiImplicitParam(name = "id", value = "广告id", dataType = "int")
- @GetMapping("/getById")
- public R<Banner> getById(Integer id) {
- log.info("BannerController[].getById[].input.param:id" + id);
- return bannerService.getById(id);
-
- }
-
- @ApiOperation(value = "广告投放", notes = "广告投放", httpMethod = "GET")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "广告id", dataType = "int", required = true),
- @ApiImplicitParam(name = "status", value = "广告状æ€:0：暂åœä¸ 1：投放ä¸", dataType = "int", required = true)
- })
- @GetMapping("/putIn")
- public R<Boolean> editStatus(Integer id, Integer status) {
- log.info("BannerController[]editStatus[]input.param:id,status{}" + id, status);
- return bannerService.editStatus(id, status);
- }
-
- @ApiOperation(value = "广告编辑", notes = "广告编辑", httpMethod = "POST")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "advertising", value = "广告修改数æ®", dataType = "Banner"),
- })
- @PostMapping("/edit")
- public R<Boolean> edit(@RequestBody Banner advertising) {
- log.info("BannerController[].edit[].input.param:advertising:" + advertising);
- return bannerService.edit(advertising);
- }
-
-
- @ApiOperation(value = "获å–顶部/底部广告", notes = "获å–顶部/底部广告", httpMethod = "GET")
- @ApiImplicitParam(name = "type", value = "广告类型：1：顶部 2：底部", dataType = "int", required = true)
- @GetMapping("/getBanners")
- public R<List<Banner>> getBanners(Integer type) {
- log.info("BannerController[]getBanners[]input.param.type:" + type);
- if (null == type) {
- return R.error("å…¥å‚ä¸èƒ½ä¸ºç©º!");
- }
- return bannerService.getTopBanners(type);
- }
-
- @ApiOperation(value = "åˆ é™¤å¹¿å‘Š", notes = "åˆ é™¤å¹¿å‘Š", httpMethod = "GET")
- @ApiImplicitParam(name = "id", value = "广告id", dataType = "int", required = true)
- @GetMapping("/delBanner")
- public R<Boolean> delBanner(Integer id) {
- log.info("BannerController[]delBanner[]input.param.id:" + id);
- if (null == id) {
- return R.error("å…¥å‚ä¸èƒ½ä¸ºç©º!");
- }
- return bannerService.delBanner(id);
- }
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/FileUploadController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/FileUploadController.java
deleted file mode 100644
index f13985c..0000000
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/FileUploadController.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package cn.wisenergy.web.admin.controller.app;
-
-import cn.wisenergy.common.utils.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.IOException;
-import java.util.UUID;
-
-/**
- * @author 86187
- * @ Description:
- * @ Author : 86187
- * @ Date : 2021/2/3 17:05
- */
-@Api(tags = "å›¾ç‰‡ä¸Šä¼ ")
-@RestController
-@RequestMapping("/pic")
-@Slf4j
-public class FileUploadController {
-
- /**
- * 请求 url ä¸çš„资æºæ˜ 射，ä¸æŽ¨è写æ»åœ¨ä»£ç ä¸ï¼Œæœ€å¥½æä¾›å¯é…置，如 /upload_flowChart/**
- */
- @Value("${uploadFile.resourceHandler}")
- private String resourceHandler;
-
- /**
- * ä¸Šä¼ æ–‡ä»¶ä¿å˜çš„本地目录，使用@Value获å–全局é…置文件ä¸é…置的属性值，如 D:/java/upload_flowChart/
- */
- @Value("${uploadFile.location}")
- private String uploadImagesLocation;
-
- /**
- * å…è®¸ä¸Šä¼ çš„æ ¼å¼
- */
- private static final String[] IMAGE_TYPE = new String[]{".bmp", ".jpg", ".jpeg", ".gif", ".png", ".xlsx", ".xls"};
-
- @ApiOperation(value = "æ–‡ä»¶ä¸Šä¼ ", notes = "æ–‡ä»¶ä¸Šä¼ ")
- @PostMapping(value = "/upload", headers = "content-type=multipart/form-data")
- public R file(
- @ApiParam(required = true, value = "ä¸Šä¼ æ–‡ä»¶")
- @RequestParam("file") MultipartFile file,
- HttpServletRequest request) {
-
- boolean isLegal = true;
-
- if (file.isEmpty()) {
- // ä¸Šä¼ æ–‡ä»¶ä¸ºç©º
- return R.error("ä¸Šä¼ æ–‡ä»¶ä¸èƒ½ä¸ºç©º");
- }
- for (String type : IMAGE_TYPE) {
- if (StringUtils.endsWithIgnoreCase(file.getOriginalFilename(), type)) {
- isLegal = false;
- break;
- }
- }
- if (isLegal) {
- return R.error("ä¸Šä¼ æ–‡ä»¶ç±»åž‹ä¸ç¬¦åˆ");
- }
- File folder = new File(uploadImagesLocation);
- if (!folder.exists()) {
- folder.mkdirs();
- }
- String oldName = file.getOriginalFilename();
- String newName = UUID.randomUUID().toString() + oldName.substring(oldName.lastIndexOf("."));
- try {
- file.transferTo(new File(folder, newName));
- String url = "/upload_flowChart/" + newName;
- return R.ok(200, url);
- } catch (IOException e) {
- e.printStackTrace();
- }
- return R.error("ä¸Šä¼ æ–‡ä»¶å¤±è´¥ï¼");
- }
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/GraduationController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/GraduationController.java
deleted file mode 100644
index 777749b..0000000
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/GraduationController.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package cn.wisenergy.web.admin.controller.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.Graduation;
-import cn.wisenergy.service.app.GraduationSerivce;
-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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@Api(tags = "æ¯•ä¸šé™¢æ ¡æŸ¥è¯¢")
-@RestController
-@RequestMapping("/school")
-@Slf4j
-public class GraduationController {
-
- @Autowired
- private GraduationSerivce graduationSerivce;
-
- @ApiOperation(value = "æ¯•ä¸šé™¢æ ¡æŸ¥è¯¢", notes = "æ¯•ä¸šé™¢æ ¡æŸ¥è¯¢",httpMethod = "GET")
- @GetMapping(value = "/getList")
- public R<List<Graduation>> getSchool(){
- return graduationSerivce.getList();
- }
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PayController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PayController.java
deleted file mode 100644
index 43eccc6..0000000
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PayController.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package cn.wisenergy.web.admin.controller.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.dto.PayPageDto;
-import cn.wisenergy.model.dto.PayQueryDto;
-import cn.wisenergy.service.app.WxPayService;
-import cn.wisenergy.service.common.Common;
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.AlipayClient;
-import com.alipay.api.DefaultAlipayClient;
-import com.alipay.api.request.AlipayTradePagePayRequest;
-import com.alipay.api.request.AlipayTradeQueryRequest;
-import com.alipay.api.response.AlipayTradeQueryResponse;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.crypto.IllegalBlockSizeException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SignatureException;
-import java.security.spec.InvalidKeySpecException;
-
-/**
- * @author 86187
- * @ Description:
- * @ Author : 86187
- * @ Date : 2021/2/1 10:05
- */
-@RestController
-@Api(tags = "PC-支付接å£")
-@RequestMapping("/pay")
-@Slf4j
-public class PayController {
- private static final String CHARSET = "UTF-8";
-
- @Autowired
- private WxPayService wxPayService;
-
- @ApiOperation(value = "PC支付å®-支付接å£", notes = "PC支付å®-支付接å£", httpMethod = "POST")
- @ApiImplicitParam(name = "payPageDto", value = "å‚æ•°", dataType = "PayPageDto")
- @PostMapping("/page")
- public R<String> doPost(@RequestBody PayPageDto payPageDto, HttpServletRequest request, HttpServletResponse httpResponse) throws IOException, AlipayApiException {
-
- if (null == payPageDto || null == payPageDto.getTotal()) {
- return R.error("人å‚ä¸èƒ½ä¸ºç©º!");
- }
-
- AlipayClient alipayClient = new DefaultAlipayClient(Common.PAY_URL_CS, Common.APP_ID_CS, Common.PRIVATE_KEY_CS, "json", "GBK", Common.ALIPAY_PUBLIC_KEY_CS, "RSA2");
- AlipayTradePagePayRequest alipayRequest = new AlipayTradePagePayRequest();
- String tradeNo = "21" + System.currentTimeMillis();
-
- //创建API对应的request
- alipayRequest.setReturnUrl("http://domain.com/CallBack/return_url.jsp");
- //在公共å‚æ•°ä¸è®¾ç½®å›žè·³å’Œé€šçŸ¥åœ°å€
- alipayRequest.setNotifyUrl("http://domain.com/CallBack/notify_url.jsp");
- alipayRequest.setBizContent("{" +
- "\"out_trade_no\":\"" + tradeNo + "\"," +
- "\"product_code\":\"FAST_INSTANT_TRADE_PAY\"," +
- "\"total_amount\":" + payPageDto.getTotal() + "," +
- "\"subject\":\"充值\"," +
- "\"body\":\"充值\"," +
- "\"time_expire\":\"2021-01-30 10:05:01\"," +
- " \"goods_detail\":[{" +
- " \"goods_id\":\"apple-01\"," +
- "\"alipay_goods_id\":\"20010001\"," +
- "\"goods_name\":\"ipad\"," +
- "\"quantity\":1," +
- "\"price\":2000," +
- "\"goods_category\":\"34543238\"," +
- "\"categories_tree\":\"124868003|126232002|126252004\"," +
- "\"body\":\"特价手机\"," +
- "\"show_url\":\"http://www.alipay.com/xxx.jpg\"" +
- " }]," +
- "\"passback_params\":\"merchantBizType%3d3C%26merchantBizNo%3d2016010101111\"," +
- "\"extend_params\":{" +
- "\"sys_service_provider_id\":\"2088511833207846\"," +
- "\"hb_fq_num\":\"3\"," +
- "\"hb_fq_seller_percent\":\"100\"," +
- "\"industry_reflux_info\":\"{\\\\\\\"scene_code\\\\\\\":\\\\\\\"metro_tradeorder\\\\\\\",\\\\\\\"channel\\\\\\\":\\\\\\\"xxxx\\\\\\\",\\\\\\\"scene_data\\\\\\\":{\\\\\\\"asset_name\\\\\\\":\\\\\\\"ALIPAY\\\\\\\"}}\"," +
- "\"card_type\":\"S0JP0000\"" +
- " }," +
- "\"goods_type\":\"0\"," +
- "\"timeout_express\":\"90m\"," +
- "\"promo_params\":\"{\\\"storeIdType\\\":\\\"1\\\"}\"," +
- "\"royalty_info\":{" +
- "\"royalty_type\":\"ROYALTY\"," +
- " \"royalty_detail_infos\":[{" +
- " \"serial_no\":1," +
- "\"trans_in_type\":\"userId\"," +
- "\"batch_no\":\"123\"," +
- "\"out_relation_id\":\"20131124001\"," +
- "\"trans_out_type\":\"userId\"," +
- "\"trans_out\":\"2088101126765726\"," +
- "\"trans_in\":\"2088101126708402\"," +
- "\"amount\":0.1," +
- "\"desc\":\"分账测试1\"," +
- "\"amount_percentage\":\"100\"" +
- " }]" +
- " }," +
- "\"sub_merchant\":{" +
- "\"merchant_id\":\"2088000603999128\"," +
- "\"merchant_type\":\"alipay: 支付å®åˆ†é…的间连商户编å·, merchant: 商户端的间连商户编å·\"" +
- " }," +
- "\"merchant_order_no\":\"20161008001\"," +
- "\"enable_pay_channels\":\"pcredit,moneyFund,debitCardExpress\"," +
- "\"store_id\":\"NJ_001\"," +
- "\"disable_pay_channels\":\"pcredit,moneyFund,debitCardExpress\"," +
- "\"qr_pay_mode\":\"1\"," +
- "\"qrcode_width\":100," +
- "\"settle_info\":{" +
- " \"settle_detail_infos\":[{" +
- " \"trans_in_type\":\"cardAliasNo\"," +
- "\"trans_in\":\"A0001\"," +
- "\"summary_dimension\":\"A0001\"," +
- "\"settle_entity_id\":\"2088xxxxx;ST_0001\"," +
- "\"settle_entity_type\":\"SecondMerchantã€Store\"," +
- "\"amount\":0.1" +
- " }]," +
- "\"settle_period_time\":\"7d\"" +
- " }," +
- "\"invoice_info\":{" +
- "\"key_info\":{" +
- "\"is_support_invoice\":true," +
- "\"invoice_merchant_name\":\"ABC|003\"," +
- "\"tax_num\":\"1464888883494\"" +
- " }," +
- "\"details\":\"[{\\\"code\\\":\\\"100294400\\\",\\\"name\\\":\\\"æœé¥°\\\",\\\"num\\\":\\\"2\\\",\\\"sumPrice\\\":\\\"200.00\\\",\\\"taxRate\\\":\\\"6%\\\"}]\"" +
- " }," +
- "\"agreement_sign_params\":{" +
- "\"personal_product_code\":\"GENERAL_WITHHOLDING_P\"," +
- "\"sign_scene\":\"INDUSTRY|CARRENTAL\"," +
- "\"external_agreement_no\":\"test\"," +
- "\"external_logon_id\":\"13852852877\"," +
- "\"sign_validity_period\":\"2m\"," +
- "\"third_party_type\":\"PARTNER\"," +
- "\"buckle_app_id\":\"1001164\"," +
- "\"buckle_merchant_id\":\"268820000000414397785\"," +
- "\"promo_params\":\"{\\\"key\\\",\\\"value\\\"}\"" +
- " }," +
- "\"integration_type\":\"PCWEB\"," +
- "\"request_from_url\":\"https://\"," +
- "\"business_params\":\"{\\\"data\\\":\\\"123\\\"}\"," +
- "\"ext_user_info\":{" +
- "\"name\":\"æŽæ˜Ž\"," +
- "\"mobile\":\"16587658765\"," +
- "\"cert_type\":\"IDENTITY_CARD\"," +
- "\"cert_no\":\"362334768769238881\"," +
- "\"min_age\":\"18\"," +
- "\"fix_buyer\":\"F\"," +
- "\"need_check_info\":\"F\"" +
- " }" +
- " }");
- String form = "";
- //调用SDK生æˆè¡¨å•
- form = alipayClient.pageExecute(alipayRequest).getBody();
-
- httpResponse.setContentType("text/html;charset=" + CHARSET);
- //直接将完整的表å•html输出到页é¢
- httpResponse.getWriter().write(form);
- httpResponse.getWriter().flush();
- httpResponse.getWriter().close();
- return R.ok();
- }
-
- @ApiOperation(value = "PC支付å®-交易查询", notes = "PC支付å®-交易查询", httpMethod = "POST")
- @ApiImplicitParam(name = "payQueryDto", value = "查询å‚æ•°", dataType = "PayQueryDto")
- @PostMapping("/query")
- public R<String> query(@RequestBody PayQueryDto payQueryDto) throws AlipayApiException {
- AlipayClient alipayClient = new DefaultAlipayClient(Common.PAY_URL_CS, Common.APP_ID_CS, Common.PRIVATE_KEY_CS, "json", "GBK", Common.ALIPAY_PUBLIC_KEY_CS, "RSA2");
- AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
- request.setBizContent("{" +
- " \"out_trade_no\":\"" + payQueryDto.getOutTradeNo() + "\"," +
- " \"trade_no\":\"" + payQueryDto.getTradeNo() + "\"" +
- " }");
- AlipayTradeQueryResponse response = alipayClient.execute(request);
- System.out.println(response.getBody());
- return R.ok(response.getBody());
- }
-
-
- @ApiOperation(value = "微行支付-统一下å•", notes = "微行支付-统一下å•", httpMethod = "POST")
- @ApiImplicitParam(name = "payPageDto", value = "支付入å‚", dataType = "PayPageDto")
- @PostMapping("/wxPay")
- public R<String> wxPay(@RequestBody PayPageDto payPageDto) throws AlipayApiException, UnsupportedEncodingException, InvalidKeySpecException, NoSuchAlgorithmException, InvalidKeyException, SignatureException {
- return wxPayService.wxPay(payPageDto);
- }
-
-
- @ApiOperation(value = "微信支付-交易查询", notes = "微信支付-交易查询", httpMethod = "POST")
- @ApiImplicitParam(name = "payQueryDto", value = "查询å‚æ•°", dataType = "PayQueryDto")
- @PostMapping("/queryWx")
- public R<String> queryWx(@RequestBody PayQueryDto payQueryDto) throws AlipayApiException, InvalidKeySpecException, SignatureException, NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException {
- if (null == payQueryDto || StringUtils.isBlank(payQueryDto.getOutTradeNo())) {
- return R.error("æ“作错误!");
- }
-
- return wxPayService.queryWx(payQueryDto);
- }
-
- @ApiOperation(value = "测试-微行支付-统一下å•", notes = "测试-微行支付-统一下å•", httpMethod = "POST")
- @ApiImplicitParam(name = "payPageDto", value = "支付入å‚", dataType = "PayPageDto")
- @PostMapping("/wx_Pay")
- public R<String> wx_Pay(@RequestBody PayPageDto payPageDto) throws AlipayApiException, IOException, InvalidKeySpecException, NoSuchAlgorithmException, InvalidKeyException, SignatureException, IllegalBlockSizeException {
- return wxPayService.wx_Pay(payPageDto);
- }
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PayRecordController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PayRecordController.java
deleted file mode 100644
index 675e704..0000000
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PayRecordController.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package cn.wisenergy.web.admin.controller.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.PayRecord;
-import cn.wisenergy.model.app.Volunteer;
-import cn.wisenergy.model.vo.PayRecordQueryVo;
-import cn.wisenergy.model.vo.PayRecordShowVo;
-import cn.wisenergy.service.app.PayRecordService;
-import com.github.pagehelper.PageInfo;
-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.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-
-/**
- * @ Description: PC-我的账户
- * @ Author : 86187
- * @ Date : 2021/1/14 10:45
- * @author 86187
- */
-@RestController
-@Api(tags = "PC-我的账户")
-@RequestMapping("/pay/record")
-@Slf4j
-public class PayRecordController {
-
- @Autowired
- private PayRecordService payRecordService;
-
- @ApiOperation(value = "ä¿å˜å……值记录", notes = "ä¿å˜å……值记录", httpMethod = "POST")
- @ApiImplicitParam(name = "payRecord", value = "充值记录信æ¯", dataType = "PayRecord")
- @PostMapping("/add")
- public R<Boolean> add(@RequestBody PayRecord payRecord) {
- log.info("volunteer-service[]PayRecordController[]add[]input.param.payRecord:" + payRecord);
- if (null == payRecord) {
- return R.error("å…¥å‚为空!");
- }
-
- return payRecordService.add(payRecord);
- }
-
- @ApiOperation(value = "获å–充值记录列表", notes = "获å–充值记录列表", httpMethod = "GET")
- @ApiImplicitParam(name = "payVo", value = "充值记录查询å‚æ•°", dataType = "PayRecord")
- @GetMapping("/getList")
- public R<PageInfo<PayRecordShowVo>> getList(PayRecordQueryVo payVo) {
- log.info("volunteer-service[]PayRecordController[]getList[]input.param.payVo:" + payVo);
- if (null == payVo) {
- return R.error("å…¥å‚为空!");
- }
-
- return payRecordService.getList(payVo);
- }
-
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PriceController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PriceController.java
deleted file mode 100644
index d0bfa11..0000000
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PriceController.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package cn.wisenergy.web.admin.controller.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.Price;
-import cn.wisenergy.service.app.PriceService;
-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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-
-/**
- * @author 86187
- */
-@Api(tags = "ä»·æ ¼æ˜Žç»†")
-@RestController
-@RequestMapping("/price")
-@Slf4j
-public class PriceController {
-
- @Autowired
- private PriceService priceService;
-
- @ApiOperation(value = "获å–ä»·æ ¼æ˜Žç»†", notes = "获å–ä»·æ ¼æ˜Žç»†", httpMethod = "GET")
- @GetMapping("/getList")
- public R<List<Price>> getList() {
- log.info("volunteer-service[]PriceController[]getList[]input.param");
-
- return priceService.getList();
- }
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/ProfessionController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/ProfessionController.java
deleted file mode 100644
index 0ce7e34..0000000
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/ProfessionController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package cn.wisenergy.web.admin.controller.app;
-
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.Profession;
-import cn.wisenergy.service.app.ProfessionService;
-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.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @ Description: 用户管ç†æ¨¡
- * @ Author : 86187
- * @ Date : 2021/1/13 10:29
- */
-@RestController
-@Api(tags = "专业管ç†")
-@RequestMapping("/profession")
-@Slf4j
-public class ProfessionController {
- @Autowired
- private ProfessionService professionService;
-
- @ApiOperation(value = "获å–ä¸“ä¸šæ ‘ç»“æž„", notes = "获å–ä¸“ä¸šæ ‘ç»“æž„", httpMethod = "GET")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "type", value = "考生类型 1：文化考生 2：美术考生 3：体育生 4：文å¦ç¼–导", dataType = "int"),
- @ApiImplicitParam(name = "userId", value = "考生id", dataType = "int")
- })
- @GetMapping("/getTree")
- public R<List<Profession>> getTree(Integer type,Integer userId) {
- if (null == type || null == userId) {
- return R.error("å…¥å‚为空!");
- }
- return professionService.getTree(type,userId);
- }
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/RefillCardController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/RefillCardController.java
deleted file mode 100644
index 32f8c3a..0000000
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/RefillCardController.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package cn.wisenergy.web.admin.controller.app;
-
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.RefillCard;
-import cn.wisenergy.model.dto.RefillCardDto;
-import cn.wisenergy.service.app.RefillCardService;
-import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.*;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-
-@Api(tags = "充值å¡ç®¡ç†")
-@RestController
-@RequestMapping("/refillCard")
-@Slf4j
-public class RefillCardController {
-
- @Autowired
- private RefillCardService refillCardService;
-
- @ApiOperation(value = "æ·»åŠ å……å€¼å¡",notes = "æ·»åŠ å……å€¼å¡",httpMethod = "POST")
- @ApiImplicitParam(name = "numbers",value = "å¡çš„æ•°é‡",dataType="int",required = true)
- @PostMapping("/manage")
- public R<Boolean> manage(Integer numbers){
- log.info("RefillCardController[].manage[].input.param,numbers"+numbers);
-
- //创建对象å‚æ•°
- RefillCard refillCard = new RefillCard();
- refillCard.setCardNumber(numbers);
- return refillCardService.add(refillCard);
- }
-
- @ApiOperation(value = "激活充值å¡",notes = "激活充值å¡",httpMethod = "POST")
- @ApiImplicitParam(name = "batchNumber",value = "批次å·",dataType = "string",required = true)
- @PostMapping("/update")
- public R<Boolean> update(String batchNumber){
- log.info("RefillCardController[].manage[].input.param,batchNumber"+batchNumber);
- return refillCardService.update(batchNumber);
- }
-
- @ApiOperation(value = "充值å¡æŸ¥è¯¢",notes = "充值å¡æŸ¥è¯¢",httpMethod = "GET")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "pageNo",value = "页数",dataType="int"),
- @ApiImplicitParam(name = "pageSize",value = "æ¯é¡µæ˜¾ç¤ºæ¡æ•°",dataType="int")
- })
- @GetMapping("/select")
- public R<PageInfo<RefillCardDto>> select(Integer pageNo, Integer pageSize){
- log.info("RefillCardController[].select[].input.param.parampageNo,pageSize"+pageNo,pageSize);
- return refillCardService.getList(pageNo, pageSize);
- }
-
- @ApiOperation(value = "生æˆå¡ç‰‡",notes = "生æˆå¡ç‰‡",httpMethod = "GET")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id",value = "充值å¡id",dataType="int"),
- })
- @GetMapping("/createCard")
- public R<Boolean> createCard(Integer id){
- log.info("RefillCardController[].createCard[].input.param:id"+id);
- return refillCardService.createCard(id);
- }
-
- @ApiOperation(value = "充值å¡å¯¼å‡º",notes = "充值å¡å¯¼å‡º",httpMethod = "GET")
- @ApiImplicitParam(name = "batchNumber",value = "充值å¡æ‰¹æ¬¡å·",dataType = "string",required = true)
- @GetMapping(value = "/exportCard")
- public R<Boolean> exportCard(String batchNumber, HttpServletResponse response){
- log.info("RefillCardController[].exportCard[].input.param:batchNumber"+batchNumber);
-
- return refillCardService.createExcel(batchNumber,response);
- }
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SchemeController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SchemeController.java
deleted file mode 100644
index 9a8b1d5..0000000
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SchemeController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package cn.wisenergy.web.admin.controller.app;
-
-import cn.wisenergy.common.expection.BaseException;
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.SchemeInfo;
-import cn.wisenergy.model.vo.SchemeQueryVo;
-import cn.wisenergy.model.vo.SchemeVo;
-import cn.wisenergy.model.vo.VolunteerVo;
-import cn.wisenergy.service.app.SchemeService;
-import cn.wisenergy.service.app.VolunteerService;
-import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * @author 86187
- * @ Description: PC-方案
- * @ Author : 86187
- * @ Date : 2021/1/14 10:50
- */
-@RestController
-@Api(tags = "PC-方案")
-@RequestMapping("/scheme")
-@Slf4j
-public class SchemeController {
-
- @Autowired
- private SchemeService schemeService;
-
- @Autowired
- private VolunteerService volunteerService;
-
- @ApiOperation(value = "方案查询", notes = "方案查询", httpMethod = "GET")
- @ApiImplicitParam(name = "queryVo", value = "志愿查询å‚æ•°", dataType = "SchemeQueryVo")
- @GetMapping("/getList")
- public R<VolunteerVo> getList(SchemeVo queryVo) {
- log.info("volunteer-service[]SchemeController[]getList[]input.param.queryVo:" + queryVo);
- if (null == queryVo) {
- return R.error("å…¥å‚为空!");
- }
-
- return schemeService.getList(queryVo);
- }
-
- @ApiOperation(value = "Excel批é‡æ·»åŠ 方案志愿", notes = "Excel批é‡æ·»åŠ 方案志愿")
- @PostMapping("/excel/add")
- public R excelAdd(@RequestParam("file") MultipartFile file, @RequestParam("type") Integer type,
- @RequestParam("schemeName") String schemeName,
- @RequestParam("fileUrl") String fileUrl, HttpServletResponse response) throws IOException {
- log.info("volunteer-service[]SchemeController[]excelAdd[]input.param.file:" + file);
- if (file == null || file.isEmpty() || null == type || StringUtils.isBlank(schemeName) ||
- StringUtils.isBlank(fileUrl)) {
- throw new BaseException("æ“作错误");
- }
-
- volunteerService.excelAdd(file, type, schemeName, fileUrl, response);
- return R.ok("æ·»åŠ æˆåŠŸ");
- }
-
- @ApiOperation(value = "测试Excel", notes = "测试Excel")
- @ApiImplicitParam(name = "file", value = "志愿查询å‚æ•°", dataType = "MultipartFile")
- @PostMapping("/excel/add/ceshi")
- public R ceshi(@RequestBody MultipartFile file, HttpServletResponse response) throws IOException {
- log.info("");
- if (file == null || file.isEmpty()) {
- throw new BaseException("æ“作错误");
- }
-
- volunteerService.ceshi(file, response);
- return R.ok("æ·»åŠ æˆåŠŸ");
- }
-
-
- @ApiOperation(value = "æ–¹æ¡ˆä¸Šä¼ Excel模æ¿", notes = "æ–¹æ¡ˆä¸Šä¼ Excel模æ¿")
- @PostMapping("/excel/template")
- public R excelTemplate(HttpServletResponse response) throws IOException {
-
- volunteerService.excelTemplate(response);
- return R.ok(response);
- }
-
- @ApiOperation(value = "获å–方案列表", notes = "获å–方案列表", httpMethod = "GET")
- @ApiImplicitParam(name = "queryVo", value = "查询å‚æ•°", dataType = "SchemeQueryVo")
- @GetMapping("/getSchemeList")
- public R<PageInfo<SchemeInfo>> getSchemeList(SchemeQueryVo queryVo) {
- log.info("volunteer-service[]SchemeController[]getSchemeList[]input.param.queryVo:" + queryVo);
- if (null == queryVo) {
- return R.error("å…¥å‚为空!");
- }
-
- return schemeService.getSchemeList(queryVo);
- }
-
- @ApiOperation(value = "åˆ é™¤æ–¹æ¡ˆ", notes = "åˆ é™¤æ–¹æ¡ˆ", httpMethod = "DELETE")
- @ApiImplicitParam(name = "schemeId", value = "方案id", dataType = "schemeId")
- @DeleteMapping("/delete")
- public R<Boolean> delete(Integer schemeId) {
- log.info("volunteer-service[]SchemeController[]getSchemeList[]input.param.schemeId:" + schemeId);
- if (null == schemeId) {
- return R.error("å…¥å‚为空!");
- }
-
- return schemeService.deleteById(schemeId);
- }
-
- @ApiOperation(value = "获å–方案下载路径", notes = "获å–方案下载路径", httpMethod = "GET")
- @ApiImplicitParam(name = "schemeId", value = "方案id", dataType = "int")
- @GetMapping("/download")
- public R<String> download(Integer schemeId) {
- log.info("volunteer-service[]SchemeController[]download[]input.param.schemeId:" + schemeId);
- if (null == schemeId) {
- return R.error("å…¥å‚为空!");
- }
-
- return schemeService.download(schemeId);
- }
-
- @ApiOperation(value = "测试é‡å¤æ•°æ®", notes = "测试é‡å¤æ•°æ®", httpMethod = "GET")
- @ApiImplicitParam(name = "schemeId", value = "方案id", dataType = "int")
- @GetMapping("/ceishi")
- public List<Integer> ceishi(Integer schemeId) {
-
- return schemeService.ceishi(schemeId);
- }
-
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SchemeRecordController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SchemeRecordController.java
deleted file mode 100644
index ade25a0..0000000
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SchemeRecordController.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package cn.wisenergy.web.admin.controller.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.SchemeQueryRecord;
-import cn.wisenergy.model.app.Volunteer;
-import cn.wisenergy.model.vo.SchemeRecordQueryVo;
-import cn.wisenergy.service.app.SchemeRecordService;
-import com.github.pagehelper.PageInfo;
-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.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * @ Description: PC-我的方案
- * @ Author : 86187
- * @ Date : 2021/1/14 10:48
- * @author 86187
- */
-@RestController
-@Api(tags = "PC-我的方案")
-@RequestMapping("/scheme/record")
-@Slf4j
-public class SchemeRecordController {
-
- @Autowired
- private SchemeRecordService schemeRecordService;
-
- @ApiOperation(value = "ä¿å˜æ–¹æ¡ˆæŸ¥è¯¢è®°å½•", notes = "ä¿å˜æ–¹æ¡ˆæŸ¥è¯¢è®°å½•", httpMethod = "POST")
- @ApiImplicitParam(name = "query", value = "方案查询信æ¯", dataType = "SchemeQueryRecord")
- @PostMapping("/add")
- public R<SchemeQueryRecord> add(@RequestBody SchemeQueryRecord query) {
- log.info("volunteer-service[]SchemeRecordController[]add[]input.param.query:" + query);
- if (null == query) {
- return R.error("å…¥å‚为空!");
- }
-
- return schemeRecordService.add(query);
- }
-
- @ApiOperation(value = "获å–方案查询记录列表", notes = "获å–方案查询记录列表", httpMethod = "GET")
- @ApiImplicitParam(name = "queryVo", value = "方案查询记录å‚æ•°", dataType = "SchemeRecordQueryVo")
- @GetMapping("/getList")
- public R<PageInfo<SchemeQueryRecord>> getList(SchemeRecordQueryVo queryVo) {
- log.info("volunteer-service[]SchemeRecordController[]getList[]input.param.queryVo:" + queryVo);
- if (null == queryVo) {
- return R.error("å…¥å‚为空!");
- }
-
- return schemeRecordService.getList(queryVo);
- }
-
- @ApiOperation(value = "获å–充值记录志愿列表", notes = "获å–充值记录志愿列表", httpMethod = "GET")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "用户id", dataType = "int", required = true),
- @ApiImplicitParam(name = "recordId", value = "记录id", dataType = "int", required = true)
- })
- @GetMapping("/getVolunteerList")
- public R<List<Volunteer>> getVolunteerList(Integer userId, Integer recordId) {
- log.info("volunteer-service[]SchemeRecordController[]getVolunteerList[]input.param.userId:{},recordId:" + userId, recordId);
- if (null == userId || null == recordId) {
- return R.error("å…¥å‚为空!");
- }
-
- return schemeRecordService.getVolunteerList(userId, recordId);
- }
-
- @ApiOperation(value = "方案导出", notes = "方案导出", httpMethod = "GET")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "用户id", dataType = "int", required = true),
- @ApiImplicitParam(name = "recordId", value = "记录id", dataType = "int", required = true)
- })
- @GetMapping("/export")
- public R<Boolean> export(Integer userId, Integer recordId, HttpServletResponse response) {
- log.info("volunteer-service[]SchemeRecordController[]getVolunteerList[]input.param.userId,recordId:" + userId, recordId);
- if (null == userId || null == recordId) {
- return R.error("å…¥å‚为空!");
- }
-
- return schemeRecordService.export(userId, recordId,response);
- }
-
- @ApiOperation(value = "方案Excel导出",notes = "方案Excel导出",httpMethod = "GET")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "userId", value = "用户id", dataType = "int", required = true),
- @ApiImplicitParam(name = "recordId", value = "记录id", dataType = "int", required = true)
- })
- @GetMapping(value = "/createExcel")
- public R<Boolean> createExcel(Integer userId, Integer recordId, HttpServletResponse response){
- log.info("volunteer-service[]SchemeRecordController[]createExcel[]input.param.userId,recordId:" + userId, recordId);
- return schemeRecordService.createExcel(userId,recordId,response);
- }
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SendSmsController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SendSmsController.java
deleted file mode 100644
index 5e72103..0000000
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SendSmsController.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package cn.wisenergy.web.admin.controller.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.vo.SendSmsVo;
-import cn.wisenergy.service.app.SendSmsSerVice;
-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.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author 86187
- * @ Description: çŸä¿¡ç®¡ç†
- * @ Author : 86187
- * @ Date : 2021/1/15 15:40
- */
-@RestController
-@Api(tags = "çŸä¿¡ç®¡ç†")
-@RequestMapping("/user")
-@Slf4j
-public class SendSmsController {
- @Autowired
- private SendSmsSerVice sendSmsSerVice;
-
- @ApiOperation(value = "å‘é€çŸä¿¡éªŒè¯ç ", notes = "å‘é€çŸä¿¡éªŒè¯ç ", httpMethod = "POST")
- @ApiImplicitParam(name = "sendSmsVo", value = "手机å·ç ", dataType = "SendSmsVo")
- @PostMapping("/sendSms")
- public R<Boolean> sendSms(@RequestBody SendSmsVo sendSmsVo) throws Exception {
- log.info("SendSmsController[]sendSms[]input.param.sendSmsVo:" + sendSmsVo);
- if (null == sendSmsVo || StringUtils.isBlank(sendSmsVo.getPhone()) ||
- null == sendSmsVo.getSource() || null == sendSmsVo.getScene()) {
- return R.error("å…¥å‚为空!");
- }
-
- return sendSmsSerVice.sendSmCode(sendSmsVo);
- }
-
- @ApiOperation(value = "在缓å˜ä¸è®°å½•éªŒè¯ç ", notes = "在缓å˜ä¸è®°å½•éªŒè¯ç ", httpMethod = "GET")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "phone", value = "手机å·ç ", dataType = "String", required = true),
- @ApiImplicitParam(name = "code", value = "çŸä¿¡éªŒè¯ç ", dataType = "String", required = true),
- @ApiImplicitParam(name = "scene", value = "场景类型 1:验è¯ç 登录 2:手机注册 3:修改密ç 4：找回密ç ", dataType = "int", required = true),
- @ApiImplicitParam(name = "source", value = "æ¥æº PC/APP", dataType = "String", required = true)
- })
- @GetMapping("/valid")
- public R<Boolean> valid(String phone, String code, Integer scene, String source) {
- log.info("SendSmsController[]valid[]input.param:phone,code,type" + phone, code, scene);
- if (StringUtils.isBlank(phone) || StringUtils.isBlank(code) || StringUtils.isBlank(source) ||
- null == scene) {
- return R.error("å…¥å‚为空!");
- }
-
- return sendSmsSerVice.valid(phone, code, scene, source);
- }
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java
deleted file mode 100644
index 2367b66..0000000
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package cn.wisenergy.web.admin.controller.app;
-
-import cn.wisenergy.common.constant.RedisConsts;
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.User;
-import cn.wisenergy.model.dto.UserCommitDto;
-import cn.wisenergy.model.dto.UserInfoDto;
-import cn.wisenergy.model.vo.UserInfoVo;
-import cn.wisenergy.model.vo.UserQueryVo;
-import cn.wisenergy.model.vo.UserShowVo;
-import cn.wisenergy.service.app.UserService;
-import cn.wisenergy.web.config.JwtConfig;
-import cn.wisenergy.web.shiro.JwtUtil;
-import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-
-/**
- * @ Description: 用户管ç†æ¨¡
- * @ Author : 86187
- * @ Date : 2021/1/7 10:29
- * @author 86187
- */
-@RestController
-@Api(tags = "PC-用户管ç†")
-@RequestMapping("/user")
-@Slf4j
-public class UserController {
- @Autowired
- private UserService userService;
-
- @Autowired
- private JwtUtil jwtUtil;
- @Autowired
- private JwtConfig jwtConfig;
- @Autowired
- private RedisTemplate<String, Object> redisTemplate;
-
-
- @ApiOperation(value = "用户管ç†", notes = "用户管ç†", httpMethod = "POST")
- @ApiImplicitParam(name = "queryVo", value = "用户信æ¯", dataType = "UserQueryVo")
- @PostMapping("/manage")
- public R<PageInfo<UserInfoDto>> manageUser(@RequestBody UserQueryVo queryVo) {
- log.info("UserController[]manageUser[]input.param:queryV0:" + queryVo);
- if (null == queryVo) {
- return R.error("å…¥å‚为空!");
- }
- //返回数æ®
- return userService.getUserList(queryVo);
- }
-
- @ApiOperation(value = "æ交个人信æ¯", notes = "æ交个人信æ¯", httpMethod = "POST")
- @ApiImplicitParam(name = "userInfo", value = "个人信æ¯", dataType = "UserCommitDto")
- @PostMapping("/commit")
- public R<UserInfoVo> commitUserInfo(@RequestBody UserCommitDto userInfo) {
- log.info("UserController[]commitUserInfo[]input.param:queryV0:" + userInfo);
- if (null == userInfo) {
- return R.error("å…¥å‚为空!");
- }
- //返回数æ®
- return userService.commitUserInfo(userInfo);
- }
-
- @ApiOperation(value = "编辑个人信æ¯", notes = "编辑个人信æ¯", httpMethod = "POST")
- @ApiImplicitParam(name = "userInfo", value = "个人信æ¯", dataType = "UserCommitDto")
- @PostMapping("/edit")
- public R<Boolean> edit(@RequestBody UserCommitDto userInfo) {
- log.info("UserController[]edit[]input.param:queryV0:" + userInfo);
- if (null == userInfo) {
- return R.error("å…¥å‚为空!");
- }
- //返回数æ®
- return userService.edit(userInfo);
- }
-
- @ApiOperation(value = "获å–个人信æ¯", notes = "获å–个人信æ¯", httpMethod = "GET")
- @ApiImplicitParam(name = "userId", value = "用户id", dataType = "int")
- @GetMapping("/getById")
- public R<UserShowVo> getById(Integer userId) {
- log.info("UserController[]getById[]input.param:queryV0:" + userId);
- if (null == userId) {
- return R.error("å…¥å‚为空!");
- }
-
- //返回数æ®
- return userService.getById(userId);
- }
-
- @ApiOperation(value = "测试like循环查询", notes = "测试like循环查询", httpMethod = "GET")
- @GetMapping("/test")
- public R<List<User>> test() {
- log.info("UserController[]test[]input.param");
-
- //返回数æ®
- return userService.test();
- }
-
- /**
- * shiro登录
- *
- * @return
- */
- @ApiOperation(value = "获å–token接å£", notes = "获å–token接å£", httpMethod = "POST")
- @PostMapping(value = "/login")
- public R<String> login(String phone) {
- if (StringUtils.isBlank(phone)) {
- return R.error("å…¥å‚为空!");
- }
-
- //用户信æ¯
- User user = userService.getByPhone(phone);
-
- // 创建token
- String token = jwtUtil.generateToken(user);
- // ä¿å˜Redis
- redisTemplate.opsForValue().set(RedisConsts.JWT_ACCESS_TOKEN + token, token);
- return R.ok(token);
- }
-
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserLimitController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserLimitController.java
deleted file mode 100644
index c37b751..0000000
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserLimitController.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package cn.wisenergy.web.admin.controller.app;
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.app.UserLimit;
-import cn.wisenergy.model.vo.AddLimitVo;
-import cn.wisenergy.model.vo.MinusLimitVo;
-import cn.wisenergy.service.app.UserLimitService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author 86187
- * @ Description: PC-用户查询次数
- * @ Author : 86187
- * @ Date : 2021/1/14 10:50
- */
-@RestController
-@Api(tags = "PC-用户查询次数")
-@RequestMapping("/user/limit")
-@Slf4j
-public class UserLimitController {
-
- @Autowired
- private UserLimitService userLimitService;
-
- @ApiOperation(value = "获å–用户查询次数", notes = "获å–用户查询次数", httpMethod = "GET")
- @ApiImplicitParam(name = "userId", value = "用户id", dataType = "int", required = true)
- @GetMapping("/getByUserId")
- public R<UserLimit> getByUserId(Integer userId) {
- log.info("volunteer-service[]UserLimitController[]getVolunteerList[]input.param.userId:" + userId);
- if (null == userId) {
- return R.error("å…¥å‚为空!");
- }
-
- return userLimitService.getByUserId(userId);
- }
-
- @ApiOperation(value = "用户充值", notes = "用户充值", httpMethod = "POST")
- @ApiImplicitParam(name = "addLimitVo", value = "充值信æ¯", dataType = "AddLimitVo")
- @PostMapping("/addLimit")
- public R<Boolean> addLimit(@RequestBody AddLimitVo addLimitVo) {
- log.info("volunteer-service[]UserLimitController[]addLimit[]input.param.addLimitVo:" + addLimitVo);
- if (null == addLimitVo || null == addLimitVo.getUserId() || null == addLimitVo.getPayType()) {
- return R.error("å…¥å‚ä¸èƒ½ä¸ºç©º!");
- }
-
- return userLimitService.addLimit(addLimitVo);
- }
-
-
- @ApiOperation(value = "扣å‡ç”¨æˆ·æŸ¥è¯¢æ¬¡æ•°", notes = "扣å‡ç”¨æˆ·æŸ¥è¯¢æ¬¡æ•°", httpMethod = "POST")
- @ApiImplicitParam(name = "minusLimitVo", value = "用户id", dataType = "MinusLimitVo")
- @PostMapping("/minusLimit")
- public R<Boolean> minusLimit(@RequestBody MinusLimitVo minusLimitVo) {
- log.info("volunteer-service[]UserLimitController[]minusLimit[]input.param.minusLimitVo:" + minusLimitVo);
- if (null == minusLimitVo || null == minusLimitVo.getUserId()) {
- return R.error("å…¥å‚为空!");
- }
-
- return userLimitService.minusLimit(minusLimitVo.getUserId());
- }
-
-
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserLoginController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserLoginController.java
deleted file mode 100644
index 2cbc569..0000000
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserLoginController.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package cn.wisenergy.web.admin.controller.app;
-
-
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.model.vo.*;
-import cn.wisenergy.service.app.UserLoginService;
-import cn.wisenergy.web.common.BaseController;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author 86187
- * @ Description: PC-用户登录
- * @ Author : 86187
- * @ Date : 2021/1/14 10:50
- */
-@RestController
-@Api(tags = "PC-用户登录")
-@RequestMapping("/user/login")
-@Slf4j
-public class UserLoginController extends BaseController {
-
- @Autowired
- private UserLoginService userLoginService;
-
- @ApiOperation(value = "用户注册", notes = "用户注册", httpMethod = "POST")
- @ApiImplicitParam(name = "userVo", value = "用户信æ¯", dataType = "UserRegisterVo")
- @PostMapping("/register")
- public R<UserInfoVo> register(@RequestBody UserRegisterVo userVo) {
- log.info("volunteer-service[]UserLongController[]resetPassword[]input.param.userVo:" + userVo);
-
- if (null == userVo || StringUtils.isBlank(userVo.getPhone()) ||
- StringUtils.isBlank(userVo.getPassword()) || StringUtils.isBlank(userVo.getSmCode()) ||
- null == userVo.getSource() || null == userVo.getScene()) {
- return R.error("å…¥å‚为空!");
- }
-
- return userLoginService.register(userVo);
- }
-
- @ApiOperation(value = "用户验è¯ç 登录", notes = "用户验è¯ç 登录", httpMethod = "POST")
- @ApiImplicitParam(name = "userVo", value = "用户信æ¯", dataType = "UserLoginVo")
- @PostMapping("/loginCode")
- public R<UserInfoVo> loginCode(@RequestBody UserLoginVo userVo) {
- log.info("volunteer-service[]UserLongController[]loginCode[]input.param.userVo:" + userVo);
-
- if (null == userVo || StringUtils.isBlank(userVo.getPhone()) || StringUtils.isBlank(userVo.getCode()) ||
- null == userVo.getSource() || null == userVo.getScene()) {
- return R.error("å…¥å‚为空!");
- }
-
- return userLoginService.loginCode(userVo);
- }
-
- @ApiOperation(value = "用户账å·å¯†ç 登录", notes = "用户账å·å¯†ç 登录", httpMethod = "POST")
- @ApiImplicitParam(name = "userVo", value = "登录用户信æ¯", dataType = "UserLoginVo")
- @PostMapping("/login")
- public R<UserInfoVo> login(@RequestBody UserLoginVo userVo) {
- log.info("volunteer-service[]UserLongController[]login[]input.param.userVo:" + userVo);
- if (null == userVo || StringUtils.isBlank(userVo.getPhone()) || StringUtils.isBlank(userVo.getPassword())) {
- return R.error("å…¥å‚ä¸èƒ½ä¸ºç©º!");
- }
-
- return userLoginService.login(userVo);
- }
-
-
- @ApiOperation(value = "退出登录", notes = "退出登录", httpMethod = "POST")
- @ApiImplicitParam(name = "outVo", value = "退出用户信æ¯", dataType = "LoginOutVo")
- @PostMapping("/loginOut")
- public R<Boolean> loginOut(@RequestBody LoginOutVo outVo) {
- log.info("volunteer-service[]UserLongController[]loginOut[]input.param.outVo:" + outVo);
- if (null == outVo || null == outVo.getUserId()) {
- return R.error("å…¥å‚ä¸èƒ½ä¸ºç©º!");
- }
-
- return userLoginService.loginOut(outVo.getUserId());
- }
-
- @ApiOperation(value = "修改用户密ç ", notes = "修改用户密ç ", httpMethod = "POST")
- @ApiImplicitParam(name = "userVo", value = "用户密ç ", dataType = "UpdatePasswordVo")
- @PostMapping("/updatePassword")
- public R<Boolean> updatePassword(@RequestBody UpdatePasswordVo userVo) {
- log.info("volunteer-service[]UserLongController[]updatePassword[]input.param.userVo:" + userVo);
- if (null == userVo || null == userVo.getUserId() || StringUtils.isBlank(userVo.getOldPassword()) ||
- StringUtils.isBlank(userVo.getNewPassword())) {
- return R.error("å…¥å‚ä¸èƒ½ä¸ºç©º!");
- }
-
- return userLoginService.updatePassword(userVo);
- }
-
- @ApiOperation(value = "é‡ç½®å¯†ç ", notes = "é‡ç½®å¯†ç ", httpMethod = "POST")
- @PostMapping("/resetPassword")
- public R<Boolean> resetPassword(Integer userId) {
- log.info("volunteer-service[]UserLongController[]resetPassword[]input.param.userId:" + userId);
- if (null == userId) {
- return R.error("å…¥å‚ä¸èƒ½ä¸ºç©º!");
- }
-
- return userLoginService.resetPassword(userId);
- }
-
- @ApiOperation(value = "çŸä¿¡é‡ç½®å¯†ç ", notes = "修改用户密ç ", httpMethod = "POST")
- @ApiImplicitParam(name = "userVo", value = "用户密ç ", dataType = "UserLoginVo")
- @PostMapping("/smsResetPassword")
- public R<Boolean> smsResetPassword(@RequestBody UserLoginVo userVo) {
- log.info("volunteer-service[]UserLongController[]smsResetPassword[]input.param.userVo:" + userVo);
- if (null == userVo || StringUtils.isBlank(userVo.getPhone()) || StringUtils.isBlank(userVo.getPassword()) ||
- null == userVo.getSource() || null == userVo.getScene()) {
- return R.error("å…¥å‚ä¸èƒ½ä¸ºç©º!");
- }
-
- return userLoginService.smsResetPassword(userVo);
- }
-
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/VolunteerController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/VolunteerController.java
deleted file mode 100644
index deff57d..0000000
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/VolunteerController.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package cn.wisenergy.web.admin.controller.app;
-
-import io.swagger.annotations.Api;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @ Description: PC-志愿模å—
- * @ Author : 86187
- * @ Date : 2021/1/14 10:55
- * @author 86187
- */
-@RestController
-@Api(tags = "PC-志愿模å—")
-@RequestMapping("/volunteer")
-@Slf4j
-public class VolunteerController {
-}
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/common/BaseController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/common/BaseController.java
index ec69513..3f407cf 100644
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/common/BaseController.java
+++ b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/common/BaseController.java
@@ -1,7 +1,6 @@
package cn.wisenergy.web.common;
import cn.wisenergy.model.app.User;
-import cn.wisenergy.service.app.UserService;
import cn.wisenergy.web.shiro.JwtUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/swagger/Swagger2.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/swagger/Swagger2.java
index 56e1b44..79a9724 100644
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/swagger/Swagger2.java
+++ b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/swagger/Swagger2.java
@@ -39,7 +39,7 @@ public class Swagger2 {
private ApiInfo apiInfo() {
return new ApiInfoBuilder()
//页é¢æ ‡é¢˜
- .title("高考志愿一点通")
+ .title("西田森app")
//创建人
.contact(new Contact("WYY", "", ""))
//版本å·
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/shiro/filter/AuthRealm.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/shiro/filter/AuthRealm.java
index 4f29f00..169b7e1 100644
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/shiro/filter/AuthRealm.java
+++ b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/shiro/filter/AuthRealm.java
@@ -4,7 +4,6 @@ import cn.wisenergy.common.constant.RedisConsts;
import cn.wisenergy.common.enums.RespCodeEnum;
import cn.wisenergy.model.app.AccountInfo;
import cn.wisenergy.model.app.User;
-import cn.wisenergy.service.app.UserService;
import cn.wisenergy.web.config.JwtConfig;
import cn.wisenergy.web.shiro.AuthToken;
import cn.wisenergy.web.shiro.JwtUtil;
@@ -21,7 +20,6 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.Set;
/**
* 认è¯
diff --git a/wisenergy-web-admin/src/main/resources/application-dev.yml b/wisenergy-web-admin/src/main/resources/application-dev.yml
index 1c86162..3b5bb51 100644
--- a/wisenergy-web-admin/src/main/resources/application-dev.yml
+++ b/wisenergy-web-admin/src/main/resources/application-dev.yml
@@ -3,9 +3,9 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
druid:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.110.165:3306/volunteer?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.110.165:3306/intellir?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
username: root
- password: adm4HYservice$
+ password: admin!@#123
initial-size: 10
max-active: 100
min-idle: 10
--
2.18.1