From 0b41dd1491a6cd69dca8caa355390d578af500ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Wed, 19 Feb 2020 13:10:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doc/db/dev_youhua/esua_epdc_user.sql | 52 - .../10.5.34.162-master/docker-compose.yml | 4 +- .../prod/nginx/docker-compose.yml | 14 - .../test/nginx/docker-compose.yml | 15 - .../epdc/constant/RoleTypeKeyConstant.java | 15 - .../esua/epdc/dto/DeptLevelAndLeaderDTO.java | 50 - .../com/elink/esua/epdc/dto/SysRoleDTO.java | 10 - .../elink/esua/epdc/dto/SysSimpleDictDTO.java | 4 +- .../dto/epdc/form/UserSysDeptInfoFormDTO.java | 4 + .../epdc-admin/epdc-admin-server/pom.xml | 6 - .../epdc/controller/SysDeptController.java | 48 +- .../epdc/controller/SysRoleController.java | 8 - .../epdc/controller/SysUserController.java | 14 - .../com/elink/esua/epdc/dao/SysDeptDao.java | 36 - .../com/elink/esua/epdc/dao/SysRoleDao.java | 18 +- .../esua/epdc/feign/EventFeignClient.java | 63 - .../fallback/EventFeignClientFallback.java | 41 - .../esua/epdc/service/SysRoleService.java | 3 - .../epdc/service/impl/SysDeptServiceImpl.java | 78 +- .../epdc/service/impl/SysDictServiceImpl.java | 2 +- .../epdc/service/impl/SysRoleServiceImpl.java | 123 -- .../epdc/service/impl/SysUserServiceImpl.java | 2 +- .../src/main/resources/mapper/SysDeptDao.xml | 91 +- .../src/main/resources/mapper/SysRoleDao.xml | 15 - .../epdc-common-clienttoken/pom.xml | 6 - .../esua/epdc/common/token/dto/TokenDto.java | 12 +- .../common/token/util/CpUserDetailRedis.java | 20 - .../token/util/IdentityNoAnalysisUtil.java | 178 --- .../commons/mybatis/entity/DeptScope.java | 36 - .../mybatis/utils/DeptEntityUtils.java | 74 - .../epdc-commons-tools-wx-ma/pom.xml | 2 +- .../tools/constant/NacosConfigConstant.java | 12 - .../commons/tools/constant/NumConstant.java | 12 +- .../tools/constant/PointsConstant.java | 13 - .../tools/constant/ServiceConstant.java | 10 - .../commons/tools/constant/StrConstant.java | 41 - .../commons/tools/enums/UserAuthTypeEnum.java | 35 - .../epdc/commons/tools/enums/UserTagEnum.java | 28 - .../pointsenum/PointsBehaviorCodeEnum.java | 40 - .../enums/pointsenum/PointsLimitTimeEnum.java | 27 - .../enums/pointsenum/PointsOperationEnum.java | 24 - .../pointsenum/PointsOperationModeEnum.java | 34 - .../pointsenum/PointsRuleAvailableEnum.java | 26 - .../enums/pointsenum/PointsRuleCodeEnum.java | 36 - .../pointsenum/PointsUpperLimitEnum.java | 28 - .../epdc/commons/tools/redis/RedisKeys.java | 56 +- .../epdc/commons/tools/utils/DateUtils.java | 5 - .../epdc/commons/tools/utils/ExcelUtils.java | 65 - .../epdc/commons/tools/utils/GPSUtils.java | 271 ++-- .../commons/tools/utils/LocalDateUtils.java | 51 - .../epdc/commons/tools/utils/ModuleUtils.java | 69 +- .../form/EpdcAppActUserCancelsignupDTO.java | 51 - .../dto/form/EpdcAppActUserClockLogDTO.java | 80 -- .../dto/form/EpdcCompleteUserInfoFormDTO.java | 1 - .../epdc/dto/result/EpdcAppClockListDTO.java | 48 - .../dto/result/EpdcAppVolunteerRankDTO.java | 68 - .../epdc-api/epdc-api-server/pom.xml | 12 +- .../com/elink/esua/epdc/ApiApplication.java | 12 +- .../controller/ApiActPhraseController.java | 47 - .../ApiActUserRelationController.java | 164 --- .../controller/ApiAppActInfoController.java | 106 -- .../epdc/controller/ApiAppUserController.java | 25 +- .../controller/ApiEvaluateController.java | 81 -- .../controller/ApiScanSwitchController.java | 2 +- .../ApiVolunteerRankController.java | 42 - .../esua/epdc/controller/DemoController.java | 37 - .../esua/epdc/feign/ActInfoFeignClient.java | 68 - .../esua/epdc/feign/AdminFeignClient.java | 3 +- .../epdc/feign/AppActPhraseFeignClient.java | 35 - .../feign/AppActUserRelationFeignClient.java | 66 - .../feign/AppVolunteerRankFeignClient.java | 28 - .../esua/epdc/feign/CommentFeignClient.java | 4 +- .../esua/epdc/feign/EvaluateFeignClient.java | 79 -- .../elink/esua/epdc/feign/OssFeignClient.java | 13 - .../esua/epdc/feign/UserFeignClient.java | 65 +- .../fallback/ActInfoFeignClientFallback.java | 54 - .../AppActPhraseFeignClientFallback.java | 25 - ...AppActUserRelationFeignClientFallback.java | 44 - .../AppVolunteerRankFeignClientFallback.java | 25 - .../fallback/CommentFeignClientFallback.java | 6 +- .../fallback/EvaluateFeignClientFallback.java | 49 - .../fallback/OssFeignClientFallback.java | 6 - .../fallback/UserFeignClientFallback.java | 26 +- .../esua/epdc/rest/v2/DemoV2Controller.java | 1 - .../esua/epdc/service/ActInfoService.java | 53 - .../esua/epdc/service/ActPhraseService.java | 30 - .../epdc/service/ActUserRelationService.java | 56 - .../esua/epdc/service/AppUserService.java | 24 +- .../epdc/service/AppVolunteerRankService.java | 22 - .../elink/esua/epdc/service/DemoService.java | 26 - .../esua/epdc/service/EvaluateService.java | 55 - .../epdc/service/impl/ActInfoServiceImpl.java | 59 - .../service/impl/ActPhraseServiceImpl.java | 36 - .../impl/ActUserRelationServiceImpl.java | 57 - .../epdc/service/impl/AppUserServiceImpl.java | 244 +--- .../impl/AppVolunteerRankServiceImpl.java | 36 - .../epdc/service/impl/CommentServiceImpl.java | 13 +- .../epdc/service/impl/DemoServiceImpl.java | 42 - .../service/impl/EvaluateServiceImpl.java | 49 - .../epdc/service/impl/GroupServiceImpl.java | 24 +- .../epdc/service/impl/IssueServiceImpl.java | 11 +- .../service/impl/TopicCommentServiceImpl.java | 9 +- .../epdc/service/impl/TopicServiceImpl.java | 9 +- .../elink/esua/epdc/utils/UserTagUtils.java | 55 - .../src/main/resources/application-dev.yml | 0 .../src/main/resources/application-prod.yml | 3 - .../src/main/resources/application-test.yml | 4 - .../src/main/resources/application.yml | 30 +- .../java/com/elink/esua/epdc/UserTest.java | 1 + .../epdc/dto/evaluate/EvaluateDeptDTO.java | 107 -- .../epdc/dto/evaluate/EvaluateDetailDTO.java | 91 -- .../epdc/dto/evaluate/EvaluateInfoDTO.java | 98 -- .../epdc/dto/evaluate/EvaluateOfficerDTO.java | 107 -- .../epdc/dto/evaluate/EvaluateOptionDTO.java | 92 -- .../epdc/dto/evaluate/EvaluateOptions.java | 19 - .../epdc/dto/evaluate/EvaluateRoleDTO.java | 87 -- .../dto/evaluate/EvaluateSelectOption.java | 27 - .../epdc/dto/evaluate/EvaluateShowOption.java | 25 - .../EvaluateUpdateDeptOfficerCountDTO.java | 51 - .../form/EvaluateOfficerAppFormDTO.java | 61 - .../form/EvaluateOptionAppFormDTO.java | 45 - .../evaluate/form/EvaluateOptionFormDTO.java | 46 - .../evaluate/form/EvaluateRoleFormDTO.java | 41 - .../evaluate/form/EvaluateSubmitFormDTO.java | 78 -- .../result/EvaluateDeptCountResultDTO.java | 113 -- .../result/EvaluateInfoResultDTO.java | 107 -- .../result/EvaluateOfficerAppResultDTO.java | 60 - .../result/EvaluateOfficerCountResultDTO.java | 127 -- .../result/EvaluateOptionAppResultDTO.java | 53 - .../epdc/dto/evaluate/result/RoleDictDTO.java | 23 - .../dto/evaluate/result/RoleResultDTO.java | 22 - .../epdc-custom/epdc-custom-server/pom.xml | 6 - .../controller/EvaluateDeptController.java | 109 -- .../controller/EvaluateDetailController.java | 94 -- .../controller/EvaluateInfoController.java | 103 -- .../controller/EvaluateOfficerController.java | 129 -- .../controller/EvaluateOptionController.java | 137 -- .../controller/EvaluateRoleController.java | 131 -- .../modules/evaluate/dao/EvaluateDeptDao.java | 51 - .../evaluate/dao/EvaluateDetailDao.java | 33 - .../modules/evaluate/dao/EvaluateInfoDao.java | 44 - .../evaluate/dao/EvaluateOfficerDao.java | 102 -- .../evaluate/dao/EvaluateOptionDao.java | 63 - .../modules/evaluate/dao/EvaluateRoleDao.java | 43 - .../evaluate/entity/EvaluateDeptEntity.java | 73 - .../evaluate/entity/EvaluateDetailEntity.java | 61 - .../evaluate/entity/EvaluateInfoEntity.java | 68 - .../entity/EvaluateOfficerEntity.java | 73 - .../evaluate/entity/EvaluateOptionEntity.java | 58 - .../evaluate/entity/EvaluateRoleEntity.java | 53 - .../excel/EvaluateDeptCountExcel.java | 77 - .../evaluate/excel/EvaluateDeptExcel.java | 77 - .../evaluate/excel/EvaluateDetailExcel.java | 68 - .../evaluate/excel/EvaluateInfoExcel.java | 71 - .../excel/EvaluateOfficerCountExcel.java | 77 - .../evaluate/excel/EvaluateOfficerExcel.java | 75 - .../evaluate/excel/EvaluateOptionExcel.java | 68 - .../evaluate/excel/EvaluateRoleExcel.java | 65 - .../evaluate/redis/EvaluateDeptRedis.java | 47 - .../evaluate/redis/EvaluateDetailRedis.java | 47 - .../evaluate/redis/EvaluateInfoRedis.java | 47 - .../evaluate/redis/EvaluateOfficerRedis.java | 47 - .../evaluate/redis/EvaluateOptionRedis.java | 47 - .../evaluate/redis/EvaluateRoleRedis.java | 47 - .../evaluate/service/EvaluateDeptService.java | 105 -- .../service/EvaluateDetailService.java | 95 -- .../evaluate/service/EvaluateInfoService.java | 111 -- .../service/EvaluateOfficerService.java | 124 -- .../service/EvaluateOptionService.java | 120 -- .../evaluate/service/EvaluateRoleService.java | 115 -- .../service/impl/EvaluateDeptServiceImpl.java | 129 -- .../impl/EvaluateDetailServiceImpl.java | 104 -- .../service/impl/EvaluateInfoServiceImpl.java | 174 --- .../impl/EvaluateOfficerServiceImpl.java | 350 ----- .../impl/EvaluateOptionServiceImpl.java | 136 -- .../service/impl/EvaluateRoleServiceImpl.java | 118 -- .../epdc/modules/feign/SysFeignClient.java | 34 - .../fallback/SysFeignClientFallback.java | 27 - .../src/main/resources/application.yml | 2 - .../mapper/evaluate/EvaluateDeptDao.xml | 198 --- .../mapper/evaluate/EvaluateDetailDao.xml | 21 - .../mapper/evaluate/EvaluateInfoDao.xml | 78 -- .../mapper/evaluate/EvaluateOfficerDao.xml | 297 ---- .../mapper/evaluate/EvaluateOptionDao.xml | 97 -- .../mapper/evaluate/EvaluateRoleDao.xml | 31 - .../epdc-demo/epdc-demo-server/pom.xml | 4 + .../elink/esua/epdc/entity/DemoEntity.java | 2 +- .../epdc/service/impl/DemoServiceImpl.java | 4 +- .../java/com/elink/esua/epdc/OrikaTest.java | 2 +- .../db/esua_epdc_events.pdman.json | 355 +---- .../epdc/constant/ItemEvaluationLevel.java | 17 - .../comment/form/SubmitCommentFormDTO.java | 50 - .../dto/events/form/EventCountSqlFromDTO.java | 32 - .../dto/handlecategory/HandleCategoryDTO.java | 94 -- .../handlecategory/HandleCategoryTreeDTO.java | 30 - .../dto/handleroledept/HandleRoleDeptDTO.java | 86 -- .../form/HandleRoleDeptFormDTO.java | 24 - .../result/HandleRoleDeptPermissionDTO.java | 29 - .../rulecategory/HandleRoleCategoryDTO.java | 81 -- .../form/HandleRoleCategoryFormDTO.java | 29 - .../HandleRoleCategoryPermissionDTO.java | 29 - .../epdc/enums/ItemHandleCategoryEnum.java | 3 +- .../epdc-events/epdc-events-server/pom.xml | 36 +- .../controller/CategoryController.java | 6 +- .../category/entity/CategoryEntity.java | 16 +- .../category/service/CategoryService.java | 6 +- .../service/impl/CategoryServiceImpl.java | 254 ++-- .../controller/AppEventCommentController.java | 10 +- .../comment/service/EventCommentService.java | 5 +- .../service/impl/EventCommentServiceImpl.java | 15 +- .../controller/EpdcEventsController.java | 35 +- .../modules/events/dao/EpdcEventsDao.java | 36 +- .../events/service/EpdcEventsService.java | 13 - .../service/impl/EpdcEventsServiceImpl.java | 60 +- .../epdc/modules/feign/AdminFeignClient.java | 37 +- .../fallback/AdminFeignClientFallback.java | 5 - .../controller/HandleCategoryController.java | 104 -- .../handlecategory/dao/HandleCategoryDao.java | 44 - .../entity/HandleCategoryEntity.java | 65 - .../excel/HandleCategoryExcel.java | 65 - .../redis/HandleCategoryRedis.java | 47 - .../service/HandleCategoryService.java | 106 -- .../impl/HandleCategoryServiceImpl.java | 150 -- .../controller/HandleRoleDeptController.java | 119 -- .../handleroledept/dao/HandleRoleDeptDao.java | 45 - .../entity/HandleRoleDeptEntity.java | 61 - .../excel/HandleRoleDeptExcel.java | 65 - .../redis/HandleRoleDeptRedis.java | 47 - .../service/HandleRoleDeptService.java | 126 -- .../impl/HandleRoleDeptServiceImpl.java | 167 --- .../item/controller/ItemController.java | 65 +- .../esua/epdc/modules/item/dao/ItemDao.java | 95 +- .../item/entity/ItemEvaluateDeptEntity.java | 22 +- .../modules/item/service/ItemService.java | 77 +- .../impl/ItemEvaluateDeptServiceImpl.java | 5 +- .../item/service/impl/ItemServiceImpl.java | 356 ++--- .../HandleRoleCategoryController.java | 104 -- .../dao/HandleRoleCategoryDao.java | 83 -- .../entity/HandleRoleCategoryEntity.java | 51 - .../excel/HandleRoleCategoryExcel.java | 62 - .../redis/HandleRoleCategoryRedis.java | 47 - .../service/HandleRoleCategoryService.java | 147 -- .../impl/HandleRoleCategoryServiceImpl.java | 203 --- .../src/main/resources/application.yml | 20 - .../resources/mapper/category/CategoryDao.xml | 6 +- .../resources/mapper/events/EpdcEventsDao.xml | 101 +- .../handlecategory/HandleCategoryDao.xml | 27 - .../handleroledept/HandleRoleDeptDao.xml | 31 - .../main/resources/mapper/item/ItemDao.xml | 102 -- .../rolecategory/HandleRoleCategoryDao.xml | 94 -- .../dto/comment/TopicCommentFormDTO.java | 5 - .../epdc-group/epdc-group-server/pom.xml | 43 +- .../service/impl/TopicCommentServiceImpl.java | 14 +- .../src/main/resources/application.yml | 20 - .../epdc-heart/epdc-heart-client/pom.xml | 7 - .../esua/epdc/activity/ActBannerDTO.java | 101 -- .../esua/epdc/activity/ActClockListDTO.java | 62 - .../esua/epdc/activity/ActClockPicDTO.java | 77 - .../elink/esua/epdc/activity/ActInfoDTO.java | 219 --- .../epdc/activity/ActUserClockLogDTO.java | 107 -- .../esua/epdc/activity/ActUserLogDTO.java | 97 -- .../epdc/activity/ActUserPointsLogDTO.java | 96 -- .../epdc/activity/ActUserRelationDTO.java | 137 -- .../activity/AppActUserCancelsignupDTO.java | 50 - .../epdc/activity/AppActUserClockLogDTO.java | 80 -- .../esua/epdc/activity/AppClockListDTO.java | 46 - .../epdc/activity/form/ActInfoAppFormDTO.java | 70 - .../epdc/activity/form/ActInfoFormDTO.java | 210 --- .../activity/form/ActPointCheckFormDTO.java | 58 - .../form/ActUserRelationAuditFormDTO.java | 116 -- .../activity/result/ActInfoAppResultDTO.java | 108 -- .../result/ActInfoClockResultDTO.java | 75 - .../result/ActInfoDetailAppResultDTO.java | 227 --- .../result/ActInfoDetailResultDTO.java | 123 -- .../activity/result/ActInfoResultDTO.java | 208 --- .../result/ActUserClockLogResultDTO.java | 91 -- .../result/ActUserClockResultDTO.java | 131 -- .../result/ActUserRelationResultDTO.java | 113 -- .../epdc/activity/result/AppActInfoDTO.java | 61 - .../esua/epdc/constant/ActStateConstant.java | 87 -- .../ActUserPointsOperationTypeConstant.java | 31 - .../ActUserRelationStatusConstant.java | 43 - .../epdc/constant/ActUserStatusConstant.java | 51 - .../epdc/constant/HeartNoticeConstant.java | 54 - .../elink/esua/epdc/phrases/ActPhraseDTO.java | 92 -- .../epdc/volunteer/EpdcVolunteerRankDTO.java | 68 - .../esua/epdc/volunteer/VolunteerRankDTO.java | 122 -- .../epdc-heart/epdc-heart-server/Dockerfile | 20 - .../epdc-heart/epdc-heart-server/pom.xml | 90 +- .../controller/ActBannerController.java | 107 -- .../controller/ActClockPicController.java | 94 -- .../controller/ActInfoController.java | 135 -- .../controller/ActUserClockLogController.java | 122 -- .../controller/ActUserLogController.java | 94 -- .../ActUserPointsLogController.java | 94 -- .../controller/ActUserRelationController.java | 101 -- .../controller/AppActInfoController.java | 118 -- .../AppActUserClockLogController.java | 56 - .../AppActUserRelationController.java | 83 -- .../modules/activity/dao/ActBannerDao.java | 78 -- .../modules/activity/dao/ActClockPicDao.java | 33 - .../epdc/modules/activity/dao/ActInfoDao.java | 106 -- .../activity/dao/ActUserClockLogDao.java | 39 - .../modules/activity/dao/ActUserLogDao.java | 33 - .../activity/dao/ActUserPointsLogDao.java | 33 - .../activity/dao/ActUserRelationDao.java | 119 -- .../activity/entity/ActBannerEntity.java | 91 -- .../activity/entity/ActClockPicEntity.java | 48 - .../activity/entity/ActInfoEntity.java | 205 --- .../entity/ActUserClockLogEntity.java | 82 -- .../activity/entity/ActUserLogEntity.java | 70 - .../entity/ActUserPointsLogEntity.java | 66 - .../entity/ActUserRelationEntity.java | 111 -- .../activity/excel/ActBannerExcel.java | 86 -- .../activity/excel/ActClockPicExcel.java | 59 - .../modules/activity/excel/ActInfoExcel.java | 138 -- .../activity/excel/ActUserClockLogExcel.java | 75 - .../activity/excel/ActUserLogExcel.java | 74 - .../activity/excel/ActUserPointsLogExcel.java | 71 - .../activity/excel/ActUserRelationExcel.java | 95 -- .../activity/redis/ActBannerRedis.java | 47 - .../activity/redis/ActClockPicRedis.java | 47 - .../modules/activity/redis/ActInfoRedis.java | 47 - .../activity/redis/ActUserClockLogRedis.java | 47 - .../activity/redis/ActUserLogRedis.java | 47 - .../activity/redis/ActUserPointsLogRedis.java | 47 - .../activity/redis/ActUserRelationRedis.java | 47 - .../activity/service/ActBannerService.java | 133 -- .../activity/service/ActClockPicService.java | 95 -- .../activity/service/ActInfoService.java | 179 --- .../service/ActUserClockLogService.java | 116 -- .../activity/service/ActUserLogService.java | 95 -- .../service/ActUserPointsLogService.java | 104 -- .../service/ActUserRelationService.java | 169 --- .../service/impl/ActBannerServiceImpl.java | 155 --- .../service/impl/ActClockPicServiceImpl.java | 104 -- .../service/impl/ActInfoServiceImpl.java | 481 ------- .../impl/ActUserClockLogServiceImpl.java | 357 ----- .../service/impl/ActUserLogServiceImpl.java | 104 -- .../impl/ActUserPointsLogServiceImpl.java | 118 -- .../impl/ActUserRelationServiceImpl.java | 468 ------- .../esua/epdc/modules/async/NewsTask.java | 47 - .../epdc/modules/feign/JobFeignClient.java | 37 - .../epdc/modules/feign/NewsFeignClient.java | 43 - .../epdc/modules/feign/PointsFeignClient.java | 25 - .../modules/feign/UserInfoFeignClient.java | 82 -- .../fallback/JobFeignClientFallback.java | 22 - .../fallback/NewsFeignClientFallback.java | 28 - .../fallback/PointsFeignClientFallback.java | 23 - .../fallback/UserInfoFeignClientFallback.java | 48 - .../controller/ActPhraseController.java | 95 -- .../controller/AppActPhraseController.java | 66 - .../modules/phrases/dao/ActPhraseDao.java | 53 - .../phrases/entity/ActPhraseEntity.java | 63 - .../phrases/entity/ActPhraseRedisEntity.java | 46 - .../modules/phrases/excel/ActPhraseExcel.java | 65 - .../modules/phrases/redis/ActPhraseRedis.java | 47 - .../phrases/service/ActPhraseService.java | 126 -- .../service/impl/ActPhraseServiceImpl.java | 202 --- .../AppVolunteerRankController.java | 65 - .../controller/VolunteerRankController.java | 94 -- .../volunteer/dao/VolunteerRankDao.java | 41 - .../volunteer/entity/VolunteerRankEntity.java | 92 -- .../volunteer/excel/VolunteerRankExcel.java | 87 -- .../volunteer/redis/VolunteerRankRedis.java | 47 - .../service/VolunteerRankService.java | 114 -- .../impl/VolunteerRankServiceImpl.java | 136 -- .../epdc/support/initbean/InitRedisCache.java | 19 - .../src/main/resources/application.yml | 38 - .../mapper/activity/ActBannerDao.xml | 112 -- .../mapper/activity/ActClockPicDao.xml | 18 - .../resources/mapper/activity/ActInfoDao.xml | 509 ------- .../mapper/activity/ActUserClockLogDao.xml | 67 - .../mapper/activity/ActUserLogDao.xml | 19 - .../mapper/activity/ActUserPointsLogDao.xml | 22 - .../mapper/activity/ActUserRelationDao.xml | 271 ---- .../resources/mapper/phrases/ActPhraseDao.xml | 59 - .../mapper/volunteer/VolunteerRankDao.xml | 34 - .../src/main/resources/registry.conf | 4 +- .../epdc-job/epdc-job-client/pom.xml | 5 - .../epdc-job/epdc-job-server/Dockerfile | 20 - .../epdc-job/epdc-job-server/pom.xml | 18 - .../controller/ScheduleJobController.java | 1 - .../elink/esua/epdc/dao/ScheduleJobDao.java | 7 +- .../esua/epdc/feign/HeartFeignClient.java | 40 - .../elink/esua/epdc/feign/KpiFeignClient.java | 49 - .../esua/epdc/feign/UserFeignClient.java | 48 - .../fallback/HeartFeignClientFallback.java | 39 - .../fallback/KpiFeignClientFallBack.java | 27 - .../fallback/UserFeignClientFallback.java | 37 - .../esua/epdc/service/ActivityService.java | 27 - .../epdc/service/ScheduleJobKpiService.java | 38 - .../esua/epdc/service/ScheduleJobService.java | 6 +- .../esua/epdc/service/VolunteerService.java | 27 - .../service/impl/ActivityServiceImpl.java | 37 - .../impl/ScheduleJobKpiServiceImpl.java | 36 - .../service/impl/ScheduleJobServiceImpl.java | 6 - .../service/impl/VolunteerServiceImpl.java | 42 - .../esua/epdc/task/KpiManualScoreTask.java | 30 - .../elink/esua/epdc/task/KpiMetaDataTask.java | 35 - .../com/elink/esua/epdc/task/KpiRuleTask.java | 34 - .../task/activity/AutoAuditActUserTask.java | 31 - .../activity/AutoAuditActUserTaskImpl.java | 55 - .../volunteer/UpdateVolunteerRankTask.java | 31 - .../UpdateVolunteerRankTaskImpl.java | 43 - .../src/main/resources/application.yml | 21 - .../main/resources/mapper/ScheduleJobDao.xml | 4 - .../esua/epdc/constant/KpiFieldConstant.java | 24 - .../esua/epdc/constant/KpiItemConstant.java | 15 - .../constant/KpiScheduleCodeConstant.java | 65 - .../esua/epdc/dto/EventCountFromDTO.java | 25 - .../esua/epdc/dto/KpiManualScoreDTO.java | 25 +- .../esua/epdc/dto/KpiManualScoreRuleDTO.java | 4 +- .../esua/epdc/dto/KpiManualScoreTempDTO.java | 2 +- .../elink/esua/epdc/dto/KpiMetaDataDTO.java | 113 -- .../elink/esua/epdc/dto/KpiResultGridDTO.java | 177 --- .../esua/epdc/dto/KpiResultSuperiorDTO.java | 144 -- .../esua/epdc/dto/KpiTimeLimitItemDTO.java | 4 +- .../esua/epdc/dto/ScheduleJobParamDTO.java | 50 - .../epdc/dto/form/CategoryInfoFormDTO.java | 20 - .../dto/form/KpiMetaDataOfEventsFormDTO.java | 33 - .../dto/form/KpiRuleSaveOrUpdateFormDTO.java | 6 - .../dto/result/CategoryInfoResultDTO.java | 38 - .../result/KpiEvaluationAmountResultDTO.java | 36 - .../result/KpiEventReportAmountResultDTO.java | 30 - .../result/KpiItemHandleAmountResultDTO.java | 30 - .../KpiItemTimeLimitByDeptResultDTO.java | 48 - .../KpiManualScoreTemplateResultDTO.java | 51 +- .../dto/result/KpiRuleQueryResultDTO.java | 5 - .../elink/esua/epdc/enums/KpiCycleEnum.java | 82 +- .../esua/epdc/enums/KpiMetaDataEnum.java | 116 -- .../epdc/enums/KpiResultGridDataEnum.java | 50 - .../esua/epdc/enums/KpiRuleModeEnum.java | 37 - .../epdc-kpi/epdc-kpi-server/pom.xml | 27 +- .../epdc/controller/KpiFormulaController.java | 2 +- .../controller/KpiManualScoreController.java | 49 +- .../KpiManualScoreRuleController.java | 2 +- .../controller/KpiMetaDataController.java | 110 -- .../controller/KpiResultGridController.java | 125 -- .../KpiResultSuperiorController.java | 111 -- .../epdc/controller/KpiRuleController.java | 224 ++- .../controller/KpiRuleParamController.java | 2 +- .../KpiTimeLimitIssueController.java | 2 +- .../KpiTimeLimitItemController.java | 2 +- .../elink/esua/epdc/dao/KpiFormulaDao.java | 10 - .../esua/epdc/dao/KpiManualScoreDao.java | 19 +- .../elink/esua/epdc/dao/KpiMetaDataDao.java | 48 - .../elink/esua/epdc/dao/KpiResultGridDao.java | 86 -- .../esua/epdc/dao/KpiResultSuperiorDao.java | 81 -- .../com/elink/esua/epdc/dao/KpiRuleDao.java | 10 - .../elink/esua/epdc/dao/KpiRuleParamDao.java | 12 - .../esua/epdc/dao/KpiTimeLimitItemDao.java | 16 +- .../epdc/entity/KpiManualScoreEntity.java | 50 +- .../epdc/entity/KpiManualScoreRuleEntity.java | 5 +- .../esua/epdc/entity/KpiMetaDataEntity.java | 82 -- .../esua/epdc/entity/KpiResultGridEntity.java | 107 -- .../epdc/entity/KpiResultSuperiorEntity.java | 92 -- .../epdc/entity/KpiTimeLimitItemEntity.java | 2 +- .../excel/KpiManualScoreTemplateExcel.java | 147 +- .../esua/epdc/excel/KpiMetaDataExcel.java | 78 -- .../epdc/excel/KpiResultGridDetailExcel.java | 22 - .../esua/epdc/excel/KpiResultGridExcel.java | 56 - .../excel/KpiResultSuperiorDetailExcel.java | 35 - .../epdc/excel/KpiResultSuperiorExcel.java | 53 - .../esua/epdc/feign/AdminFeignClient.java | 46 +- .../esua/epdc/feign/EventFeignClient.java | 72 +- .../fallback/AdminFeignClientFallback.java | 55 +- .../fallback/EventFeignClientFallback.java | 38 +- .../esua/epdc/redis/KpiMetaDataRedis.java | 47 - .../esua/epdc/redis/KpiResultGridRedis.java | 47 - .../epdc/redis/KpiResultSuperiorRedis.java | 47 - .../epdc/redis/KpiTimeLimitItemRedis.java | 32 +- .../epdc/service/KpiManualScoreService.java | 19 - .../esua/epdc/service/KpiMetaDataService.java | 107 -- .../epdc/service/KpiResultGridService.java | 95 -- .../service/KpiResultSuperiorService.java | 97 -- .../esua/epdc/service/KpiRuleService.java | 236 ++-- .../service/impl/KpiFormulaServiceImpl.java | 3 +- .../impl/KpiManualScoreRuleServiceImpl.java | 2 +- .../impl/KpiManualScoreServiceImpl.java | 1234 ++++++----------- .../service/impl/KpiMetaDataServiceImpl.java | 579 -------- .../impl/KpiResultGridServiceImpl.java | 252 ---- .../impl/KpiResultSuperiorServiceImpl.java | 171 --- .../epdc/service/impl/KpiRuleServiceImpl.java | 791 +++-------- .../impl/KpiTimeLimitIssueServiceImpl.java | 5 + .../impl/KpiTimeLimitItemServiceImpl.java | 98 +- .../com/elink/esua/epdc/utils/DeptUtils.java | 73 - .../esua/epdc/utils/KpiLocalDateUtils.java | 129 -- .../src/main/resources/application.yml | 19 - .../main/resources/mapper/KpiFormulaDao.xml | 16 - .../resources/mapper/KpiManualScoreDao.xml | 68 +- .../main/resources/mapper/KpiMetaDataDao.xml | 37 - .../resources/mapper/KpiResultGridDao.xml | 119 -- .../resources/mapper/KpiResultSuperiorDao.xml | 84 -- .../src/main/resources/mapper/KpiRuleDao.xml | 17 - .../main/resources/mapper/KpiRuleParamDao.xml | 14 - .../resources/mapper/KpiTimeLimitItemDao.xml | 20 +- .../src/main/resources/application.yml | 2 +- .../dto/epdc/form/EpdcInformationFormDTO.java | 6 +- .../epdc-news/epdc-news-server/pom.xml | 19 +- .../EpdcAppInformationController.java | 15 +- .../esua/epdc/service/InformationService.java | 11 +- .../service/impl/InformationServiceImpl.java | 14 +- .../src/main/resources/application.yml | 20 - .../src/main/resources/mapper/NoticeDao.xml | 2 +- .../epdc-oss/epdc-oss-server/pom.xml | 22 - .../esua/epdc/controller/OssController.java | 12 - .../elink/esua/epdc/service/OssService.java | 9 - .../epdc/service/impl/OssServiceImpl.java | 31 - .../src/main/resources/application.yml | 20 - .../epdc-points/epdc-points-client/pom.xml | 22 - .../epdc/constant/PointsNoticeConstant.java | 43 - .../esua/epdc/dto/logs/PointsLogsDTO.java | 136 -- .../esua/epdc/dto/logs/UserPointsLogDTO.java | 46 - .../esua/epdc/dto/rule/PointsRuleDTO.java | 122 -- .../java/com/elink/esua/epdc/epdc.gitkeep | 0 .../epdc-points/epdc-points-server/Dockerfile | 20 - .../epdc-points/epdc-points-server/pom.xml | 198 --- .../elink/esua/epdc/PointsApplication.java | 31 - .../esua/epdc/config/ModuleConfigImpl.java | 26 - .../esua/epdc/modules/async/NewsTask.java | 34 - .../epdc/modules/feign/NewsFeignClient.java | 31 - .../epdc/modules/feign/UserFeignClient.java | 42 - .../fallback/NewsFeignClientFallback.java | 21 - .../fallback/UserFeignClientFallback.java | 28 - .../logs/controller/PointsLogsController.java | 112 -- .../epdc/modules/logs/dao/PointsLogsDao.java | 33 - .../modules/logs/entity/PointsLogsEntity.java | 104 -- .../modules/logs/excel/PointsLogsExcel.java | 86 -- .../modules/logs/redis/PointsLogsRedis.java | 47 - .../logs/service/PointsLogsService.java | 106 -- .../service/impl/PointsLogsServiceImpl.java | 200 --- .../rule/controller/PointsRuleController.java | 103 -- .../epdc/modules/rule/dao/PointsRuleDao.java | 34 - .../modules/rule/entity/PointsRuleEntity.java | 91 -- .../modules/rule/excel/PointsRuleExcel.java | 86 -- .../modules/rule/redis/PointsRuleRedis.java | 47 - .../rule/service/PointsRuleService.java | 114 -- .../service/impl/PointsRuleServiceImpl.java | 235 ---- .../epdc/support/annotion/PointsBehavior.java | 42 - .../epdc/support/aop/PointsBehaviorAop.java | 209 --- .../initbean/InitPointsRuleRedisCache.java | 31 - .../src/main/resources/application.yml | 77 - .../main/resources/i18n/messages.properties | 0 .../resources/i18n/messages_en_US.properties | 0 .../resources/i18n/messages_zh_CN.properties | 0 .../resources/i18n/messages_zh_TW.properties | 0 .../main/resources/i18n/validation.properties | 0 .../i18n/validation_en_US.properties | 0 .../i18n/validation_zh_CN.properties | 0 .../i18n/validation_zh_TW.properties | 0 .../src/main/resources/logback-spring.xml | 159 --- .../resources/mapper/logs/PointsLogsDao.xml | 29 - .../resources/mapper/rule/PointsRuleDao.xml | 27 - .../src/main/resources/registry.conf | 21 - esua-epdc/epdc-module/epdc-points/pom.xml | 20 - .../epdc-services-server/Dockerfile | 20 - .../constant/VolunteerInfoNoticeConstant.java | 22 - .../esua/epdc/dto/CachingUserInfoDTO.java | 73 - .../esua/epdc/dto/UserGridRelationDTO.java | 62 +- .../com/elink/esua/epdc/dto/UserTagDTO.java | 4 - .../com/elink/esua/epdc/dto/UserTagInfo.java | 27 - .../elink/esua/epdc/dto/VolunteerInfoDTO.java | 199 --- .../epdc/dto/epdc/EpdcCompleteAppUserDTO.java | 5 - .../EpdcCompleteVolunteerInfoFormDTO.java | 115 -- .../dto/epdc/form/EpdcUserPointsFormDTO.java | 32 - .../EpdcVolunteerKindnessTimeFormDTO.java | 28 - .../result/EpdcAdjustVolunteerPointsDTO.java | 79 -- .../epdc/result/EpdcGetVolunteerRankDTO.java | 122 -- .../result/EpdcVolunteerInfoResultDTO.java | 158 --- .../epdc-user/epdc-user-server/pom.xml | 24 - .../com/elink/esua/epdc/UserApplication.java | 4 +- .../com/elink/esua/epdc/async/NewsTask.java | 33 - .../controller/EpdcAppUserController.java | 72 +- .../EpdcAppVolunteerInfoController.java | 65 - .../esua/epdc/controller/UserController.java | 13 - .../epdc/controller/UserTagController.java | 10 +- .../controller/VolunteerInfoController.java | 184 --- .../java/com/elink/esua/epdc/dao/UserDao.java | 20 - .../com/elink/esua/epdc/dao/UserTagDao.java | 24 +- .../esua/epdc/dao/UserTagRelationDao.java | 15 +- .../elink/esua/epdc/dao/VolunteerInfoDao.java | 131 -- .../PartyAuthenticationFailedEntity.java | 57 +- .../esua/epdc/entity/PartyMembersEntity.java | 63 +- .../entity/UserAuthenticateHistoryEntity.java | 28 +- .../elink/esua/epdc/entity/UserEntity.java | 25 +- .../epdc/entity/UserGridRelationEntity.java | 34 +- .../elink/esua/epdc/entity/UserTagEntity.java | 6 - .../esua/epdc/entity/VolunteerInfoEntity.java | 158 --- .../esua/epdc/excel/VolunteerInfoExcel.java | 126 -- .../esua/epdc/feign/NewsFeignClient.java | 32 - .../fallback/NewsFeignClientFallback.java | 23 - .../esua/epdc/redis/VolunteerInfoRedis.java | 47 - .../epdc/service/PartyMembersService.java | 11 - .../elink/esua/epdc/service/UserService.java | 54 +- .../epdc/service/UserTagRelationService.java | 12 +- .../esua/epdc/service/UserTagService.java | 7 +- .../epdc/service/VolunteerInfoService.java | 207 --- .../service/impl/PartyMembersServiceImpl.java | 78 +- .../impl/UserTagRelationServiceImpl.java | 53 +- .../epdc/service/impl/UserTagServiceImpl.java | 25 +- .../impl/VolunteerInfoServiceImpl.java | 340 ----- .../src/main/resources/application.yml | 20 - .../src/main/resources/mapper/UserDao.xml | 85 -- .../src/main/resources/mapper/UserTagDao.xml | 24 +- .../resources/mapper/UserTagRelationDao.xml | 15 +- .../resources/mapper/VolunteerInfoDao.xml | 206 --- .../esua/epdc/config/WebServiceConfig.java | 22 +- .../com/elink/esua/epdc/dto/form/TestDTO.java | 16 +- .../com/elink/esua/epdc/utils/JaxbUtil.java | 2 +- .../epdc-websocket-server/pom.xml | 6 +- esua-epdc/epdc-module/pom.xml | 2 +- .../kongcun/app-master/mysql/mysql-config.yml | 30 - .../kongcun/app-master/mysql/mysql-deploy.yml | 42 - .../k8s/kongcun/app-master/mysql/mysql-pv.yml | 17 - .../kongcun/app-master/mysql/mysql-pvc.yml | 17 - .../kongcun/app-master/mysql/mysql-secret.yml | 11 - .../kongcun/app-master/mysql/mysql-svc.yml | 16 - .../k8s/kongcun/app-master/nacos/nacos-cm.yml | 11 - .../app-master/nacos/nacos-pvc-nfs.yml | 132 -- .../kongcun/app-master/nacos/nacos-svc.yml | 18 - .../kongcun/app-master/nfs/nfs-deployment.yml | 35 - .../k8s/kongcun/app-master/nfs/nfs-rbac.yml | 42 - .../app-master/nfs/storageclass-nfs.yml | 5 - .../kongcun/app-master/nginx/nginx-deploy.yml | 41 - .../k8s/kongcun/app-master/nginx/nginx-pv.yml | 60 - .../kongcun/app-master/nginx/nginx-pvc.yml | 61 - .../kongcun/app-master/nginx/nginx-svc.yml | 16 - esua-epdc/pom.xml | 31 +- 629 files changed, 2448 insertions(+), 39716 deletions(-) delete mode 100644 esua-epdc/doc/db/dev_youhua/esua_epdc_user.sql delete mode 100644 esua-epdc/docker-compose/prod/nginx/docker-compose.yml delete mode 100644 esua-epdc/docker-compose/test/nginx/docker-compose.yml delete mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/RoleTypeKeyConstant.java delete mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptLevelAndLeaderDTO.java delete mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java delete mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java delete mode 100644 esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/IdentityNoAnalysisUtil.java delete mode 100644 esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/entity/DeptScope.java delete mode 100644 esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java delete mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NacosConfigConstant.java delete mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/PointsConstant.java delete mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/StrConstant.java delete mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/UserAuthTypeEnum.java delete mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/UserTagEnum.java delete mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsBehaviorCodeEnum.java delete mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsLimitTimeEnum.java delete mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsOperationEnum.java delete mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsOperationModeEnum.java delete mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsRuleAvailableEnum.java delete mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsRuleCodeEnum.java delete mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsUpperLimitEnum.java delete mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/LocalDateUtils.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserClockLogDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppClockListDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActPhraseController.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiEvaluateController.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/DemoController.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActPhraseFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/EvaluateFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActPhraseFeignClientFallback.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActUserRelationFeignClientFallback.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/EvaluateFeignClientFallback.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActPhraseService.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActUserRelationService.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppVolunteerRankService.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/DemoService.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/EvaluateService.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActPhraseServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActUserRelationServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/DemoServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/EvaluateServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/UserTagUtils.java delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-dev.yml delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-prod.yml delete mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-test.yml delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateDeptDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateDetailDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateInfoDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOfficerDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptionDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptions.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateRoleDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateSelectOption.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateShowOption.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateUpdateDeptOfficerCountDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateOfficerAppFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateOptionAppFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateOptionFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateRoleFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateSubmitFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateDeptCountResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateInfoResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateOfficerAppResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateOfficerCountResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateOptionAppResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/RoleDictDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/RoleResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDeptController.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDetailController.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateInfoController.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOfficerController.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOptionController.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateRoleController.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateDeptDao.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateDetailDao.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOptionDao.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateRoleDao.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateDeptEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateDetailEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateInfoEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateOfficerEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateOptionEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateRoleEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptCountExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDetailExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateInfoExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerCountExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOptionExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateRoleExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateDeptRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateDetailRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateInfoRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateOfficerRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateOptionRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateRoleRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateDeptService.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateDetailService.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateInfoService.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOfficerService.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOptionService.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateRoleService.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateDeptServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateDetailServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOptionServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateRoleServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/SysFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/SysFeignClientFallback.java delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDeptDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDetailDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateRoleDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemEvaluationLevel.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/SubmitCommentFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventCountSqlFromDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handlecategory/HandleCategoryDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handlecategory/HandleCategoryTreeDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handleroledept/HandleRoleDeptDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handleroledept/form/HandleRoleDeptFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handleroledept/result/HandleRoleDeptPermissionDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rulecategory/HandleRoleCategoryDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rulecategory/form/HandleRoleCategoryFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rulecategory/result/HandleRoleCategoryPermissionDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/controller/HandleCategoryController.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/dao/HandleCategoryDao.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/entity/HandleCategoryEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/excel/HandleCategoryExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/redis/HandleCategoryRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/service/HandleCategoryService.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/service/impl/HandleCategoryServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/controller/HandleRoleDeptController.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/dao/HandleRoleDeptDao.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/entity/HandleRoleDeptEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/excel/HandleRoleDeptExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/redis/HandleRoleDeptRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/service/HandleRoleDeptService.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/service/impl/HandleRoleDeptServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/controller/HandleRoleCategoryController.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/dao/HandleRoleCategoryDao.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/entity/HandleRoleCategoryEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/excel/HandleRoleCategoryExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/redis/HandleRoleCategoryRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/service/HandleRoleCategoryService.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/service/impl/HandleRoleCategoryServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/handlecategory/HandleCategoryDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/handleroledept/HandleRoleDeptDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/rolecategory/HandleRoleCategoryDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActClockListDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActClockPicDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserClockLogDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserLogDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserPointsLogDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserRelationDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserCancelsignupDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppClockListDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActInfoAppFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActInfoFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActPointCheckFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActUserRelationAuditFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoAppResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoClockResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockLogResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/AppActInfoDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActStateConstant.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserPointsOperationTypeConstant.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserRelationStatusConstant.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserStatusConstant.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/phrases/ActPhraseDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerRankDTO.java delete mode 100755 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/Dockerfile delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActClockPicController.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserClockLogController.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserLogController.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserPointsLogController.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserClockLogController.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActClockPicDao.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserClockLogDao.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserLogDao.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserPointsLogDao.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserRelationDao.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActClockPicEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserClockLogEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserLogEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserPointsLogEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserRelationEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActBannerExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActClockPicExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActInfoExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserClockLogExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserLogExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserPointsLogExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserRelationExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActBannerRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActClockPicRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActInfoRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserClockLogRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserLogRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserPointsLogRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserRelationRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActClockPicService.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserClockLogService.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserLogService.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserPointsLogService.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActClockPicServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserLogServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserPointsLogServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/async/NewsTask.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/JobFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/NewsFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/PointsFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/JobFeignClientFallback.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/NewsFeignClientFallback.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/ActPhraseController.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/AppActPhraseController.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/dao/ActPhraseDao.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/entity/ActPhraseEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/entity/ActPhraseRedisEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/excel/ActPhraseExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/redis/ActPhraseRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/ActPhraseService.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/AppVolunteerRankController.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerRankController.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/excel/VolunteerRankExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/redis/VolunteerRankRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerRankService.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/support/initbean/InitRedisCache.java delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActClockPicDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserClockLogDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserLogDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserPointsLogDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/phrases/ActPhraseDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml delete mode 100755 esua-epdc/epdc-module/epdc-job/epdc-job-server/Dockerfile delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/HeartFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/KpiFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/HeartFeignClientFallback.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/KpiFeignClientFallBack.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ActivityService.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobKpiService.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/VolunteerService.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ActivityServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobKpiServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiManualScoreTask.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiMetaDataTask.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiRuleTask.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/activity/AutoAuditActUserTask.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/activity/AutoAuditActUserTaskImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/volunteer/UpdateVolunteerRankTask.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/volunteer/UpdateVolunteerRankTaskImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiFieldConstant.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiItemConstant.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiScheduleCodeConstant.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/EventCountFromDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiMetaDataDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiResultGridDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiResultSuperiorDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/CategoryInfoFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiMetaDataOfEventsFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/CategoryInfoResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiEvaluationAmountResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiEventReportAmountResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiItemHandleAmountResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiItemTimeLimitByDeptResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiMetaDataEnum.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiRuleModeEnum.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultGridController.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultSuperiorController.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMetaDataDao.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultGridDao.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultSuperiorDao.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiMetaDataEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiResultGridEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiResultSuperiorEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiMetaDataExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridDetailExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultSuperiorDetailExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultSuperiorExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiMetaDataRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiResultGridRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiResultSuperiorRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMetaDataService.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiResultGridService.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiResultSuperiorService.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultSuperiorServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/DeptUtils.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/KpiLocalDateUtils.java delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMetaDataDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-client/pom.xml delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/constant/PointsNoticeConstant.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/logs/PointsLogsDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/logs/UserPointsLogDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/rule/PointsRuleDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/epdc.gitkeep delete mode 100755 esua-epdc/epdc-module/epdc-points/epdc-points-server/Dockerfile delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/pom.xml delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/PointsApplication.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/async/NewsTask.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/NewsFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/UserFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/NewsFeignClientFallback.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserFeignClientFallback.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/controller/PointsLogsController.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/dao/PointsLogsDao.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/entity/PointsLogsEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/excel/PointsLogsExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/redis/PointsLogsRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/PointsLogsService.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/logs/service/impl/PointsLogsServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/rule/controller/PointsRuleController.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/rule/dao/PointsRuleDao.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/rule/entity/PointsRuleEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/rule/excel/PointsRuleExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/rule/redis/PointsRuleRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/rule/service/PointsRuleService.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/modules/rule/service/impl/PointsRuleServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/support/annotion/PointsBehavior.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/support/aop/PointsBehaviorAop.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/support/initbean/InitPointsRuleRedisCache.java delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/application.yml delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/messages.properties delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/messages_en_US.properties delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/messages_zh_CN.properties delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/messages_zh_TW.properties delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/validation.properties delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/validation_en_US.properties delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/validation_zh_CN.properties delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/i18n/validation_zh_TW.properties delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/logback-spring.xml delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/logs/PointsLogsDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/rule/PointsRuleDao.xml delete mode 100644 esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/registry.conf delete mode 100644 esua-epdc/epdc-module/epdc-points/pom.xml delete mode 100755 esua-epdc/epdc-module/epdc-services/epdc-services-server/Dockerfile delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/constant/VolunteerInfoNoticeConstant.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/CachingUserInfoDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserTagInfo.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcCompleteVolunteerInfoFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcUserPointsFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcVolunteerKindnessTimeFormDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcGetVolunteerRankDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/async/NewsTask.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/NewsFeignClient.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/feign/fallback/NewsFeignClientFallback.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/VolunteerInfoRedis.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml delete mode 100644 esua-epdc/k8s/kongcun/app-master/mysql/mysql-config.yml delete mode 100644 esua-epdc/k8s/kongcun/app-master/mysql/mysql-deploy.yml delete mode 100644 esua-epdc/k8s/kongcun/app-master/mysql/mysql-pv.yml delete mode 100644 esua-epdc/k8s/kongcun/app-master/mysql/mysql-pvc.yml delete mode 100644 esua-epdc/k8s/kongcun/app-master/mysql/mysql-secret.yml delete mode 100644 esua-epdc/k8s/kongcun/app-master/mysql/mysql-svc.yml delete mode 100644 esua-epdc/k8s/kongcun/app-master/nacos/nacos-cm.yml delete mode 100644 esua-epdc/k8s/kongcun/app-master/nacos/nacos-pvc-nfs.yml delete mode 100644 esua-epdc/k8s/kongcun/app-master/nacos/nacos-svc.yml delete mode 100644 esua-epdc/k8s/kongcun/app-master/nfs/nfs-deployment.yml delete mode 100644 esua-epdc/k8s/kongcun/app-master/nfs/nfs-rbac.yml delete mode 100644 esua-epdc/k8s/kongcun/app-master/nfs/storageclass-nfs.yml delete mode 100644 esua-epdc/k8s/kongcun/app-master/nginx/nginx-deploy.yml delete mode 100644 esua-epdc/k8s/kongcun/app-master/nginx/nginx-pv.yml delete mode 100644 esua-epdc/k8s/kongcun/app-master/nginx/nginx-pvc.yml delete mode 100644 esua-epdc/k8s/kongcun/app-master/nginx/nginx-svc.yml diff --git a/esua-epdc/doc/db/dev_youhua/esua_epdc_user.sql b/esua-epdc/doc/db/dev_youhua/esua_epdc_user.sql deleted file mode 100644 index db8f63d20..000000000 --- a/esua-epdc/doc/db/dev_youhua/esua_epdc_user.sql +++ /dev/null @@ -1,52 +0,0 @@ ---------标记一下这个已经随工作端上线 -ALTER TABLE esua_epdc_user.epdc_party_authentication_failed MODIFY COLUMN `STATE` VARCHAR(1) NULL COMMENT '状态 0-认证失败'; -ALTER TABLE esua_epdc_user.epdc_party_authentication_failed MODIFY COLUMN `CADRE_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 0 NULL COMMENT '干部下沉标识 0-否，1-是'; -ALTER TABLE esua_epdc_user.epdc_user_authenticate_history ADD AUTHENTICATED_TYPE varchar(2) NOT NULL COMMENT '认证类别(0-居民认证，1-党员认证，2-志愿者认证)'; ------------------------------------------------- - -CREATE TABLE `epdc_handle_category` ( - `ID` varchar(32) NOT NULL COMMENT '主键', - `CATEGORY_VAL` int(11) NOT NULL COMMENT '处理类别值', - `CATEGORY_LABEL` varchar(20) NOT NULL COMMENT '处理类别显示信息', - `AVAILABLE` varchar(1) NOT NULL DEFAULT '1' COMMENT '可用状态(0-不可用，1-可用)', - `SORT` int(11) NOT NULL DEFAULT '0' COMMENT '排序', - `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建人', - `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新人', - `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', - `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识 0：未删除，1：已删除', - `CATEGORY_CODE` varchar(32) NOT NULL COMMENT '处理类型编码', - PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='处理类别表' - - -CREATE TABLE `epdc_role_category` ( - `ID` varchar(32) NOT NULL COMMENT '主键', - `ROLE_ID` varchar(32) NOT NULL COMMENT '角色ID', - `CATEGORY_ID` varchar(32) NOT NULL COMMENT '处理类别ID', - `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建人', - `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新人', - `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', - `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识 0：未删除，1：已删除', - PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色和处理类别关系表' - - -ALTER TABLE EPDC_HANDLE_ROLE_CATEGORY COMMENT '角色和处理类别关系表';; -CREATE TABLE EPDC_HANDLE_ROLE_DEPT( - ID VARCHAR(32) NOT NULL COMMENT '主键' , - ROLE_ID VARCHAR(32) NOT NULL COMMENT '角色ID' , - DEPT_ID VARCHAR(32) NOT NULL COMMENT '部门ID' , - DEPT_TYPE VARCHAR(50) NOT NULL COMMENT '部门机构类型' , - REVISION INT COMMENT '乐观锁' , - CREATED_BY VARCHAR(32) COMMENT '创建人' , - CREATED_TIME DATETIME COMMENT '创建时间' , - UPDATED_BY VARCHAR(32) COMMENT '更新人' , - UPDATED_TIME DATETIME COMMENT '更新时间' , - PRIMARY KEY (ID) -) COMMENT = '处理部门角色权限表 处理部门角色权限表';; - -ALTER TABLE EPDC_HANDLE_ROLE_DEPT COMMENT '处理部门角色权限表';; diff --git a/esua-epdc/docker-compose/prod/master/application/10.5.34.162-master/docker-compose.yml b/esua-epdc/docker-compose/prod/master/application/10.5.34.162-master/docker-compose.yml index d0b0da8af..020aa2d1b 100644 --- a/esua-epdc/docker-compose/prod/master/application/10.5.34.162-master/docker-compose.yml +++ b/esua-epdc/docker-compose/prod/master/application/10.5.34.162-master/docker-compose.yml @@ -6,8 +6,8 @@ services: - 443:443 volumes: - /mnt/nginx/html:/usr/share/nginx/html - - /mnt/nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro - - /mnt/nginx/conf.d:/etc/nginx/conf.d:ro + - /mnt/nginx/conf/nginx.conf:/etc/nginx/nginx.conf + - /mnt/nginx/conf.d:/etc/nginx/conf.d - /mnt/nginx/logs:/var/log/nginx restart: always container_name: nginx_master diff --git a/esua-epdc/docker-compose/prod/nginx/docker-compose.yml b/esua-epdc/docker-compose/prod/nginx/docker-compose.yml deleted file mode 100644 index d0b0da8af..000000000 --- a/esua-epdc/docker-compose/prod/nginx/docker-compose.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: '3.7' -services: - web: - image: nginx - ports: - - 443:443 - volumes: - - /mnt/nginx/html:/usr/share/nginx/html - - /mnt/nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro - - /mnt/nginx/conf.d:/etc/nginx/conf.d:ro - - /mnt/nginx/logs:/var/log/nginx - restart: always - container_name: nginx_master - diff --git a/esua-epdc/docker-compose/test/nginx/docker-compose.yml b/esua-epdc/docker-compose/test/nginx/docker-compose.yml deleted file mode 100644 index cfbdcd268..000000000 --- a/esua-epdc/docker-compose/test/nginx/docker-compose.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: '3.7' -services: - web: - image: nginx - ports: - - 443:443 - volumes: - - /opt/docker/nginx/html:/usr/share/nginx/html - - /opt/docker/nginx/conf/nginx.conf:/etc/nginx/nginx.conf:ro - - /opt/docker/nginx/conf.d:/etc/nginx/conf.d:ro - - /opt/docker/nginx/logs:/var/log/nginx - - /opt/docker/nginx/cert:/etc/nginx/cert:ro - restart: always - container_name: nginx_master - diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/RoleTypeKeyConstant.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/RoleTypeKeyConstant.java deleted file mode 100644 index 4ac881e24..000000000 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/constant/RoleTypeKeyConstant.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.elink.esua.epdc.constant; - -/** - * TypeKey 常量 - * - * @author work@yujt.net.cn - * @date 2019/12/18 10:10 - */ -public interface RoleTypeKeyConstant { - - /** - * 角色：网格长 - */ - String ROLE_GRID_LEADER = "gridLeader"; -} diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptLevelAndLeaderDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptLevelAndLeaderDTO.java deleted file mode 100644 index a097e497a..000000000 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptLevelAndLeaderDTO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.elink.esua.epdc.dto; - -import lombok.Data; - -import java.io.Serializable; - -/** - * 机构层级关系与机构负责人 - * - * @author work@yujt.net.cn - * @date 2019/12/18 10:55 - */ -@Data -public class DeptLevelAndLeaderDTO implements Serializable { - - private static final long serialVersionUID = 8264059305193996215L; - - /** - * 部门ID - */ - private Long deptId; - /** - * 部门名称 - */ - private String deptName; - /** - * 父所有部门ID - */ - private String parentDeptIds; - /** - * 父所有部门 - */ - private String parentDeptNames; - /** - * 所有部门ID - */ - private String allDeptIds; - /** - * 所有部门名称 - */ - private String allDeptNames; - /** - * 部门负责人名称 - */ - private String leaderName; - /** - * 部门负责人名称 - */ - private String typeKey; -} diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java index 2f234a40c..306b2ebc6 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysRoleDTO.java @@ -72,14 +72,4 @@ public class SysRoleDTO implements Serializable { * app菜单ID列表 */ private List appMenuIdList; - - /** - * 项目处理类型授权id列表 - */ - private List categoryIdList; - - /** - * 吹哨部门id列表 - */ - private List whistleDeptIdList; } diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDictDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDictDTO.java index 4ff6d87c6..493c0f1cf 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDictDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDictDTO.java @@ -28,6 +28,4 @@ public class SysSimpleDictDTO implements Serializable { @ApiModelProperty(value = "字典值") private String dictValue; - @ApiModelProperty(value = "备注") - private String remark; -} +} \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java index 3f530eec5..238a6ea6b 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java @@ -16,10 +16,14 @@ public class UserSysDeptInfoFormDTO implements Serializable { /** * 主键集合 */ +// @NotEmpty(message = "deptIdList不能为空") +// @Valid private List deptIdList; /** * 部门类型键值 */ +// @NotEmpty(message = "部门类型不能为空") +// @Valid private List typeKeyList; } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 756d7b035..fcf9f2a23 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -62,12 +62,6 @@ feign-httpclient 10.3.0 - - com.esua.epdc - epdc-events-client - 1.0.0 - compile - diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index cdfe26a50..372629e95 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -131,7 +131,6 @@ public class SysDeptController { public Result getCompleteDept(@PathVariable("gridId") String gridId) { return sysDeptService.getCompleteDept(gridId); } - /** * 通过网格ID获取该网格所有上级机构 * @@ -142,7 +141,7 @@ public class SysDeptController { */ @GetMapping("getParentAndAllDept/{deptId}") public Result getParentAndAllDept(@PathVariable("deptId") String deptId) { - return new Result().ok(sysDeptService.getParentAndAllDept(deptId)); + return sysDeptService.getParentAndAllDept(deptId); } /** @@ -235,49 +234,4 @@ public class SysDeptController { PageData page = sysDeptService.listCompleteDeptDTO(params); return new Result>().ok(page); } - - /*** - * 获取所有网格 kpi模块原始数据 - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author qushutong - * @date 2019/12/12 17:26 - */ - @GetMapping("listAllGridId") - public Result listAllGridId() { - return sysDeptService.listAllGridId(); - } - - /** - * 按部门类型，分页查询部门列表 - * - * @param typeKey 部门类型 - * @param pageSize 页容量 - * @param pageIndex 页码 - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author work@yujt.net.cn - * @date 2019/12/17 16:03 - */ - @GetMapping("pageDeptIdByTypeKey/{typeKey}/{pageSize}/{pageIndex}") - public Result> pageDeptIdByTypeKey(@PathVariable("typeKey") String typeKey, - @PathVariable("pageSize") Integer pageSize, - @PathVariable("pageIndex") Integer pageIndex) { - return sysDeptService.pageDeptIdByTypeKey(typeKey, pageSize, pageIndex); - } - - - /** - * 根据部门id，获取部门层级关系，获取部门领导姓名 - * - * @param deptId 部门id - * @param leaderFlag 是否需要查询网格长姓名 0 否 、1 是 - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author work@yujt.net.cn - * @date 2019/12/18 11:04 - */ - @GetMapping("getDeptInfoById/{deptId}/{leaderFlag}") - public Result getDeptInfoById(@PathVariable("deptId") Long deptId, - @PathVariable("leaderFlag") String leaderFlag) { - DeptLevelAndLeaderDTO dto = sysDeptService.getDeptInfoById(deptId, leaderFlag); - return new Result().ok(dto); - } } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java index 3845c6a83..dcf0b1f25 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysRoleController.java @@ -93,14 +93,6 @@ public class SysRoleController { List appMenuIdList = appRoleMenuService.getAppMenuIdList(id); data.setAppMenuIdList(appMenuIdList); - //查询角色对应的项目处理类型权限 - List categoryIdList = sysRoleService.getCategoryIdList(id); - data.setCategoryIdList(categoryIdList); - - //查询角色对应的吹哨部门 - List whistleDeptIdList=sysRoleService.getWhistleDeptIdList(id); - data.setWhistleDeptIdList(whistleDeptIdList); - return new Result().ok(data); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java index 2dd8de273..8db11a678 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java @@ -88,20 +88,6 @@ public class SysUserController { return new Result().ok(data); } - /** - * @param userId - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 查询用户角色Id - * @Date 2020/2/3 8:13 - **/ - @GetMapping("getRoleIdList/{userId}") - public Result> getRoleIdList(@PathVariable("userId") Long userId) { - //用户角色列表 - List roleIdList = sysRoleUserService.getRoleIdList(userId); - return new Result>().ok(roleIdList); - } - @GetMapping("info") @ApiOperation("登录用户信息") public Result info(@ApiIgnore UserDetail user) { diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java index 8193bca28..38b7f3a57 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java @@ -9,7 +9,6 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.DeptTreeDTO; import com.elink.esua.epdc.dto.SysDeptDTO; @@ -157,39 +156,4 @@ public interface SysDeptDao extends BaseDao { List selectListCompleteDeptDTO(Map params); List selectListDeptTreeForEpiDemic(); - - - /*** - * 查询所有网格 - * @param - * @return java.util.List - * @author qushutong - * @date 2019/12/12 18:12 - */ - List selectListAllGridId(); - - /** - * 按部门类型，分页查询部门列表 - * - * @param typeKey 部门类型 - * @param pageSize 页容量 - * @param pageIndex 页码 - * @return java.util.List - * @author work@yujt.net.cn - * @date 2019/12/17 16:11 - */ - List pageDeptIdByTypeKey(@Param("typeKey") String typeKey, - @Param("pageSize") Integer pageSize, - @Param("pageIndex") Integer pageIndex); - - /** - * 根据部门id，查询该部门指定角色的用户姓名 - * - * @param deptId 部门id - * @param roleType 角色类型 - * @return java.lang.String - * @author work@yujt.net.cn - * @date 2019/12/18 13:45 - */ - String selectDeptLeaderName(@Param("deptId") Long deptId, @Param("roleType") String roleType); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java index 1310c61b0..31de4510a 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysRoleDao.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - *

+ * * https://www.renren.io - *

+ * * 版权所有，侵权必究！ */ @@ -12,10 +12,6 @@ import com.elink.esua.epdc.entity.SysRoleEntity; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.entity.SysRoleEntity; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; /** * 角色管理 @@ -26,14 +22,4 @@ import java.util.Map; @Mapper public interface SysRoleDao extends BaseDao { - /** - * 根据角色类型，获取机构的此类角色数量 - * - * @param roleType - * @param deptIdList - * @return java.util.List> - * @author work@yujt.net.cn - * @date 2019/12/18 10:20 - */ - List> selectAmountByRoleTpye(@Param("roleType") String roleType, @Param("deptIdList") List deptIdList); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java deleted file mode 100644 index e9990896d..000000000 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.elink.esua.epdc.feign; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.handleroledept.form.HandleRoleDeptFormDTO; -import com.elink.esua.epdc.dto.rulecategory.form.HandleRoleCategoryFormDTO; -import com.elink.esua.epdc.feign.fallback.EventFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; - -import java.util.List; - -/** - * @Auther: yinzuomei - * @Date: 2019/12/24 09:28 - * @Description: 事件接口 - */ -@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = EventFeignClientFallback.class) -public interface EventFeignClient { - - /** - * @param orgTypeFormDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 保存项目处理类型权限 - * @Date 2019/12/24 17:17 - **/ - @PostMapping(value = "events/handlerolecategory/saveOrUpdate", consumes = MediaType.APPLICATION_JSON_VALUE) - Result saveOrUpdateHandleCategory(HandleRoleCategoryFormDTO orgTypeFormDTO); - - /** - * @param roleId - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 查询角色对应的项目处理类型权限 - * @Date 2019/12/24 17:17 - **/ - @GetMapping(value = "events/handlerolecategory/queryCategoryIdList/{roleId}") - Result> queryCategoryIdList(@PathVariable("roleId") Long roleId); - - /** - * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 保存角色对应可吹哨部门权限 - * @Date 2019/12/26 14:09 - **/ - @PostMapping(value = "events/handleroledept/saveOrUpdate", consumes = MediaType.APPLICATION_JSON_VALUE) - Result saveOrUpdateHandleRoleDept(HandleRoleDeptFormDTO formDTO); - - /** - * @param roleId - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 查询角色对应可吹哨部门权限 - * @Date 2019/12/26 14:09 - **/ - @GetMapping(value = "events/handleroledept/queryWhistleDeptIdList/{roleId}") - Result> queryWhistleDeptIdList(@PathVariable("roleId")Long roleId); -} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java deleted file mode 100644 index ecbaa9bf0..000000000 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.elink.esua.epdc.feign.fallback; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.handleroledept.form.HandleRoleDeptFormDTO; -import com.elink.esua.epdc.dto.rulecategory.form.HandleRoleCategoryFormDTO; -import com.elink.esua.epdc.feign.EventFeignClient; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @Description - * @Author yinzuomei - * @Date 2019/12/24 9:45 - */ -@Component -public class EventFeignClientFallback implements EventFeignClient { - - @Override - public Result saveOrUpdateHandleCategory(HandleRoleCategoryFormDTO orgTypeFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "saveOrUpdate", orgTypeFormDTO); - } - - @Override - public Result> queryCategoryIdList(Long roleId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryCategoryIdList", roleId); - } - - @Override - public Result saveOrUpdateHandleRoleDept(HandleRoleDeptFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "saveOrUpdate", formDTO); - } - - @Override - public Result> queryWhistleDeptIdList(Long roleId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryWhistleDeptIdList", roleId); - } - -} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysRoleService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysRoleService.java index 7e06254ee..1e1ea15ef 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysRoleService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysRoleService.java @@ -36,7 +36,4 @@ public interface SysRoleService extends BaseService { void delete(Long[] ids); - List getCategoryIdList(Long id); - - List getWhistleDeptIdList(Long id); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 15920f2b8..80f42e52a 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -18,9 +18,7 @@ import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; -import com.elink.esua.epdc.commons.tools.constant.*; import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum; -import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.exception.ErrorCode; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; @@ -32,7 +30,6 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.TreeUtils; -import com.elink.esua.epdc.constant.RoleTypeKeyConstant; import com.elink.esua.epdc.dao.SysDeptDao; import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO; @@ -252,7 +249,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl getParentAndAllDept(String deptId) { Long deptIdL = null; try { deptIdL = Long.parseLong(deptId.trim()); @@ -260,7 +257,7 @@ public class SysDeptServiceImpl extends BaseServiceImplgetCompleteDept:::部门ID格式转换异常:::deptId->{}", deptId); } if (null == deptIdL) { - throw new RenException("参数格式异常"); + return new Result().error("参数格式异常"); } CompleteDeptDTO completeDept = this.baseDao.getParentAndAllDept(deptIdL); ParentAndAllDeptDTO parentAndAllDeptDTO = new ParentAndAllDeptDTO(); @@ -283,11 +280,11 @@ public class SysDeptServiceImpl extends BaseServiceImpl userDtoList = this.baseDao.selectListCompleteDeptDTO(params); return new PageData<>(userDtoList, iPage.getTotal()); } - - @Override - public Result> listAllGridId() { - List gridIdList = baseDao.selectListAllGridId(); - - return new Result>().ok(gridIdList); - } - - @Override - public Result> pageDeptIdByTypeKey(String typeKey, Integer pageSize, Integer pageIndex) { - if (null == pageSize || null == pageIndex || pageSize < NumConstant.ONE || pageIndex < NumConstant.ONE) { - return new Result().error("参数错误"); - } - pageIndex = (pageIndex - NumConstant.ONE) * pageSize; - List deptIdList = baseDao.pageDeptIdByTypeKey(typeKey, pageSize, pageIndex); - return new Result().ok(deptIdList); - } - - @Override - public DeptLevelAndLeaderDTO getDeptInfoById(Long deptId, String leaderFlag) { - if (null == deptId || null == leaderFlag) { - return null; - } - SysDeptEntity sysDeptEntity = baseDao.selectById(deptId); - if (null == sysDeptEntity) { - return null; - } - String deptName = sysDeptEntity.getName(); - String pids = sysDeptEntity.getPids(); - // 上级机构id - String parentDeptIds = NumConstant.ZERO_STR.equals(pids) ? "" : pids; - // 全部机构id - String allDeptIds = StringUtils.isBlank(pids) ? String.valueOf(deptId) : - pids.concat(StrConstant.COMMA).concat(String.valueOf(deptId)); - - // 上级机构名称 - String parentDeptNames = ""; - if (StringUtils.isNotBlank(parentDeptIds)) { - String[] pidArray = parentDeptIds.split(StrConstant.COMMA); - List deptNameList = Lists.newArrayList(); - SysDeptEntity dept; - for (int i = 0; i < pidArray.length; i++) { - dept = baseDao.selectById(Long.parseLong(pidArray[i])); - deptNameList.add(dept.getName()); - } - parentDeptNames = StringUtils.join(deptNameList, StrConstant.HYPHEN); - } - // 全部机构名称 - String allDeptNames = StringUtils.isBlank(parentDeptNames) ? deptName : parentDeptNames.concat(StrConstant.HYPHEN).concat(deptName); - - DeptLevelAndLeaderDTO deptLevel = new DeptLevelAndLeaderDTO(); - deptLevel.setDeptId(deptId); - deptLevel.setDeptName(deptName); - deptLevel.setParentDeptIds(parentDeptIds); - deptLevel.setParentDeptNames(parentDeptNames); - deptLevel.setAllDeptIds(allDeptIds); - deptLevel.setAllDeptNames(allDeptNames); - deptLevel.setTypeKey(sysDeptEntity.getTypeKey()); - - if (YesOrNoEnum.YES.value().equals(leaderFlag)) { - String leaderName = baseDao.selectDeptLeaderName(deptId, RoleTypeKeyConstant.ROLE_GRID_LEADER); - deptLevel.setLeaderName(leaderName); - } - - redisUtils.set(RedisKeys.getDeptOptionKey(deptId), deptLevel); - return deptLevel; - } } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java index 5b5a69ffa..b3f79c64a 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDictServiceImpl.java @@ -134,7 +134,7 @@ public class SysDictServiceImpl extends BaseServiceImpl sdWrapper = new QueryWrapper<>(); - sdWrapper.select("dict_value", "dict_name","remark"); + sdWrapper.select("dict_value", "dict_name"); sdWrapper.eq("dict_type", dictType); sdWrapper.ne("dict_value", ""); sdWrapper.isNotNull("dict_value"); diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java index 9ae9ebaaa..7a509dc40 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java @@ -8,40 +8,25 @@ package com.elink.esua.epdc.service.impl; -import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.Constant; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum; -import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dao.SysDeptDao; -import com.elink.esua.epdc.constant.RoleTypeKeyConstant; import com.elink.esua.epdc.dao.SysRoleDao; -import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.SysRoleDTO; -import com.elink.esua.epdc.dto.handleroledept.HandleRoleDeptDTO; -import com.elink.esua.epdc.dto.handleroledept.form.HandleRoleDeptFormDTO; -import com.elink.esua.epdc.dto.rulecategory.form.HandleRoleCategoryFormDTO; -import com.elink.esua.epdc.entity.SysDeptEntity; import com.elink.esua.epdc.entity.SysRoleEntity; -import com.elink.esua.epdc.feign.EventFeignClient; import com.elink.esua.epdc.service.*; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -64,12 +49,6 @@ public class SysRoleServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -122,8 +101,6 @@ public class SysRoleServiceImpl extends BaseServiceImpl deptidList) { - if (RoleTypeKeyConstant.ROLE_GRID_LEADER.equals(roleType)) { - List> resultList = baseDao.selectAmountByRoleTpye(roleType, deptidList); - if (CollUtil.isEmpty(resultList)) { - return; - } - Map map; - String mapValue; - for (int i = 0; i < resultList.size(); i++) { - map = resultList.get(i); - - mapValue = map.get("typeKey").toString(); - if (!mapValue.equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) { - continue; - } - - mapValue = map.get("amount").toString(); - if (Integer.parseInt(mapValue) <= NumConstant.THREE) { - continue; - } - mapValue = map.get("id").toString(); - ParentAndAllDeptDTO parentAndAllDept = sysDeptService.getParentAndAllDept(mapValue); - throw new RenException("保存失败：" + parentAndAllDept.getAllDeptNames() + "，网格长多于3人"); - } - } } @Override @@ -198,15 +130,6 @@ public class SysRoleServiceImpl extends BaseServiceImpl - * @Author yinzuomei - * @Description 查询角色对应的项目处理类型权限 - * @Date 2019/12/24 16:03 - **/ - @Override - public List getCategoryIdList(Long id) { - Result> result = eventFeignClient.queryCategoryIdList(id); - return result.getData(); - } - - @Override - public List getWhistleDeptIdList(Long id) { - Result> result = eventFeignClient.queryWhistleDeptIdList(id); - return result.getData(); - } - - /** - * @param roleId - * @param whistleDeptIdList - * @return void - * @Author yinzuomei - * @Description - * @Date 2019/12/26 13:22 - **/ - private void saveOrUpdateWhistleDeptId(Long roleId, List whistleDeptIdList) { - HandleRoleDeptFormDTO formDTO = new HandleRoleDeptFormDTO(); - formDTO.setRoleId(roleId.toString()); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.in(FieldConstant.ID, whistleDeptIdList); - List deptEntityList = sysDeptDao.selectList(wrapper); - List formDTOList = new ArrayList<>(); - for (SysDeptEntity dept : deptEntityList) { - HandleRoleDeptDTO handleRoleDeptDTO = new HandleRoleDeptDTO(); - handleRoleDeptDTO.setDeptId(dept.getId().toString()); - handleRoleDeptDTO.setDeptName(dept.getName()); - handleRoleDeptDTO.setDeptType(dept.getTypeKey()); - handleRoleDeptDTO.setRoleId(roleId.toString()); - formDTOList.add(handleRoleDeptDTO); - } - formDTO.setHandleRoleDeptDTOList(formDTOList); - eventFeignClient.saveOrUpdateHandleRoleDept(formDTO); - } } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index f9ded4cc9..51b1c6a02 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java @@ -191,7 +191,7 @@ public class SysUserServiceImpl extends BaseServiceImpl listGridWhileLeaderRegister(String mobile) { - //TODO:该方法的获取组织结构不灵活，得重构 create by rongchao + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(FieldConstant.MOBILE, mobile) .eq(FieldConstant.DEL_FLAG, DelFlagEnum.NORMAL.value()); diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml index d316d0c1f..27e545402 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml @@ -5,7 +5,7 @@ SELECT - sd.id, - sd.NAME, - sd.pid, - p.NAME AS parentName, - sd.pids, - NULL AS parentNames, - null as street, - null as community, - (case - when sd.type_key='grid_party' then sd.name - else null - end) as grid - FROM - sys_dept sd - LEFT JOIN sys_dept p ON ( sd.pid = p.id ) - WHERE - sd.del_flag = '0' - - AND sd.type_key in - - #{typeKey} - - - - AND sd.id IN - - #{deptId} - - - - - - - - - - diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml index c8cc9d182..9a422e550 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleDao.xml @@ -3,19 +3,4 @@ - diff --git a/esua-epdc/epdc-commons/epdc-common-clienttoken/pom.xml b/esua-epdc/epdc-commons/epdc-common-clienttoken/pom.xml index 07d4a1526..dd4f4e01c 100644 --- a/esua-epdc/epdc-commons/epdc-common-clienttoken/pom.xml +++ b/esua-epdc/epdc-commons/epdc-common-clienttoken/pom.xml @@ -23,12 +23,6 @@ ${project.version} - - com.esua.epdc - epdc-user-client - ${project.version} - - org.springframework.boot spring-boot-starter-web diff --git a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/TokenDto.java b/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/TokenDto.java index b530dc903..b0989145e 100644 --- a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/TokenDto.java +++ b/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/TokenDto.java @@ -1,11 +1,8 @@ package com.elink.esua.epdc.common.token.dto; -import com.elink.esua.epdc.dto.UserTagInfo; import lombok.Data; import java.io.Serializable; -import java.util.Date; -import java.util.List; /** * 用户token @@ -49,12 +46,7 @@ public class TokenDto implements Serializable { private Long gridId; /** - * 性别(女性-0，男性-1) + * 党员标识 0：否、1：是 */ - private String sex; - - /** - * 用户标签信息列表 - */ - private List userTagInfos; + private String partyFlag; } diff --git a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/CpUserDetailRedis.java b/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/CpUserDetailRedis.java index 178c4a29d..791e89b9c 100644 --- a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/CpUserDetailRedis.java +++ b/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/CpUserDetailRedis.java @@ -40,26 +40,6 @@ public class CpUserDetailRedis { redisUtils.hMSet(key, map, expire); } - /** - * 缓存用户信息，不同于{@link CpUserDetailRedis#set(TokenDto, long)}之处在于存放进redis时，拼接key的后缀可以自定义 - * - * @param user 用户信息 - * @param expire 超时时长 - * @param redisKeySuffix redis的key的后缀 - * @return void - * @author work@yujt.net.cn - * @date 2020/1/31 15:13 - */ - public void set(TokenDto user, long expire, String redisKeySuffix) { - if (user == null) { - return; - } - String key = RedisKeys.getCpUserKey(redisKeySuffix); - //bean to map - Map map = BeanUtil.beanToMap(user, false, true); - redisUtils.hMSet(key, map, expire); - } - /** * 获取token信息 * diff --git a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/IdentityNoAnalysisUtil.java b/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/IdentityNoAnalysisUtil.java deleted file mode 100644 index ca247743e..000000000 --- a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/util/IdentityNoAnalysisUtil.java +++ /dev/null @@ -1,178 +0,0 @@ -package com.elink.esua.epdc.common.token.util; - -import org.apache.commons.lang3.StringUtils; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; - -/** - * 用户工具类 - * - * @author wanggongfeng - * @Date 19-12-16 - */ -public class IdentityNoAnalysisUtil { - /** - * 15位身份证号 - */ - private static final Integer FIFTEEN_ID_CARD=15; - /** - * 18位身份证号 - */ - private static final Integer EIGHTEEN_ID_CARD=18; - private static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - - /** - * 从身份证号码中获取生日 - * @param idno - * @return null表示idno错误，未获取到生日 - */ - public static Date getBirthDay(String idno){ - if(!isValid(idno)){ - return null; - } - return toBirthDay(idno.substring(6, 14)); - } - - /** - * 根据身份证号获取性别 - * @param IDCard - * @return - */ - public static String getSex(String IDCard){ - String sex =""; - if (StringUtils.isNotBlank(IDCard)){ - //15位身份证号 - if (IDCard.length() == FIFTEEN_ID_CARD){ - if (Integer.parseInt(IDCard.substring(14, 15)) % 2 == 0) { - sex = "女"; - } else { - sex = "男"; - } - //18位身份证号 - }else if(IDCard.length() == EIGHTEEN_ID_CARD){ - // 判断性别 - if (Integer.parseInt(IDCard.substring(16).substring(0, 1)) % 2 == 0) { - sex = "女"; - } else { - sex = "男"; - } - } - } - return sex; - } - - /** - * 根据身份证号获取年龄 - * @param IDCard - * @return - */ - public static Integer getAge(String IDCard){ - Integer age = 0; - Date date = new Date(); - if (StringUtils.isNotBlank(IDCard)&& isValid(IDCard)){ - //15位身份证号 - if (IDCard.length() == FIFTEEN_ID_CARD){ - // 身份证上的年份(15位身份证为1980年前的) - String uyear = "19" + IDCard.substring(6, 8); - // 身份证上的月份 - String uyue = IDCard.substring(8, 10); - // 当前年份 - String fyear = format.format(date).substring(0, 4); - // 当前月份 - String fyue = format.format(date).substring(5, 7); - if (Integer.parseInt(uyue) <= Integer.parseInt(fyue)) { - age = Integer.parseInt(fyear) - Integer.parseInt(uyear) + 1; - // 当前用户还没过生 - } else { - age = Integer.parseInt(fyear) - Integer.parseInt(uyear); - } - //18位身份证号 - }else if(IDCard.length() == EIGHTEEN_ID_CARD){ - // 身份证上的年份 - String year = IDCard.substring(6).substring(0, 4); - // 身份证上的月份 - String yue = IDCard.substring(10).substring(0, 2); - // 当前年份 - String fyear = format.format(date).substring(0, 4); - // 当前月份 - String fyue = format.format(date).substring(5, 7); - // 当前月份大于用户出身的月份表示已过生日 - if (Integer.parseInt(yue) <= Integer.parseInt(fyue)) { - age = Integer.parseInt(fyear) - Integer.parseInt(year) + 1; - // 当前用户还没过生日 - } else { - age = Integer.parseInt(fyear) - Integer.parseInt(year); - } - } - } - return age; - } - - /** - * 身份证验证 - * @param id 号码内容 - * @return 是否有效 - */ - public static boolean isValid(String id){ - Boolean validResult = true; - //校验长度只能为15或18 - int len = id.length(); - if (len != FIFTEEN_ID_CARD && len != EIGHTEEN_ID_CARD){ - validResult = false; - } - //校验生日 - if (!validDate(id)){ - validResult = false; - } - return validResult; - } - - /** - * 校验生日 - * @param id - * @return - */ - private static boolean validDate(String id) - { - try - { - String birth = id.length() == 15 ? "19" + id.substring(6, 12) : id.substring(6, 14); - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); - Date birthDate = sdf.parse(birth); - if (!birth.equals(sdf.format(birthDate))){ - return false; - } - } - catch (ParseException e) - { - return false; - } - return true; - } - - /** - * 转换成日期 - * @param birthday - * @return - */ - private static Date toBirthDay(String birthday){ - try{ - Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.YEAR, Integer.parseInt(birthday.substring(0, 4))); - calendar.set(Calendar.MONTH, Integer.parseInt(birthday.substring(4, 6)) - 1);//月份从0开始，所以减1 - calendar.set(Calendar.DAY_OF_MONTH, Integer.parseInt(birthday.substring(6, 8))); - //以下设置意义不大 - calendar.set(Calendar.HOUR_OF_DAY, 0); - calendar.set(Calendar.MINUTE, 0); - calendar.set(Calendar.SECOND, 0); - calendar.set(Calendar.MILLISECOND, 0); - - return calendar.getTime(); - }catch (Exception e){ - return null; - } - } -} diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/entity/DeptScope.java b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/entity/DeptScope.java deleted file mode 100644 index cc66e73e9..000000000 --- a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/entity/DeptScope.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.elink.esua.epdc.commons.mybatis.entity; - -import lombok.Data; - -import java.io.Serializable; - -/** - * 部门冗余字段基类 - * - * @author rongchao - * @Date 19-12-18 - */ -@Data -public abstract class DeptScope extends BaseEpdcEntity implements Serializable { - - /*** - *所有部门名称 - */ - private String allDeptNames; - - /*** - *所有部门ID - */ - private String allDeptIds; - - /*** - *父所有部门 - */ - private String parentDeptNames; - - /*** - *父所有部门 - */ - private String parentDeptIds; - -} diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java deleted file mode 100644 index b4d4c792e..000000000 --- a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.elink.esua.epdc.commons.mybatis.utils; - -import com.elink.esua.epdc.commons.mybatis.entity.DeptScope; -import lombok.Data; - -/** - * 部门信息实体工具类 - * - * @author rongchao - * @Date 19-12-18 - */ -public class DeptEntityUtils { - - @Data - public static class DeptDto { - /** - * 父所有部门ID - */ - private String parentDeptIds; - /** - * 父所有部门 - */ - private String parentDeptNames; - /** - * 所有部门ID - */ - private String allDeptIds; - /** - * 所有部门 - */ - private String allDeptNames; - } - - /** - * 装载部门信息 - * - * @param dto - * @param entityClass - * @return T - * @author rongchao - * @since 2019-12-18 - */ - public static T loadDeptInfo(DeptDto dto, Class entityClass) { - try { - T t = entityClass.newInstance(); - t.setAllDeptIds(dto.getAllDeptIds()); - t.setAllDeptNames(dto.getAllDeptNames()); - t.setParentDeptIds(dto.getParentDeptIds()); - t.setParentDeptNames(dto.getParentDeptNames()); - return t; - } catch (InstantiationException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - return null; - } - - /** - * 装载部门信息 - * - * @param dto - * @param entity - * @return void - * @author rongchao - * @since 2019-12-18 - */ - public static void loadDeptInfo(DeptDto dto, T entity) { - entity.setAllDeptIds(dto.getAllDeptIds()); - entity.setAllDeptNames(dto.getAllDeptNames()); - entity.setParentDeptIds(dto.getParentDeptIds()); - entity.setParentDeptNames(dto.getParentDeptNames()); - } -} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools-wx-ma/pom.xml b/esua-epdc/epdc-commons/epdc-commons-tools-wx-ma/pom.xml index e7e900877..b427bed4b 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools-wx-ma/pom.xml +++ b/esua-epdc/epdc-commons/epdc-commons-tools-wx-ma/pom.xml @@ -31,4 +31,4 @@ - + \ No newline at end of file diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NacosConfigConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NacosConfigConstant.java deleted file mode 100644 index c3c2d716f..000000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NacosConfigConstant.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.elink.esua.epdc.commons.tools.constant; - -/** - * Nacos配置中心相关常量 - * - * @author rongchao - * @Date 20-1-15 - */ -public interface NacosConfigConstant { - - String CONFIG_GROUP = "EPDC_CONFIG_GROUP"; -} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java index b7902105d..dc987077c 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java @@ -9,21 +9,17 @@ package com.elink.esua.epdc.commons.tools.constant; */ public interface NumConstant { - int TWO_NEG = -2; - int ONE_NEG = -1; int ZERO = 0; int ONE = 1; int TWO = 2; int THREE = 3; int FOUR = 4; int SIX = 6; - int SEVEN = 7; - int EIGHT = 8; - int NINE = 9; - int TEN = 10; - int ELEVEN = 11; - int TWELVE = 12; + int ONE_NEG = -1; + int TWO_NEG = -2; + + int TEN = 10; int FIFTEEN = 15; int TWENTY = 20; int THIRTY = 30; diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/PointsConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/PointsConstant.java deleted file mode 100644 index f5eb87209..000000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/PointsConstant.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.elink.esua.epdc.commons.tools.constant; - -/** - * @Auther: yinzuomei - * @Date: 2019/12/16 19:38 - * @Description: 积分用 - */ -public interface PointsConstant { - /** - * 手动调整积分编码 - */ - String ruleCode ="hand_regulation"; -} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java index 7dd45bf2d..1c33d197b 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/ServiceConstant.java @@ -84,14 +84,4 @@ public interface ServiceConstant { * 定制功能模块 */ String EPDC_CUSTOM_SERVER = "epdc-custom-server"; - - /** - * 积分模块 - */ - String EPDC_POINTS_SERVER = "epdc-points-server"; - - /** - * 开放接口模块 - */ - String EPDC_API_SERVER = "epdc-api-server"; } diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/StrConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/StrConstant.java deleted file mode 100644 index 583d683f6..000000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/StrConstant.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.elink.esua.epdc.commons.tools.constant; - -import org.apache.commons.codec.CharEncoding; -import org.springframework.http.MediaType; - - -/** - * 字符串常量 - * - * @author work@yujt.net.cn - * @date 2019/12/13 11:19 - */ -public interface StrConstant { - - String UTF_8 = CharEncoding.UTF_8; - - String ISO_8859_1 = CharEncoding.ISO_8859_1; - - String JAVASCRIPT = "javascript"; - - String APPLICATION_JSON_UTF8_VALUE = MediaType.APPLICATION_JSON_UTF8_VALUE; - - String EXCEL_SUFFIX_2003 = ".xls"; - - String EXCEL_SUFFIX_2007 = ".xlsx"; - - /** - * 连字符号、短杠 - */ - String HYPHEN = "-"; - - /** - * 英文逗号 - */ - String COMMA = ","; - - /** - * 冒号 - */ - String COLON = ":"; -} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/UserAuthTypeEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/UserAuthTypeEnum.java deleted file mode 100644 index 3c372e4f2..000000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/UserAuthTypeEnum.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.elink.esua.epdc.commons.tools.enums; - -/** - * 用户认证类别枚举类 - * - * @author rongchao - * @Date 19-12-19 - */ -public enum UserAuthTypeEnum { - - /** - * 居民认证 - */ - RESIDENT_AUTH("0"), - - /** - * 党员认证 - */ - PARTY_AUTH("1"), - - /** - * 志愿者认证 - */ - VOLUNTEER_AUTH("2"); - - private String value; - - UserAuthTypeEnum(String value) { - this.value = value; - } - - public String value() { - return this.value; - } -} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/UserTagEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/UserTagEnum.java deleted file mode 100644 index d3471119f..000000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/UserTagEnum.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.elink.esua.epdc.commons.tools.enums; - -/** - * @Auther: yinzuomei - * @Date: 2019/12/17 19:11 - * @Description: 用户身份枚举类 - */ -public enum UserTagEnum { - /** - * 党员 - */ - PARTY_MEMBER("partymember"), - - /** - * 志愿者 - */ - VOLUNTEER("volunteer"); - - private String value; - - UserTagEnum(String value) { - this.value = value; - } - - public String value() { - return this.value; - } -} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsBehaviorCodeEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsBehaviorCodeEnum.java deleted file mode 100644 index dfaab97d3..000000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsBehaviorCodeEnum.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.elink.esua.epdc.commons.tools.enums.pointsenum; - -/** - * @Auther: yinzuomei - * @Date: 2020/2/6 14:01 - * @Description: 积分行为编码 - */ -public enum PointsBehaviorCodeEnum { - LIKE("like", "赞"), - DISLIKE("dislike", "踩"), - SHARE("share", "分享"), - CLOCK("clock", "打卡"), - COMMENT("comment", "评论"), - BREAK_PROMISE("break_promise", "爽约"), - JOIN_ACT("join_act", "活动积分"); - - private String behaviorCode; - private String name; - - PointsBehaviorCodeEnum(String behaviorCode, String name) { - this.behaviorCode = behaviorCode; - this.name = name; - } - - public String getBehaviorCode() { - return behaviorCode; - } - - public void setBehaviorCode(String behaviorCode) { - this.behaviorCode = behaviorCode; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsLimitTimeEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsLimitTimeEnum.java deleted file mode 100644 index a3092ed46..000000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsLimitTimeEnum.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.elink.esua.epdc.commons.tools.enums.pointsenum; - -/** - * @Auther: yinzuomei - * @Date: 2019/12/13 09:43 - * @Description: 积分规则限制时限枚举类 - */ -public enum PointsLimitTimeEnum { - /** - * 限制时限(0-分钟，1-小时，2-日，3-月，4-年) - */ - LIMIT_TIME_MINUTE("0"), - LIMIT_TIME_HOUR("1"), - LIMIT_TIME_DAY("2"), - LIMIT_TIME_MONTH("3"), - LIMIT_TIME_YEAR("4"); - - private String value; - - PointsLimitTimeEnum(String value) { - this.value = value; - } - - public String value() { - return value; - } -} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsOperationEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsOperationEnum.java deleted file mode 100644 index 6aa3fa9e3..000000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsOperationEnum.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.elink.esua.epdc.commons.tools.enums.pointsenum; - -/** - * @Auther: yinzuomei - * @Date: 2019/12/13 09:31 - * @Description: 积分操作类型枚举类 - */ -public enum PointsOperationEnum { - /** - * 规则操作类型(0-减积分，1-加积分) - */ - OPERATION_TYPE_ADD("1"), - OPERATION_TYPE_SUBSTRACT("0"); - - private String operationType; - - PointsOperationEnum(String operationType) { - this.operationType = operationType; - } - - public String getOperationType() { - return operationType; - } -} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsOperationModeEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsOperationModeEnum.java deleted file mode 100644 index c486cfb7a..000000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsOperationModeEnum.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.elink.esua.epdc.commons.tools.enums.pointsenum; - -/** - * @Auther: yinzuomei - * @Date: 2019/12/13 09:33 - * @Description: 积分操作方式枚举类 - */ -public enum PointsOperationModeEnum { - - /** - * user-用户操作 - */ - OPERATION_MODE_USER("user"), - - /** - * admin-管理员操作 - */ - OPERATION_MODE_ADMIN("admin"), - - /** - * sys-系统操作 - */ - OPERATION_MODE_SYS("sys"); - - private String operationMode; - - PointsOperationModeEnum(String operationMode) { - this.operationMode = operationMode; - } - - public String getOperationMode() { - return operationMode; - } -} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsRuleAvailableEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsRuleAvailableEnum.java deleted file mode 100644 index 0ed15d169..000000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsRuleAvailableEnum.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.elink.esua.epdc.commons.tools.enums.pointsenum; - -/** - * @Auther: yinzuomei - * @Date: 2019/12/12 15:04 - * @Description: 积分规则可用标志枚举类 - */ -public enum PointsRuleAvailableEnum { - - - /** - * 可用标记(0-不可用，1-可用) - */ - AVAILABLE_TRUE("1"), - AVAILABLE_FALSE("0"); - - private String value; - - PointsRuleAvailableEnum(String value) { - this.value = value; - } - - public String value() { - return value; - } -} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsRuleCodeEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsRuleCodeEnum.java deleted file mode 100644 index 280e37b87..000000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsRuleCodeEnum.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.elink.esua.epdc.commons.tools.enums.pointsenum; - -/** - * @Auther: yinzuomei - * @Date: 2020/2/6 14:00 - * @Description: 积分规则编码 - */ -public enum PointsRuleCodeEnum { - CANCEL_ACT("cancel_act", "取消报名系统扣减积分"), - CONFIRM_JOIN_ACT("confirm_join_act", "参与活动确认积分"); - - private String ruleCode; - private String name; - - PointsRuleCodeEnum(String ruleCode, String name) { - this.ruleCode = ruleCode; - this.name = name; - } - - public String getRuleCode() { - return ruleCode; - } - - public void setRuleCode(String ruleCode) { - this.ruleCode = ruleCode; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} - diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsUpperLimitEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsUpperLimitEnum.java deleted file mode 100644 index d65c768a1..000000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/pointsenum/PointsUpperLimitEnum.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.elink.esua.epdc.commons.tools.enums.pointsenum; - -/** - * @Auther: yinzuomei - * @Date: 2019/12/13 09:48 - * @Description: 积分是否有上限限制 枚举类 - */ -public enum PointsUpperLimitEnum { - /** - * 是 - */ - YES("1"), - - /** - * 否 - */ - NO("0"); - - private String value; - - PointsUpperLimitEnum(String value) { - this.value = value; - } - - public String value() { - return value; - } -} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java index 16bc967c6..9fe1ff36a 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java @@ -128,7 +128,7 @@ public class RedisKeys { } /** - * 管理员有数据权限的部门层级关系 + * 管理员部门层级关系 * * @param userId 用户id * @return java.lang.String @@ -151,18 +151,6 @@ public class RedisKeys { return rootPrefix.concat("options:dept:user:all:").concat(String.valueOf(userId)); } - /** - * 存放部门层级关系，主要用于获取拼接后的部门id和部门名称 - * - * @param deptId - * @return java.lang.String - * @author work@yujt.net.cn - * @date 2019/12/20 20:34 - */ - public static String getDeptOptionKey(Long deptId) { - return rootPrefix.concat("options:dept:common:").concat(String.valueOf(deptId)); - } - /** * 事件分类 */ @@ -191,46 +179,4 @@ public class RedisKeys { public static String getAllDeptOptionKeyForEpiDemic() { return rootPrefix.concat("options:dept:epidemic:all:"); } - - /** - * @Author wanggongfeng - * @Description常用语 - */ - public static String getPhraseListKey() { - return rootPrefix.concat("heart:phrase:list"); - } - - /** - * @param ruleCode 积分规则编码 - * @return java.lang.String - * @Author yinzuomei - * @Description 积分规则 - * @Date 2019/12/12 10:02 - **/ - public static String getPointsRuleKey(String ruleCode) { - return rootPrefix.concat("config:points:rule:").concat(ruleCode); - } - - /** - * 按项目分类设置项目响应/关闭时限 - * - * @param categoryId - * @return java.lang.String - * @author work@yujt.net.cn - * @date 2019/12/20 20:38 - */ - public static String getKpiItemTimeLimitKey(String categoryId) { - return rootPrefix.concat("config:kpi:itemtimelimit:").concat(categoryId); - } - - /** - * 存储议题响应/关闭时限 - * - * @return java.lang.String - * @author work@yujt.net.cn - * @date 2019/12/20 20:39 - */ - public static String getKpiIssueTimeLimitKey() { - return rootPrefix.concat("config:kpi:itemtimelimit"); - } } diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java index 0de5d2834..3789283f4 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java @@ -25,16 +25,11 @@ import java.util.Date; * @since 1.0.0 */ public class DateUtils { - /** 时间格式(yyyy-MM-dd) */ public final static String DATE_PATTERN = "yyyy-MM-dd"; - /** 时间格式(yyyy-MM-dd HH:mm:ss) */ public final static String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss"; - /** 时间格式(yyyyMMddHHmmss) */ - public final static String DATE_TIME_NO_SPLIT = "yyyyMMddHHmmss"; - /** * 日期格式化 日期格式为：yyyy-MM-dd * @param date 日期 diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java index f3f675bcb..f451aa620 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java @@ -11,12 +11,9 @@ package com.elink.esua.epdc.commons.tools.utils; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.BeanUtils; -import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; @@ -83,66 +80,4 @@ public class ExcelUtils { exportExcel(response, fileName, targetList, targetClass); } - - /** - * 获取单元格内容 - * @param cell - * @return - */ - public static String getCellContent(Cell cell){ - String value = ""; - if (cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC) { - value = String.valueOf(cell.getNumericCellValue()); - } else { - value = cell.getStringCellValue(); - } - //内容超过25个字进行长度限制，否则数据库会超限 - /*if(value.length() > 25){ - value = value.substring(0,25) + "..."; - }*/ - return value; - } - - /** - * 获取excle版本 - * @param mFile - * @return - */ - public static String getExcelInfo(MultipartFile mFile) { - String fileName = mFile.getOriginalFilename();// 获取文件名 - String isExcel2003 = "true";// 根据文件名判断文件是2003版本还是2007版本 - try { - if (!validateExcel(fileName)) {// 验证文件名是否合格 - return ""; - } - if (isExcel2007(fileName)) { - isExcel2003 = "false"; - } - return isExcel2003; - } catch (Exception e) { - e.printStackTrace(); - } - return ""; - } - - /** - * 验证EXCEL文件 - * @param filePath - * @return - */ - public static boolean validateExcel(String filePath) { - if (filePath == null || !(isExcel2003(filePath) || isExcel2007(filePath))) { - return false; - } - return true; - } - - // @描述：是否是2003的excel，返回true是2003 - public static boolean isExcel2003(String filePath) { - return filePath.matches("^.+\\.(?i)(xls)$"); - } - // @描述：是否是2007的excel，返回true是2007 - public static boolean isExcel2007(String filePath) { - return filePath.matches("^.+\\.(?i)(xlsx)$"); - } } diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/GPSUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/GPSUtils.java index ad1e5f979..4a7b6fecd 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/GPSUtils.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/GPSUtils.java @@ -1,155 +1,146 @@ package com.elink.esua.epdc.commons.tools.utils; /** - * @Description + * @Description TODO * @Author yinzuomei * @Date 2019/12/27 10:00 */ public class GPSUtils { - public static double pi = 3.1415926535897932384626; - public static double x_pi = 3.14159265358979324 * 3000.0 / 180.0; - public static double a = 6378245.0; - public static double ee = 0.00669342162296594323; + public static double pi = 3.1415926535897932384626; + public static double x_pi = 3.14159265358979324 * 3000.0 / 180.0; + public static double a = 6378245.0; + public static double ee = 0.00669342162296594323; - public static double transformLat(double x, double y) { - double ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y - + 0.2 * Math.sqrt(Math.abs(x)); - ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0; - ret += (20.0 * Math.sin(y * pi) + 40.0 * Math.sin(y / 3.0 * pi)) * 2.0 / 3.0; - ret += (160.0 * Math.sin(y / 12.0 * pi) + 320 * Math.sin(y * pi / 30.0)) * 2.0 / 3.0; - return ret; - } + public static double transformLat(double x, double y) { + double ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + + 0.2 * Math.sqrt(Math.abs(x)); + ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(y * pi) + 40.0 * Math.sin(y / 3.0 * pi)) * 2.0 / 3.0; + ret += (160.0 * Math.sin(y / 12.0 * pi) + 320 * Math.sin(y * pi / 30.0)) * 2.0 / 3.0; + return ret; + } - public static double transformLon(double x, double y) { - double ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 - * Math.sqrt(Math.abs(x)); - ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0; - ret += (20.0 * Math.sin(x * pi) + 40.0 * Math.sin(x / 3.0 * pi)) * 2.0 / 3.0; - ret += (150.0 * Math.sin(x / 12.0 * pi) + 300.0 * Math.sin(x / 30.0 - * pi)) * 2.0 / 3.0; - return ret; - } + public static double transformLon(double x, double y) { + double ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 + * Math.sqrt(Math.abs(x)); + ret += (20.0 * Math.sin(6.0 * x * pi) + 20.0 * Math.sin(2.0 * x * pi)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(x * pi) + 40.0 * Math.sin(x / 3.0 * pi)) * 2.0 / 3.0; + ret += (150.0 * Math.sin(x / 12.0 * pi) + 300.0 * Math.sin(x / 30.0 + * pi)) * 2.0 / 3.0; + return ret; + } + public static double[] transform(double lat, double lon) { + if (outOfChina(lat, lon)) { + return new double[]{lat,lon}; + } + double dLat = transformLat(lon - 105.0, lat - 35.0); + double dLon = transformLon(lon - 105.0, lat - 35.0); + double radLat = lat / 180.0 * pi; + double magic = Math.sin(radLat); + magic = 1 - ee * magic * magic; + double sqrtMagic = Math.sqrt(magic); + dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi); + dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi); + double mgLat = lat + dLat; + double mgLon = lon + dLon; + return new double[]{mgLat,mgLon}; + } + public static boolean outOfChina(double lat, double lon) { + if (lon < 72.004 || lon > 137.8347) + return true; + if (lat < 0.8293 || lat > 55.8271) + return true; + return false; + } + /** + * 84 to 火星坐标系 (GCJ-02) World Geodetic System ==> Mars Geodetic System + * + * @param lat + * @param lon + * @return + */ + public static double[] gps84_To_Gcj02(double lat, double lon) { + if (outOfChina(lat, lon)) { + return new double[]{lat,lon}; + } + double dLat = transformLat(lon - 105.0, lat - 35.0); + double dLon = transformLon(lon - 105.0, lat - 35.0); + double radLat = lat / 180.0 * pi; + double magic = Math.sin(radLat); + magic = 1 - ee * magic * magic; + double sqrtMagic = Math.sqrt(magic); + dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi); + dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi); + double mgLat = lat + dLat; + double mgLon = lon + dLon; + return new double[]{mgLat, mgLon}; + } - public static double[] transform(double lat, double lon) { - if (outOfChina(lat, lon)) { - return new double[]{lat, lon}; - } - double dLat = transformLat(lon - 105.0, lat - 35.0); - double dLon = transformLon(lon - 105.0, lat - 35.0); - double radLat = lat / 180.0 * pi; - double magic = Math.sin(radLat); - magic = 1 - ee * magic * magic; - double sqrtMagic = Math.sqrt(magic); - dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi); - dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi); - double mgLat = lat + dLat; - double mgLon = lon + dLon; - return new double[]{mgLat, mgLon}; - } + /** + * * 火星坐标系 (GCJ-02) to 84 * * @param lon * @param lat * @return + * */ + public static double[] gcj02_To_Gps84(double lat, double lon) { + double[] gps = transform(lat, lon); + double lontitude = lon * 2 - gps[1]; + double latitude = lat * 2 - gps[0]; + return new double[]{latitude, lontitude}; + } + /** + * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换算法 将 GCJ-02 坐标转换成 BD-09 坐标 + * + * @param lat + * @param lon + */ + public static double[] gcj02_To_Bd09(double lat, double lon) { + double x = lon, y = lat; + double z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi); + double theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi); + double tempLon = z * Math.cos(theta) + 0.0065; + double tempLat = z * Math.sin(theta) + 0.006; + double[] gps = {tempLat,tempLon}; + return gps; + } - public static boolean outOfChina(double lat, double lon) { - if (lon < 72.004 || lon > 137.8347) - return true; - if (lat < 0.8293 || lat > 55.8271) - return true; - return false; - } + /** + * * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换算法 * * 将 BD-09 坐标转换成GCJ-02 坐标 * * @param + * bd_lat * @param bd_lon * @return + */ + public static double[] bd09_To_Gcj02(double lat, double lon) { + double x = lon - 0.0065, y = lat - 0.006; + double z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_pi); + double theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi); + double tempLon = z * Math.cos(theta); + double tempLat = z * Math.sin(theta); + double[] gps = {tempLat,tempLon}; + return gps; + } - /** - * 84 to 火星坐标系 (GCJ-02) World Geodetic System ==> Mars Geodetic System - * - * @param lat - * @param lon - * @return - */ - public static double[] gps84_To_Gcj02(double lat, double lon) { - if (outOfChina(lat, lon)) { - return new double[]{lat, lon}; - } - double dLat = transformLat(lon - 105.0, lat - 35.0); - double dLon = transformLon(lon - 105.0, lat - 35.0); - double radLat = lat / 180.0 * pi; - double magic = Math.sin(radLat); - magic = 1 - ee * magic * magic; - double sqrtMagic = Math.sqrt(magic); - dLat = (dLat * 180.0) / ((a * (1 - ee)) / (magic * sqrtMagic) * pi); - dLon = (dLon * 180.0) / (a / sqrtMagic * Math.cos(radLat) * pi); - double mgLat = lat + dLat; - double mgLon = lon + dLon; - return new double[]{mgLat, mgLon}; - } + /**将gps84转为bd09 + * @param lat + * @param lon + * @return + */ + public static double[] gps84_To_bd09(double lat,double lon){ + double[] gcj02 = gps84_To_Gcj02(lat,lon); + double[] bd09 = gcj02_To_Bd09(gcj02[0],gcj02[1]); + return bd09; + } + public static double[] bd09_To_gps84(double lat,double lon){ + double[] gcj02 = bd09_To_Gcj02(lat, lon); + double[] gps84 = gcj02_To_Gps84(gcj02[0], gcj02[1]); + //保留小数点后六位 + gps84[0] = retain6(gps84[0]); + gps84[1] = retain6(gps84[1]); + return gps84; + } - /** - * * 火星坐标系 (GCJ-02) to 84 * * @param lon * @param lat * @return - */ - public static double[] gcj02_To_Gps84(double lat, double lon) { - double[] gps = transform(lat, lon); - double lontitude = lon * 2 - gps[1]; - double latitude = lat * 2 - gps[0]; - return new double[]{latitude, lontitude}; - } - - /** - * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换算法 将 GCJ-02 坐标转换成 BD-09 坐标 - * - * @param lat - * @param lon - */ - public static double[] gcj02_To_Bd09(double lat, double lon) { - double x = lon, y = lat; - double z = Math.sqrt(x * x + y * y) + 0.00002 * Math.sin(y * x_pi); - double theta = Math.atan2(y, x) + 0.000003 * Math.cos(x * x_pi); - double tempLon = z * Math.cos(theta) + 0.0065; - double tempLat = z * Math.sin(theta) + 0.006; - double[] gps = {tempLat, tempLon}; - return gps; - } - - /** - * * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换算法 * * 将 BD-09 坐标转换成GCJ-02 坐标 * * @param - * bd_lat * @param bd_lon * @return - */ - public static double[] bd09_To_Gcj02(double lat, double lon) { - double x = lon - 0.0065, y = lat - 0.006; - double z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_pi); - double theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi); - double tempLon = z * Math.cos(theta); - double tempLat = z * Math.sin(theta); - double[] gps = {tempLat, tempLon}; - return gps; - } - - /** - * 将gps84转为bd09 - * - * @param lat - * @param lon - * @return - */ - public static double[] gps84_To_bd09(double lat, double lon) { - double[] gcj02 = gps84_To_Gcj02(lat, lon); - double[] bd09 = gcj02_To_Bd09(gcj02[0], gcj02[1]); - return bd09; - } - - public static double[] bd09_To_gps84(double lat, double lon) { - double[] gcj02 = bd09_To_Gcj02(lat, lon); - double[] gps84 = gcj02_To_Gps84(gcj02[0], gcj02[1]); - //保留小数点后六位 - gps84[0] = retain6(gps84[0]); - gps84[1] = retain6(gps84[1]); - return gps84; - } - - /** - * 保留小数点后六位 - * - * @param num - * @return - */ - private static double retain6(double num) { - String result = String.format("%.6f", num); - return Double.valueOf(result); - } + /**保留小数点后六位 + * @param num + * @return + */ + private static double retain6(double num){ + String result = String .format("%.6f", num); + return Double.valueOf(result); + } } diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/LocalDateUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/LocalDateUtils.java deleted file mode 100644 index 133340b24..000000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/LocalDateUtils.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.elink.esua.epdc.commons.tools.utils; - - -import java.time.*; -import java.util.Date; - -/** - * @author work@yujt.net.cn - * @date 2019/12/13 15:05 - */ -public class LocalDateUtils { - - - public static LocalDateTime dateToLocalDateTime(Date date) { - Instant instant = date.toInstant(); - ZoneId zone = ZoneId.systemDefault(); - return LocalDateTime.ofInstant(instant, zone); - } - - public static LocalDate dateToLocalDate(Date date) { - Instant instant = date.toInstant(); - ZoneId zone = ZoneId.systemDefault(); - LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone); - return localDateTime.toLocalDate(); - } - - public static YearMonth dateToYearMonth(Date date) { - LocalDate localDate = dateToLocalDate(date); - return YearMonth.of(localDate.getYear(), localDate.getMonthValue()); - } - - public static LocalTime dateToLocalTime(Date date) { - Instant instant = date.toInstant(); - ZoneId zone = ZoneId.systemDefault(); - LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone); - return localDateTime.toLocalTime(); - } - - public static Date localDateTimeToDate(LocalDateTime localDateTime) { - ZoneId zone = ZoneId.systemDefault(); - Instant instant = localDateTime.atZone(zone).toInstant(); - return Date.from(instant); - } - - public static Date localDateToDate(LocalDate localDate) { - ZoneId zone = ZoneId.systemDefault(); - Instant instant = localDate.atStartOfDay().atZone(zone).toInstant(); - return Date.from(instant); - } - -} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java index 3c75b2837..24bb7ac73 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ModuleUtils.java @@ -1,16 +1,8 @@ package com.elink.esua.epdc.commons.tools.utils; import com.alibaba.fastjson.JSON; -import com.elink.esua.epdc.commons.tools.constant.StrConstant; -import com.elink.esua.epdc.commons.tools.exception.RenException; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.codec.CharEncoding; -import org.springframework.util.Base64Utils; -import org.springframework.util.StringUtils; -import java.io.UnsupportedEncodingException; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.UUID; /** @@ -48,66 +40,7 @@ public class ModuleUtils { * @date 2019/9/5 14:44 */ public static String generateUUID() { - return UUID.randomUUID().toString().replace(StrConstant.HYPHEN, ""); + return UUID.randomUUID().toString().replace("-", ""); } - /** - * 字符串转换为base64 - * - * @param params - * @return java.lang.String - * @author work@yujt.net.cn - * @date 2020/2/6 16:39 - */ - public static String encodeByBase64(String params) { - if (StringUtils.isEmpty(params)) { - return null; - } - try { - return Base64Utils.encodeToUrlSafeString(params.getBytes(CharEncoding.UTF_8)); - } catch (UnsupportedEncodingException e) { - throw new RenException("字符串编码方法异常"); - } - } - - /** - * base64解码 - * - * @param base64Str - * @return java.lang.String - * @author work@yujt.net.cn - * @date 2020/2/6 16:48 - */ - public static String decodeFromBase64(String base64Str) { - if (StringUtils.isEmpty(base64Str)) { - return null; - } - try { - return new String(Base64Utils.decodeFromUrlSafeString(base64Str), CharEncoding.UTF_8); - } catch (UnsupportedEncodingException e) { - throw new RenException("字符串编码方法异常"); - } - } - - /** - * 验证字符串是否是日期格式 - * - * @param str 被验证的字符串 - * @param dateFormat 指定日期格式 - * @return boolean - * @author work@yujt.net.cn - * @date 2020/2/7 10:53 - */ - public static boolean isValidDate(String str, String dateFormat) { - boolean convertSuccess = true; - // 指定日期格式 - SimpleDateFormat format = new SimpleDateFormat(dateFormat); - try { - format.setLenient(false); - format.parse(str); - } catch (ParseException e) { - convertSuccess = false; - } - return convertSuccess; - } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java deleted file mode 100644 index e1141505f..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -/** - * 取消报名参数 - * - * @author wanggongfeng - * @since v1.0.0 2019-12-17 - */ -@Data -public class EpdcAppActUserCancelsignupDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - private String userId; - /** - * 活动ID - */ - @NotBlank(message = "活动ID不能为空") - private String actId; - - /** - * 取消报名原因 - */ - @NotBlank(message = "取消报名原因不能为空") - private String failureReason; -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserClockLogDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserClockLogDTO.java deleted file mode 100644 index 2d30a4525..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserClockLogDTO.java +++ /dev/null @@ -1,80 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.ArrayList; - -/** - * 用户打卡参数 - * - * @author wanggongfeng - * @since v1.0.0 2019-12-17 - */ -@Data -public class EpdcAppActUserClockLogDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - private String userId; - /** - * 活动ID - */ - @NotBlank(message = "活动ID不能为空") - private String actId; - /** - * 打卡描述 - */ - @NotBlank(message = "打卡描述不能为空") - private String clockDesc; - /** - * 打卡位置经度 - */ - private BigDecimal clockLongitude; - /** - * 打卡位置纬度 - */ - private BigDecimal clockLatitude; - /** - * 打卡地址 - */ - @NotBlank(message = "打卡地址不能为空") - private String clockAddress; - /** - * 打卡图片 - */ - private ArrayList images; - /** - * 打卡类型（0-打卡，1-更新打卡） - */ - @NotBlank(message = "打卡类型不能为空") - private String clockType; - /** - * 打卡是否有效（0-否，1-是） - */ - @NotBlank(message = "打卡是否有效不能为空") - private String effectiveFlag; - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java index 6c3ccb3ec..ca49d2f3e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java @@ -23,7 +23,6 @@ public class EpdcCompleteUserInfoFormDTO implements Serializable { * 身份证号码 */ private String identityNo; - /** * 手机号 */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppClockListDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppClockListDTO.java deleted file mode 100644 index 8cfa70ea3..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppClockListDTO.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.result; - -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * 打卡列表 - * - * @author wanggongfeng - * @since v1.0.0 2019-12-18 - */ -@Data -public class EpdcAppClockListDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 活动打卡人次 - */ - private int clockNum; - - /** - * 打卡列表 - */ - private List clocks; - - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java deleted file mode 100644 index d589c4f99..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppVolunteerRankDTO.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.result; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * 志愿者排名 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-18 - */ -@Data -public class EpdcAppVolunteerRankDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 排名 - */ - private Integer sort; - - /** - * 头像 - */ - private String faceImg; - - /** - * 用户名 - */ - private String nickname; - - /** - * 是否党员(0-否，1-是) - */ - private String partyFlag; - - /** - * 爱心时长(单位：小时) - */ - private BigDecimal kindnessTime; - - /** - * 参加次数 - */ - private Integer participationNum; - - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index 49bd4e004..31a3c42d9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -13,6 +13,7 @@ jar + @@ -21,42 +22,35 @@ epdc-api-client 1.0.0 - com.esua.epdc epdc-commons-tools 1.0.0 - com.esua.epdc epdc-commons-mybatis 1.0.0 - org.springframework.boot spring-boot-starter-web - org.springframework spring-context-support - de.codecentric spring-boot-admin-starter-client ${spring.boot.admin.version} - com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - com.esua.epdc @@ -92,10 +86,6 @@ 1.0.0 compile - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/ApiApplication.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/ApiApplication.java index cf7c97661..96d647692 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/ApiApplication.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/ApiApplication.java @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + package com.elink.esua.epdc; import org.springframework.boot.SpringApplication; @@ -8,8 +16,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients; /** * API模块 * - * @author rongchao - * @Date 20-1-15 + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 */ @SpringBootApplication @EnableDiscoveryClient diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActPhraseController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActPhraseController.java deleted file mode 100644 index 0a563cdf9..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActPhraseController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.service.ActPhraseService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * APP常用语相关接口 - * - * @author wanggongfeng - * @date 2019/12/17 10:30 - */ -@RestController -@RequestMapping("heart/phrase") -public class ApiActPhraseController { - - @Autowired - private ActPhraseService actPhraseService; - - /** - * 使用次数加一 - * @param id - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author wanggongfeng - * @date 2019/12/13 14:41 - */ - @PostMapping("sagenumAddOne") - public Result sagenumAddOneById(String id) { - return actPhraseService.sagenumAddOneById(id); - } - - /** - * 获取常用语列表 - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author wanggongfeng - * @date 2019/12/13 14:41 - */ - @GetMapping("getPhraseList") - public Result getPhraseList() { - return actPhraseService.getPhraseList(); - - } - - - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java deleted file mode 100644 index aeacb46c5..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.activity.ActUserRelationDTO; -import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO; -import com.elink.esua.epdc.activity.AppActUserClockLogDTO; -import com.elink.esua.epdc.activity.AppClockListDTO; -import com.elink.esua.epdc.activity.result.AppActInfoDTO; -import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.common.token.util.IdentityNoAnalysisUtil; -import com.elink.esua.epdc.commons.tools.annotation.LoginUser; -import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; -import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; -import com.elink.esua.epdc.dto.form.EpdcAppActUserCancelsignupDTO; -import com.elink.esua.epdc.dto.form.EpdcAppActUserClockLogDTO; -import com.elink.esua.epdc.dto.result.EpdcAppClockListDTO; -import com.elink.esua.epdc.service.ActUserRelationService; -import com.elink.esua.epdc.service.AppUserService; -import com.elink.esua.epdc.utils.UserTagUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; - -/** - * APP活动相关接口 - * - * @author wanggongfeng - * @date 2019/12/17 10:30 - */ -@RestController -@RequestMapping("heart/act") -public class ApiActUserRelationController { - - @Autowired - private ActUserRelationService actUserRelationService; - - @Autowired - private AppUserService appUserService; - - /** - * 活动报名 - * - * @param tokenDto - * @param actId - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author wanggongfeng - * @date 2019/12/13 14:41 - */ - @PostMapping("signup") - public Result activitySignUp(@LoginUser TokenDto tokenDto,String actId) { - if (StringUtils.isBlank(actId)) { - return new Result().error("活动id不能为空"); - } - //验证是否为志愿者 - Result isVolunteer = appUserService.getVolunteerCountById(tokenDto); - int code = isVolunteer.getCode(); - if (code != 0) { - //不是志愿者 - return isVolunteer; - } - Result userInfo = appUserService.getInfoById(tokenDto); - EpdcUserInfoResultDTO epdcUserInfoResultDTO = userInfo.getData(); - String identityNo = epdcUserInfoResultDTO.getIdentityNo(); - ActUserRelationDTO actUserRelationDTO = new ActUserRelationDTO(); - actUserRelationDTO.setActId(actId); - actUserRelationDTO.setUserId(tokenDto.getUserId()); - actUserRelationDTO.setNickname(tokenDto.getNickname()); - actUserRelationDTO.setFaceImg(tokenDto.getFaceImg()); - if (UserTagUtils.containIdentity(tokenDto.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { - actUserRelationDTO.setPartyFlag(YesOrNoEnum.YES.value()); - } else { - actUserRelationDTO.setPartyFlag(YesOrNoEnum.NO.value()); - } - actUserRelationDTO.setRealName(tokenDto.getRealName()); - String sex = IdentityNoAnalysisUtil.getSex(identityNo); // 身份证解析性别 - if ("女".equals(sex)){ - sex = "0"; - }else { - sex = "1"; - } - actUserRelationDTO.setSex(sex); - actUserRelationDTO.setAge(IdentityNoAnalysisUtil.getAge(identityNo)); - actUserRelationDTO.setMobile(tokenDto.getMobile()); - actUserRelationDTO.setIdentityNo(identityNo); - actUserRelationDTO.setStatus("0"); - actUserRelationDTO.setSignupTime(new Date()); - return actUserRelationService.activitySignUp(actUserRelationDTO); - - } - - /** - * 取消活动报名 - * - * @param tokenDto - * @param epdcAppActUserCancelsignupDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author wanggongfeng - * @date 2019/12/13 14:41 - */ - @PostMapping("cancelsignup") - public Result activityCancelSignUp(@LoginUser TokenDto tokenDto,@RequestBody EpdcAppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) { - ValidatorUtils.validateEntity(epdcAppActUserCancelsignupDTO); - epdcAppActUserCancelsignupDTO.setUserId(tokenDto.getUserId()); - AppActUserCancelsignupDTO actUserCancelsignupDTO = ConvertUtils.sourceToTarget(epdcAppActUserCancelsignupDTO, AppActUserCancelsignupDTO.class); - return actUserRelationService.activityCancelSignUp(actUserCancelsignupDTO); - - } - - /** - * 活动打卡 - * - * @param tokenDto - * @param epdcAppActUserClockLogDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author wanggongfeng - * @date 2019/12/13 14:41 - */ - @PostMapping("clock") - public Result activityClock(@LoginUser TokenDto tokenDto, @RequestBody EpdcAppActUserClockLogDTO epdcAppActUserClockLogDTO) { - ValidatorUtils.validateEntity(epdcAppActUserClockLogDTO); - AppActUserClockLogDTO appActUserClockLogDTO = ConvertUtils.sourceToTarget(epdcAppActUserClockLogDTO, AppActUserClockLogDTO.class); - appActUserClockLogDTO.setUserId(tokenDto.getUserId()); - return actUserRelationService.activityClock(appActUserClockLogDTO); - - } - - /** - * 获取打卡列表 - * - * @param tokenDto - * @param actId - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author wanggongfeng - * @date 2019/12/13 14:41 - */ - @GetMapping("clockList") - public Result getClockList(@LoginUser TokenDto tokenDto, String actId) { - Result result = actUserRelationService.getClockList(actId); - EpdcAppClockListDTO epdcAppClockListDTO = ConvertUtils.sourceToTarget(result.getData(), EpdcAppClockListDTO.class); - Result result1 = new Result(); - result1.setData(epdcAppClockListDTO); - return result1; - - } - - /** - * 获取活动打卡地点详情 - * - * @param actId - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author wanggongfeng - * @date 2019/12/13 14:41 - */ - @GetMapping("clockAddressDetail") - public Result clockAddressDetail(String actId) { - return actUserRelationService.clockAddressDetail(actId); - - } -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java deleted file mode 100644 index 20a4cca3f..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.activity.ActBannerDTO; -import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; -import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.commons.tools.annotation.LoginUser; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.service.ActInfoService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * 移动端接口-项目模块 - * @Author LPF - * @Date 2019/11/18 13:32 - */ -@RestController -@RequestMapping("heart/act") -public class ApiAppActInfoController { - - @Autowired - private ActInfoService actInfoService; - - - /** - * 活动列表 - * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:34 - */ - @GetMapping("list") - public Result> listItems(ActInfoAppFormDTO formDto, @LoginUser TokenDto tokenDto) { - formDto.setUserId(tokenDto.getUserId()); - return actInfoService.listItems(formDto); - } - /** - * 活动列表 - * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:34 - */ - @GetMapping("signupList") - public Result> signupListItems(ActInfoAppFormDTO formDto, @LoginUser TokenDto tokenDto) { - formDto.setUserId(tokenDto.getUserId()); - return actInfoService.signupListItems(formDto); - } - - /** - * 项目详情 - * @Params: [id] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: lipengfei - * @Date: 2019/11/19 16:34 - */ - @GetMapping("detail/{id}") - public Result detail(@PathVariable String id, @LoginUser TokenDto tokenDto) { - if (StringUtils.isBlank(id)) { - return new Result().error("id不能为空"); - } - ActInfoAppFormDTO formDto = new ActInfoAppFormDTO(); - formDto.setId(id); - formDto.setUserId(tokenDto.getUserId()); - return actInfoService.getDetail(formDto); - } - - /** - * 项目详情 - * @Params: [id] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: lipengfei - * @Date: 2019/11/19 16:34 - */ - @GetMapping("rejectDetail/{id}") - public Result rejectDetail(@PathVariable String id, @LoginUser TokenDto tokenDto) { - ActInfoAppFormDTO formDto = new ActInfoAppFormDTO(); - formDto.setId(id); - formDto.setUserId(tokenDto.getUserId()); - return actInfoService.getRejectDetail(formDto); - } - - /** - * 项目详情 - * @Params: [id] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: lipengfei - * @Date: 2019/11/19 16:34 - */ - @GetMapping("cancelDetail/{id}") - public Result cancelDetail(@PathVariable String id) { - return actInfoService.getCancelDetail(id); - } - @GetMapping("banner/list") - public Result> bannerList() { - return actInfoService.getBannerList(); - } -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index 5b411a111..8c462b1fa 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -9,8 +9,8 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO; import com.elink.esua.epdc.dto.form.*; -import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; +import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO; import com.elink.esua.epdc.service.AppUserService; import org.springframework.beans.factory.annotation.Autowired; @@ -22,7 +22,7 @@ import java.util.List; * 用户模块 * * @author yujintao - * @email yujintao@elink-cn.comuser/completeInfo + * @email yujintao@elink-cn.com * @date 2019/9/6 19:30 */ @RestController @@ -106,7 +106,6 @@ public class ApiAppUserController { ValidatorUtils.validateEntity(formDto); return appUserService.checkRegister(formDto); } - /** * 用户生成小程序码 * @@ -128,7 +127,6 @@ public class ApiAppUserController { * @author yujintao * @date 2019/9/9 10:52 */ - @Deprecated @GetMapping("user/mp/getToken") public Result getToken(EpdcAppUserTokenFormDTO formDto) { ValidatorUtils.validateEntity(formDto); @@ -243,7 +241,6 @@ public class ApiAppUserController { public Result prepareCompleteUserInfo(@LoginUser TokenDto tokenDto) { return appUserService.prepareCompleteUserInfo(tokenDto); } - /** * 获取邀请记录 * @@ -267,22 +264,4 @@ public class ApiAppUserController { public Result checkWxUnionId(@LoginUser TokenDto tokenDto) { return appUserService.checkWxUnionId(tokenDto); } - - /** - * 志愿者认证 - * - * @param tokenDto - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author wanggongfeng - * @date 2019/12/13 14:41 - */ - @PostMapping("volunteer/authenticate") - public Result volunteerAuthenticate(@LoginUser TokenDto tokenDto, @RequestBody EpdcCompleteVolunteerInfoFormDTO formDto) { - ValidatorUtils.validateEntity(formDto); - return appUserService.volunteerAuthenticate(tokenDto, formDto); - - } - - } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiEvaluateController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiEvaluateController.java deleted file mode 100644 index 960f844c0..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiEvaluateController.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.commons.tools.annotation.LoginUser; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO; -import com.elink.esua.epdc.service.ActInfoService; -import com.elink.esua.epdc.service.EvaluateService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 移动端接口-项目模块 - * @Author LPF - * @Date 2019/11/18 13:32 - */ -@RestController -@RequestMapping("custom/evaluate") -public class ApiEvaluateController { - - @Autowired - private EvaluateService evaluateService; - - - /** - * 街道干部列表 - * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:34 - */ - @GetMapping("getDeptOfficer") - public Result> getDeptOfficer(@LoginUser TokenDto tokenDto) { - EvaluateOfficerAppFormDTO formDto = new EvaluateOfficerAppFormDTO(); - formDto.setGridId(tokenDto.getGridId()); - return evaluateService.getDeptOfficer(formDto); - } - /** - * 评价列表 - * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:34 - */ - @GetMapping("getOptionList") - public Result> getOptionList(EvaluateOptionAppFormDTO formDto) { - return evaluateService.getOptionList(formDto); - } - /** - * 评价状态 - * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> - * @Author: lipengfei - * @Date: 2019/11/19 16:34 - */ - @GetMapping("getAvailable") - public Result getAvailable() { - return evaluateService.getAvailable(); - } - /** - * 评价提交 - * @Params: [ formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:34 - */ - @PostMapping("evaluateSubmit") - public Result evaluateSubmit(EvaluateSubmitFormDTO formDto, @LoginUser TokenDto tokenDto) { - formDto.setFullName(tokenDto.getRealName()); - formDto.setMobile(tokenDto.getMobile()); - return evaluateService.evaluateSubmit(formDto); - } -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java index 5f9443486..137b8ffb6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiScanSwitchController.java @@ -43,7 +43,7 @@ import java.util.Map; @RestController @RequestMapping("ma") public class ApiScanSwitchController { - + @Autowired private ScanSwitchService scanSwitchService; diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java deleted file mode 100644 index a0c104bdf..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.result.EpdcAppVolunteerRankDTO; -import com.elink.esua.epdc.service.AppVolunteerRankService; -import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; -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; - -/** - * APP爱心排名 - * - * @author wanggongfeng - * @date 2019/12/17 10:30 - */ -@RestController -@RequestMapping("heart/volunteer") -public class ApiVolunteerRankController { - - @Autowired - private AppVolunteerRankService appVolunteerRankService; - - /** - * 获取排行榜 - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author wanggongfeng - * @date 2019/12/13 14:41 - */ - @GetMapping("leaderboard") - public Result> leaderboard() { - Result> data = appVolunteerRankService.leaderboard(); - List list2 = ConvertUtils.sourceToTarget(data.getData(), EpdcAppVolunteerRankDTO.class); - return new Result().ok(list2); - - } - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/DemoController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/DemoController.java deleted file mode 100644 index aaa4418c6..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/DemoController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.service.DemoService; -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 java.util.Map; - -/** - * 移动端接口-评论模块 - * - * @Author WJP - * @Date 2019/9/9 09:45 - */ -@RestController -@RequestMapping("demo") -public class DemoController { - - @Autowired - private DemoService demoService; - - /** - * 事务 - * - * @return - */ - @PostMapping("seata") - public Result demo(@RequestBody Map map) { - return demoService.demo(map); - } - - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java deleted file mode 100644 index 95fd6e0e1..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.elink.esua.epdc.feign; - -import com.elink.esua.epdc.activity.ActBannerDTO; -import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.config.FeignRequestInterceptor; -import com.elink.esua.epdc.feign.fallback.ActInfoFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; - -import java.util.List; - -/** - * 活动模块调用-移动app端 - * @Author LPF - * @Date 2019/11/18 16:39 - */ -@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = ActInfoFeignClientFallback.class, configuration = FeignRequestInterceptor.class) -public interface ActInfoFeignClient { - - - - /** - * 活动列表 - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:42 - */ - @GetMapping(value = "heart/appactinfo/list", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> listItems(ActInfoAppFormDTO formDto); - - /** - * 活动列表（已报名） - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:42 - */ - @GetMapping(value = "heart/appactinfo/signupList", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> signupListItems(ActInfoAppFormDTO formDto); - /** - * 活动详情 - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:42 - */ - @GetMapping(value = "heart/appactinfo/detail", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getDetail(ActInfoAppFormDTO formDto); - - @GetMapping(value = "heart/appactinfo/rejectdetail", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getRejectDetail(ActInfoAppFormDTO formDto); - - @GetMapping(value = "heart/appactinfo/canceldetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getCancelDetail(@PathVariable String id); - - @GetMapping(value = "heart/actbanner/bannerlist", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> getBannerList(); - - - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index 40a78e93e..9b41b246a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -60,10 +60,11 @@ public interface AdminFeignClient { Result listGridWhileLeaderRegister(@PathVariable("mobile") String mobile); /** + * * 根据openId获取用户信息 * - * @return com.elink.esua.epdc.commons.tools.utils.Result * @params [openId] + * @return com.elink.esua.epdc.commons.tools.utils.Result * @author liuchuang * @since 2019/11/19 17:43 */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActPhraseFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActPhraseFeignClient.java deleted file mode 100644 index 9115db045..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActPhraseFeignClient.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.elink.esua.epdc.feign; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.feign.fallback.AppActPhraseFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; - -/** - * - * 活动报名管理 - * - * @Author：wanggongfeng - * @Date：2019/12/16 17:36 - */ -@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = AppActPhraseFeignClientFallback.class) -public interface AppActPhraseFeignClient { - - /** - * 常用语加一 - * - * @param id - * @return - */ - @GetMapping("heart/appactphrase/sagenumAddOneById/{id}") - Result sagenumAddOneById(@PathVariable("id")String id); - - /** - * redis获取常用语列表 - * @return - */ - @GetMapping("heart/appactphrase/getPhraseList") - Result getPhraseList(); -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java deleted file mode 100644 index 00f257f18..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.elink.esua.epdc.feign; - -import com.elink.esua.epdc.activity.ActUserRelationDTO; -import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO; -import com.elink.esua.epdc.activity.AppActUserClockLogDTO; -import com.elink.esua.epdc.activity.AppClockListDTO; -import com.elink.esua.epdc.activity.result.AppActInfoDTO; -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.feign.fallback.AppActUserRelationFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; - -/** - * - * 活动报名管理 - * - * @Author：wanggongfeng - * @Date：2019/12/16 17:36 - */ -@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = AppActUserRelationFeignClientFallback.class) -public interface AppActUserRelationFeignClient { - - /** - * 活动报名 - * @param actUserRelationDTO - * @return - */ - @GetMapping(value = "heart/appactuserrelation/activitySignUp",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) - Result activitySignUp(ActUserRelationDTO actUserRelationDTO); - - /** - * 取消活动报名 - * @param epdcAppActUserCancelsignupDTO - * @return - */ - @GetMapping("heart/appactuserrelation/activityCancelSignUp") - Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO); - - /** - * 活动打卡 - * @param appActUserClockLogDTO - * @return - */ - @GetMapping(value = "heart/appactuserclocklog/activityClock",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) - Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO); - - /** - * 通过活动ID查询打卡列表 - * @param actId - * @return - */ - @GetMapping(value = "heart/appactuserrelation/selectListActUserRelation/{actId}") - Result selectListActUserRelation(@PathVariable("actId") String actId); - - /** - * 获取活动打卡地点详情 - * @param actId - * @return - */ - @GetMapping("heart/appactinfo/clockAddressDetail/{actId}") - Result clockAddressDetail(@PathVariable("actId") String actId); - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java deleted file mode 100644 index be3999ed3..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.elink.esua.epdc.feign; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.feign.fallback.AppVolunteerRankFeignClientFallback; -import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; - -import java.util.List; - -/** - * - * 活动报名管理 - * - * @Author：wanggongfeng - * @Date：2019/12/16 17:36 - */ -@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = AppVolunteerRankFeignClientFallback.class) -public interface AppVolunteerRankFeignClient { - - /** - * 获取排行榜 - * @return - */ - @GetMapping("heart/volunteer/leaderboard") - Result> leaderboard(); -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CommentFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CommentFeignClient.java index 752921c9c..dd428c14b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CommentFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CommentFeignClient.java @@ -3,8 +3,8 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO; +import com.elink.esua.epdc.dto.comment.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; -import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; import com.elink.esua.epdc.feign.fallback.CommentFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; @@ -22,7 +22,7 @@ public interface CommentFeignClient { @PostMapping(value = "events/epdc-app/comment/submit", consumes = MediaType.APPLICATION_JSON_VALUE) - Result submit(SubmitCommentFormDTO submitCommentFormDTO); + Result submit(CommentFormDTO commentFormDTO); /** * 评论列表 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/EvaluateFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/EvaluateFeignClient.java deleted file mode 100644 index 556cefc10..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/EvaluateFeignClient.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.elink.esua.epdc.feign; - -import com.elink.esua.epdc.activity.ActBannerDTO; -import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.config.FeignRequestInterceptor; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO; -import com.elink.esua.epdc.feign.fallback.ActInfoFeignClientFallback; -import com.elink.esua.epdc.feign.fallback.EvaluateFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; - -import java.util.List; - -/** - * 评价模块调用-移动app端 - * @Author LPF - * @Date 2019/11/18 16:39 - */ -@FeignClient(name = ServiceConstant.EPDC_CUSTOM_SERVER, fallback = EvaluateFeignClientFallback.class, configuration = FeignRequestInterceptor.class) -public interface EvaluateFeignClient { - - - - /** - * 街道干部列表 - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:42 - */ - @GetMapping(value = "custom/evaluateofficer/getDeptOfficer", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> getDeptOfficer(EvaluateOfficerAppFormDTO formDto); - - /** - * 评价列表 - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:42 - */ - @GetMapping(value = "custom/evaluateoption/getOptionList", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> getOptionList(EvaluateOptionAppFormDTO formDto); - /** - * 评价提交 - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> - * @Author: lipengfei - * @Date: 2019/11/19 16:42 - */ - @PostMapping(value = "custom/evaluateinfo/evaluateSubmit", consumes = MediaType.APPLICATION_JSON_VALUE) - Result evaluateSubmit(EvaluateSubmitFormDTO formDto); - - /** - * 评价状态 - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result<> - * @Author: lipengfei - * @Date: 2019/11/19 16:42 - */ - @PostMapping(value = "custom/evaluaterole/getAppAvailable", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getAvailable(); - - - - - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/OssFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/OssFeignClient.java index b79ea6c38..875445a57 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/OssFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/OssFeignClient.java @@ -2,15 +2,12 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.UploadDTO; import com.elink.esua.epdc.dto.UploadFormDTO; import com.elink.esua.epdc.dto.UploadToOssDTO; import com.elink.esua.epdc.feign.fallback.OssFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; /** * 文件对象模块 @@ -41,14 +38,4 @@ public interface OssFeignClient { */ @PostMapping(value = "oss/file/uploadFile", consumes = MediaType.APPLICATION_JSON_VALUE) Result uploadFile(UploadToOssDTO uploadToOssDto); - - /** - * @param avatarUrl - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 上传微信头像 - * @Date 2019/12/20 9:33 - **/ - @GetMapping(value="oss/file/saveWeChatFaceImg") - Result saveWeChatFaceImg(@RequestParam("avatarUrl")String avatarUrl); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 08ede327f..b9854986c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -2,19 +2,16 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.CachingUserInfoDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.UserGridRelationDTO; import com.elink.esua.epdc.dto.UserWxFormIdDTO; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; +import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO; import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -189,7 +186,7 @@ public interface UserFeignClient { * 获取网格长管理的网格列表 * * @param userId - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author work@yujt.net.cn * @date 2019/10/23 13:34 */ @@ -222,13 +219,13 @@ public interface UserFeignClient { /** * 更新用户微信信息 * - * @param userDTO * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [userDTO] * @author liuchuang * @since 2019/10/25 17:07 */ @PostMapping("app-user/epdc-app/user/updateWxInfo") - Result updateWxInfo(UserDTO userDTO); + Result updateWxInfo(UserDTO userDTO); /** * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户） @@ -240,10 +237,11 @@ public interface UserFeignClient { Result residentDetail(@PathVariable("userId") String userId); /** + * * 获取用户最后一次切换的网格信息 * - * @return com.elink.esua.epdc.commons.tools.utils.Result * @params [openId] + * @return com.elink.esua.epdc.commons.tools.utils.Result * @author liuchuang * @since 2019/12/6 11:04 */ @@ -307,12 +305,12 @@ public interface UserFeignClient { * @Date 2019/11/22 14:22 **/ @PostMapping("app-user/epdc-app/usergrid/removeGrid") - Result removeGrid(EpdcAppRemoveGridFormDTO formDto); + Result removeGrid(EpdcAppRemoveGridFormDTO formDto); /** * 获取邀请记录 * - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author work@yujt.net.cn * @date 2019/10/23 13:34 */ @@ -326,49 +324,6 @@ public interface UserFeignClient { * @Description 根据openId或者unionId查询用户信息 * @Date 2019/12/7 14:11 **/ - @PostMapping(value = "app-user/epdc-app/user/queryUserDto", consumes = MediaType.APPLICATION_JSON_VALUE) + @PostMapping(value="app-user/epdc-app/user/queryUserDto", consumes = MediaType.APPLICATION_JSON_VALUE) Result queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO); - - /** - * <<<<<<< HEAD - * 需要缓存的用户信息 - * - * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author rongchao - * @since 2019-12-18 - */ - @PostMapping(value = "app-user/epdc-app/user/needCachingUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE) - Result needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO); - - /** - * 根据用户ID需要缓存的用户信息 - * - * @param userId - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author rongchao - * @since 2019-12-19 - */ - @GetMapping(value = "app-user/epdc-app/user/needCachingUserInfoByUserId/{userId}") - Result needCachingUserInfoByUserId(@PathVariable("userId") String userId); - - /** - * 志愿者认证 - * - * @param userId - * @return - */ - @GetMapping("app-user/epdc-app/volunteerinfo/getVolunteerCountById/{userId}") - Result getVolunteerCountById(@PathVariable("userId") String userId); - - /** - * 添加志愿者 - * - * @param epdcCompleteVolunteerInfoFormDTO - * @return - */ - @GetMapping("app-user/epdc-app/volunteerinfo/insertVolunteerInfo") - Result insertVolunteerInfo(EpdcCompleteVolunteerInfoFormDTO epdcCompleteVolunteerInfoFormDTO); - - } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java deleted file mode 100644 index b83175a18..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.elink.esua.epdc.feign.fallback; - -import com.elink.esua.epdc.activity.ActBannerDTO; -import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; -import com.elink.esua.epdc.dto.item.form.*; -import com.elink.esua.epdc.dto.item.result.*; -import com.elink.esua.epdc.feign.ActInfoFeignClient; -import com.elink.esua.epdc.feign.WorkItemFeignClient; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.PathVariable; - -import java.util.List; - -/** - * @Author LPF - * @Date 2019/11/18 16:39 - */ -@Component -public class ActInfoFeignClientFallback implements ActInfoFeignClient { - - - @Override - public Result> listItems(ActInfoAppFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "listItems", formDto); - } - @Override - public Result> signupListItems(ActInfoAppFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "signupListItems", formDto); - } - @Override - public Result getDetail(ActInfoAppFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getDetail", formDto); - } - @Override - public Result getRejectDetail(ActInfoAppFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getRejectDetail", formDto); - } - @Override - public Result getCancelDetail(@PathVariable String id) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getCancelDetail", id); - } - @Override - public Result> getBannerList() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getBannerList"); - } - - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActPhraseFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActPhraseFeignClientFallback.java deleted file mode 100644 index 145640506..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActPhraseFeignClientFallback.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.elink.esua.epdc.feign.fallback; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.feign.AppActPhraseFeignClient; -import org.springframework.stereotype.Component; - -/** - * @Author：wanggongfeng - * @Date：2019/12/16 15:11 - */ -@Component -public class AppActPhraseFeignClientFallback implements AppActPhraseFeignClient { - - @Override - public Result sagenumAddOneById(String id) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "sagenumAddOneById", id); - } - @Override - public Result getPhraseList() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getPhraseList"); - } - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActUserRelationFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActUserRelationFeignClientFallback.java deleted file mode 100644 index 3954ce303..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActUserRelationFeignClientFallback.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.elink.esua.epdc.feign.fallback; - -import com.elink.esua.epdc.activity.ActUserRelationDTO; -import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO; -import com.elink.esua.epdc.activity.AppActUserClockLogDTO; -import com.elink.esua.epdc.activity.result.AppActInfoDTO; -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.feign.AppActUserRelationFeignClient; -import org.springframework.stereotype.Component; - -/** - * @Author：wanggongfeng - * @Date：2019/12/16 15:11 - */ -@Component -public class AppActUserRelationFeignClientFallback implements AppActUserRelationFeignClient { - - @Override - public Result activitySignUp(ActUserRelationDTO actUserRelationDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "activitySignUp", actUserRelationDTO); - } - @Override - public Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "activityCancelSignUp", epdcAppActUserCancelsignupDTO); - } - - @Override - public Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "activityClock", appActUserClockLogDTO); - } - - @Override - public Result selectListActUserRelation(String actId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "selectListActUserRelation", actId); - } - - @Override - public Result clockAddressDetail(String actId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "clockAddressDetail", actId); - } - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java deleted file mode 100644 index 831adce1b..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.elink.esua.epdc.feign.fallback; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.feign.AppVolunteerRankFeignClient; -import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @Author：wanggongfeng - * @Date：2019/12/16 15:11 - */ -@Component -public class AppVolunteerRankFeignClientFallback implements AppVolunteerRankFeignClient { - - @Override - public Result> leaderboard() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "leaderboard"); - } - - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CommentFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CommentFeignClientFallback.java index bfa24b371..1e37ebca4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CommentFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CommentFeignClientFallback.java @@ -4,8 +4,8 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO; +import com.elink.esua.epdc.dto.comment.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; -import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; import com.elink.esua.epdc.feign.CommentFeignClient; import org.springframework.stereotype.Component; @@ -15,8 +15,8 @@ import org.springframework.stereotype.Component; public class CommentFeignClientFallback implements CommentFeignClient { @Override - public Result submit(SubmitCommentFormDTO submitCommentFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "submit", submitCommentFormDTO); + public Result submit(CommentFormDTO commentFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "submit", commentFormDTO); } @Override diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/EvaluateFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/EvaluateFeignClientFallback.java deleted file mode 100644 index 50805d03a..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/EvaluateFeignClientFallback.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.elink.esua.epdc.feign.fallback; - -import com.elink.esua.epdc.activity.ActBannerDTO; -import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO; -import com.elink.esua.epdc.feign.ActInfoFeignClient; -import com.elink.esua.epdc.feign.EvaluateFeignClient; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.PathVariable; - -import java.util.List; - -/** - * @Author LPF - * @Date 2019/11/18 16:39 - */ -@Component -public class EvaluateFeignClientFallback implements EvaluateFeignClient { - - - @Override - public Result> getDeptOfficer(EvaluateOfficerAppFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getDeptOfficer", formDto); - } - @Override - public Result> getOptionList(EvaluateOptionAppFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getOptionList", formDto); - } - @Override - public Result evaluateSubmit(EvaluateSubmitFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "evaluateSubmit", formDto); - } - @Override - public Result getAvailable() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getAvailable"); - } - - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/OssFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/OssFeignClientFallback.java index 4766822ff..8925de8fb 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/OssFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/OssFeignClientFallback.java @@ -3,7 +3,6 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.UploadDTO; import com.elink.esua.epdc.dto.UploadFormDTO; import com.elink.esua.epdc.dto.UploadToOssDTO; import com.elink.esua.epdc.feign.OssFeignClient; @@ -26,9 +25,4 @@ public class OssFeignClientFallback implements OssFeignClient { public Result uploadFile(UploadToOssDTO uploadToOssDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "uploadFile", uploadToOssDto); } - - @Override - public Result saveWeChatFaceImg(String avatarUrl) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "saveWeChatFaceImg", avatarUrl); - } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index cd171b4d8..962b5f70b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -3,7 +3,6 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.CachingUserInfoDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.UserGridRelationDTO; import com.elink.esua.epdc.dto.UserWxFormIdDTO; @@ -108,7 +107,7 @@ public class UserFeignClientFallback implements UserFeignClient { } @Override - public Result updateWxInfo(UserDTO userDTO) { + public Result updateWxInfo(UserDTO userDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateWxInfo", userDTO); } @@ -151,7 +150,6 @@ public class UserFeignClientFallback implements UserFeignClient { public Result removeGrid(EpdcAppRemoveGridFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "removeGrid", formDto); } - @Override public Result> invitationRecord() { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "invitationRecord"); @@ -159,26 +157,6 @@ public class UserFeignClientFallback implements UserFeignClient { @Override public Result queryUserDto(EpdcAppQueryUserInfoFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "queryUserDto", formDTO); - } - - @Override - public Result needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "needCachingUserInfo", formDTO); - } - - @Override - public Result needCachingUserInfoByUserId(String userId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "needCachingUserInfoByUserId", userId); - } - - @Override - public Result getVolunteerCountById(String userId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getVolunteerCountById", userId); - } - - @Override - public Result insertVolunteerInfo(EpdcCompleteVolunteerInfoFormDTO epdcCompleteVolunteerInfoFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "insertVolunteerInfo", epdcCompleteVolunteerInfoFormDTO); + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "queryUserDto",formDTO); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/rest/v2/DemoV2Controller.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/rest/v2/DemoV2Controller.java index ac1c1f3fe..b6d7d114f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/rest/v2/DemoV2Controller.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/rest/v2/DemoV2Controller.java @@ -15,5 +15,4 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/demo" + Constant.VERSION_CONTROL) public class DemoV2Controller { - } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java deleted file mode 100644 index ffde98c20..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.activity.ActBannerDTO; -import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; -import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.item.result.*; - -import java.util.List; - -/** - * 项目模块-移动App端 - * @Author LPF - * @Date 2019/11/18 13:34 - */ -public interface ActInfoService { - - - /** - * 活动列表 - * @Params: [userDetail, formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:37 - */ - Result> listItems(ActInfoAppFormDTO formDto); - /** - * 活动列表（已报名） - * @Params: [userDetail, formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:37 - */ - Result> signupListItems(ActInfoAppFormDTO formDto); - /** - * 项目详情 - * @Params: [userDetail, itemId] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: lipengfei - * @Date: 2019/11/19 16:34 - */ - Result getDetail(ActInfoAppFormDTO formDto); - - Result getRejectDetail(ActInfoAppFormDTO formDto); - - Result getCancelDetail(String itemId); - - Result> getBannerList(); - - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActPhraseService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActPhraseService.java deleted file mode 100644 index 9d249e4cb..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActPhraseService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.commons.tools.utils.Result; - -/** - * @author wanggongfeng - * @date 2019/12/17 9:50 - */ -public interface ActPhraseService { - - /** - * 常用语使用次数加一 - * @param id - * @Author wanggongfeng - * @return - */ - Result sagenumAddOneById(String id); - - /** - * redis获取常用语 - * @Author wanggongfeng - * @return - */ - Result getPhraseList(); - - - - - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActUserRelationService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActUserRelationService.java deleted file mode 100644 index d85f6ba4a..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActUserRelationService.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.activity.ActUserRelationDTO; -import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO; -import com.elink.esua.epdc.activity.AppActUserClockLogDTO; -import com.elink.esua.epdc.activity.AppClockListDTO; -import com.elink.esua.epdc.activity.result.AppActInfoDTO; -import com.elink.esua.epdc.commons.tools.utils.Result; - -/** - * @author wanggongfeng - * @date 2019/12/17 9:50 - */ -public interface ActUserRelationService { - - /** - * 活动报名 - * @param actUserRelationDTO - * @Author wanggongfeng - * @return - */ - Result activitySignUp(ActUserRelationDTO actUserRelationDTO); - - /** - * 取消活动报名 - * @param epdcAppActUserCancelsignupDTO - * @Author wanggongfeng - * @return - */ - Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO); - - /** - * 活动打卡 - * @param appActUserClockLogDTO - * @Author wanggongfeng - * @return - */ - Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO); - - /** - * 获取打卡列表 - * @param actId - * @Author wanggongfeng - * @return - */ - Result getClockList(String actId); - - /** - * 获取活动打卡地点详情 - * @param actId - * @Author wanggongfeng - * @return - */ - Result clockAddressDetail(String actId); - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 558c268c2..4155c3c28 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -7,8 +7,8 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO; import com.elink.esua.epdc.dto.form.*; -import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; +import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO; import java.util.List; @@ -216,26 +216,4 @@ public interface AppUserService { * @Date 2019/12/7 14:32 **/ Result checkWxUnionId(TokenDto tokenDto); - - /** - * 志愿者认证 - * @param tokenDto - * @param formDto - * @Author wanggongfeng - * @return - */ - Result volunteerAuthenticate(TokenDto tokenDto, EpdcCompleteVolunteerInfoFormDTO formDto); - - /** - * 验证是否为志愿者 - * - * @param tokenDto - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author wanggongfeng - * @date 2019/12/13 14:41 - */ - Result getVolunteerCountById(TokenDto tokenDto); - - - } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppVolunteerRankService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppVolunteerRankService.java deleted file mode 100644 index 1457bf53f..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppVolunteerRankService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; - -import java.util.List; - -/** - * @author wanggongfeng - * @date 2019/12/17 9:50 - */ -public interface AppVolunteerRankService { - - /** - * 获取排行榜 - * @Author wanggongfeng - * @return - */ - Result> leaderboard(); - - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/DemoService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/DemoService.java deleted file mode 100644 index 4f6a10fd5..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/DemoService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.commons.tools.utils.Result; - -import java.util.Map; - -/** - * Demo - * - * @author yujintao - * @email yujintao@elink-cn.com - * @date 2019/6/5 14:10 - */ -public interface DemoService { - - /** - * 测试分布式事务 - * - * @param map - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author rongchao - * @since 2020-01-09 - */ - Result demo(Map map); - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/EvaluateService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/EvaluateService.java deleted file mode 100644 index 3f06e989b..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/EvaluateService.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.activity.ActBannerDTO; -import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO; - -import java.util.List; - -/** - * 项目模块-移动App端 - * @Author LPF - * @Date 2019/11/18 13:34 - */ -public interface EvaluateService { - - - /** - * 街道干部列表 - * @Params: [userDetail, formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:37 - */ - Result> getDeptOfficer(EvaluateOfficerAppFormDTO formDto); - /** - * 评价列表 - * @Params: [userDetail, formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:37 - */ - Result> getOptionList(EvaluateOptionAppFormDTO formDto); - - Result getAvailable(); - /** - * 评价提交 - * @Params: [userDetail, itemId] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: lipengfei - * @Date: 2019/11/19 16:34 - */ - Result evaluateSubmit(EvaluateSubmitFormDTO formDto); - - - - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java deleted file mode 100644 index 729c15dc3..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.elink.esua.epdc.service.impl; - -import com.elink.esua.epdc.activity.ActBannerDTO; -import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; -import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; -import com.elink.esua.epdc.dto.item.form.*; -import com.elink.esua.epdc.dto.item.result.*; -import com.elink.esua.epdc.feign.ActInfoFeignClient; -import com.elink.esua.epdc.feign.WorkItemFeignClient; -import com.elink.esua.epdc.service.ActInfoService; -import com.elink.esua.epdc.service.WorkItemService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 项目模块-移动app端 - * @Author LPF - * @Date 2019/11/18 16:34 - */ -@Service -public class ActInfoServiceImpl implements ActInfoService { - - @Autowired - private ActInfoFeignClient actInfoFeignClient; - - - - @Override - public Result> listItems(ActInfoAppFormDTO formDto) { - return actInfoFeignClient.listItems(formDto); - } - @Override - public Result> signupListItems(ActInfoAppFormDTO formDto) { - return actInfoFeignClient.signupListItems(formDto); - } - - @Override - public Result getDetail(ActInfoAppFormDTO formDto) { - return actInfoFeignClient.getDetail(formDto); - } - @Override - public Result getRejectDetail(ActInfoAppFormDTO formDto) { - return actInfoFeignClient.getRejectDetail(formDto); - } - @Override - public Result getCancelDetail(String itemId) { - return actInfoFeignClient.getCancelDetail(itemId); - } - @Override - public Result> getBannerList() { - return actInfoFeignClient.getBannerList(); - } -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActPhraseServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActPhraseServiceImpl.java deleted file mode 100644 index c6e92b1d8..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActPhraseServiceImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.elink.esua.epdc.service.impl; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.feign.AppActPhraseFeignClient; -import com.elink.esua.epdc.service.ActPhraseService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - - -/** - * @author wanggongfeng - * @date 2019/12/16 17:50 - */ -@Slf4j -@Service -public class ActPhraseServiceImpl implements ActPhraseService { - - @Autowired - private AppActPhraseFeignClient appActPhraseFeignClient; - - @Override - public Result sagenumAddOneById(String id) { - Result dataResult = appActPhraseFeignClient.sagenumAddOneById(id); - return dataResult; - } - - @Override - public Result getPhraseList() { - Result dataResult = appActPhraseFeignClient.getPhraseList(); - return dataResult; - } - - - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActUserRelationServiceImpl.java deleted file mode 100644 index 26d89d255..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActUserRelationServiceImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.elink.esua.epdc.service.impl; - -import com.elink.esua.epdc.activity.ActUserRelationDTO; -import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO; -import com.elink.esua.epdc.activity.AppActUserClockLogDTO; -import com.elink.esua.epdc.activity.AppClockListDTO; -import com.elink.esua.epdc.activity.result.AppActInfoDTO; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.feign.AppActUserRelationFeignClient; -import com.elink.esua.epdc.service.ActUserRelationService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - - -/** - * @author wanggongfeng - * @date 2019/12/16 17:50 - */ -@Slf4j -@Service -public class ActUserRelationServiceImpl implements ActUserRelationService { - - @Autowired - private AppActUserRelationFeignClient actInfoFeignClient; - - @Override - public Result activitySignUp(ActUserRelationDTO actUserRelationDTO) { - Result dataResult = actInfoFeignClient.activitySignUp(actUserRelationDTO); - return dataResult; - } - - @Override - public Result activityCancelSignUp(AppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) { - Result dataResult = actInfoFeignClient.activityCancelSignUp(epdcAppActUserCancelsignupDTO); - return dataResult; - } - - @Override - public Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO) { - Result dataResult = actInfoFeignClient.activityClock(appActUserClockLogDTO); - return dataResult; - } - - @Override - public Result getClockList(String actId) { - Result result = actInfoFeignClient.selectListActUserRelation(actId); - return result; - } - - @Override - public Result clockAddressDetail(String actId) { - Result dataResult = actInfoFeignClient.clockAddressDetail(actId); - return dataResult; - } - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 5002dcb1e..92bf20d64 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -5,10 +5,8 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo; import com.elink.esua.epdc.async.GroupTask; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.common.token.util.CpUserDetailRedis; -import com.elink.esua.epdc.common.token.util.IdentityNoAnalysisUtil; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.enums.UserSexEnum; -import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; @@ -17,22 +15,20 @@ import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.enums.GroupUserStateEnum; import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO; import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcGridLeaderRegisterFormDTO; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO; import com.elink.esua.epdc.dto.form.*; import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO; import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO; -import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; +import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO; -import com.elink.esua.epdc.enums.AppUserAuditStateEnum; -import com.elink.esua.epdc.enums.AppUserRegisterSourceEnum; -import com.elink.esua.epdc.enums.AppUserRegisterWayEnum; -import com.elink.esua.epdc.enums.AppUserStatesEnum; +import com.elink.esua.epdc.enums.*; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.feign.GroupFeignClient; import com.elink.esua.epdc.feign.OssFeignClient; @@ -41,7 +37,6 @@ import com.elink.esua.epdc.jwt.JwtTokenProperties; import com.elink.esua.epdc.jwt.JwtTokenUtils; import com.elink.esua.epdc.redis.AppUserRedis; import com.elink.esua.epdc.service.AppUserService; -import com.elink.esua.epdc.utils.UserTagUtils; import com.elink.esua.epdc.utils.WxMaServiceUtils; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; @@ -49,8 +44,6 @@ import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; import me.chanjar.weixin.mp.bean.result.WxMpUser; import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -72,7 +65,7 @@ import java.util.List; @Slf4j @Service public class AppUserServiceImpl implements AppUserService { - private static final Logger logger = LoggerFactory.getLogger(AppUserServiceImpl.class); + @Autowired private AppUserRedis appUserRedis; @@ -93,7 +86,6 @@ public class AppUserServiceImpl implements AppUserService { @Autowired private JwtTokenProperties jwtTokenProperties; - @Autowired private OssFeignClient ossFeignClient; @@ -214,7 +206,7 @@ public class AppUserServiceImpl implements AppUserService { EpdcAppQueryUserInfoFormDTO formDTO = new EpdcAppQueryUserInfoFormDTO(); formDTO.setOpenId(wxMaJscode2SessionResult.getOpenid()); formDTO.setUnionId(wxMaJscode2SessionResult.getUnionid()); - Result userInfoResult = userFeignClient.needCachingUserInfo(formDTO); + Result userInfoResult = userFeignClient.queryUserDto(formDTO); if (!userInfoResult.success()) { return new Result().error(userInfoResult.getMsg()); } @@ -229,7 +221,7 @@ public class AppUserServiceImpl implements AppUserService { * @author work@yujt.net.cn * @date 2019/9/19 19:17 */ - private Result getTokenByUserDto(CachingUserInfoDTO userDto) { + private Result getTokenByUserDto(UserDTO userDto) { EpdcAppAuthorizationDTO authorization = new EpdcAppAuthorizationDTO(); // 用户未注册 @@ -238,9 +230,10 @@ public class AppUserServiceImpl implements AppUserService { return new Result().ok(authorization); } TokenDto tokenDto = ConvertUtils.sourceToTarget(userDto, TokenDto.class); + tokenDto.setUserId(userDto.getId()); String state = userDto.getState(); - authorization = this.packageEpdcAppAuthorization(tokenDto, userDto.getGrid(), state); + authorization = this.packageEpdcAppAuthorization(tokenDto, userDto.getGrid(), userDto.getState()); Result result = new Result().ok(authorization); // 已注册，未完善信息 @@ -290,6 +283,12 @@ public class AppUserServiceImpl implements AppUserService { // 组装用户注册信息 EpdcGridLeaderRegisterDTO gridLeaderRegister = this.packageGridLeaderWhileRegister(leaderRegisterDto.getSysUser(), formDto.getWxCode()); List userGridList = ConvertUtils.sourceToTarget(leaderRegisterDto.getLeaderGridList(), UserGridRelationDTO.class); + for (UserGridRelationDTO item : userGridList) { + item.setAllDeptNames(item.getDistrict() + "-" + item.getStreet() + "-" + item.getCommunity() + "-" + item.getGrid()); + item.setAllDeptIds(item.getDistrictId() + "," + item.getStreetId() + "," + item.getCommunityId() + "," + item.getGridId()); + item.setParentDeptIds(item.getDistrict() + "-" + item.getStreet() + "-" + item.getCommunity()); + item.setParentDeptNames(item.getDistrictId() + "," + item.getStreetId() + "," + item.getCommunityId()); + } EpdcGridLeaderRegisterFormDTO registerDto = new EpdcGridLeaderRegisterFormDTO(); registerDto.setGridLeader(gridLeaderRegister); registerDto.setUserGridList(userGridList); @@ -665,7 +664,21 @@ public class AppUserServiceImpl implements AppUserService { WxMaJscode2SessionResult wxMaResult = this.getWxMaUser(formDto.getWxCode()); String openId = wxMaResult.getOpenid(); String unionId = wxMaResult.getUnionid(); - +// if (null == formDto.getGridId()) { +// // 获取用户绑定网格信息 +// Result dtoResult = userFeignClient.getUserLastSwitchGrid(openId); +// if (!dtoResult.success()) { +// return new Result().error(dtoResult.getMsg()); +// } +// EpdcUserRegisterInfoResultDTO userDto = dtoResult.getData(); +// if (userDto.getRegisterState() != NumConstant.TWO) { +// EpdcAppAuthorizationDTO resultDto = new EpdcAppAuthorizationDTO(); +// resultDto.setUserState(NumConstant.FIVE_STR); +// return new Result().ok(resultDto); +// } else { +// formDto.setGridId(userDto.getGridId()); +// } +// } // 查询当前微信注册状态 EpdcCheckUserRegisterFromDTO checkFromDto = new EpdcCheckUserRegisterFromDTO(); checkFromDto.setOpenId(openId); @@ -778,7 +791,6 @@ public class AppUserServiceImpl implements AppUserService { return new Result().error("解析微信开放平台ID失败"); } userDto.setWxUnionId(wxMaUserInfo.getUnionId()); - userDto.setWxOpenId(wxMaUserInfo.getOpenId()); } // 党员提交，验证身份证号 @@ -823,26 +835,22 @@ public class AppUserServiceImpl implements AppUserService { } return new Result().error(completeResult.getMsg()); } - - tokenDto.setUserId(completeResult.getData().getId()); - - //更新用户缓存信息 - Result cachingUserResult = userFeignClient.needCachingUserInfoByUserId(tokenDto.getUserId()); - CachingUserInfoDTO cachingUserInfoDTO = cachingUserResult.getData(); - TokenDto newTokenDto = ConvertUtils.sourceToTarget(cachingUserInfoDTO, TokenDto.class); - tokenDto.setUserId(userDto.getId()); - EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(newTokenDto, userGrid.getGrid(), userDto.getState()); + UserDTO user = completeResult.getData(); + tokenDto.setRealName(user.getRealName()); + tokenDto.setNickname(user.getNickname()); + tokenDto.setMobile(user.getMobile()); + tokenDto.setPartyFlag(user.getPartyFlag()); + EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), user.getState()); // 更新社群用户党员标识并加入关联的所有网格党员群 - boolean partyFlag = UserTagUtils.containIdentity(cachingUserInfoDTO.getUserTagInfos(), UserTagEnum.PARTY_MEMBER); - if (partyFlag) { + if (NumConstant.ONE_STR.equals(user.getPartyFlag())) { GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO(); - formDto.setUserId(cachingUserInfoDTO.getUserId()); - formDto.setPartyMember(partyFlag ? NumConstant.ZERO_STR : NumConstant.ONE_STR); - formDto.setNickname(cachingUserInfoDTO.getNickname()); - formDto.setUserAvatar(cachingUserInfoDTO.getFaceImg()); - formDto.setMobile(cachingUserInfoDTO.getMobile()); - formDto.setDeptId(cachingUserInfoDTO.getGridId()); + formDto.setUserId(user.getId()); + formDto.setPartyMember(user.getPartyFlag()); + formDto.setNickname(user.getNickname()); + formDto.setUserAvatar(user.getFaceImg()); + formDto.setMobile(user.getMobile()); + formDto.setDeptId(user.getDeptId()); formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); groupFeignClient.updateUserPartyMember(formDto); @@ -968,13 +976,7 @@ public class AppUserServiceImpl implements AppUserService { UserDTO userDTO = new UserDTO(); userDTO.setId(userDetail.getUserId()); userDTO.setNickname(wxMaUserInfo.getNickName()); - //上传微信头像 - Result uploadDTOResult = ossFeignClient.saveWeChatFaceImg(wxMaUserInfo.getAvatarUrl()); - if (uploadDTOResult.success()) { - userDTO.setFaceImg(uploadDTOResult.getData().getUrl()); - } else { - userDTO.setFaceImg(USER_FACE); - } + userDTO.setFaceImg(wxMaUserInfo.getAvatarUrl()); //微信性别0未知 1:男 2：女 本系统：1男,0女 if (UserSexEnum.WX_MALE.sex().equals(wxMaUserInfo.getGender())) { userDTO.setSex(UserSexEnum.MALE.sex()); @@ -985,28 +987,21 @@ public class AppUserServiceImpl implements AppUserService { userDTO.setSex(""); } userDTO.setWxUnionId(wxMaUserInfo.getUnionId()); - userDTO.setWxOpenId(wxMaUserInfo.getOpenId()); - Result updateWxInfoResult = userFeignClient.updateWxInfo(userDTO); + Result updateWxInfoResult = userFeignClient.updateWxInfo(userDTO); if (!updateWxInfoResult.success()) { return new Result().error("更新用户信息失败"); } - UserDTO oldUser = updateWxInfoResult.getData(); - // 注销原来的登录信息 - cpUserDetailRedis.logout(userDetail.getUserId()); - // 更新用户缓存信息 TokenDto tokenDto = ConvertUtils.sourceToTarget(userDTO, TokenDto.class); - // 在迁移小程序后，olduser的id和userDetail的id可能不一样。 - tokenDto.setUserId(oldUser.getId()); + tokenDto.setUserId(userDetail.getUserId()); tokenDto.setGridId(userDetail.getGridId()); tokenDto.setMobile(userDetail.getMobile()); - tokenDto.setUserTagInfos(userDetail.getUserTagInfos()); + tokenDto.setPartyFlag(userDetail.getPartyFlag()); tokenDto.setRealName(userDetail.getRealName()); - tokenDto.setMobile(oldUser.getMobile()); - tokenDto.setRealName(oldUser.getRealName()); - // 保证用户手机上的token仍然可用 - cpUserDetailRedis.set(tokenDto, jwtTokenProperties.getExpire(), userDetail.getUserId()); + long expire = cpUserDetailRedis.getExpire(userDetail.getUserId()); + cpUserDetailRedis.logout(userDetail.getUserId()); + cpUserDetailRedis.set(tokenDto, expire); return new Result(); } @@ -1087,143 +1082,4 @@ public class AppUserServiceImpl implements AppUserService { } return result; } - - /** - * 志愿者认证 - * - * @param tokenDto - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author wanggongfeng - * @date 2019/12/13 14:41 - */ - @Override - public Result volunteerAuthenticate(TokenDto tokenDto, EpdcCompleteVolunteerInfoFormDTO formDto) { - logger.info("志愿者认证wxCode="+formDto.getWxCode()+";userId="+tokenDto.getUserId()); - String sex = IdentityNoAnalysisUtil.getSex(formDto.getIdentityNo()); // 身份证解析性别 - if (sex.equals("女")){ - sex = "0"; - }else { - sex = "1"; - } - Date birthday = IdentityNoAnalysisUtil.getBirthDay(formDto.getIdentityNo()); // 身份证解析生日 - formDto.setSex(sex); // 性别 - formDto.setBirthday(birthday); // 生日 - formDto.setUserId(tokenDto.getUserId()); // 用户ID - // 验证是否为志愿者 - Result volunteerCountResult = userFeignClient.getVolunteerCountById(tokenDto.getUserId()); - if (!volunteerCountResult.success() || null == volunteerCountResult.getData()) { - return new Result().error("志愿者认证失败"); - } else if (volunteerCountResult.getData() == 0) { - // 添加志愿者 - Result insertCountResult = userFeignClient.insertVolunteerInfo(formDto); - } - - // 调用用户完善个人信息-保存 - EpdcCompleteUserInfoFormDTO epdcCompleteUserInfoFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcCompleteUserInfoFormDTO.class); - if (UserTagUtils.containIdentity(tokenDto.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { - epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.YES.value());// 党员标志 - } else { - epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.NO.value()); // 党员标志 - } - Result result = completeUserInfoNoVerifyCode(tokenDto, epdcCompleteUserInfoFormDTO); - - return result; - } - - /** - * 查询是否为志愿者 - * - * @param tokenDto - * @return - */ - @Override - public Result getVolunteerCountById(TokenDto tokenDto) { - Result result = new Result(); - Result volunteerCountResult = userFeignClient.getVolunteerCountById(tokenDto.getUserId()); - if (!volunteerCountResult.success() || null == volunteerCountResult.getData()) { - result.error("志愿者验证错误"); - } else { - if (volunteerCountResult.getData() == 0) { - result.error("该用户不是志愿者"); - } else { - result.setMsg("志愿者认证通过"); - } - } - return result; - } - - public Result completeUserInfoNoVerifyCode(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) { - - UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class); - userDto.setDeptId(Long.valueOf(infoDto.getGridId())); - userDto.setId(tokenDto.getUserId()); - - if (StringUtils.isNotBlank(infoDto.getWxCode())) { - String sessionKey = this.getUserSessionKey(infoDto.getWxCode()); - WxMaUserInfo wxMaUserInfo = wxMaServiceUtils.normalWxMaService().getUserService().getUserInfo(sessionKey, infoDto.getEncryptedData(), infoDto.getIv()); - if (StringUtils.isBlank(wxMaUserInfo.getUnionId())) { - return new Result().error("解析微信开放平台ID失败"); - } - userDto.setWxUnionId(wxMaUserInfo.getUnionId()); - userDto.setWxOpenId(wxMaUserInfo.getOpenId()); - } - - // 党员提交，验证身份证号 - if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { - String identityNo = userDto.getIdentityNo(); - if (StringUtils.isBlank(identityNo)) { - return new Result().error("身份证号不能为空"); - } else { - String verification = IdentityNoUtils.IdentityNoVerification(identityNo); - if (StringUtils.isNotBlank(verification)) { - return new Result().error(verification); - } - } - } - // 验证手机号验证码 - //this.checkSmsCode(userDto.getMobile(), infoDto.getSmsCode()); - // 验证用户提交的信息 - Result verifyResult = userFeignClient.verifyUserCompleteData(userDto); - if (!verifyResult.success()) { - return new Result().error(verifyResult.getMsg()); - } - String userState = verifyResult.getData(); - - UserGridRelationDTO userGrid = this.packageUserGridRelationInfo(infoDto.getGridId()); - EpdcCompleteAppUserDTO completeAppUserDto = ConvertUtils.sourceToTarget(userDto, EpdcCompleteAppUserDTO.class); - completeAppUserDto = this.packageUserCompleteInfo(completeAppUserDto, userState); - // 组装对象，准备保存用户信息 - EpdcAppUserCompleteInfoFormDTO dto = new EpdcAppUserCompleteInfoFormDTO(); - dto.setCompleteAppUser(completeAppUserDto); - dto.setUserGridRelation(userGrid); - - Result completeResult = userFeignClient.completeUserInfo(dto); - if (!completeResult.success()) { - return new Result().error(completeResult.getMsg()); - } - UserDTO user = completeResult.getData(); - tokenDto.setRealName(user.getRealName()); - tokenDto.setNickname(user.getNickname()); - tokenDto.setMobile(user.getMobile()); - EpdcAppAuthorizationDTO authorizationDto = this.packageEpdcAppAuthorization(tokenDto, userGrid.getGrid(), userDto.getState()); - - // 更新社群用户党员标识并加入关联的所有网格党员群 - if (NumConstant.ONE_STR.equals(user.getPartyFlag())) { - GroupUserPartyMemberFormDTO formDto = new GroupUserPartyMemberFormDTO(); - formDto.setUserId(user.getId()); - formDto.setPartyMember(user.getPartyFlag()); - formDto.setNickname(user.getNickname()); - formDto.setUserAvatar(user.getFaceImg()); - formDto.setMobile(user.getMobile()); - formDto.setDeptId(user.getGridId()); - formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); - - groupTask.updateUserPartyMember(formDto); - } - - return new Result().ok(authorizationDto); - } - - } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java deleted file mode 100644 index 2f5012274..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.elink.esua.epdc.service.impl; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.feign.AppVolunteerRankFeignClient; -import com.elink.esua.epdc.service.AppVolunteerRankService; -import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - - -/** - * @author wanggongfeng - * @date 2019/12/16 17:50 - */ -@Slf4j -@Service -public class AppVolunteerRankServiceImpl implements AppVolunteerRankService { - - @Autowired - private AppVolunteerRankFeignClient appVolunteerRankFeignClient; - - /** - * 获取排行榜 - * @Author wanggongfeng - * @return - */ - @Override - public Result> leaderboard() { - Result> dataResult = appVolunteerRankFeignClient.leaderboard(); - return dataResult; - } - -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java index d9163414b..466c3ab54 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CommentServiceImpl.java @@ -3,18 +3,13 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.async.WxMaSecCheckTask; import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; -import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO; import com.elink.esua.epdc.dto.comment.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; -import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; import com.elink.esua.epdc.feign.CommentFeignClient; import com.elink.esua.epdc.service.CommentService; -import com.elink.esua.epdc.utils.UserTagUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,13 +37,7 @@ public class CommentServiceImpl implements CommentService { commentFormDTO.setUserId(userDetail.getUserId()); commentFormDTO.setUserName(userDetail.getNickname()); commentFormDTO.setUserFace(userDetail.getFaceImg()); - SubmitCommentFormDTO submitCommentFormDTO = ConvertUtils.sourceToTarget(commentFormDTO, SubmitCommentFormDTO.class); - if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { - submitCommentFormDTO.setPartyFlag(YesOrNoEnum.YES.value()); - } else { - submitCommentFormDTO.setPartyFlag(YesOrNoEnum.NO.value()); - } - return commentFeignClient.submit(submitCommentFormDTO); + return commentFeignClient.submit(commentFormDTO); } @Override diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/DemoServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/DemoServiceImpl.java deleted file mode 100644 index 530b4205a..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/DemoServiceImpl.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.elink.esua.epdc.service.impl; - -import com.elink.esua.epdc.commons.tools.exception.RenException; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.ScanSwitchDTO; -import com.elink.esua.epdc.feign.DemoFeignClient; -import com.elink.esua.epdc.service.DemoService; -import com.elink.esua.epdc.service.ScanSwitchService; -import io.seata.spring.annotation.GlobalTransactional; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Map; - -/** - * @author yujintao - * @email yujintao@elink-cn.com - * @date 2019/9/11 9:40 - */ -@Service -public class DemoServiceImpl implements DemoService { - - @Autowired - private ScanSwitchService scanSwitchService; - - @Autowired - private DemoFeignClient demoFeignClient; - - @GlobalTransactional(rollbackFor = Exception.class) - @Override - public Result demo(Map map) { - ScanSwitchDTO dto = new ScanSwitchDTO(); - dto.setId("54185412da2bea73804fc1de69827e18"); - dto.setMaintainInfo(map.get("username").toString()); - scanSwitchService.update(dto); - Result r = demoFeignClient.seata(map.get("username").toString(), Integer.parseInt(map.get("age").toString())); - if (!r.success()) { - throw new RenException("添加失败"); - } - return new Result(); - } -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/EvaluateServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/EvaluateServiceImpl.java deleted file mode 100644 index 57df991c4..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/EvaluateServiceImpl.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.elink.esua.epdc.service.impl; - - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO; -import com.elink.esua.epdc.feign.EvaluateFeignClient; -import com.elink.esua.epdc.service.EvaluateService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 项目模块-移动app端 - * @Author LPF - * @Date 2019/11/18 16:34 - */ -@Service -public class EvaluateServiceImpl implements EvaluateService { - - @Autowired - private EvaluateFeignClient evaluateFeignClient; - - - - @Override - public Result> getDeptOfficer(EvaluateOfficerAppFormDTO formDto) { - return evaluateFeignClient.getDeptOfficer(formDto); - } - @Override - public Result> getOptionList(EvaluateOptionAppFormDTO formDto) { - return evaluateFeignClient.getOptionList(formDto); - } - @Override - public Result getAvailable() { - return evaluateFeignClient.getAvailable(); - } - - - @Override - public Result evaluateSubmit(EvaluateSubmitFormDTO formDto){ - return evaluateFeignClient.evaluateSubmit(formDto); - } -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java index 8a91b534d..294ed172a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java @@ -2,24 +2,20 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; -import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.dto.enums.GroupStateEnum; -import com.elink.esua.epdc.dto.enums.GroupUserStateEnum; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO; import com.elink.esua.epdc.dto.group.GroupSettingStateDTO; +import com.elink.esua.epdc.dto.enums.GroupStateEnum; +import com.elink.esua.epdc.dto.enums.GroupUserStateEnum; import com.elink.esua.epdc.dto.group.form.*; -import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO; -import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO; +import com.elink.esua.epdc.dto.group.result.*; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.feign.GroupFeignClient; import com.elink.esua.epdc.service.GroupService; -import com.elink.esua.epdc.utils.UserTagUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -67,10 +63,10 @@ public class GroupServiceImpl implements GroupService { groupUserFormDTO.setUserAvatar(userDetail.getFaceImg()); groupUserFormDTO.setMobile(userDetail.getMobile()); // 判断当前用户是否为党员 - if (!UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { + if (!NumConstant.ONE_STR.equals(userDetail.getPartyFlag())) { return new Result().error("您当前身份不是党员，不能创建社群"); } - groupUserFormDTO.setPartyMember(YesOrNoEnum.YES.value()); + groupUserFormDTO.setPartyMember(userDetail.getPartyFlag()); groupUserFormDTO.setLordFlag(NumConstant.ONE_STR); groupUserFormDTO.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue()); formDto.setGroupUserFormDTO(groupUserFormDTO); @@ -191,11 +187,7 @@ public class GroupServiceImpl implements GroupService { formDto.setNickname(userDetail.getNickname()); formDto.setUserAvatar(userDetail.getFaceImg()); formDto.setMobile(userDetail.getMobile()); - if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { - formDto.setPartyMember(YesOrNoEnum.YES.value()); - } else { - formDto.setPartyMember(YesOrNoEnum.NO.value()); - } + formDto.setPartyMember(userDetail.getPartyFlag()); return groupFeignClient.applyForGroup(formDto); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java index 74c9b43af..a5575b0db 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java @@ -2,9 +2,8 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.async.WxMaSecCheckTask; import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; -import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.UploadFormDTO; import com.elink.esua.epdc.dto.category.CategoryDTO; @@ -16,9 +15,9 @@ import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.feign.IssueFeignClient; import com.elink.esua.epdc.feign.OssFeignClient; import com.elink.esua.epdc.service.IssueService; -import com.elink.esua.epdc.utils.UserTagUtils; import me.chanjar.weixin.mp.api.WxMpMaterialService; import me.chanjar.weixin.mp.api.WxMpService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -87,11 +86,7 @@ public class IssueServiceImpl implements IssueService { formDto.setUserId(userDetail.getUserId()); formDto.setNickName(userDetail.getNickname()); formDto.setUserFace(userDetail.getFaceImg()); - if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { - formDto.setIsPartyMember(YesOrNoEnum.YES.value()); - } else { - formDto.setIsPartyMember(YesOrNoEnum.NO.value()); - } + formDto.setIsPartyMember(userDetail.getPartyFlag()); formDto.setMobile(userDetail.getMobile()); return issueFeignClient.submitEvent(formDto); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicCommentServiceImpl.java index e3eededb8..c878f58c5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicCommentServiceImpl.java @@ -3,8 +3,6 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.async.WxMaSecCheckTask; import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; -import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.comment.TopicCommentFormDTO; import com.elink.esua.epdc.dto.comment.TopicCommentStatementFormDTO; @@ -12,8 +10,8 @@ import com.elink.esua.epdc.dto.comment.TopicCommentsFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; import com.elink.esua.epdc.feign.TopicCommentFeignClient; import com.elink.esua.epdc.service.TopicCommentService; -import com.elink.esua.epdc.utils.UserTagUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.listener.Topic; import org.springframework.stereotype.Service; /** @@ -40,11 +38,6 @@ public class TopicCommentServiceImpl implements TopicCommentService { topicCommentFormDTO.setUserId(userDetail.getUserId()); topicCommentFormDTO.setUserName(userDetail.getNickname()); topicCommentFormDTO.setUserFace(userDetail.getFaceImg()); - if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { - topicCommentFormDTO.setPartyFlag(YesOrNoEnum.YES.value()); - } else { - topicCommentFormDTO.setPartyFlag(YesOrNoEnum.NO.value()); - } return topicCommentFeignClient.submit(topicCommentFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java index a0bd8b78b..1ca2ad161 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java @@ -1,8 +1,6 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.common.token.dto.TokenDto; -import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; -import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.UploadToOssDTO; @@ -15,7 +13,6 @@ import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.feign.OssFeignClient; import com.elink.esua.epdc.feign.TopicFeignClient; import com.elink.esua.epdc.service.TopicService; -import com.elink.esua.epdc.utils.UserTagUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -61,11 +58,7 @@ public class TopicServiceImpl implements TopicService { formDto.setUserId(userDetail.getUserId()); formDto.setUserFace(userDetail.getFaceImg()); formDto.setNickname(userDetail.getNickname()); - if (UserTagUtils.containIdentity(userDetail.getUserTagInfos(), UserTagEnum.PARTY_MEMBER)) { - formDto.setPartyMember(YesOrNoEnum.YES.value()); - } else { - formDto.setPartyMember(YesOrNoEnum.NO.value()); - } + formDto.setPartyMember(userDetail.getPartyFlag()); formDto.setMobile(userDetail.getMobile()); formDto.setState(TopicStateEnum.TOPIC_STATE_IN_CONVERSATION.getValue()); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/UserTagUtils.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/UserTagUtils.java deleted file mode 100644 index cdcd3d8b4..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/UserTagUtils.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.elink.esua.epdc.utils; - -import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; -import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; -import com.elink.esua.epdc.dto.UserTagInfo; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; - - -/** - * @Description 判断用户身份工具类 - * @Author yinzuomei - * @Date 2019/12/18 17:15 - */ -public class UserTagUtils { - private static Logger logger = LoggerFactory.getLogger(UserTagUtils.class); - -// /** -// * @param userTagInfos -// * @return java.lang.String -// * @Author yinzuomei -// * @Description 党员标识 0：否，1：是 -// * @Date 2019/12/18 17:23 -// **/ -// public static String getUserPartyFlag(List userTagInfos) { -// for (UserTagInfo userTagInfo : userTagInfos) { -// if (UserTagEnum.PARTY_MEMBER.value().equals(userTagInfo.getTagCode())) { -// return YesOrNoEnum.YES.value(); -// } -// } -// return YesOrNoEnum.NO.value(); -// } - - /** - * 判断用户是否有该身份 - * - * @param userTagInfos - * @param userTagEnum - * @return boolean - * @author rongchao - * @since 2019-12-19 - */ - public static boolean containIdentity(List userTagInfos, UserTagEnum userTagEnum) { - boolean flag = Boolean.FALSE; - for (UserTagInfo userTagInfo : userTagInfos) { - if (userTagEnum.value().equals(userTagInfo.getTagCode())) { - flag = Boolean.TRUE; - break; - } - } - return flag; - } -} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-dev.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-dev.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-prod.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-prod.yml deleted file mode 100644 index cae812087..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-prod.yml +++ /dev/null @@ -1,3 +0,0 @@ -nacos: - config: - server-addr: 47.104.224.45:8848 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-test.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-test.yml deleted file mode 100644 index 8a46445fc..000000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application-test.yml +++ /dev/null @@ -1,4 +0,0 @@ -nacos: - config: - server-addr: 47.104.224.45:8848 - namespace: 6a3577b4-7b79-43f6-aebb-9c3f31263f6a diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml index 9f3311f25..7cb97f9f8 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml @@ -1,31 +1,3 @@ -#server: -# port: 9700 -# servlet: -# context-path: /api -# -#spring: -# application: -# name: epdc-api-server -# profiles: -# active: @spring.profiles.active@ -# cloud: -# nacos: -# config: -# server-addr: 47.104.224.45:8848 -# namespace: 513d6635-3cfe-401f-b8b6-a04417288f47 -# group: EPDC_CONFIG_GROUP -# file-exetension: yaml -# enabled: true -# -#management: -# endpoints: -# web: -# exposure: -# include: * -# -#logging: -# config: classpath:logback-spring.xml - server: port: @server.port@ servlet: @@ -38,7 +10,7 @@ spring: name: epdc-api-server # 环境 dev|test|prod profiles: - active: @spring.profiles.active@ + active: dev messages: encoding: UTF-8 basename: i18n/messages,i18n/messages_common diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/test/java/com/elink/esua/epdc/UserTest.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/test/java/com/elink/esua/epdc/UserTest.java index 04726e4b2..5f659ea76 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/test/java/com/elink/esua/epdc/UserTest.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/test/java/com/elink/esua/epdc/UserTest.java @@ -38,6 +38,7 @@ public class UserTest { tokenDto.setGridId(1169158285790900226L); tokenDto.setMobile("15555555555"); tokenDto.setNickname("测试用户"); + tokenDto.setPartyFlag(YesOrNoEnum.YES.value()); tokenDto.setRealName("无名氏"); String token = jwtTokenUtils.generateToken(tokenDto.getUserId()); diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateDeptDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateDeptDTO.java deleted file mode 100644 index 44361ea9e..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateDeptDTO.java +++ /dev/null @@ -1,107 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 评价部门表 评价部门表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateDeptDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 部门ID - */ - private String deptId; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 父所有部门ID - */ - private String parentDeptIds; - - /** - * 父所有部门名称 - */ - private String parentDeptNames; - - /** - * 所有部门ID - */ - private String allDeptIds; - - /** - * 所有部门名称 - */ - private String allDeptNames; - - /** - * 干部人数 - */ - private Integer officerCount; - - /** - * 删除标识 0：否，1：是 - */ - private String delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateDetailDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateDetailDTO.java deleted file mode 100644 index aa17f7195..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateDetailDTO.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 评价详情表 评价详情表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@Data -public class EvaluateDetailDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 信息ID 评价信息表主键 - */ - private String infoId; - - /** - * 评价类别（1.点赞，2.吐槽） - */ - private Integer roleCode; - - /** - * 选项ID 选项表主键 - */ - private String optionId; - - /** - * 是否选中(0-否，1-是) - */ - private String selectFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 删除标识 0：否，1：是 - */ - private String delFlag; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateInfoDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateInfoDTO.java deleted file mode 100644 index 3d0703301..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateInfoDTO.java +++ /dev/null @@ -1,98 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 评价信息表 评价信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@Data -public class EvaluateInfoDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 提交人姓名 - */ - private String fullName; - - /** - * 联系电话 - */ - private String mobile; - - /** - * 干部ID 干部信息表主键 - */ - private String officerId; - - /** - * 评价类别（1.点赞，2.吐槽） - */ - private Integer roleCode; - - /** - * 评价内容 - */ - private String content; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 删除标识 0：否，1：是 - */ - private String delFlag; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - - private Integer optionCount; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOfficerDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOfficerDTO.java deleted file mode 100644 index ee06037e8..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOfficerDTO.java +++ /dev/null @@ -1,107 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 干部信息表 干部信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateOfficerDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 部门ID 部门表主键ID - */ - private String deptId; - - /** - * 姓名 - */ - private String fullName; - - /** - * 性别(0-女，1-男) - */ - private String sex; - - /** - * 职位 - */ - private String position; - - /** - * 点赞次数 - */ - private Integer likesCount; - - /** - * 被踩次数 - */ - private Integer opposeCount; - - /** - * 排序 - */ - private Integer sort; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 删除标识 0：否，1：是 - */ - private String delFlag; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptionDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptionDTO.java deleted file mode 100644 index fb3275437..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptionDTO.java +++ /dev/null @@ -1,92 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 评价选项表 评价选项表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateOptionDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 权限编码（1.点赞，2.吐槽） - */ - private Integer roleCode; - - /** - * 评价选项 - */ - private String optionContent; - - /** - * 显示顺序 - */ - private Integer sort; - - /** - * 可用标记(0-不可用，1-可用) - */ - private String available; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 删除标识 0：否，1：是 - */ - private String delFlag; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptions.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptions.java deleted file mode 100644 index 12b28c441..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateOptions.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.elink.esua.epdc.dto.evaluate; - -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; -import lombok.Data; - -import java.util.List; - -/** - * 评价选项 - * - * @author work@yujt.net.cn - * @date 2019/11/27 10:03 - */ -@Data -public class EvaluateOptions { - private List optionList; -} - - diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateRoleDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateRoleDTO.java deleted file mode 100644 index 7125bfda0..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateRoleDTO.java +++ /dev/null @@ -1,87 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 评价权限表 评价权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateRoleDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 权限编码（1.点赞，2.吐槽） - */ - private Integer roleCode; - - /** - * 权限描述 - */ - private String ruleDesc; - - /** - * 可用标记(0-不可用，1-可用) - */ - private String available; - - /** - * 删除标识 0：否，1：是 - */ - private String delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateSelectOption.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateSelectOption.java deleted file mode 100644 index ece866621..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateSelectOption.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.elink.esua.epdc.dto.evaluate; - -import lombok.Data; - -import java.util.List; - -/** - * 评价选项 - * - * @author work@yujt.net.cn - * @date 2019/11/27 10:03 - */ -@Data -public class EvaluateSelectOption { - /** - * 主键 - */ - private String optionId; - - /** - * 选中状态 - */ - private String selectFlag; - -} - - diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateShowOption.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateShowOption.java deleted file mode 100644 index b7c0a1f1c..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateShowOption.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.elink.esua.epdc.dto.evaluate; - -import lombok.Data; - -/** - * 评价选项 - * - * @author work@yujt.net.cn - * @date 2019/11/27 10:03 - */ -@Data -public class EvaluateShowOption { - /** - * 主键 - */ - private Integer index; - - /** - * 选项 - */ - private String optionContent; - -} - - diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateUpdateDeptOfficerCountDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateUpdateDeptOfficerCountDTO.java deleted file mode 100644 index bc237a07b..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/EvaluateUpdateDeptOfficerCountDTO.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate; - -import lombok.Data; - -import java.io.Serializable; - - -/** - * 评价部门表 评价部门表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateUpdateDeptOfficerCountDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 部门ID - */ - private String deptId; - - /** - * 干部人数 - */ - private Integer officerCount; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateOfficerAppFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateOfficerAppFormDTO.java deleted file mode 100644 index 61c651536..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateOfficerAppFormDTO.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate.form; - -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; - - -/** - * 干部信息表 干部信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateOfficerAppFormDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 网格Id - */ - @NotNull(message = "网格Id不能为空") - private Long gridId; - - /** - * 页码，从1开始 - */ - @Min(value = 1, message = "页码必须大于0") - private int pageIndex; - /** - * 页容量，默认20页 - */ - @Min(value = 1, message = "每页条数必须大于必须大于0") - private int pageSize = 10; - - /** - * 街道ID - */ - private Long deptId; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateOptionAppFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateOptionAppFormDTO.java deleted file mode 100644 index 874cb1aa9..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateOptionAppFormDTO.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate.form; - -import lombok.Data; - -import javax.validation.constraints.NotNull; -import java.io.Serializable; -import java.util.Date; - - -/** - * 评价选项表 评价选项表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateOptionAppFormDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 权限编码（1.点赞，2.吐槽） - */ - @NotNull(message = "评价类别不能为空") - private Integer roleCode; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateOptionFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateOptionFormDTO.java deleted file mode 100644 index 192cf059c..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateOptionFormDTO.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate.form; - -import lombok.Data; - -import java.io.Serializable; - - -/** - * 评价选项表 评价选项表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateOptionFormDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 可用标记(0-不可用，1-可用) - */ - private String available; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateRoleFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateRoleFormDTO.java deleted file mode 100644 index 6adc2e417..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateRoleFormDTO.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate.form; - -import lombok.Data; - -import java.io.Serializable; - - -/** - * 评价权限表 评价权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateRoleFormDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 可用标记(0-不可用，1-可用) - */ - private String available; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateSubmitFormDTO.java deleted file mode 100644 index ce39dcfb7..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/form/EvaluateSubmitFormDTO.java +++ /dev/null @@ -1,78 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate.form; - -import com.elink.esua.epdc.dto.evaluate.EvaluateSelectOption; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - - -/** - * 评价信息表 评价信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@Data -public class EvaluateSubmitFormDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - - /** - * 提交人姓名 - */ - @NotBlank(message = "联系电话不能为空") - private String fullName; - - /** - * 联系电话 - */ - @NotBlank(message = "联系电话不能为空") - private String mobile; - - /** - * 干部ID 干部信息表主键 - */ - @NotBlank(message = "联系电话不能为空") - private String officerId; - - /** - * 评价类别（1.点赞，2.吐槽） - */ - @NotNull(message = "评价类别不能为空") - private Integer roleCode; - - /** - * 评价内容 - */ - @Size(min = 0, max = 50, message = "评价内容在50字以内") - private String content; - - /** - * 评价选项 - */ - private List optionList; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateDeptCountResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateDeptCountResultDTO.java deleted file mode 100644 index 51d736a40..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateDeptCountResultDTO.java +++ /dev/null @@ -1,113 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate.result; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 评价部门表 评价部门表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateDeptCountResultDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 部门ID - */ - private String deptId; - - /** - * 部门名称 - */ - private String deptName; - /** - * 干部人数 - */ - private Integer officerCount; - - /** - * 被评价干部人数 - */ - private Integer beEvaluatedCount; - - /** - * 评价总人数 - */ - private Integer evaluatePeopleCount; - - /** - * 评价总次数 - */ - private Integer evaluateCount; - - /** - * 被点赞总次数 - */ - private Integer likeCount; - - /** - * 被吐槽总次数 - */ - private Integer opposeCount; - - - - /** - * 删除标识 0：否，1：是 - */ - private String delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateInfoResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateInfoResultDTO.java deleted file mode 100644 index b40fea6e6..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateInfoResultDTO.java +++ /dev/null @@ -1,107 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate.result; - -import com.elink.esua.epdc.dto.evaluate.EvaluateSelectOption; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - - -/** - * 评价信息表 评价信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@Data -public class EvaluateInfoResultDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 提交人姓名 - */ - private String fullName; - - /** - * 联系电话 - */ - private String mobile; - - /** - * 干部ID 干部信息表主键 - */ - private String officerId; - - /** - * 评价类别（1.点赞，2.吐槽） - */ - private Integer roleCode; - - /** - * 评价内容 - */ - private String content; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 删除标识 0：否，1：是 - */ - private String delFlag; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - - private Integer optionCount; - - /** - * 评价选项 - */ - private List optionsList; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateOfficerAppResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateOfficerAppResultDTO.java deleted file mode 100644 index 085570500..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateOfficerAppResultDTO.java +++ /dev/null @@ -1,60 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate.result; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 干部信息表 干部信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateOfficerAppResultDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String officerId; - - - - /** - * 姓名 - */ - private String fullName; - - /** - * 性别(0-女，1-男) - */ - private String sex; - - /** - * 职位 - */ - private String position; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateOfficerCountResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateOfficerCountResultDTO.java deleted file mode 100644 index f9ff4f248..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateOfficerCountResultDTO.java +++ /dev/null @@ -1,127 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate.result; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 干部信息表 干部信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateOfficerCountResultDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 部门ID 部门表主键ID - */ - private String deptId; - - /** - * 姓名 - */ - private String fullName; - - /** - * 性别(0-女，1-男) - */ - private String sex; - - /** - * 职位 - */ - private String position; - - /** - * 点赞次数 - */ - private Integer likesCount; - - /** - * 评价总人数 - */ - private Integer evaluatePeopleCount; - - /** - * 评价总次数 - */ - private Integer evaluateCount; - - /** - * 点赞选项次数 - */ - private Integer likesOptionCount; - - /** - * 吐槽选项次数 - */ - private Integer opposeOptionCount; - - /** - * 被踩次数 - */ - private Integer opposeCount; - - /** - * 排序 - */ - private Integer sort; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 删除标识 0：否，1：是 - */ - private String delFlag; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateOptionAppResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateOptionAppResultDTO.java deleted file mode 100644 index a8b6be60d..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/EvaluateOptionAppResultDTO.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.evaluate.result; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 评价选项表 评价选项表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateOptionAppResultDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String optionId; - - /** - * 权限编码（1.点赞，2.吐槽） - */ - private Integer roleCode; - - /** - * 评价选项 - */ - private String optionContent; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/RoleDictDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/RoleDictDTO.java deleted file mode 100644 index 4fc574460..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/RoleDictDTO.java +++ /dev/null @@ -1,23 +0,0 @@ - -package com.elink.esua.epdc.dto.evaluate.result; - -import lombok.Data; - -import java.io.Serializable; - -/** - * role表下拉字典项 - * - * @author wgf - * @date 2020/02/10 09:29 - */ -@Data -public class RoleDictDTO implements Serializable { - - private static final long serialVersionUID = -4827806651372425347L; - - private String dictName; - - private Integer dictValue; - -} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/RoleResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/RoleResultDTO.java deleted file mode 100644 index 921fa3fda..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/evaluate/result/RoleResultDTO.java +++ /dev/null @@ -1,22 +0,0 @@ - -package com.elink.esua.epdc.dto.evaluate.result; - -import lombok.Data; - -import java.io.Serializable; - -/** - * role表下拉字典项 - * - * @author wgf - * @date 2020/02/10 09:29 - */ -@Data -public class RoleResultDTO implements Serializable { - - private static final long serialVersionUID = -4827806651372425347L; - - private String available; - - -} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml index dfe9576ea..f10985631 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml @@ -63,12 +63,6 @@ orika-spring-boot-starter 1.8.0 - - com.esua.epdc - epdc-admin-client - 1.0.0 - compile - diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDeptController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDeptController.java deleted file mode 100644 index eca3acced..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDeptController.java +++ /dev/null @@ -1,109 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateDeptCountResultDTO; -import com.elink.esua.epdc.dto.evaluate.EvaluateDeptDTO; -import com.elink.esua.epdc.modules.evaluate.excel.EvaluateDeptCountExcel; -import com.elink.esua.epdc.modules.evaluate.excel.EvaluateDeptExcel; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateDeptService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 评价部门表 评价部门表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@RestController -@RequestMapping("evaluatedept") -public class EvaluateDeptController { - - @Autowired - private EvaluateDeptService evaluateDeptService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - //PageData page = evaluateDeptService.page(params); - PageData page = evaluateDeptService.getDeptPage(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - EvaluateDeptDTO data = evaluateDeptService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody EvaluateDeptDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - evaluateDeptService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody EvaluateDeptDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - evaluateDeptService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - evaluateDeptService.delete(ids); - return new Result(); - } - @GetMapping("countPage") - public Result> countPage(@RequestParam Map params){ - PageData page = evaluateDeptService.getEvaluateDeptCountPage(params); - System.out.println(params); - return new Result>().ok(page); - } - @GetMapping("countExport") - public void countExport(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = evaluateDeptService.countExport(params); - - ExcelUtils.exportExcelToTarget(response, null, list, EvaluateDeptCountExcel.class); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = evaluateDeptService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, EvaluateDeptExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDetailController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDetailController.java deleted file mode 100644 index 8d0788f91..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateDetailController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.dto.evaluate.EvaluateDetailDTO; -import com.elink.esua.epdc.modules.evaluate.excel.EvaluateDetailExcel; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateDetailService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 评价详情表 评价详情表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@RestController -@RequestMapping("evaluatedetail") -public class EvaluateDetailController { - - @Autowired - private EvaluateDetailService evaluateDetailService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = evaluateDetailService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - EvaluateDetailDTO data = evaluateDetailService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody EvaluateDetailDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - evaluateDetailService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody EvaluateDetailDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - evaluateDetailService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - evaluateDetailService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = evaluateDetailService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, EvaluateDetailExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateInfoController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateInfoController.java deleted file mode 100644 index 5e7893ab7..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateInfoController.java +++ /dev/null @@ -1,103 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.dto.evaluate.EvaluateInfoDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateInfoResultDTO; -import com.elink.esua.epdc.modules.evaluate.excel.EvaluateInfoExcel; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateDetailService; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateInfoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 评价信息表 评价信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@RestController -@RequestMapping("evaluateinfo") -public class EvaluateInfoController { - - @Autowired - private EvaluateInfoService evaluateInfoService; - - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = evaluateInfoService.infoPage(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - EvaluateInfoDTO data = evaluateInfoService.get(id); - return new Result().ok(data); - } - @PostMapping("evaluateSubmit") - public Result evaluateSubmit(@RequestBody EvaluateSubmitFormDTO formDto){ - ValidatorUtils.validateEntity(formDto); - return evaluateInfoService.evaluateSubmit(formDto); - } - - @PostMapping - public Result save(@RequestBody EvaluateInfoDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - evaluateInfoService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody EvaluateInfoDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - evaluateInfoService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - evaluateInfoService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = evaluateInfoService.listExport(params); - ExcelUtils.exportExcelToTarget(response, null, list, EvaluateInfoExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOfficerController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOfficerController.java deleted file mode 100644 index 06f540797..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOfficerController.java +++ /dev/null @@ -1,129 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerCountResultDTO; -import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO; -import com.elink.esua.epdc.modules.evaluate.excel.EvaluateOfficerCountExcel; -import com.elink.esua.epdc.modules.evaluate.excel.EvaluateOfficerExcel; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateOfficerService; -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.util.List; -import java.util.Map; - - -/** - * 干部信息表 干部信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@RestController -@RequestMapping("evaluateofficer") -public class EvaluateOfficerController { - - @Autowired - private EvaluateOfficerService evaluateOfficerService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - //PageData page = evaluateOfficerService.page(params); - PageData page = evaluateOfficerService.getOfficerPage(params); - return new Result>().ok(page); - } - @GetMapping("countPage") - public Result> countPage(@RequestParam Map params){ - PageData page = evaluateOfficerService.getEvaluateOfficerCountPage(params); - System.out.println(params); - return new Result>().ok(page); - } - @GetMapping("countExport") - public void countExport(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = evaluateOfficerService.countExport(params); - ExcelUtils.exportExcelToTarget(response, null, list, EvaluateOfficerCountExcel.class); - } - @GetMapping("getDeptOfficer") - public Result> getDeptOfficer(@RequestBody EvaluateOfficerAppFormDTO formDto){ - ValidatorUtils.validateEntity(formDto); - List list = evaluateOfficerService.getDeptOfficer(formDto); - return new Result>().ok(list); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - EvaluateOfficerDTO data = evaluateOfficerService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody EvaluateOfficerDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - evaluateOfficerService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody EvaluateOfficerDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - evaluateOfficerService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - evaluateOfficerService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = evaluateOfficerService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, EvaluateOfficerExcel.class); - } - - /*** - * 导入分类Excel表格 - * @Author wanggongfeng - * @Description excle层级导入 ,@PathVariable("deptId") String deptId - * @Date 2020/02/07 8:20 - */ - @PostMapping("importExcel/{deptId}") - public Result importExcel(@RequestParam("file") MultipartFile file, @PathVariable("deptId") String deptId) { - return evaluateOfficerService.insertPartyList(file, deptId); - //return new Result(); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOptionController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOptionController.java deleted file mode 100644 index 2a03a0e4c..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOptionController.java +++ /dev/null @@ -1,137 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.dto.evaluate.EvaluateOptionDTO; -import com.elink.esua.epdc.dto.evaluate.EvaluateOptions; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.RoleDictDTO; -import com.elink.esua.epdc.modules.evaluate.excel.EvaluateOptionExcel; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateOptionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 评价选项表 评价选项表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@RestController -@RequestMapping("evaluateoption") -public class EvaluateOptionController { - - @Autowired - private EvaluateOptionService evaluateOptionService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - //PageData page = evaluateOptionService.page(params); - PageData page = evaluateOptionService.getOptionPage(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - EvaluateOptionDTO data = evaluateOptionService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody EvaluateOptionDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - evaluateOptionService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody EvaluateOptionDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - evaluateOptionService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - evaluateOptionService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = evaluateOptionService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, EvaluateOptionExcel.class); - } - @GetMapping("getOptionList") - public Result> getOptionList(@RequestBody EvaluateOptionAppFormDTO formDto){ - ValidatorUtils.validateEntity(formDto); - List list = evaluateOptionService.getOptionList(formDto); - return new Result>().ok(list); - } - @GetMapping("optionShowList") - public Result optionShowList(){ - List optionList = evaluateOptionService.optionShowList(); - EvaluateOptions evalOption = new EvaluateOptions(); - evalOption.setOptionList(optionList); - return new Result().ok(evalOption); - } - - /** - * 更新可用标记 - * @param evaluateOptionFormDTO - * @Author: wanggongfeng - * @return - */ - @PostMapping("updateOptionInfo") - public Result updateOptionInfo(@RequestBody EvaluateOptionFormDTO evaluateOptionFormDTO){ - EvaluateOptionDTO dto = ConvertUtils.sourceToTarget(evaluateOptionFormDTO, EvaluateOptionDTO.class); - evaluateOptionService.update(dto); - return new Result(); - } - - /** - * role表查询评价类别 - * @return - */ - @GetMapping("listSimple") - public Result> listSimpleDictInfo() { - // 字典分类数据 - return evaluateOptionService.listSimpleDictInfo(); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateRoleController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateRoleController.java deleted file mode 100644 index 12b46ff24..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateRoleController.java +++ /dev/null @@ -1,131 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.dto.evaluate.EvaluateRoleDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateRoleFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.RoleResultDTO; -import com.elink.esua.epdc.modules.evaluate.excel.EvaluateRoleExcel; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateRoleService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 评价权限表 评价权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@RestController -@RequestMapping("evaluaterole") -public class EvaluateRoleController { - - @Autowired - private EvaluateRoleService evaluateRoleService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = evaluateRoleService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - EvaluateRoleDTO data = evaluateRoleService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody EvaluateRoleDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - evaluateRoleService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody EvaluateRoleDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - evaluateRoleService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - evaluateRoleService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = evaluateRoleService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, EvaluateRoleExcel.class); - } - - /** - * 获取可用标记 - * @Author: wanggongfeng - * @return - */ - @GetMapping("getAvailable") - public Result getAvailable(){ - EvaluateRoleDTO data = evaluateRoleService.getAvailable(); - return new Result().ok(data); - } - /** - * 获取可用标记 - * @Author: wanggongfeng - * @return - */ - @GetMapping("getAppAvailable") - public Result getAppAvailable(){ - EvaluateRoleDTO data = evaluateRoleService.getAvailable(); - RoleResultDTO role = new RoleResultDTO(); - role.setAvailable(data.getAvailable()); - return new Result().ok(role); - } - - /** - * 更新可用标记 - * @param evaluateRoleFormDTO - * @Author: wanggongfeng - * @return - */ - @PostMapping("updateRoleInfo") - public Result updateRoleInfo(@RequestBody EvaluateRoleFormDTO evaluateRoleFormDTO){ - evaluateRoleService.updateAll(evaluateRoleFormDTO); - return new Result(); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateDeptDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateDeptDao.java deleted file mode 100644 index dda627b08..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateDeptDao.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateDeptCountResultDTO; -import com.elink.esua.epdc.dto.evaluate.EvaluateDeptDTO; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateDeptEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; -import java.util.Map; - -/** - * 评价部门表 评价部门表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Mapper -public interface EvaluateDeptDao extends BaseDao { - /** - * 条件查询 - * @param params - * @return - */ - List getDeptPage(Map params); - /** - * 部门统计列表 - * @Params: [params] - * @Return: java.util.List - * @Author: liuchuang - * @Date: 2019/9/5 19:42 - */ - List getEvaluateDeptCount(Map params); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateDetailDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateDetailDao.java deleted file mode 100644 index 614cbb1ca..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateDetailDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateDetailEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 评价详情表 评价详情表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@Mapper -public interface EvaluateDetailDao extends BaseDao { - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java deleted file mode 100644 index dfb2d805a..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateInfoDao.java +++ /dev/null @@ -1,44 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateInfoResultDTO; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateInfoEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; -import java.util.Map; - -/** - * 评价信息表 评价信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@Mapper -public interface EvaluateInfoDao extends BaseDao { - - /** - * 条件查询 - * @param params - * @return - */ - List getInfoPage(Map params); - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java deleted file mode 100644 index 237609bfa..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java +++ /dev/null @@ -1,102 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO; -import com.elink.esua.epdc.dto.evaluate.EvaluateUpdateDeptOfficerCountDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerCountResultDTO; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOfficerEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -/** - * 干部信息表 干部信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Mapper -public interface EvaluateOfficerDao extends BaseDao { - /** - * 条件查询 - * @param params - * @return - */ - List getOfficerPage(Map params); - - void updateCount(@Param("id")String id,@Param("type")String type); - - /** - * 数据批量插入 - * @param evaluateOfficerEntities - */ - void insertList(@Param("evaluateOfficerEntities")EvaluateOfficerEntity[] evaluateOfficerEntities); - - /** - * 清空当前街道数据 - * @param deptId - */ - void deleteByDeptId(@Param("deptId")String deptId); - /** - * 干部统计列表 - * @Params: [params] - * @Return: java.util.List - * @Author: liuchuang - * @Date: 2019/9/5 19:42 - */ - List getEvaluateOfficerCount(Map params); - - /** - * 干部列表 - * @param formDto - */ - List getDeptOfficer(EvaluateOfficerAppFormDTO formDto); - - /** - * 街道干部管理表干部人数加1 - * @param deptId - */ - void officerCountAddOne(@Param("deptId")String deptId); - - /** - * 街道干部管理表干部人数减少对应数量 - * @param evaluateUpdateDeptOfficerCountDTO - */ - void updateOfficerCount(EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO); - - /** - * 导入操作时更新街道干部管理表干部人数 - * @param evaluateUpdateDeptOfficerCountDTO - */ - void updateOfficerCountByDeptId(EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO); - - // 清空该人员相关评价数据 - void deleteEvaluateInfoById(@Param("ids")String[] ids); - - void deleteEvaluateDetailById(@Param("ids")String[] ids); - - void deleteEvaluateDetailByDeptId(@Param("deptId")String deptId); - - void deleteEvaluateInfoByDeptId(@Param("deptId")String deptId); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOptionDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOptionDao.java deleted file mode 100644 index 429b53d93..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOptionDao.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.evaluate.EvaluateOptionDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.RoleDictDTO; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOptionEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; -import java.util.Map; - -/** - * 评价选项表 评价选项表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Mapper -public interface EvaluateOptionDao extends BaseDao { - /** - * 条件查询 - * @param params - * @return - */ - List getOptionPage(Map params); - - /** - * 选项列表 - * @param formDto - * @return - */ - List getOptionList(EvaluateOptionAppFormDTO formDto); - /** - * 选项显示列表（后台） - * @return - */ - List optionShowList(); - - /** - * role表查询评价类别（后台） - * @return - */ - List listSimpleDictInfo(); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateRoleDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateRoleDao.java deleted file mode 100644 index 8245eb2c3..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateRoleDao.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateRoleEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 评价权限表 评价权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Mapper -public interface EvaluateRoleDao extends BaseDao { - /** - * 获取启用状态 - * @return - */ - EvaluateRoleEntity getAvailable(); - - /** - * 更新全部 - * @param entity - */ - void updateAll(EvaluateRoleEntity entity); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateDeptEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateDeptEntity.java deleted file mode 100644 index aceec954d..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateDeptEntity.java +++ /dev/null @@ -1,73 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 评价部门表 评价部门表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_evaluate_dept") -public class EvaluateDeptEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 部门ID - */ - private String deptId; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 父所有部门ID - */ - private String parentDeptIds; - - /** - * 父所有部门名称 - */ - private String parentDeptNames; - - /** - * 所有部门ID - */ - private String allDeptIds; - - /** - * 所有部门名称 - */ - private String allDeptNames; - - /** - * 干部人数 - */ - private Integer officerCount; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateDetailEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateDetailEntity.java deleted file mode 100644 index eb3c9d66b..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateDetailEntity.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 评价详情表 评价详情表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_evaluate_detail") -public class EvaluateDetailEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 信息ID 评价信息表主键 - */ - private String infoId; - - /** - * 评价类别（1.点赞，2.吐槽） - */ - private Integer roleCode; - - /** - * 选项ID 选项表主键 - */ - private String optionId; - - /** - * 是否选中(0-否，1-是) - */ - private String selectFlag; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateInfoEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateInfoEntity.java deleted file mode 100644 index 6bc0ee56f..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateInfoEntity.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 评价信息表 评价信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_evaluate_info") -public class EvaluateInfoEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 提交人姓名 - */ - private String fullName; - - /** - * 联系电话 - */ - private String mobile; - - /** - * 干部ID 干部信息表主键 - */ - private String officerId; - - /** - * 评价类别（1.点赞，2.吐槽） - */ - private Integer roleCode; - - /** - * 评价内容 - */ - private String content; - - private Integer optionCount; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateOfficerEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateOfficerEntity.java deleted file mode 100644 index 6c4de264f..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateOfficerEntity.java +++ /dev/null @@ -1,73 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 干部信息表 干部信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_evaluate_officer") -public class EvaluateOfficerEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 部门ID 部门表主键ID - */ - private String deptId; - - /** - * 姓名 - */ - private String fullName; - - /** - * 性别(0-女，1-男) - */ - private String sex; - - /** - * 职位 - */ - private String position; - - /** - * 点赞次数 - */ - private Integer likesCount; - - /** - * 被踩次数 - */ - private Integer opposeCount; - - /** - * 排序 - */ - private Integer sort; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateOptionEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateOptionEntity.java deleted file mode 100644 index 72b00037c..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateOptionEntity.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 评价选项表 评价选项表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_evaluate_option") -public class EvaluateOptionEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 权限编码（1.点赞，2.吐槽） - */ - private Integer roleCode; - - /** - * 评价选项 - */ - private String optionContent; - - /** - * 显示顺序 - */ - private Integer sort; - - /** - * 可用标记(0-不可用，1-可用) - */ - private String available; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateRoleEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateRoleEntity.java deleted file mode 100644 index c7b835811..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/entity/EvaluateRoleEntity.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 评价权限表 评价权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_evaluate_role") -public class EvaluateRoleEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 权限编码（1.点赞，2.吐槽） - */ - private Integer roleCode; - - /** - * 权限描述 - */ - private String ruleDesc; - - /** - * 可用标记(0-不可用，1-可用) - */ - private String available; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptCountExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptCountExcel.java deleted file mode 100644 index eb5c6c191..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptCountExcel.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 评价部门表 评价部门表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateDeptCountExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "部门ID") - private String deptId; - - @Excel(name = "部门名称") - private String deptName; - - @Excel(name = "干部人数") - private Integer officerCount; - - /** - * 被评价干部人数 - */ - @Excel(name = "被评价干部人数") - private Integer beEvaluatedCount; - - /** - * 评价总人数 - */ - @Excel(name = "评价总人数") - private Integer evaluatePeopleCount; - - /** - * 评价总次数 - */ - @Excel(name = "评价总次数") - private Integer evaluateCount; - - /** - * 被点赞总次数 - */ - @Excel(name = "被点赞总次数") - private Integer likeCount; - - /** - * 被吐槽总次数 - */ - @Excel(name = "被吐槽总次数") - private Integer opposeCount; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptExcel.java deleted file mode 100644 index 12a59e621..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDeptExcel.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 评价部门表 评价部门表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateDeptExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "部门ID") - private String deptId; - - @Excel(name = "部门名称") - private String deptName; - - @Excel(name = "父所有部门ID") - private String parentDeptIds; - - @Excel(name = "父所有部门名称") - private String parentDeptNames; - - @Excel(name = "所有部门ID") - private String allDeptIds; - - @Excel(name = "所有部门名称") - private String allDeptNames; - - @Excel(name = "干部人数") - private Integer officerCount; - - @Excel(name = "删除标识 0：否，1：是") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDetailExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDetailExcel.java deleted file mode 100644 index 372f2ee99..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateDetailExcel.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 评价详情表 评价详情表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@Data -public class EvaluateDetailExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "信息ID 评价信息表主键") - private String infoId; - - @Excel(name = "评价类别（1.点赞，2.吐槽）") - private Integer roleCode; - - @Excel(name = "选项ID 选项表主键") - private String optionId; - - @Excel(name = "是否选中(0-否，1-是)") - private String selectFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "删除标识 0：否，1：是") - private String delFlag; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateInfoExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateInfoExcel.java deleted file mode 100644 index 8240465fc..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateInfoExcel.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 评价信息表 评价信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@Data -public class EvaluateInfoExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "提交人姓名") - private String fullName; - - @Excel(name = "联系电话") - private String mobile; - - @Excel(name = "干部ID 干部信息表主键") - private String officerId; - - @Excel(name = "评价类别（1.点赞，2.吐槽）") - private Integer roleCode; - - @Excel(name = "评价内容") - private String content; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "删除标识 0：否，1：是") - private String delFlag; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerCountExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerCountExcel.java deleted file mode 100644 index a1368ded5..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerCountExcel.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -/** - * 干部信息表 干部信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateOfficerCountExcel { - - /*@Excel(name = "主键") - private String id; - - @Excel(name = "部门ID 部门表主键ID") - private String deptId;*/ - - @Excel(name = "干部姓名") - private String fullName; - - @Excel(name = "性别", replace = {"女_0", "男_1"}) - private String sex; - - @Excel(name = "单位职务") - private String position; - - @Excel(name = "点赞次数") - private Integer likesCount; - - @Excel(name = "被踩次数") - private Integer opposeCount; - - /** - * 评价总人数 - */ - @Excel(name = "评价总人数") - private Integer evaluatePeopleCount; - - /** - * 评价总次数 - */ - @Excel(name = "评价总次数") - private Integer evaluateCount; - - /** - * 点赞选项次数 - */ - @Excel(name = "点赞选项次数") - private Integer likesOptionCount; - - /** - * 吐槽选项次数 - */ - @Excel(name = "吐槽选项次数") - private Integer opposeOptionCount; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java deleted file mode 100644 index 352dd730a..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOfficerExcel.java +++ /dev/null @@ -1,75 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -/** - * 干部信息表 干部信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateOfficerExcel { - - /*@Excel(name = "主键") - private String id; - - @Excel(name = "部门ID 部门表主键ID") - private String deptId;*/ - - @Excel(name = "干部姓名") - private String fullName; - - @Excel(name = "性别", replace = {"女_0","男_1"}) - private String sex; - - @Excel(name = "单位职务") - private String position; - - @Excel(name = "点赞次数") - private Integer likesCount; - - @Excel(name = "被踩次数") - private Integer opposeCount; - - @Excel(name = "排序") - private Integer sort; - - /* @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "删除标识 0：否，1：是") - private String delFlag; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime;*/ - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOptionExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOptionExcel.java deleted file mode 100644 index d6e30a50e..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateOptionExcel.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 评价选项表 评价选项表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateOptionExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "权限编码（1.点赞，2.吐槽）") - private Integer roleCode; - - @Excel(name = "评价选项") - private String optionContent; - - @Excel(name = "显示顺序") - private Integer sort; - - @Excel(name = "可用标记(0-不可用，1-可用)") - private String available; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "删除标识 0：否，1：是") - private String delFlag; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateRoleExcel.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateRoleExcel.java deleted file mode 100644 index 1b4d77f65..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/excel/EvaluateRoleExcel.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 评价权限表 评价权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Data -public class EvaluateRoleExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "权限编码（1.点赞，2.吐槽）") - private Integer roleCode; - - @Excel(name = "权限描述") - private String ruleDesc; - - @Excel(name = "可用标记(0-不可用，1-可用)") - private String available; - - @Excel(name = "删除标识 0：否，1：是") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateDeptRedis.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateDeptRedis.java deleted file mode 100644 index 4e52d30e6..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateDeptRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 评价部门表 评价部门表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Component -public class EvaluateDeptRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateDetailRedis.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateDetailRedis.java deleted file mode 100644 index a299a0f56..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateDetailRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 评价详情表 评价详情表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@Component -public class EvaluateDetailRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateInfoRedis.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateInfoRedis.java deleted file mode 100644 index f2bcf17df..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateInfoRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 评价信息表 评价信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@Component -public class EvaluateInfoRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateOfficerRedis.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateOfficerRedis.java deleted file mode 100644 index 345915017..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateOfficerRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 干部信息表 干部信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Component -public class EvaluateOfficerRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateOptionRedis.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateOptionRedis.java deleted file mode 100644 index 7fb78b5e9..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateOptionRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 评价选项表 评价选项表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Component -public class EvaluateOptionRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateRoleRedis.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateRoleRedis.java deleted file mode 100644 index 0995767dd..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/redis/EvaluateRoleRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 评价权限表 评价权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Component -public class EvaluateRoleRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateDeptService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateDeptService.java deleted file mode 100644 index b08cf1b24..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateDeptService.java +++ /dev/null @@ -1,105 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateDeptCountResultDTO; -import com.elink.esua.epdc.dto.evaluate.EvaluateDeptDTO; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateDeptEntity; - -import java.util.List; -import java.util.Map; - -/** - * 评价部门表 评价部门表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -public interface EvaluateDeptService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-02-05 - */ - PageData page(Map params); - - /** - * 分页条件查询 - * @param params - * @return - */ - PageData getDeptPage(Map params); - - PageData getEvaluateDeptCountPage(Map params); - List countExport(Map params); - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-02-05 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return EvaluateDeptDTO - * @author generator - * @date 2020-02-05 - */ - EvaluateDeptDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-02-05 - */ - void save(EvaluateDeptDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-02-05 - */ - void update(EvaluateDeptDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-02-05 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateDetailService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateDetailService.java deleted file mode 100644 index 6e9fdeb32..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateDetailService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.dto.evaluate.EvaluateDetailDTO; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateDetailEntity; - -import java.util.List; -import java.util.Map; - -/** - * 评价详情表 评价详情表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -public interface EvaluateDetailService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-02-06 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-02-06 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return EvaluateDetailDTO - * @author generator - * @date 2020-02-06 - */ - EvaluateDetailDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-02-06 - */ - void save(EvaluateDetailDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-02-06 - */ - void update(EvaluateDetailDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-02-06 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateInfoService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateInfoService.java deleted file mode 100644 index 8ec99b331..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateInfoService.java +++ /dev/null @@ -1,111 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.evaluate.EvaluateInfoDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateInfoResultDTO; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateInfoEntity; - -import java.util.List; -import java.util.Map; - -/** - * 评价信息表 评价信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -public interface EvaluateInfoService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-02-06 - */ - PageData page(Map params); - - PageData infoPage(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-02-06 - */ - List list(Map params); - - List listExport(Map params); - - /** - * 单条查询 - * - * @param id - * @return EvaluateInfoDTO - * @author generator - * @date 2020-02-06 - */ - EvaluateInfoDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-02-06 - */ - void save(EvaluateInfoDTO dto); - /** - * 评价提交 - * - * @param formDto - * @return Result - * @author generator - * @date 2020-02-06 - */ - Result evaluateSubmit(EvaluateSubmitFormDTO formDto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-02-06 - */ - void update(EvaluateInfoDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-02-06 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOfficerService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOfficerService.java deleted file mode 100644 index 1b8e4d9f8..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOfficerService.java +++ /dev/null @@ -1,124 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerCountResultDTO; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOfficerEntity; -import org.springframework.web.multipart.MultipartFile; - -import java.util.List; -import java.util.Map; - -/** - * 干部信息表 干部信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -public interface EvaluateOfficerService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-02-05 - */ - PageData page(Map params); - - PageData getEvaluateOfficerCountPage(Map params); - List countExport(Map params); - - /** - * 获取街道干部列表 - * @param formDto - * @return - */ - List getDeptOfficer(EvaluateOfficerAppFormDTO formDto); - - /** - * 分页条件查询 - * @param params - * @return - */ - PageData getOfficerPage(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-02-05 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return EvaluateOfficerDTO - * @author generator - * @date 2020-02-05 - */ - EvaluateOfficerDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-02-05 - */ - void save(EvaluateOfficerDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-02-05 - */ - void update(EvaluateOfficerDTO dto); - - void updateCount(String id, String type); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-02-05 - */ - void delete(String[] ids); - - /*** - * 导入分类表格 - */ - Result insertPartyList(MultipartFile file, String deptId); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOptionService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOptionService.java deleted file mode 100644 index 1cf705db3..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOptionService.java +++ /dev/null @@ -1,120 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.evaluate.EvaluateOptionDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.RoleDictDTO; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOptionEntity; - -import java.util.List; -import java.util.Map; - -/** - * 评价选项表 评价选项表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -public interface EvaluateOptionService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-02-05 - */ - PageData page(Map params); - - /** - * 分页条件查询 - * @param params - * @return - */ - PageData getOptionPage(Map params); - - /** - * 获取评价选项列表 - * @param formDto - * @return - */ - List getOptionList(EvaluateOptionAppFormDTO formDto); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-02-05 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return EvaluateOptionDTO - * @author generator - * @date 2020-02-05 - */ - EvaluateOptionDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-02-05 - */ - void save(EvaluateOptionDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-02-05 - */ - void update(EvaluateOptionDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-02-05 - */ - void delete(String[] ids); - - List optionShowList(); - - /*** - * role表查询评价类别 - */ - Result> listSimpleDictInfo(); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateRoleService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateRoleService.java deleted file mode 100644 index 81f7e8744..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateRoleService.java +++ /dev/null @@ -1,115 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.dto.evaluate.EvaluateRoleDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateRoleFormDTO; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateRoleEntity; - -import java.util.List; -import java.util.Map; - -/** - * 评价权限表 评价权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -public interface EvaluateRoleService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-02-05 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-02-05 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return EvaluateRoleDTO - * @author generator - * @date 2020-02-05 - */ - EvaluateRoleDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-02-05 - */ - void save(EvaluateRoleDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-02-05 - */ - void update(EvaluateRoleDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-02-05 - */ - void delete(String[] ids); - - /** - * 获取可用标记 - * - * @return void - * @author generator - * @date 2020-02-05 - */ - EvaluateRoleDTO getAvailable(); - - /** - * 全部更新 - * - * @param dto - * @return void - * @author wanggongfeng - * @date 2020-02-07 - */ - void updateAll(EvaluateRoleFormDTO dto); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateDeptServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateDeptServiceImpl.java deleted file mode 100644 index dfeb171d5..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateDeptServiceImpl.java +++ /dev/null @@ -1,129 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.dto.evaluate.EvaluateDeptDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateDeptCountResultDTO; -import com.elink.esua.epdc.modules.evaluate.dao.EvaluateDeptDao; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateDeptEntity; -import com.elink.esua.epdc.modules.evaluate.redis.EvaluateDeptRedis; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateDeptService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 评价部门表 评价部门表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Service -public class EvaluateDeptServiceImpl extends BaseServiceImpl implements EvaluateDeptService { - - @Autowired - private EvaluateDeptRedis evaluateDeptRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, EvaluateDeptDTO.class); - } - @Override - public PageData getEvaluateDeptCountPage(Map params) { - IPage page = getPage(params); - List list = baseDao.getEvaluateDeptCount(params); - return new PageData<>(list, page.getTotal()); - } - @Override - public List countExport(Map params) { - List list = baseDao.getEvaluateDeptCount(params); - return list; - } - - - /** - * 条件查询 - * @param params - * @return - */ - @Override - public PageData getDeptPage(Map params) { - IPage page = getPage(params); - List list = baseDao.getDeptPage(params); - return new PageData<>(list, page.getTotal()); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, EvaluateDeptDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public EvaluateDeptDTO get(String id) { - EvaluateDeptEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, EvaluateDeptDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(EvaluateDeptDTO dto) { - EvaluateDeptEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateDeptEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(EvaluateDeptDTO dto) { - EvaluateDeptEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateDeptEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateDetailServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateDetailServiceImpl.java deleted file mode 100644 index 8c00eb792..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateDetailServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.dto.evaluate.EvaluateDetailDTO; -import com.elink.esua.epdc.modules.evaluate.dao.EvaluateDetailDao; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateDetailEntity; -import com.elink.esua.epdc.modules.evaluate.redis.EvaluateDetailRedis; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateDetailService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 评价详情表 评价详情表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@Service -public class EvaluateDetailServiceImpl extends BaseServiceImpl implements EvaluateDetailService { - - @Autowired - private EvaluateDetailRedis evaluateDetailRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, EvaluateDetailDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, EvaluateDetailDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public EvaluateDetailDTO get(String id) { - EvaluateDetailEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, EvaluateDetailDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(EvaluateDetailDTO dto) { - EvaluateDetailEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateDetailEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(EvaluateDetailDTO dto) { - EvaluateDetailEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateDetailEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java deleted file mode 100644 index 4ab649770..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateInfoServiceImpl.java +++ /dev/null @@ -1,174 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.evaluate.EvaluateDetailDTO; -import com.elink.esua.epdc.dto.evaluate.EvaluateInfoDTO; -import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO; -import com.elink.esua.epdc.dto.evaluate.EvaluateSelectOption; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateDeptCountResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateInfoResultDTO; -import com.elink.esua.epdc.modules.evaluate.dao.EvaluateInfoDao; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateInfoEntity; -import com.elink.esua.epdc.modules.evaluate.redis.EvaluateInfoRedis; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateDetailService; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateInfoService; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateOfficerService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 评价信息表 评价信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-06 - */ -@Service -public class EvaluateInfoServiceImpl extends BaseServiceImpl implements EvaluateInfoService { - - @Autowired - private EvaluateInfoRedis evaluateInfoRedis; - - @Autowired - private EvaluateDetailService evaluateDetailService; - - @Autowired - private EvaluateOfficerService evaluateOfficerService; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, EvaluateInfoDTO.class); - } - @Override - public PageData infoPage(Map params) { - IPage page = getPage(params); - List list = baseDao.getInfoPage(params); - return new PageData<>(list, page.getTotal()); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, EvaluateInfoDTO.class); - } - - @Override - public List listExport(Map params) { - List list = baseDao.getInfoPage(params); - return list; - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public EvaluateInfoDTO get(String id) { - EvaluateInfoEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, EvaluateInfoDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(EvaluateInfoDTO dto) { - EvaluateInfoEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateInfoEntity.class); - insert(entity); - } - @Override - @Transactional(rollbackFor = Exception.class) - public Result evaluateSubmit(EvaluateSubmitFormDTO formDto) { - try{ - EvaluateInfoDTO dto = new EvaluateInfoDTO(); - dto.setFullName(formDto.getFullName()); - dto.setMobile(formDto.getMobile()); - dto.setOfficerId(formDto.getOfficerId()); - dto.setContent(formDto.getContent()); - if (formDto.getRoleCode() != 1 - && formDto.getRoleCode() != 2) { - return new Result().error("评价选项错误。"); - } - int optionCount = 0; - //统计选项 - for (EvaluateSelectOption item : formDto.getOptionList()) { - if("1".equals(item.getSelectFlag())){ - optionCount++; - } - } - // 新增评价信息 - dto.setOptionCount(optionCount); - dto.setRoleCode(formDto.getRoleCode()); - EvaluateInfoEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateInfoEntity.class); - insert(entity); - // 新增评价选项信息 - EvaluateDetailDTO detailDto = new EvaluateDetailDTO(); - for (EvaluateSelectOption item : formDto.getOptionList()) { - detailDto.setInfoId(entity.getId()); - detailDto.setOptionId(item.getOptionId()); - detailDto.setSelectFlag(item.getSelectFlag()); - detailDto.setRoleCode(formDto.getRoleCode()); - evaluateDetailService.save(detailDto); - } - evaluateOfficerService.updateCount(formDto.getOfficerId(),formDto.getRoleCode().toString()); - - }catch (Exception e){ - e.printStackTrace(); - } - - return new Result(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(EvaluateInfoDTO dto) { - EvaluateInfoEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateInfoEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java deleted file mode 100644 index 0629931e5..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java +++ /dev/null @@ -1,350 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.commons.tools.exception.RenException; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.CompleteDeptDTO; -import com.elink.esua.epdc.dto.evaluate.EvaluateOfficerDTO; -import com.elink.esua.epdc.dto.evaluate.EvaluateRoleDTO; -import com.elink.esua.epdc.dto.evaluate.EvaluateUpdateDeptOfficerCountDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerCountResultDTO; -import com.elink.esua.epdc.modules.evaluate.dao.EvaluateOfficerDao; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOfficerEntity; -import com.elink.esua.epdc.modules.evaluate.redis.EvaluateOfficerRedis; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateOfficerService; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateRoleService; -import com.elink.esua.epdc.modules.feign.SysFeignClient; -import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Cell; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; - -import java.io.InputStream; -import java.text.SimpleDateFormat; -import java.util.*; - -/** - * 干部信息表 干部信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Service -public class EvaluateOfficerServiceImpl extends BaseServiceImpl implements EvaluateOfficerService { - - private int totalRows = 0; // 总行数 - - private int totalCells = 0;// 总条数 - - public static int Guid = 100;//id自增值 - - @Autowired - private EvaluateOfficerRedis evaluateOfficerRedis; - @Autowired - private SysFeignClient sysFeignClient; - - @Autowired - private EvaluateRoleService evaluateRoleService; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, EvaluateOfficerDTO.class); - } - - @Override - public PageData getEvaluateOfficerCountPage(Map params) { - IPage page = getPage(params); - List list = baseDao.getEvaluateOfficerCount(params); - return new PageData<>(list, page.getTotal()); - } - - @Override - public List countExport(Map params) { - List list = baseDao.getEvaluateOfficerCount(params); - return list; - } - - @Override - public List getDeptOfficer(EvaluateOfficerAppFormDTO formDto) { - int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); - formDto.setPageIndex(pageIndex); - Result completeDept = sysFeignClient.getCompleteDept(formDto.getGridId()); - if (!completeDept.success()) { - throw new RenException("获取街道失败"); - } - EvaluateRoleDTO data = evaluateRoleService.getAvailable(); - if (!"1".equals(data.getAvailable())) { - throw new RenException("评价功能停用"); - } - CompleteDeptDTO completeDeptDTO = completeDept.getData(); - formDto.setDeptId(completeDeptDTO.getStreetId()); - List list = baseDao.getDeptOfficer(formDto); - return list; - } - - /** - * 条件查询 - * - * @param params - * @return - */ - @Override - public PageData getOfficerPage(Map params) { - IPage page = getPage(params); - List list = baseDao.getOfficerPage(params); - return new PageData<>(list, page.getTotal()); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, EvaluateOfficerDTO.class); - } - - private QueryWrapper getWrapper(Map params) { - String id = (String) params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public EvaluateOfficerDTO get(String id) { - EvaluateOfficerEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, EvaluateOfficerDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(EvaluateOfficerDTO dto) { - EvaluateOfficerEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateOfficerEntity.class); - // 街道干部管理表干部人数加1 - String deptId = entity.getDeptId(); - insert(entity); - baseDao.officerCountAddOne(deptId); - - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(EvaluateOfficerDTO dto) { - EvaluateOfficerEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateOfficerEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateCount(String id, String type) { - baseDao.updateCount(id, type); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - - // 街道干部管理表干部人数减少对应数量 - String id = ids[0]; - int num = ids.length; - EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO = new EvaluateUpdateDeptOfficerCountDTO(); - evaluateUpdateDeptOfficerCountDTO.setId(id); - evaluateUpdateDeptOfficerCountDTO.setOfficerCount(num); - baseDao.updateOfficerCount(evaluateUpdateDeptOfficerCountDTO); - - // 清空该人员相关评价数据 - baseDao.deleteEvaluateDetailById(ids); - baseDao.deleteEvaluateInfoById(ids); - - } - - @Override - public Result insertPartyList(MultipartFile file, String deptId) { - // 清空当前街道数据 - if (deptId != null && !"".equals(deptId)) { - baseDao.deleteByDeptId(deptId); - } - // 清空该人员相关评价数据 - baseDao.deleteEvaluateDetailByDeptId(deptId); - baseDao.deleteEvaluateInfoByDeptId(deptId); - - //获取excle版本 - String isExcel2003 = ExcelUtils.getExcelInfo(file); - Result result = new Result(); - //需存储的实体 - List list = new ArrayList(); - try { - Workbook wb = null; - InputStream is = file.getInputStream(); - if ("true".equals(isExcel2003)) { - // 当excel是2003时,创建excel2003 - wb = new HSSFWorkbook(is); - } else if ("false".equals(isExcel2003)) { - // 当excel是2007时,创建excel2007 - wb = new XSSFWorkbook(is); - } else { - result.setMsg("defeat"); - result.setCode(1); - result.setData("excle格式错误！"); - return result; - } - // 得到第一个shell - Sheet sheet = wb.getSheetAt(0); - // 得到Excel的行数 - this.totalRows = sheet.getPhysicalNumberOfRows(); - // 得到Excel的列数(前提是有行数) - if (totalRows > 1 && sheet.getRow(0) != null) { - this.totalCells = sheet.getRow(0).getPhysicalNumberOfCells(); - } - // 循环Excel行数(不要列名，从1开始) ；0是列名 - for (int r = 1; r < totalRows; r++) { - Row row = sheet.getRow(r); - if (row == null) { - continue; - } - EvaluateOfficerEntity evaluateOfficerEntity = new EvaluateOfficerEntity(); - // 循环Excel的列 - for (int c = 0; c < 6; c++) { - Cell cell = row.getCell(c); - if (null != cell) { - if (c == 0) { - // 干部姓名 - String value = ExcelUtils.getCellContent(cell); - evaluateOfficerEntity.setFullName(value); - - } else if (c == 1) { - // 性别 - String value = ExcelUtils.getCellContent(cell); - if ("女".equals(value)) { - value = "0"; - } else { - value = "1"; - } - evaluateOfficerEntity.setSex(value); - - } else if (c == 2) { - // 单位职务 - String value = ExcelUtils.getCellContent(cell); - evaluateOfficerEntity.setPosition(value); - - } else if (c == 3) { - // 点赞次数 - String value = ExcelUtils.getCellContent(cell); - evaluateOfficerEntity.setLikesCount(Integer.parseInt(value)); - - } else if (c == 4) { - // 被踩次数 - String value = ExcelUtils.getCellContent(cell); - evaluateOfficerEntity.setOpposeCount(Integer.parseInt(value)); - - } else if (c == 5) { - // 排序 - String value = ExcelUtils.getCellContent(cell); - evaluateOfficerEntity.setSort(Integer.parseInt(value)); - - } - - - } - } - evaluateOfficerEntity.setDeptId(deptId); - - String userId = SecurityUser.getUserId() == null ? "" : SecurityUser.getUserId().toString(); - evaluateOfficerEntity.setId(getLongRandom()); - evaluateOfficerEntity.setDelFlag("0");//删除标识 0：未删除 1：删除 - evaluateOfficerEntity.setRevision(0); - evaluateOfficerEntity.setCreatedBy(userId); - evaluateOfficerEntity.setUpdatedBy(userId); - evaluateOfficerEntity.setCreatedTime(new Date()); - evaluateOfficerEntity.setUpdatedTime(new Date()); - list.add(evaluateOfficerEntity); - } - if (list.size() > 0) { - EvaluateOfficerEntity[] evaluateOfficerEntities = new EvaluateOfficerEntity[list.size()]; - for (int k = 0; k < list.size(); k++) { - evaluateOfficerEntities[k] = list.get(k); - } - baseDao.insertList(evaluateOfficerEntities); - - // 导入操作时更新街道干部管理表干部人数 - int num = list.size(); - EvaluateUpdateDeptOfficerCountDTO evaluateUpdateDeptOfficerCountDTO = new EvaluateUpdateDeptOfficerCountDTO(); - evaluateUpdateDeptOfficerCountDTO.setDeptId(deptId); - evaluateUpdateDeptOfficerCountDTO.setOfficerCount(num); - baseDao.updateOfficerCountByDeptId(evaluateUpdateDeptOfficerCountDTO); - } - result.setMsg("success"); - result.setCode(0); - result.setData("数据导入成功！"); - return result; - } catch (Exception e) { - - } - result.setMsg("defeat"); - result.setCode(1); - result.setData("数据导入失败！"); - return result; - } - - /** - * 获取19位随机数 - * - * @return - */ - public String getLongRandom() { - Guid += 1; - long now = System.currentTimeMillis(); - SimpleDateFormat dateFormat = new SimpleDateFormat("MMdd"); - String time = dateFormat.format(now); - String currentTimeMillis = now + ""; - int ran = 0; - if (Guid > 999) { - Guid = 100; - } - ran = Guid; - String str = time + currentTimeMillis.substring(1, currentTimeMillis.length()) + ran; - return str; - } - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOptionServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOptionServiceImpl.java deleted file mode 100644 index 7e4eef995..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOptionServiceImpl.java +++ /dev/null @@ -1,136 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.evaluate.EvaluateOptionDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO; -import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO; -import com.elink.esua.epdc.dto.evaluate.result.RoleDictDTO; -import com.elink.esua.epdc.modules.evaluate.dao.EvaluateOptionDao; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateOptionEntity; -import com.elink.esua.epdc.modules.evaluate.redis.EvaluateOptionRedis; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateOptionService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 评价选项表 评价选项表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Service -public class EvaluateOptionServiceImpl extends BaseServiceImpl implements EvaluateOptionService { - - @Autowired - private EvaluateOptionRedis evaluateOptionRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, EvaluateOptionDTO.class); - } - @Override - public List getOptionList(EvaluateOptionAppFormDTO formDto) { - List list = baseDao.getOptionList(formDto); - return list; - } - @Override - public List optionShowList() { - List list = baseDao.optionShowList(); - return list; - } - - /** - * 条件查询 - * @param params - * @return - */ - @Override - public PageData getOptionPage(Map params) { - IPage page = getPage(params); - List list = baseDao.getOptionPage(params); - return new PageData<>(list, page.getTotal()); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, EvaluateOptionDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public EvaluateOptionDTO get(String id) { - EvaluateOptionEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, EvaluateOptionDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(EvaluateOptionDTO dto) { - EvaluateOptionEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateOptionEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(EvaluateOptionDTO dto) { - EvaluateOptionEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateOptionEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - @Override - public Result> listSimpleDictInfo() { - List result = baseDao.listSimpleDictInfo(); - return new Result>().ok(result); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateRoleServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateRoleServiceImpl.java deleted file mode 100644 index b00a5a3a5..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateRoleServiceImpl.java +++ /dev/null @@ -1,118 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.evaluate.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.dto.evaluate.EvaluateRoleDTO; -import com.elink.esua.epdc.dto.evaluate.form.EvaluateRoleFormDTO; -import com.elink.esua.epdc.modules.evaluate.dao.EvaluateRoleDao; -import com.elink.esua.epdc.modules.evaluate.entity.EvaluateRoleEntity; -import com.elink.esua.epdc.modules.evaluate.redis.EvaluateRoleRedis; -import com.elink.esua.epdc.modules.evaluate.service.EvaluateRoleService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 评价权限表 评价权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2020-02-05 - */ -@Service -public class EvaluateRoleServiceImpl extends BaseServiceImpl implements EvaluateRoleService { - - @Autowired - private EvaluateRoleRedis evaluateRoleRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, EvaluateRoleDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, EvaluateRoleDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public EvaluateRoleDTO get(String id) { - EvaluateRoleEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, EvaluateRoleDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(EvaluateRoleDTO dto) { - EvaluateRoleEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateRoleEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(EvaluateRoleDTO dto) { - EvaluateRoleEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateRoleEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - @Override - public EvaluateRoleDTO getAvailable() { - EvaluateRoleEntity entity = baseDao.getAvailable(); - return ConvertUtils.sourceToTarget(entity, EvaluateRoleDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateAll(EvaluateRoleFormDTO dto) { - EvaluateRoleEntity entity = ConvertUtils.sourceToTarget(dto, EvaluateRoleEntity.class); - baseDao.updateAll(entity); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/SysFeignClient.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/SysFeignClient.java deleted file mode 100644 index e7135d46e..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/SysFeignClient.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.elink.esua.epdc.modules.feign; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.CompleteDeptDTO; -import com.elink.esua.epdc.dto.DeptGridPlatformDTO; -import com.elink.esua.epdc.dto.SysDeptDTO; -import com.elink.esua.epdc.modules.feign.fallback.SysFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; - -import java.util.List; - -/** - * @author lipf - * @email yujintao@elink-cn.com - * @date 2020/2/7 9:30 - */ -@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = SysFeignClientFallback.class) -public interface SysFeignClient { - - /** - * 根据网格ID获取所有上级机构名称和ID - * - * @param gridId - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author yujintao - * @date 2019/9/7 09:31 - */ - @GetMapping("sys/dept/getCompleteDept/{gridId}") - Result getCompleteDept(@PathVariable("gridId") Long gridId); -} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/SysFeignClientFallback.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/SysFeignClientFallback.java deleted file mode 100644 index 7ac298d85..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/SysFeignClientFallback.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.elink.esua.epdc.modules.feign.fallback; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.CompleteDeptDTO; -import com.elink.esua.epdc.dto.DeptGridPlatformDTO; -import com.elink.esua.epdc.dto.SysDeptDTO; -import com.elink.esua.epdc.modules.feign.SysFeignClient; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.PathVariable; - -import java.util.List; - -/** - * @author lipf - * @email yujintao@elink-cn.com - * @date 2020/2/7 9:30 - */ -@Component -public class SysFeignClientFallback implements SysFeignClient { - - @Override - public Result getCompleteDept(Long gridId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getCompleteDept", gridId); - } -} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml index 4b4863764..a2323c50c 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml @@ -4,8 +4,6 @@ server: context-path: /custom spring: - main: - allow-bean-definition-overriding: true application: name: epdc-custom-server # 环境 dev|test|prod diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDeptDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDeptDao.xml deleted file mode 100644 index bc6d4b135..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDeptDao.xml +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDetailDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDetailDao.xml deleted file mode 100644 index a5367b3cf..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateDetailDao.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml deleted file mode 100644 index 5ec4fef8b..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml deleted file mode 100644 index 6d8aeb995..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml +++ /dev/null @@ -1,297 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - insert into epdc_evaluate_officer - (id, - DEPT_ID, - FULL_NAME, - SEX, - POSITION, - LIKES_COUNT, - OPPOSE_COUNT, - SORT, - REVISION, - DEL_FLAG, - CREATED_BY, - CREATED_TIME, - UPDATED_BY, - UPDATED_TIME) - values - - (#{item.id}, - #{item.deptId}, - #{item.fullName}, - #{item.sex}, - #{item.position}, - #{item.likesCount}, - #{item.opposeCount}, - #{item.sort}, - #{item.revision}, - #{item.delFlag}, - #{item.createdBy}, - #{item.createdTime}, - #{item.updatedBy}, - #{item.updatedTime}) - - - - update epdc_evaluate_officer set DEL_FLAG = '1' where DEPT_ID = #{deptId} - - - - UPDATE epdc_evaluate_officer SET - - LIKES_COUNT = LIKES_COUNT + 1 - - - OPPOSE_COUNT = OPPOSE_COUNT + 1 - - where ID = #{id} and DEL_FLAG = '0' - - - - update epdc_evaluate_dept set OFFICER_COUNT = OFFICER_COUNT+1 where DEPT_ID = #{deptId} - - - - update epdc_evaluate_dept set OFFICER_COUNT = OFFICER_COUNT- #{officerCount} where DEPT_ID = (select eeo.DEPT_ID from epdc_evaluate_officer eeo where eeo.id = #{id}) - - - - update epdc_evaluate_dept set OFFICER_COUNT = #{officerCount} where DEPT_ID = #{deptId} - - - - update epdc_evaluate_info set DEL_FLAG = '1' where OFFICER_ID in - - #{id} - - - - - update epdc_evaluate_detail set DEL_FLAG = '1' where INFO_ID in ( - select ID from epdc_evaluate_info where OFFICER_ID in - - #{id} - - ) - - - - update epdc_evaluate_info set DEL_FLAG = '1' where OFFICER_ID in ( - select ID from epdc_evaluate_officer where DEPT_ID = #{deptId} - ) - - - - update epdc_evaluate_detail set DEL_FLAG = '1' where INFO_ID in ( - select ID from epdc_evaluate_info where OFFICER_ID in ( - select ID from epdc_evaluate_officer where DEPT_ID = #{deptId} - ) - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml deleted file mode 100644 index cee66469e..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateRoleDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateRoleDao.xml deleted file mode 100644 index c081c24da..000000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateRoleDao.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - update epdc_evaluate_role set AVAILABLE = #{available} where DEL_FLAG = '0' - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml index cdd6e505f..15ae7d4c8 100644 --- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/pom.xml @@ -86,6 +86,10 @@ true + + com.spotify + dockerfile-maven-plugin + diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/DemoEntity.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/DemoEntity.java index f5a4c074b..2843c3c65 100644 --- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/DemoEntity.java +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/entity/DemoEntity.java @@ -28,7 +28,7 @@ public class DemoEntity implements Serializable { * 用户ID */ @TableId - private String id; + private Long id; /** * 用户名 */ diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/service/impl/DemoServiceImpl.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/service/impl/DemoServiceImpl.java index 1546e86ce..b5620cd41 100644 --- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/service/impl/DemoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/main/java/com/elink/esua/epdc/service/impl/DemoServiceImpl.java @@ -16,9 +16,7 @@ import com.elink.esua.epdc.dao.DemoDao; import com.elink.esua.epdc.dto.DemoDto; import com.elink.esua.epdc.entity.DemoEntity; import com.elink.esua.epdc.service.DemoService; -import io.seata.spring.annotation.GlobalTransactional; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -38,6 +36,6 @@ public class DemoServiceImpl extends BaseServiceImpl implem public Result> demoService() { QueryWrapper demoEntityWrapper = new QueryWrapper<>(); List entityList = baseDao.selectList(demoEntityWrapper); - return new Result().ok(ConvertUtils.sourceToTarget(entityList, DemoDto.class)); + return new Result().ok(ConvertUtils.sourceToTarget(entityList,DemoDto.class)); } } diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/test/java/com/elink/esua/epdc/OrikaTest.java b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/test/java/com/elink/esua/epdc/OrikaTest.java index a3a158cef..59ef3f8a6 100644 --- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/test/java/com/elink/esua/epdc/OrikaTest.java +++ b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/src/test/java/com/elink/esua/epdc/OrikaTest.java @@ -29,7 +29,7 @@ public class OrikaTest { @Test public void Test() { DemoEntity demoEntity = new DemoEntity(); -// demoEntity.setId(1000L); + demoEntity.setId(1000L); demoEntity.setName("name"); demoEntity.setAge(19); diff --git a/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json b/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json index b38ef5612..65fe84ba5 100644 --- a/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json +++ b/esua-epdc/epdc-module/epdc-events/db/esua_epdc_events.pdman.json @@ -2679,361 +2679,8 @@ "defaultValue": "" } ] - }, - { - "title": "EPDC_HANDLE_CATEGORY", - "fields": [ - { - "name": "ID", - "type": "IdOrKey", - "remark": "", - "chnname": "主键", - "pk": true, - "notNull": true - }, - { - "name": "CATEGORY_CODE", - "type": "IdOrKey", - "remark": "", - "chnname": "处理类型编码", - "notNull": true - }, - { - "name": "CATEGORY_VAL", - "type": "Integer", - "remark": "", - "chnname": "处理类别值", - "notNull": true - }, - { - "name": "CATEGORY_LABEL", - "type": "VARCHAR_20", - "remark": "", - "chnname": "处理类别显示信息", - "notNull": true - }, - { - "name": "AVAILABLE", - "type": "YesNo", - "remark": "", - "chnname": "可用状态(0-不可用，1-可用)", - "notNull": true, - "defaultValue": "1" - }, - { - "name": "SORT", - "type": "Integer", - "remark": "", - "chnname": "排序", - "notNull": true, - "defaultValue": "0" - }, - { - "name": "REVISION", - "type": "Integer", - "remark": "", - "chnname": "乐观锁" - }, - { - "name": "CREATED_BY", - "type": "IdOrKey", - "remark": "", - "chnname": "创建人" - }, - { - "name": "CREATED_TIME", - "type": "DateTime", - "remark": "", - "chnname": "创建时间" - }, - { - "name": "UPDATED_BY", - "type": "IdOrKey", - "remark": "", - "chnname": "更新人" - }, - { - "name": "UPDATED_TIME", - "type": "DateTime", - "remark": "", - "chnname": "更新时间" - } - ], - "indexs": [], - "headers": [ - { - "fieldName": "chnname", - "relationNoShow": false - }, - { - "fieldName": "name", - "relationNoShow": false - }, - { - "fieldName": "type", - "relationNoShow": false - }, - { - "fieldName": "dataType", - "relationNoShow": true - }, - { - "fieldName": "remark", - "relationNoShow": true - }, - { - "fieldName": "pk", - "relationNoShow": false - }, - { - "fieldName": "notNull", - "relationNoShow": true - }, - { - "fieldName": "autoIncrement", - "relationNoShow": true - }, - { - "fieldName": "defaultValue", - "relationNoShow": true - }, - { - "fieldName": "relationNoShow", - "relationNoShow": true - }, - { - "fieldName": "uiHint", - "relationNoShow": true - } - ], - "chnname": "处理类别表", - "remark": "处理类别表" - }, - { - "title": "EPDC_HANDLE_ROLE_CATEGORY", - "fields": [ - { - "name": "ID", - "type": "IdOrKey", - "remark": "", - "chnname": "主键", - "pk": true, - "notNull": true - }, - { - "name": "ROLE_ID", - "type": "IdOrKey", - "remark": "", - "chnname": "角色ID", - "notNull": true - }, - { - "name": "CATEGORY_ID", - "type": "IdOrKey", - "remark": "", - "chnname": "处理类别ID", - "notNull": true - }, - { - "name": "REVISION", - "type": "Integer", - "remark": "", - "chnname": "乐观锁" - }, - { - "name": "CREATED_BY", - "type": "IdOrKey", - "remark": "", - "chnname": "创建人" - }, - { - "name": "CREATED_TIME", - "type": "DateTime", - "remark": "", - "chnname": "创建时间" - }, - { - "name": "UPDATED_BY", - "type": "IdOrKey", - "remark": "", - "chnname": "更新人" - }, - { - "name": "UPDATED_TIME", - "type": "DateTime", - "remark": "", - "chnname": "更新时间" - } - ], - "indexs": [], - "headers": [ - { - "fieldName": "chnname", - "relationNoShow": false - }, - { - "fieldName": "name", - "relationNoShow": false - }, - { - "fieldName": "type", - "relationNoShow": false - }, - { - "fieldName": "dataType", - "relationNoShow": true - }, - { - "fieldName": "remark", - "relationNoShow": true - }, - { - "fieldName": "pk", - "relationNoShow": false - }, - { - "fieldName": "notNull", - "relationNoShow": true - }, - { - "fieldName": "autoIncrement", - "relationNoShow": true - }, - { - "fieldName": "defaultValue", - "relationNoShow": true - }, - { - "fieldName": "relationNoShow", - "relationNoShow": true - }, - { - "fieldName": "uiHint", - "relationNoShow": true - } - ], - "chnname": "角色和处理类别关系表", - "remark": "角色和处理类别关系表" - }, - { - "title": "EPDC_HANDLE_ROLE_DEPT", - "fields": [ - { - "name": "ID", - "type": "IdOrKey", - "remark": "", - "chnname": "主键", - "pk": true, - "notNull": true - }, - { - "name": "ROLE_ID", - "type": "IdOrKey", - "remark": "", - "chnname": "角色ID", - "notNull": true - }, - { - "name": "DEPT_ID", - "type": "IdOrKey", - "remark": "", - "chnname": "部门ID", - "notNull": true - }, - { - "name": "DEPT_TYPE", - "type": "VARCHAR_50", - "remark": "", - "chnname": "部门机构类型", - "notNull": true - }, - { - "name": "REVISION", - "type": "Integer", - "remark": "", - "chnname": "乐观锁" - }, - { - "name": "CREATED_BY", - "type": "IdOrKey", - "remark": "", - "chnname": "创建人" - }, - { - "name": "CREATED_TIME", - "type": "DateTime", - "remark": "", - "chnname": "创建时间" - }, - { - "name": "UPDATED_BY", - "type": "IdOrKey", - "remark": "", - "chnname": "更新人" - }, - { - "name": "UPDATED_TIME", - "type": "DateTime", - "remark": "", - "chnname": "更新时间" - } - ], - "indexs": [], - "headers": [ - { - "fieldName": "chnname", - "relationNoShow": false - }, - { - "fieldName": "name", - "relationNoShow": false - }, - { - "fieldName": "type", - "relationNoShow": false - }, - { - "fieldName": "dataType", - "relationNoShow": true - }, - { - "fieldName": "remark", - "relationNoShow": true - }, - { - "fieldName": "pk", - "relationNoShow": false - }, - { - "fieldName": "notNull", - "relationNoShow": true - }, - { - "fieldName": "autoIncrement", - "relationNoShow": true - }, - { - "fieldName": "defaultValue", - "relationNoShow": true - }, - { - "fieldName": "relationNoShow", - "relationNoShow": true - }, - { - "fieldName": "uiHint", - "relationNoShow": true - } - ], - "chnname": "处理部门角色权限表", - "remark": "处理部门角色权限表" } - ], - "graphCanvas": { - "nodes": [], - "edges": [] - }, - "associations": [] + ] } ], "dataTypeDomains": { diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemEvaluationLevel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemEvaluationLevel.java deleted file mode 100644 index 6c964433d..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/ItemEvaluationLevel.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.elink.esua.epdc.constant; - - -/** - * @author: qushutong - * @Date: 2019/12/20 15:53 - * @Description: 评价结果：0-不满意，1-基本满意，2-非常满意 - */ -public interface ItemEvaluationLevel { - - String levaluationLevelBad = "0"; - - String levaluationLevelBetter = "1"; - - String levaluationLevelBest = "2"; - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/SubmitCommentFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/SubmitCommentFormDTO.java deleted file mode 100644 index 1f6373f36..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/form/SubmitCommentFormDTO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.elink.esua.epdc.dto.comment.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; -import java.io.Serializable; - -/** - * @Description 议题提交评论DTO - * @Author yinzuomei - * @Date 2019/12/18 16:56 - */ -@Data -public class SubmitCommentFormDTO implements Serializable { - private static final long serialVersionUID = -3253699905608729529L; - - private String issueId; - - private String itemId; - - /** - * 父评论（被评论）ID - */ - private String faCommentId; - - @Size(min = 1, max = 500, message = "评论内容不能超过500字") - private String content; - - /** - * 评论人ID - */ - @NotBlank(message = "评论人ID不能为空") - private String userId; - - /** - * 评论人昵称 - */ - private String userName; - - /** - * 评论人头像 - */ - private String userFace; - - /** - * 党员标识（0-否，1-是） - */ - private String partyFlag; -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventCountSqlFromDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventCountSqlFromDTO.java deleted file mode 100644 index 8fc8c086b..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EventCountSqlFromDTO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.elink.esua.epdc.dto.events.form; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * @author: qushutong - * @Date: 2019/12/16 14:52 - * @Description: 查询参数 - */ -@Data -public class EventCountSqlFromDTO implements Serializable { - private static final long serialVersionUID = 4648104037156856679L; - /*** - * 网格id - */ - private Long gridId; - - /*** - * 月 季 年 0,1,2 - */ - private String type; - - /*** - * 0 是群众反应问题总数 1 群众反应问题响应数 - */ - private String responseType; - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handlecategory/HandleCategoryDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handlecategory/HandleCategoryDTO.java deleted file mode 100644 index ba44b3bfc..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handlecategory/HandleCategoryDTO.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.handlecategory; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.Date; - - -/** - * 处理类别表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -@Data -public class HandleCategoryDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 处理类别值 - */ - private Integer categoryVal; - - /** - * 处理类别显示信息 - */ - @NotBlank(message = "处理类别显示信息不能为空") - private String categoryLabel; - - /** - * 可用状态(0-不可用，1-可用) - */ - private String available; - - /** - * 排序 - */ - private Integer sort; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - - /** - * 处理类型编码 - */ - @NotBlank(message = "处理类型编码不能为空") - private String categoryCode; -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handlecategory/HandleCategoryTreeDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handlecategory/HandleCategoryTreeDTO.java deleted file mode 100644 index 956d9298a..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handlecategory/HandleCategoryTreeDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.elink.esua.epdc.dto.handlecategory; - -import lombok.Data; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * @Description 角色授权tree返参dto - * @Author yinzuomei - * @Date 2019/12/24 10:19 - */ -@Data -public class HandleCategoryTreeDTO implements Serializable { - - private static final long serialVersionUID = -445779738699117585L; - - /** - * 主键 - */ - private String id; - - /** - * 处理类别显示信息 - */ - private String name; - - private List children= new ArrayList<>(); -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handleroledept/HandleRoleDeptDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handleroledept/HandleRoleDeptDTO.java deleted file mode 100644 index 72dc4a4a8..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handleroledept/HandleRoleDeptDTO.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.handleroledept; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 处理部门角色权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-26 - */ -@Data -public class HandleRoleDeptDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 角色ID - */ - private String roleId; - - /** - * 部门ID - */ - private String deptId; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 部门机构类型 - */ - private String deptType; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handleroledept/form/HandleRoleDeptFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handleroledept/form/HandleRoleDeptFormDTO.java deleted file mode 100644 index 65c3a5bb7..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handleroledept/form/HandleRoleDeptFormDTO.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.elink.esua.epdc.dto.handleroledept.form; - -import com.elink.esua.epdc.dto.handleroledept.HandleRoleDeptDTO; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description 保存角色对应的吹哨机构类型 入参DTO - * @Author yinzuomei - * @Date 2019/12/26 13:40 - */ -@Data -public class HandleRoleDeptFormDTO implements Serializable { - private static final long serialVersionUID = -8514999095093073286L; - /** - * 角色ID - */ - private String roleId; - - private List handleRoleDeptDTOList; - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handleroledept/result/HandleRoleDeptPermissionDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handleroledept/result/HandleRoleDeptPermissionDTO.java deleted file mode 100644 index 7e1e77896..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/handleroledept/result/HandleRoleDeptPermissionDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.elink.esua.epdc.dto.handleroledept.result; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description 角色对应吹哨部门 - * @Author yinzuomei - * @Date 2019/12/26 14:59 - */ -@Data -public class HandleRoleDeptPermissionDTO implements Serializable { - private static final long serialVersionUID = 8183862671970858166L; - /** - * 部门ID - */ - private String deptId; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 部门机构类型 - */ - private String deptType; -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rulecategory/HandleRoleCategoryDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rulecategory/HandleRoleCategoryDTO.java deleted file mode 100644 index 540ae4552..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rulecategory/HandleRoleCategoryDTO.java +++ /dev/null @@ -1,81 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto.rulecategory; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 角色和处理类别关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -@Data -public class HandleRoleCategoryDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 角色ID - */ - private String roleId; - - /** - * 处理类别ID - */ - private String categoryId; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - - /** - * 删除标识 0：未删除，1：已删除 - */ - private String delFlag; - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rulecategory/form/HandleRoleCategoryFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rulecategory/form/HandleRoleCategoryFormDTO.java deleted file mode 100644 index 1372b059e..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rulecategory/form/HandleRoleCategoryFormDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.elink.esua.epdc.dto.rulecategory.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.List; - -/** - * @Description 保存或修改 角色和处理类别关系 入参DTO - * @Author yinzuomei - * @Date 2019/12/24 12:12 - */ -@Data -public class HandleRoleCategoryFormDTO implements Serializable { - - private static final long serialVersionUID = -3295948468274114972L; - - /** - * 角色ID - */ - @NotBlank(message = "角色id不能为空") - private Long roleId; - - /** - * 处理类别ID - */ - private List categoryIdList; -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rulecategory/result/HandleRoleCategoryPermissionDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rulecategory/result/HandleRoleCategoryPermissionDTO.java deleted file mode 100644 index c38cbe969..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/rulecategory/result/HandleRoleCategoryPermissionDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.elink.esua.epdc.dto.rulecategory.result; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description 角色对应项目处理类别 - * @Author yinzuomei - * @Date 2019/12/26 15:08 - */ -@Data -public class HandleRoleCategoryPermissionDTO implements Serializable { - private static final long serialVersionUID = 1164343443504365039L; - /** - * 主键 - */ - private String id; - - /** - * 处理类别值 - */ - private Integer categoryVal; - - /** - * 处理类别显示信息 - */ - private String categoryLabel; -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java index ec04877b7..b25b09144 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java @@ -7,7 +7,6 @@ import java.util.List; /** * 项目处理类型枚举 - * * @Author LC * @Date 2019/9/16 14:00 */ @@ -29,7 +28,7 @@ public enum ItemHandleCategoryEnum { public static List getHandleCategoriesForGird(boolean selected) { List handleResultDTOS = new ArrayList<>(); - for (ItemHandleCategoryEnum e : + for (ItemHandleCategoryEnum e: ItemHandleCategoryEnum.values()) { if (e.getValue() != ItemHandleCategoryEnum.HANDLE_REPORT.getValue()) { ItemHandleResultDTO dto = new ItemHandleResultDTO(); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index ab7b479c1..00fed7324 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -13,11 +13,6 @@ jar - - com.esua.epdc - epdc-kpi-client - 1.0.0 - com.esua.epdc epdc-events-client @@ -67,10 +62,6 @@ 1.0.0 compile - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - com.esua.epdc @@ -174,14 +165,6 @@ wx29b074840ef4bfd9 4adb1afccc69f205cdf5b521d74e2aca - @@ -208,20 +191,15 @@ test - wxdd8530c5f4926766 - 5bf4fb813145431b3493a10aa7e041e9 + + + + wx5d3e97461d248397 + bfed51b731e53db9affb9e6131e7ae12 - wx29b074840ef4bfd9 - 4adb1afccc69f205cdf5b521d74e2aca + wx9f20a46906ab2c3e + dc13065f79429979d9f687d249eb5c4e - diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java index a3d0e2eae..2678142a1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java @@ -26,8 +26,8 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.category.CategoryOption; -import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO; -import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO; +import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO; +import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO; import com.elink.esua.epdc.modules.category.excel.CategoryExcel; import com.elink.esua.epdc.modules.category.service.CategoryService; import io.swagger.annotations.ApiOperation; @@ -134,7 +134,7 @@ public class CategoryController { /** * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author yinzuomei * @Description 根据id查询事件分类基本信息 * @Date 2019/12/4 9:43 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java index f936febab..79f60d255 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java @@ -17,13 +17,13 @@ package com.elink.esua.epdc.modules.category.entity; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; import java.util.Date; /** @@ -69,11 +69,6 @@ public class CategoryEntity extends BaseEntity { */ private Integer sort; - /** - * 第三方平台分类编码 - */ - private String infoCode; - /** * 删除标识 0：未删除 1：删除 */ @@ -104,6 +99,11 @@ public class CategoryEntity extends BaseEntity { @TableField(exist = false) private String label; + /** + * 第三方平台分类编码 + */ + private String infoCode; + /** * 启用标识（0-否，1-是） */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java index 9165fdb1c..967e6f85e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java @@ -21,8 +21,8 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.category.CategoryOption; -import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO; -import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO; +import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO; +import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO; import com.elink.esua.epdc.modules.category.entity.CategoryEntity; import org.springframework.web.multipart.MultipartFile; @@ -125,7 +125,7 @@ public interface CategoryService extends BaseService { /** * @param formDTO - * @return java.util.List + * @return java.util.List * @Author yinzuomei * @Description 根据id查询事件分类基本信息 * @Date 2019/12/4 9:43 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java index e975a92f7..8d1c455a7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java @@ -17,14 +17,12 @@ package com.elink.esua.epdc.modules.category.service.impl; -import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.commons.tools.constant.StrConstant; import com.elink.esua.epdc.commons.tools.exception.ErrorCode; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.redis.RedisKeys; @@ -36,8 +34,8 @@ import com.elink.esua.epdc.commons.tools.utils.TreeUtils; import com.elink.esua.epdc.dto.category.CategoryDTO; import com.elink.esua.epdc.dto.category.CategoryOption; import com.elink.esua.epdc.dto.category.CategoryTreeDTO; -import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO; -import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO; +import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO; +import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO; import com.elink.esua.epdc.modules.category.dao.CategoryDao; import com.elink.esua.epdc.modules.category.entity.CategoryEntity; import com.elink.esua.epdc.modules.category.redis.CategoryRedis; @@ -579,141 +577,127 @@ public class CategoryServiceImpl extends BaseServiceImpl().ok((CategoryOption) obj); } - /** - * @param formDTO - * @return java.util.List - * @Author yinzuomei - * @Description 根据id查询事件分类基本信息 - * @Date 2019/12/4 9:43 - **/ - @Override - public List listCategoryInfo(CategoryInfoFormDTO formDTO) { - List result = Lists.newArrayList(); - CategoryInfoResultDTO categoryInfoResult; - - for (Long id : formDTO.getIds()) { - CategoryEntity entity = baseDao.getById(id); - if (null == entity) { - continue; - } - if(StringUtils.isBlank(entity.getPids())){ - categoryInfoResult = ConvertUtils.sourceToTarget(entity, CategoryInfoResultDTO.class); - result.add(categoryInfoResult); - continue; - } - List parentNameList = Lists.newArrayList(); - String[] pidList = entity.getPids().split(StrConstant.COMMA); - if (null != pidList && pidList.length > NumConstant.ZERO) { - CategoryEntity parentEntity; - for (int i = 0; i < pidList.length; i++) { - parentEntity = baseDao.getById(Long.valueOf(pidList[i])); - if (null != parentEntity) { - parentNameList.add(parentEntity.getCategoryName()); - } - } - } - categoryInfoResult = ConvertUtils.sourceToTarget(entity, CategoryInfoResultDTO.class); - if (CollUtil.isNotEmpty(parentNameList)) { - categoryInfoResult.setParentNames(StringUtils.join(parentNameList, StrConstant.HYPHEN)); - } - result.add(categoryInfoResult); - } - return result; - } - - /** - * @param - * @return void - * @Author yinzuomei - * @Description 组装事件类别 - * @Date 2019/12/3 18:18 - **/ - @Override - public void packageCategoryOption() { - List dtoList = baseDao.selectListCategoryTreeDTO(); - JSONObject node; - JSONArray headNodes = new JSONArray(); - for (CategoryTreeDTO categoryTreeDto : dtoList) { - - if (categoryTreeDto.getPid().longValue() == NumConstant.ZERO_L) { - node = new JSONObject(); - node.put("value", categoryTreeDto.getId()); - node.put("label", categoryTreeDto.getCategoryName()); - headNodes.add(node); - } - } - - // 用于存放所有父级节点 - JSONArray parent; - // 用于存放所有子级节点 - JSONArray allChildren = new JSONArray(); - JSONArray children; - // 用于存放单个子级节点 - JSONObject childNode; - - parent = headNodes; - // 存放其余未处理的类别(节点) - List others = this.getOtherCategory(dtoList, parent); - - while (!others.isEmpty()) { - for (int i = 0; i < parent.size(); i++) { - node = parent.getJSONObject(i); - children = new JSONArray(); - for (CategoryTreeDTO categoryTreeDto : others) { - if (categoryTreeDto.getPid().equals(node.get("value"))) { - childNode = new JSONObject(); - childNode.put("value", categoryTreeDto.getId()); - childNode.put("label", categoryTreeDto.getCategoryName()); - - children.add(childNode); - allChildren.add(childNode); - } - } - if (!children.isEmpty()) { - node.put("children", children); - } - } - parent = allChildren; - - others = this.getOtherCategory(others, parent); - - } + /** + * @param formDTO + * @return java.util.List + * @Author yinzuomei + * @Description 根据id查询事件分类基本信息 + * @Date 2019/12/4 9:43 + **/ + @Override + public List listCategoryInfo(CategoryInfoFormDTO formDTO) { + List categoryInfoResultDTOList = new ArrayList<>(); + for (Long id : formDTO.getIds()) { + CategoryEntity entity = baseDao.getById(id); + if (null != entity) { + List parentNameList = new ArrayList<>(); + if (StringUtils.isNotBlank(entity.getPids())) { + String[] pidList = entity.getPids().split(","); + for (String pid : pidList) { + CategoryEntity parentEntity = baseDao.getById(Long.valueOf(pid)); + parentNameList.add(parentEntity.getCategoryName()); + } + } + CategoryInfoResultDTO categoryInfoResultDTO = ConvertUtils.sourceToTarget(entity, CategoryInfoResultDTO.class); + categoryInfoResultDTO.setParentNames(parentNameList); + categoryInfoResultDTOList.add(categoryInfoResultDTO); + } + } + return categoryInfoResultDTOList; + } + + /** + * @param + * @return void + * @Author yinzuomei + * @Description 组装事件类别 + * @Date 2019/12/3 18:18 + **/ + @Override + public void packageCategoryOption() { + List dtoList = baseDao.selectListCategoryTreeDTO(); + JSONObject node; + JSONArray headNodes = new JSONArray(); + for (CategoryTreeDTO categoryTreeDto : dtoList) { + + if (categoryTreeDto.getPid().longValue() == NumConstant.ZERO_L) { + node = new JSONObject(); + node.put("value", categoryTreeDto.getId()); + node.put("label", categoryTreeDto.getCategoryName()); + headNodes.add(node); + } + } + // 用于存放所有父级节点 + JSONArray parent; + // 用于存放所有子级节点 + JSONArray allChildren = new JSONArray(); + JSONArray children; + // 用于存放单个子级节点 + JSONObject childNode; + + parent = headNodes; + // 存放其余未处理的类别(节点) + List others = this.getOtherCategory(dtoList, parent); + + while (!others.isEmpty()) { + for (int i = 0; i < parent.size(); i++) { + node = parent.getJSONObject(i); + children = new JSONArray(); + for (CategoryTreeDTO categoryTreeDto : others) { + if (categoryTreeDto.getPid().equals(node.get("value"))) { + childNode = new JSONObject(); + childNode.put("value", categoryTreeDto.getId()); + childNode.put("label", categoryTreeDto.getCategoryName()); + + children.add(childNode); + allChildren.add(childNode); + } + } + if (!children.isEmpty()) { + node.put("children", children); + } + } + parent = allChildren; + + others = this.getOtherCategory(others, parent); + + } // JSONObject treeNodes = new JSONObject(); // treeNodes.put("options", headNodes); // logger.info(treeNodes.toJSONString()); - //存放到redis中 - List cache = Lists.newArrayList(); - cache.add(headNodes); - CategoryOption option = new CategoryOption(); - option.setOptions(cache.get(0)); - redisUtils.set(RedisKeys.getEventsCategoryKey(), option); - } - - /* - * @param dtoList 上次进行筛选的分类集合 - * @param parent 已处理过的上级节点 - * @return java.util.List - * @Author yinzuomei - * @Description 组装其余未处理过的分类集合 - * @Date 2019/12/3 17:27 - **/ - private List getOtherCategory(List dtoList, JSONArray parent) { - List already = Lists.newArrayList(); - for (int i = 0; i < parent.size(); i++) { - already.add((Long) parent.getJSONObject(i).get("value")); - } - - List others = Lists.newArrayList(); - - for (CategoryTreeDTO categoryTreeDto : dtoList) { - Long categoryTreeDtoId = categoryTreeDto.getId(); - if (!already.contains(categoryTreeDtoId)) { - others.add(categoryTreeDto); - } - } - return others; - } + //存放到redis中 + List cache = Lists.newArrayList(); + cache.add(headNodes); + CategoryOption option = new CategoryOption(); + option.setOptions(cache.get(0)); + redisUtils.set(RedisKeys.getEventsCategoryKey(), option); + } + + /* + * @param dtoList 上次进行筛选的分类集合 + * @param parent 已处理过的上级节点 + * @return java.util.List + * @Author yinzuomei + * @Description 组装其余未处理过的分类集合 + * @Date 2019/12/3 17:27 + **/ + private List getOtherCategory(List dtoList, JSONArray parent) { + List already = Lists.newArrayList(); + for (int i = 0; i < parent.size(); i++) { + already.add((Long) parent.getJSONObject(i).get("value")); + } + + List others = Lists.newArrayList(); + + for (CategoryTreeDTO categoryTreeDto : dtoList) { + Long categoryTreeDtoId = categoryTreeDto.getId(); + if (!already.contains(categoryTreeDtoId)) { + others.add(categoryTreeDto); + } + } + return others; + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java index b488bc82c..a0dd8ef59 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/controller/AppEventCommentController.java @@ -21,8 +21,8 @@ import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO; +import com.elink.esua.epdc.dto.comment.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; -import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO; import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; @@ -48,13 +48,13 @@ public class AppEventCommentController { /**AppTopicCommentController * 提交评论或回复接口 - * @param submitCommentFormDTO + * @param commentFormDTO * @return */ @PostMapping("submit") - public Result submit(@RequestBody SubmitCommentFormDTO submitCommentFormDTO){ - ValidatorUtils.validateEntity(submitCommentFormDTO); - return eventCommentService.submit(submitCommentFormDTO); + public Result submit(@RequestBody CommentFormDTO commentFormDTO){ + ValidatorUtils.validateEntity(commentFormDTO); + return eventCommentService.submit(commentFormDTO); } /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java index cc3ddf046..61afb820c 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentService.java @@ -24,7 +24,6 @@ import com.elink.esua.epdc.dto.comment.EpdcCommentsAndAttitudeFromTopicFormDTO; import com.elink.esua.epdc.dto.comment.EventCommentDTO; import com.elink.esua.epdc.dto.comment.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; -import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO; import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; @@ -106,9 +105,9 @@ public interface EventCommentService extends BaseService { /** * 提交评论或回复接口 - * @param submitCommentFormDTO + * @param commentFormDTO */ - Result submit(SubmitCommentFormDTO submitCommentFormDTO); + Result submit(CommentFormDTO commentFormDTO); /** diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java index 809088684..4cb8f8e31 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java @@ -26,9 +26,10 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.constant.EventsNoticeConstant; +import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.comment.*; +import com.elink.esua.epdc.dto.comment.form.CommentFormDTO; import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO; -import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO; import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; import com.elink.esua.epdc.dto.comment.result.EventCommentsResultDTO; import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; @@ -43,6 +44,7 @@ import com.elink.esua.epdc.modules.comment.entity.EventCommentEntity; import com.elink.esua.epdc.modules.comment.service.EventCommentService; import com.elink.esua.epdc.modules.comment.service.EventCommentUserAttitudeService; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; +import com.elink.esua.epdc.modules.feign.UserFeignClient; import com.elink.esua.epdc.modules.issue.entity.IssueEntity; import com.elink.esua.epdc.modules.issue.service.IssueService; import com.elink.esua.epdc.modules.item.entity.ItemEntity; @@ -85,6 +87,9 @@ public class EventCommentServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -139,7 +144,7 @@ public class EventCommentServiceImpl extends BaseServiceImpl userDTOResult=userFeignClient.getUserInfoById(commentFormDTO.getUserId()); + if(!userDTOResult.success()){ + return new Result().error("获取用户信息失败"); + } + commentEntity.setPartyFlag(userDTOResult.getData().getPartyFlag()); boolean isIssue = true; boolean isComment = true; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java index 2a0d7c505..602383c9a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java @@ -31,8 +31,6 @@ import com.elink.esua.epdc.dto.events.EpdcRejectEventsDTO; import com.elink.esua.epdc.dto.events.EpdcEventsDTO; import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; -import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO; import com.elink.esua.epdc.modules.events.excel.EpdcEventsExcel; import com.elink.esua.epdc.modules.events.service.EpdcEventsService; import org.springframework.beans.factory.annotation.Autowired; @@ -58,20 +56,20 @@ public class EpdcEventsController { @GetMapping("page") @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false) - public Result> page(@RequestParam Map params) { + public Result> page(@RequestParam Map params){ PageData page = epdcEventsService.listOfPendingReviewEvents(params); return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id) { + public Result get(@PathVariable("id") String id){ EpdcEventsDetailDTO data = epdcEventsService.getEvent(id); return new Result().ok(data); } @PostMapping - public Result save(@RequestBody EpdcEventsDTO dto) { + public Result save(@RequestBody EpdcEventsDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); @@ -81,7 +79,7 @@ public class EpdcEventsController { } @PutMapping - public Result update(@RequestBody EpdcEventsDTO dto) { + public Result update(@RequestBody EpdcEventsDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); @@ -91,7 +89,7 @@ public class EpdcEventsController { } @DeleteMapping - public Result delete(@RequestBody String[] ids) { + public Result delete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); @@ -109,7 +107,6 @@ public class EpdcEventsController { /** * 事件审核 - * * @Params: [dto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -123,22 +120,20 @@ public class EpdcEventsController { /** * 已驳回事件列表 - * * @Params: [params] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/6 15:11 */ @GetMapping("rejectEvents") @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false) - public Result> rejectEvents(@RequestParam Map params) { + public Result> rejectEvents(@RequestParam Map params){ PageData page = epdcEventsService.listOfRejectEvents(params); return new Result>().ok(page); } /** * 已驳回事件详情 - * * @Params: [id] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -151,10 +146,11 @@ public class EpdcEventsController { } /** + * * 初始化党群议事菜单消息 * - * @return com.elink.esua.epdc.commons.tools.utils.Result * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result * @author liuchuang * @since 2019/10/30 13:43 */ @@ -164,17 +160,4 @@ public class EpdcEventsController { return new Result(); } - /*** - * 统计网格指定时间段内事件上报数与事件受理数 - * @param eventReportAmountFormDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author qushutong - * @date 2019/12/16 14:10 - */ - @PostMapping("statEventReportAmount") - public Result> statEventReportAmount(@RequestBody KpiMetaDataOfEventsFormDTO eventReportAmountFormDto) { - List dtoList = epdcEventsService.statEventReportAmount(eventReportAmountFormDto); - return new Result().ok(dtoList); - } - } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java index 3576f8cca..04f0c83e9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java @@ -18,16 +18,16 @@ package com.elink.esua.epdc.modules.events.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.events.*; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO; -import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO; import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; @@ -42,47 +42,38 @@ import java.util.Map; public interface EpdcEventsDao extends BaseDao { /** * 根据ID获取事件详情 - * * @Params: [id] * @Return: com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO * @Author: liuchuang * @Date: 2019/9/4 20:31 */ EpdcEventsDetailDTO selectOneOfEventDetailById(@Param("id") String id); - /** * 事件待审核列表 - * * @Params: [params] * @Return: java.util.List * @Author: liuchuang * @Date: 2019/9/5 19:42 */ List selectListOfPendingReviewEvents(Map params); - /** * 已驳回事件列表 - * * @Params: [] * @Return: java.util.List * @Author: liuchuang * @Date: 2019/9/6 15:04 */ List selectListOfRejectEvents(Map params); - /** * 已驳回事件详情 - * * @Params: [] * @Return: com.elink.esua.epdc.dto.events.EpdcRejectEventDetailDTO * @Author: liuchuang * @Date: 2019/9/6 14:46 */ EpdcRejectEventDetailDTO selectOneOfRejectEventDetail(@Param("id") String id); - /** * 评论列表 - * * @Params: [eventId] * @Return: java.util.List * @Author: liuchuang @@ -97,35 +88,30 @@ public interface EpdcEventsDao extends BaseDao { /** * 赞数+1 - * * @param eventId */ void updateApproveNumAdd(String eventId); /** * 踩数+1 - * * @param eventId */ void updateOpposeNumAdd(String eventId); /** * 赞数-1 - * * @param eventId */ void updateApproveNumSubtract(String eventId); /** * 踩数-1 - * * @param eventId */ void updateOpposeNumSubtract(String eventId); /** * 移动端-事件详情 - * * @Params: [eventId] * @Return: com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO * @Author: liuchuang @@ -134,18 +120,18 @@ public interface EpdcEventsDao extends BaseDao { EventAppDetailResultDTO selectOneOfEventDetail(String eventId); /** + * * 根据网格ID 状态获取事件数量 * - * @return int * @params [deptId, state] + * @return int * @author liuchuang * @since 2019/10/30 12:36 */ int selectCountOfDeptNotice(Long deptId, int state); /** - * 根据网格id和状态获取议题状态统计 - * + *根据网格id和状态获取议题状态统计 * @param deptIdList * @return */ @@ -153,19 +139,11 @@ public interface EpdcEventsDao extends BaseDao { /** * 查询待回应列表 - * * @param formDto * @return */ List listIssuePendingResponse(IssuePendingResponseFormDTO formDto); - /** - * 统计网格指定时间内事件上报数与事件受理数 - * - * @param eventReportAmountFormDto - * @return java.util.List - * @author work@yujt.net.cn - * @date 2019/12/19 19:01 - */ - List statEventReportAmount(KpiMetaDataOfEventsFormDTO eventReportAmountFormDto); + + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java index 3e953f92d..c39f6874d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java @@ -24,11 +24,9 @@ import com.elink.esua.epdc.dto.events.*; import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.issue.IssueDTO; import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO; -import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO; import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity; @@ -210,15 +208,4 @@ public interface EpdcEventsService extends BaseService { */ Result topicToIssue(EpdcEventSubmitFormDTO dto); - - - /*** - * 统计网格指定时间内事件上报数与事件受理数 - * @param eventReportAmountFormDto - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author qushutong - * @date 2019/12/16 14:17 - */ - List statEventReportAmount(KpiMetaDataOfEventsFormDTO eventReportAmountFormDto); - } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java index 75ac03bef..b955a02ce 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java @@ -42,11 +42,9 @@ import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO; import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.events.result.EventAppDetailResultDTO; import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.issue.IssueDTO; import com.elink.esua.epdc.dto.issue.form.IssuePendingResponseFormDTO; import com.elink.esua.epdc.dto.issue.result.IssuePendingResponseResultDTO; -import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO; import com.elink.esua.epdc.dto.issue.result.IssueStateStatisticsResultDTO; import com.elink.esua.epdc.modules.async.IssueOverseeResultsTask; import com.elink.esua.epdc.modules.async.NewsTask; @@ -184,16 +182,16 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl> listIssuePendingResponse(IssuePendingResponseFormDTO formDto) { List list; - if (formDto.getDeptId() > 0) { + if (formDto.getDeptId() > 0){ list = new ArrayList<>(); list.add(formDto.getDeptId()); - } else { + }else { list = SecurityUser.getUser().getDeptIdList(); } formDto.setDeptIdList(list); @@ -482,32 +482,32 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl().ok(issueDTO); } - /** + * * 初始化分类信息 * - * @return com.elink.esua.epdc.dto.events.EventsCategoryDTO * @params [categoryId] + * @return com.elink.esua.epdc.dto.events.EventsCategoryDTO * @author liuchuang * @since 2019/11/29 13:51 */ private EventsCategoryDTO initCategoryInfo(String categoryId) { Long category = Long.parseLong(categoryId); EventsCategoryDTO resultDto = new EventsCategoryDTO(); - CategoryDTO cateDto = categoryService.get(category); + CategoryDTO cateDto =categoryService.get(category); resultDto.setCategoryCode(cateDto.getCategoryCode()); //获取所有父类分类标签 List cateList = categoryService.getPidListById(category); //所选分类标签为多级 - if (cateList != null && cateList.size() > 0) { + if(cateList != null && cateList.size() > 0) { // list第一个为一级分类标签 resultDto.setFirstCategoryCode(cateList.get(0).getCategoryCode()); //分类标签全称拼接:-分割 String name = ""; - for (int i = 0; i < cateList.size(); i++) { - if (i == cateList.size() - 1) { + for (int i = 0; i < cateList.size(); i++){ + if (i == cateList.size() -1){ name = name + cateList.get(i).getCategoryName(); - } else { + }else { name = name + cateList.get(i).getCategoryName() + "-"; } } @@ -523,31 +523,23 @@ public class EpdcEventsServiceImpl extends BaseServiceImpl userMobiles) { + * @return: void + * @Author: zy + * @Date: 2020-01-08 + */ + private void issueSmsNotification(EpdcEventsReviewFormDTO dto, List userMobiles){ // 审核操作发送短信 SmsNoticeFormDTO sms = new SmsNoticeFormDTO(); sms.setMobiles(userMobiles); if (EventIssueItemState.EVENT_REVIEW_PASS == dto.getEventState()) { // 审核通过 sms.setSmsTemplateType(SysSmsTemplateConstant.SMS_TEMPLATE_RESIDENTS_ISSUE_PASSED); - } else { + }else { sms.setSmsTemplateType(SysSmsTemplateConstant.SMS_TEMPLATE_RESIDENTS_ISSUE_NOT_PASS); } issueOverseeResultsTask.sendSmsNotice(sms); } - - @Override - public List statEventReportAmount(KpiMetaDataOfEventsFormDTO eventReportAmountFormDto) { - - List list = baseDao.statEventReportAmount(eventReportAmountFormDto); - - return list; - } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java index 158882166..7ca4195e9 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java @@ -71,32 +71,23 @@ public interface AdminFeignClient { @GetMapping("sys/deptgridplatform/selectByDeptId/{deptId}") Result getDeptGridPlatformDTO(@PathVariable("deptId") String deptId); - /** - * @Description: 根据部门id，查询部门下的所有用户手机号 - * @Param: [deptId] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: zy - * @Date: 2020-01-09 - */ + /** + * @Description: 根据部门id，查询部门下的所有用户手机号 + * @Param: [deptId] + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-01-09 + */ @GetMapping(value ="sys/user/getUserPhoneByListDeptId", consumes = MediaType.APPLICATION_JSON_VALUE) Result> getUserPhoneByListDeptId(List deptId); - /** - * @Description: 根据议题网格ID查询拥有这个网格数据权限且是网格长的角色，再根据角色查出所有用户手机号 - * @Param: [deptId] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: zy - * @Date: 2020-01-09 - */ + /** + * @Description: 根据议题网格ID查询拥有这个网格数据权限且是网格长的角色，再根据角色查出所有用户手机号 + * @Param: [deptId] + * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: zy + * @Date: 2020-01-09 + */ @GetMapping("sys/user/getSysGridLeaderPhone/{deptId}") Result> getSysGridLeaderPhone(@PathVariable("deptId") Long deptId); - /** - * @param userId - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 根据用户ID获取角色id列表 - * @Date 2020/2/3 8:16 - **/ - @GetMapping("sys/user/getRoleIdList/{userId}") - Result> getRoleIdList(@PathVariable("userId") Long userId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java index dc240e68a..3d260100f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java @@ -54,9 +54,4 @@ public class AdminFeignClientFallback implements AdminFeignClient { public Result> getSysGridLeaderPhone(@PathVariable("deptId") Long deptId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getSysGridLeaderPhone", deptId); } - - @Override - public Result> getRoleIdList(Long userId) { - return null; - } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/controller/HandleCategoryController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/controller/HandleCategoryController.java deleted file mode 100644 index 6aee55154..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/controller/HandleCategoryController.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.handlecategory.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.dto.handlecategory.HandleCategoryDTO; -import com.elink.esua.epdc.dto.handlecategory.HandleCategoryTreeDTO; -import com.elink.esua.epdc.modules.handlecategory.excel.HandleCategoryExcel; -import com.elink.esua.epdc.modules.handlecategory.service.HandleCategoryService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 处理类别表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -@RestController -@RequestMapping("handlecategory") -public class HandleCategoryController { - - @Autowired - private HandleCategoryService handleCategoryService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = handleCategoryService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - HandleCategoryDTO data = handleCategoryService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody HandleCategoryDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - return handleCategoryService.save(dto); - } - - @PutMapping - public Result update(@RequestBody HandleCategoryDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - return handleCategoryService.update(dto); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - handleCategoryService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = handleCategoryService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, HandleCategoryExcel.class); - } - - /** - * @param - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 角色管理-项目处理类型授权 - * @Date 2019/12/24 10:43 - **/ - @GetMapping("getCategoryList") - public Result> getCategoryList(){ - return handleCategoryService.selectListHandleCategoryDTO(); - } -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/dao/HandleCategoryDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/dao/HandleCategoryDao.java deleted file mode 100644 index d567e2999..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/dao/HandleCategoryDao.java +++ /dev/null @@ -1,44 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.handlecategory.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.handlecategory.HandleCategoryTreeDTO; -import com.elink.esua.epdc.modules.handlecategory.entity.HandleCategoryEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 处理类别表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -@Mapper -public interface HandleCategoryDao extends BaseDao { - - /** - * @param - * @return java.util.List - * @Author yinzuomei - * @Description 角色管理-项目处理类型授权 查询语句 - * @Date 2019/12/24 10:45 - **/ - List selectListHandleCategoryDTO(); -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/entity/HandleCategoryEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/entity/HandleCategoryEntity.java deleted file mode 100644 index 4e9184a98..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/entity/HandleCategoryEntity.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.handlecategory.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 处理类别表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_handle_category") -public class HandleCategoryEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 处理类别值 - */ - private Integer categoryVal; - - /** - * 处理类别显示信息 - */ - private String categoryLabel; - - /** - * 可用状态(0-不可用，1-可用) - */ - private String available; - - /** - * 排序 - */ - private Integer sort; - - /** - * 处理类型编码 - */ - private String categoryCode; -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/excel/HandleCategoryExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/excel/HandleCategoryExcel.java deleted file mode 100644 index 5bb45a8d4..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/excel/HandleCategoryExcel.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.handlecategory.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 处理类别表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -@Data -public class HandleCategoryExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "处理类别值") - private Integer categoryVal; - - @Excel(name = "处理类别显示信息") - private String categoryLabel; - - @Excel(name = "可用状态(0-不可用，1-可用)") - private String available; - - @Excel(name = "排序") - private Integer sort; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/redis/HandleCategoryRedis.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/redis/HandleCategoryRedis.java deleted file mode 100644 index 0aa34a6a8..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/redis/HandleCategoryRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.handlecategory.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 处理类别表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -@Component -public class HandleCategoryRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/service/HandleCategoryService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/service/HandleCategoryService.java deleted file mode 100644 index 1d6e4587b..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/service/HandleCategoryService.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.handlecategory.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.handlecategory.HandleCategoryDTO; -import com.elink.esua.epdc.dto.handlecategory.HandleCategoryTreeDTO; -import com.elink.esua.epdc.modules.handlecategory.entity.HandleCategoryEntity; - -import java.util.List; -import java.util.Map; - -/** - * 处理类别表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -public interface HandleCategoryService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-20 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-12-20 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return HandleCategoryDTO - * @author generator - * @date 2019-12-20 - */ - HandleCategoryDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-20 - */ - Result save(HandleCategoryDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-20 - */ - Result update(HandleCategoryDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-12-20 - */ - void delete(String[] ids); - - /** - * @param - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 角色管理-项目处理类型授权 - * @Date 2019/12/24 10:44 - **/ - Result> selectListHandleCategoryDTO(); -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/service/impl/HandleCategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/service/impl/HandleCategoryServiceImpl.java deleted file mode 100644 index 4d8b8bb85..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handlecategory/service/impl/HandleCategoryServiceImpl.java +++ /dev/null @@ -1,150 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.handlecategory.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.handlecategory.HandleCategoryDTO; -import com.elink.esua.epdc.dto.handlecategory.HandleCategoryTreeDTO; -import com.elink.esua.epdc.modules.handlecategory.dao.HandleCategoryDao; -import com.elink.esua.epdc.modules.handlecategory.entity.HandleCategoryEntity; -import com.elink.esua.epdc.modules.handlecategory.redis.HandleCategoryRedis; -import com.elink.esua.epdc.modules.handlecategory.service.HandleCategoryService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 处理类别表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -@Service -public class HandleCategoryServiceImpl extends BaseServiceImpl implements HandleCategoryService { - - @Autowired - private HandleCategoryRedis handleCategoryRedis; - - @Override - public PageData page(Map params) { - String categoryLabel = (String)params.get("categoryLabel"); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.like(StringUtils.isNotBlank(categoryLabel), "CATEGORY_LABEL", categoryLabel.trim()); - wrapper.orderByDesc("sort"); - - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - wrapper - ); - return getPageData(page, HandleCategoryDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, HandleCategoryDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public HandleCategoryDTO get(String id) { - HandleCategoryEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, HandleCategoryDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Result save(HandleCategoryDTO dto) { - if(!checkCategoryCode(dto)){ - return new Result().error("处理类型编码已存在"); - } - HandleCategoryEntity entity = ConvertUtils.sourceToTarget(dto, HandleCategoryEntity.class); - insert(entity); - return new Result(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Result update(HandleCategoryDTO dto) { - if(!checkCategoryCode(dto)){ - return new Result().error("处理类型编码已存在"); - } - HandleCategoryEntity entity = ConvertUtils.sourceToTarget(dto, HandleCategoryEntity.class); - updateById(entity); - return new Result(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - /** - * @param - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 角色管理-项目处理类型授权 - * @Date 2019/12/24 10:44 - **/ - @Override - public Result> selectListHandleCategoryDTO() { - List list = baseDao.selectListHandleCategoryDTO(); - return new Result>().ok(list); - } - - /** - * @param dto - * @return boolean - * @Author yinzuomei - * @Description 校验编码是否唯一 - * @Date 2019/12/20 14:57 - **/ - public boolean checkCategoryCode(HandleCategoryDTO dto) { - boolean flag = true; - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("CATEGORY_CODE", dto.getCategoryCode().trim()) - .ne(StringUtils.isNotBlank(dto.getId()), FieldConstant.ID, dto.getId()); - List list = baseDao.selectList(wrapper); - if (null != list && list.size() > 0) { - flag = false; - } - return flag; - } -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/controller/HandleRoleDeptController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/controller/HandleRoleDeptController.java deleted file mode 100644 index 99ff7b2a2..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/controller/HandleRoleDeptController.java +++ /dev/null @@ -1,119 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.handleroledept.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.dto.handleroledept.HandleRoleDeptDTO; -import com.elink.esua.epdc.dto.handleroledept.form.HandleRoleDeptFormDTO; -import com.elink.esua.epdc.modules.handleroledept.excel.HandleRoleDeptExcel; -import com.elink.esua.epdc.modules.handleroledept.service.HandleRoleDeptService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 处理部门角色权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-26 - */ -@RestController -@RequestMapping("handleroledept") -public class HandleRoleDeptController { - - @Autowired - private HandleRoleDeptService handleRoleDeptService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = handleRoleDeptService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - HandleRoleDeptDTO data = handleRoleDeptService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody HandleRoleDeptDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - handleRoleDeptService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody HandleRoleDeptDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - handleRoleDeptService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - handleRoleDeptService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = handleRoleDeptService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, HandleRoleDeptExcel.class); - } - - /** - * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 保存角色对应的吹哨机构类型 - * @Date 2019/12/26 13:42 - **/ - @PostMapping("saveOrUpdate") - public Result saveOrUpdate(@RequestBody HandleRoleDeptFormDTO formDTO) { - return handleRoleDeptService.saveOrUpdate(formDTO); - } - - /** - * @param roleId - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 查询角色对应的吹哨部门列表 - * @Date 2019/12/26 13:52 - **/ - @GetMapping("queryWhistleDeptIdList/{roleId}") - public Result> queryWhistleDeptIdList(@PathVariable("roleId") Long roleId) { - return handleRoleDeptService.queryWhistleDeptIdList(roleId); - } - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/dao/HandleRoleDeptDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/dao/HandleRoleDeptDao.java deleted file mode 100644 index c7f429aae..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/dao/HandleRoleDeptDao.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.handleroledept.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.handleroledept.entity.HandleRoleDeptEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 处理部门角色权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-26 - */ -@Mapper -public interface HandleRoleDeptDao extends BaseDao { - - /** - * @param roleId - * @return java.util.List - * @Author yinzuomei - * @Description 查询角色对应的吹哨部门列表 - * @Date 2019/12/26 13:57 - **/ - List queryWhistleDeptIdList(String roleId); - - int deleteByRoleId(String roleId); -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/entity/HandleRoleDeptEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/entity/HandleRoleDeptEntity.java deleted file mode 100644 index b310eec6c..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/entity/HandleRoleDeptEntity.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.handleroledept.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 处理部门角色权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-26 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_handle_role_dept") -public class HandleRoleDeptEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 角色ID - */ - private String roleId; - - /** - * 部门ID - */ - private String deptId; - - /** - * 部门名称 - */ - private String deptName; - - /** - * 部门机构类型 - */ - private String deptType; - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/excel/HandleRoleDeptExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/excel/HandleRoleDeptExcel.java deleted file mode 100644 index 1ded3c949..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/excel/HandleRoleDeptExcel.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.handleroledept.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 处理部门角色权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-26 - */ -@Data -public class HandleRoleDeptExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "角色ID") - private String roleId; - - @Excel(name = "部门ID") - private String deptId; - - @Excel(name = "部门名称") - private String deptName; - - @Excel(name = "部门机构类型") - private String deptType; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/redis/HandleRoleDeptRedis.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/redis/HandleRoleDeptRedis.java deleted file mode 100644 index 15b458128..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/redis/HandleRoleDeptRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.handleroledept.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 处理部门角色权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-26 - */ -@Component -public class HandleRoleDeptRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/service/HandleRoleDeptService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/service/HandleRoleDeptService.java deleted file mode 100644 index 7e540df46..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/service/HandleRoleDeptService.java +++ /dev/null @@ -1,126 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.handleroledept.service; - - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.handleroledept.HandleRoleDeptDTO; -import com.elink.esua.epdc.dto.handleroledept.form.HandleRoleDeptFormDTO; -import com.elink.esua.epdc.dto.handleroledept.result.HandleRoleDeptPermissionDTO; -import com.elink.esua.epdc.modules.handleroledept.entity.HandleRoleDeptEntity; - -import java.util.List; -import java.util.Map; - -/** - * 处理部门角色权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-26 - */ -public interface HandleRoleDeptService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-26 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-12-26 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return HandleRoleDeptDTO - * @author generator - * @date 2019-12-26 - */ - HandleRoleDeptDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-26 - */ - void save(HandleRoleDeptDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-26 - */ - void update(HandleRoleDeptDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-12-26 - */ - void delete(String[] ids); - - /** - * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 保存角色对应的吹哨机构类型 - * @Date 2019/12/26 13:42 - **/ - Result saveOrUpdate(HandleRoleDeptFormDTO formDTO); - - /** - * @param roleId - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 查询角色对应的吹哨部门列表 - * @Date 2019/12/26 13:56 - **/ - Result> queryWhistleDeptIdList(Long roleId); - - /** - * @param roleId - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 根据角色id查询用户可吹哨部门信息，供下拉框使用 - * @Date 2019/12/26 15:01 - **/ - Result> listHandleRoleDeptPermission(String roleId); -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/service/impl/HandleRoleDeptServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/service/impl/HandleRoleDeptServiceImpl.java deleted file mode 100644 index f7a7572c4..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/handleroledept/service/impl/HandleRoleDeptServiceImpl.java +++ /dev/null @@ -1,167 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.handleroledept.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.handleroledept.HandleRoleDeptDTO; -import com.elink.esua.epdc.dto.handleroledept.form.HandleRoleDeptFormDTO; -import com.elink.esua.epdc.dto.handleroledept.result.HandleRoleDeptPermissionDTO; -import com.elink.esua.epdc.modules.handleroledept.dao.HandleRoleDeptDao; -import com.elink.esua.epdc.modules.handleroledept.entity.HandleRoleDeptEntity; -import com.elink.esua.epdc.modules.handleroledept.redis.HandleRoleDeptRedis; -import com.elink.esua.epdc.modules.handleroledept.service.HandleRoleDeptService; -import com.elink.esua.epdc.modules.rolecategory.entity.HandleRoleCategoryEntity; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 处理部门角色权限表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-26 - */ -@Service -public class HandleRoleDeptServiceImpl extends BaseServiceImpl implements HandleRoleDeptService { - - @Autowired - private HandleRoleDeptRedis handleRoleDeptRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, HandleRoleDeptDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, HandleRoleDeptDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public HandleRoleDeptDTO get(String id) { - HandleRoleDeptEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, HandleRoleDeptDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(HandleRoleDeptDTO dto) { - HandleRoleDeptEntity entity = ConvertUtils.sourceToTarget(dto, HandleRoleDeptEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(HandleRoleDeptDTO dto) { - HandleRoleDeptEntity entity = ConvertUtils.sourceToTarget(dto, HandleRoleDeptEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - /** - * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 保存角色对应的吹哨机构类型 - * @Date 2019/12/26 13:42 - **/ - @Override - public Result saveOrUpdate(HandleRoleDeptFormDTO formDTO) { - //先删除角色吹哨部门权限关系 - deleteByRoleId(formDTO.getRoleId()); - //角色没有一个吹哨部门的情况 - if (CollUtil.isEmpty(formDTO.getHandleRoleDeptDTOList())) { - return new Result(); - } - //保存角色和处理类别关系 - List entityList = ConvertUtils.sourceToTarget(formDTO.getHandleRoleDeptDTOList(), - HandleRoleDeptEntity.class); - this.insertBatch(entityList); - return new Result(); - } - - private void deleteByRoleId(String roleId) { - baseDao.deleteByRoleId(roleId); - } - - /** - * @param roleId - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 查询角色对应的吹哨部门列表 - * @Date 2019/12/26 13:56 - **/ - @Override - public Result> queryWhistleDeptIdList(Long roleId) { - List list = baseDao.queryWhistleDeptIdList(roleId.toString()); - return new Result>().ok(list); - } - - /** - * @param roleId - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 根据角色id查询用户可吹哨部门信息，供下拉框使用 - * @Date 2019/12/26 15:01 - **/ - @Override - public Result> listHandleRoleDeptPermission(String roleId) { - if (StringUtils.isBlank(roleId)) { - return new Result>().error("角色id不能为空"); - } - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(roleId), "ROLE_ID", roleId); - List handleRoleDeptEntityList = baseDao.selectList(wrapper); - List list = ConvertUtils.sourceToTarget(handleRoleDeptEntityList, HandleRoleDeptPermissionDTO.class); - return new Result>().ok(list); - } - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 914006d57..80ab40693 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -27,14 +27,11 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; import com.elink.esua.epdc.dto.events.form.EventDeleteCommentsFormDTO; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO; import com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO; import com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO; -import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO; -import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO; import com.elink.esua.epdc.modules.item.excel.ItemExcel; import com.elink.esua.epdc.modules.item.service.ItemService; import org.springframework.beans.factory.annotation.Autowired; @@ -60,34 +57,32 @@ public class ItemController { /** * 项目列表 - * * @Params: [params] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/16 9:56 */ @GetMapping("page") - public Result> page(@RequestParam Map params) { + public Result> page(@RequestParam Map params){ PageData page = itemService.listOfItemsForPCEnd(params); return new Result>().ok(page); } /** * 项目处理详情 - * * @Params: [id] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang * @Date: 2019/9/16 9:56 */ @GetMapping("{id}") - public Result get(@PathVariable("id") String id) { + public Result get(@PathVariable("id") String id){ ItemDetailForPCEndResultDTO data = itemService.getItemDetailById(id); return new Result().ok(data); } @PostMapping - public Result save(@RequestBody ItemDTO dto) { + public Result save(@RequestBody ItemDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); itemService.save(dto); @@ -95,7 +90,7 @@ public class ItemController { } @PutMapping - public Result update(@RequestBody ItemDTO dto) { + public Result update(@RequestBody ItemDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); itemService.update(dto); @@ -103,7 +98,7 @@ public class ItemController { } @DeleteMapping - public Result delete(@RequestBody String[] ids) { + public Result delete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); itemService.delete(ids); @@ -118,7 +113,6 @@ public class ItemController { /** * 项目处理提交 - * * @Params: [dto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -132,23 +126,21 @@ public class ItemController { /** * 项目内容详情 - * * @Params: [id] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang * @Date: 2019/9/16 9:56 */ @GetMapping("contentDetail/{id}") - public Result getItemContentDetail(@PathVariable("id") String id) { + public Result getItemContentDetail(@PathVariable("id") String id){ ItemContentForPCEndResultDTO data = itemService.getItemContentDetail(id); return new Result().ok(data); } /** * 评论列表 - * * @Params: [params] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/6 18:58 */ @@ -160,7 +152,6 @@ public class ItemController { /** * 屏蔽评论 - * * @Params: [commentId] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -171,44 +162,4 @@ public class ItemController { return itemService.modifyCommentById(eventDeleteCommentsFormDTO.getCommentIds()); } - /*** - * kpi-统计群众对问题处理的满意度 - * @param - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author qushutong - * @date 2019/12/18 10:27 - */ - @PostMapping("statPeopleEvaluationMetaData") - public Result> statPeopleEvaluationMetaData(@RequestBody KpiMetaDataOfEventsFormDTO metaDataFormDto) { - List list = itemService.statPeopleEvaluationMetaData(metaDataFormDto); - return new Result().ok(list); - } - - - /** - * kpi- 统计项目处理数 包括：网格呼叫总数，网格呼叫被响应数，网格呼叫被关闭数 - * - * @param metaDataFormDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author qushutong - * @date 2019/12/18 16:02 - */ - @PostMapping("statItemHandleAmountMetaData") - public Result> statItemHandleAmountMetaData(@RequestBody KpiMetaDataOfEventsFormDTO metaDataFormDto) { - List list = itemService.statItemHandleAmount(metaDataFormDto); - return new Result().ok(list); - } - - /*** - * kpi- 网格对项目处理的评价 不满意 满意 非常满意 统计 - * @param metaDataFormDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author qushutong - * @date 2019/12/20 15:37 - */ - @PostMapping("statGridEvaluationMetaData") - public Result> statGridEvaluationMetaData(@RequestBody KpiMetaDataOfEventsFormDTO metaDataFormDto) { - List list = itemService.statGridEvaluationMetaData(metaDataFormDto); - return new Result().ok(list); - } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index d63b21455..89358e90a 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java @@ -18,8 +18,6 @@ package com.elink.esua.epdc.modules.item.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.result.KpiItemTimeLimitByDeptResultDTO; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; import com.elink.esua.epdc.dto.item.form.ItemCategoryStatisticsFormDTO; @@ -27,8 +25,6 @@ import com.elink.esua.epdc.dto.item.form.ItemDetailFormDTO; import com.elink.esua.epdc.dto.item.form.ItemFormDTO; import com.elink.esua.epdc.dto.item.form.ItemStatisticsFormDTO; import com.elink.esua.epdc.dto.item.result.*; -import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO; -import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO; import com.elink.esua.epdc.modules.item.entity.ItemEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -47,7 +43,6 @@ public interface ItemDao extends BaseDao { /** * 根据议题ID获取项目信息 - * * @Params: [issueId] * @Return: com.elink.esua.epdc.dto.item.ItemDTO * @Author: liuchuang @@ -57,7 +52,6 @@ public interface ItemDao extends BaseDao { /** * 移动端-项目列表 - * * @Params: [formDto] * @Return: java.util.List * @Author: liuchuang @@ -66,10 +60,11 @@ public interface ItemDao extends BaseDao { List selectListOfItems(ItemFormDTO formDto, int[] states); /** + * * 移动端-我的项目列表 * - * @return java.util.List * @params [formDto, states] + * @return java.util.List * @author liuchuang * @since 2019/10/31 16:28 */ @@ -77,7 +72,6 @@ public interface ItemDao extends BaseDao { /** * 移动端-项目详情 - * * @Params: [formDto] * @Return: com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO * @Author: liuchuang @@ -87,17 +81,14 @@ public interface ItemDao extends BaseDao { /** * 工作端-项目列表 - * - * @Params: [formDto, deptIdList] + * @Params: [formDto,deptIdList] * @Return: java.util.List * @Author: lipengfei * @Date: 2019/11/19 16:50 */ - List selectListOfItemsByWork(ItemFormDTO formDto, List deptIdList); - + List selectListOfItemsByWork(ItemFormDTO formDto,List deptIdList); /** * 工作端-项目详情 - * * @Params: [formDto] * @Return: com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO * @Author: lipengfei @@ -108,7 +99,6 @@ public interface ItemDao extends BaseDao { /** * 移动端-议题分类统计 - * * @Params: [formDTO] * @Return: com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO * @Author: liuchuang @@ -117,9 +107,9 @@ public interface ItemDao extends BaseDao { ItemCategoryStatisticsResultDTO selectOneItemCategoryStatistics(ItemCategoryStatisticsFormDTO formDTO); + /** * PC端项目列表 - * * @Params: [params] * @Return: java.util.List * @Author: liuchuang @@ -129,7 +119,6 @@ public interface ItemDao extends BaseDao { /** * PC端项目详情 - * * @Params: [itemId] * @Return: com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO * @Author: liuchuang @@ -139,7 +128,6 @@ public interface ItemDao extends BaseDao { /** * 项目处理进度 - * * @Params: [issueId, itemId, outOrInside(0：内部数据， 1：外部数据)] * @Return: com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO * @Author: liuchuang @@ -149,7 +137,6 @@ public interface ItemDao extends BaseDao { /** * 业务端-项目处理进度 - * * @Params: [itemId] * @Return: com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO * @Author: liuchuang @@ -170,29 +157,30 @@ public interface ItemDao extends BaseDao { /** * 项目内容详情 - * * @Params: [itemId] * @Return: com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO * @Author: liuchuang * @Date: 2019/9/17 10:37 */ - ItemContentForPCEndResultDTO selectItemContentForPCEnd(String itemId); + ItemContentForPCEndResultDTO selectItemContentForPCEnd(String itemId); /** + * * 项目处理发送菜单消息 * - * @return int * @params [deptId, state] + * @return int * @author liuchuang * @since 2019/10/30 13:28 */ int selectCountOfItemDeptNotice(Long deptId, int state); /** + * * 根据吹哨部门ID统计吹哨部门待处理项目数量 * - * @return int * @params [deptId] + * @return int * @author liuchuang * @since 2019/10/30 13:33 */ @@ -200,7 +188,6 @@ public interface ItemDao extends BaseDao { /** * 移动端-项目统计 - * * @Params: [formDTO] * @Return: com.elink.esua.epdc.dto.item.result.ItemStatisticsResultDTO * @Author: lipengfei @@ -208,68 +195,6 @@ public interface ItemDao extends BaseDao { */ ItemStatisticsResultDTO selectOneItemStatistics(ItemStatisticsFormDTO formDTO); - /** - * 绩效考核 - 项目 - 根据部门id,查询考核周期内群众满意度 - * - * @param metaDataFormDto - * @return java.util.List - * @author qushutong - * @date 2019/12/20 14:30 - */ - List selectListPeopleEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto); - - /*** - * 绩效考核 - 项目 - 网格对项目处理的评价 不满意 满意 非常满意 统计 - * @param metaDataFormDto - * @return java.util.List - * @author qushutong - * @date 2019/12/20 15:43 - */ - List selectListGridEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto); - - /*** - * 绩效考核 - 项目 - 网格吹哨总数 - * @param metaDataFormDto - * @param metaDataCode 元数据编码，不可变参数 ：KpiMetaDataEnum.GRID_CALL_SUPERIOR_AMOUNT.getValue() - * @return java.util.List - * @author qushutong - * @date 2019/12/18 16:23 - */ - List selectListItemGridCallAmount(@Param("metaDataFormDto") KpiMetaDataOfEventsFormDTO metaDataFormDto, - @Param("metaDataCode") String metaDataCode); - - /*** - * 绩效考核 - 项目 - 查询每个部门吹哨的所有项目，与项目吹哨时间 - * @param metaDataFormDto - * @return java.util.List - * @author qushutong - * @date 2019/12/19 17:16 - */ - List selctListItemTimeLimitByDept(KpiMetaDataOfEventsFormDTO metaDataFormDto); - - /** - * 绩效考核 - 项目 - 按部门id查询与项目有效响应时限 网格呼叫被响应总数 - * - * @param kpiItemTimeLimitByDeptList - * @param metaDataCode 元数据编码，不可变参数 ：KpiMetaDataEnum.GRID_CALL_SUPERIOR_RESP_AMOUNT.getValue() - * @return java.util.List - * @author qushutong - * @date 2019/12/23 13:27 - */ - List selectListItemRespondAmount(@Param("timeLimitList") List kpiItemTimeLimitByDeptList, - @Param("metaDataCode") String metaDataCode); - - /** - * 绩效考核 - 项目 - 按部门id查询与项目有效办结时限 网格呼叫被办结总数 - * - * @param kpiItemTimeLimitByDeptList - * @param metaDataCode 元数据编码， 不可变参数 ： KpiMetaDataEnum.GRID_CALL_SUPERIOR_CLOSE_AMOUNT.getValue() - * @return java.util.List - * @author qushutong - * @date 2019/12/23 13:37 - */ - List selectListItemCloseAmount(@Param("timeLimitList") List kpiItemTimeLimitByDeptList, - @Param("metaDataCode") String metaDataCode); /** * * 删除项目处理进度表历史记录 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEvaluateDeptEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEvaluateDeptEntity.java index 25478848d..68a1a69cd 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEvaluateDeptEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEvaluateDeptEntity.java @@ -26,41 +26,41 @@ import lombok.EqualsAndHashCode; import java.util.Date; /** - * 部门满意度评价表 + * 部门满意度评价表 * * @author qu qu@elink-cn.com * @since v1.0.0 2019-09-17 */ @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper=false) @TableName("epdc_item_evaluate_dept") public class ItemEvaluateDeptEntity extends BaseEpdcEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * 项目ID - */ - private String itemId; + /** + * 项目ID + */ + private String itemId; /** * 被评价部门ID */ - private Long deptId; + private Long deptId; /** * 被评价部门名称 */ - private String deptName; + private String deptName; /** * 评价满意度 */ - private Integer evaluationLevel; + private Integer evaluationLevel; /** * 操作人部门ID */ - private Long createdDeptId; + private Long createdDeptId; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 78d9e3baf..7827cfa9f 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -21,13 +21,10 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.item.ItemDTO; import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; -import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO; -import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO; import com.elink.esua.epdc.modules.item.entity.ItemEntity; import java.util.List; @@ -53,7 +50,6 @@ public interface ItemService extends BaseService { /** * PC端项目列表 - * * @Params: [params] * @Return: com.elink.esua.epdc.commons.tools.page.PageData * @Author: liuchuang @@ -83,7 +79,6 @@ public interface ItemService extends BaseService { /** * 项目详情 - * * @Params: [id] * @Return: com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO * @Author: liuchuang @@ -123,7 +118,6 @@ public interface ItemService extends BaseService { /** * 根据议题ID获取项目信息 - * * @Params: [issueId] * @Return: com.elink.esua.epdc.modules.item.entity.ItemEntity * @Author: liuchuang @@ -133,19 +127,16 @@ public interface ItemService extends BaseService { /** * 移动端-项目列表 - * * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/9 16:47 */ Result> listItems(ItemFormDTO formDto); - /** * 项目列表-移动app端用 - * * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei * @Date: 2019/10/19 16:47 */ @@ -153,7 +144,6 @@ public interface ItemService extends BaseService { /** * 移动端-项目详情 - * * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -163,7 +153,6 @@ public interface ItemService extends BaseService { /** * 工作端-项目详情 - * * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -174,17 +163,14 @@ public interface ItemService extends BaseService { /** * 工作端-获取满意度评价结果 - * * @Params: [evaluationFormDTO] * @Return: com.elink.esua.epdc.commons.tools.utils.Result { /** * 项目分类统计 - * * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -203,7 +188,6 @@ public interface ItemService extends BaseService { /** * 项目处理进度 - * * @Params: [itemId, outOrInside(0：内部数据， 1：外部数据)] * @Return: java.util.List * @Author: liuchuang @@ -213,7 +197,6 @@ public interface ItemService extends BaseService { /** * 项目处理提交 - * * @Params: [dto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -223,7 +206,6 @@ public interface ItemService extends BaseService { /** * 项目内容详情 - * * @Params: [itemId] * @Return: com.elink.esua.epdc.dto.item.result.ItemContentForPCEndResultDTO * @Author: liuchuang @@ -233,7 +215,6 @@ public interface ItemService extends BaseService { /** * 评论列表 - * * @Params: [params] * @Return: com.elink.esua.epdc.commons.tools.page.PageData * @Author: liuchuang @@ -243,7 +224,6 @@ public interface ItemService extends BaseService { /** * 屏蔽评论 - * * @Params: [commentId] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: liuchuang @@ -253,29 +233,30 @@ public interface ItemService extends BaseService { /** * 我的项目列表 - * * @Params: [formDTO] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/17 13:37 */ Result> listItemsOfMine(ItemOfMineFormDTO formDTO); /** + * * 项目处理发送菜单消息 * - * @return void * @params [deptId] + * @return void * @author liuchuang * @since 2019/10/30 9:12 */ void sendItemHandleMenuNotice(Long deptId, Long userId); /** + * * 项目处理发送菜单消息-吹哨部门 * - * @return void * @params [deptIds] + * @return void * @author liuchuang * @since 2019/10/30 12:26 */ @@ -283,7 +264,6 @@ public interface ItemService extends BaseService { /** * 项目统计 - * * @Params: [formDto] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -293,7 +273,6 @@ public interface ItemService extends BaseService { /** * 项目处理进度 - * * @Params: [itemId] * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei @@ -302,30 +281,33 @@ public interface ItemService extends BaseService { List listOfItemHandleProgressByWork(String itemId); /** + * * 项目处理进度-居民端 * - * @return java.util.List * @params [itemId] + * @return java.util.List * @author liuchuang * @since 2019/12/24 9:03 */ List listOfItemHandleProgressByMobile(String itemId); /** + * * 拉取市北网格化平台项目进度情况 * - * @return com.elink.esua.epdc.commons.tools.utils.Result * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result * @author liuchuang * @since 2019/12/25 13:28 */ Result queryItemHandle(); /** + * * 网格化平台处理情况回调 * - * @return com.elink.esua.epdc.commons.tools.utils.Result * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result * @author liuchuang * @since 2019/12/26 13:52 */ @@ -339,33 +321,4 @@ public interface ItemService extends BaseService { * @Date 2020/1/13 16:55 **/ Result> queryHandleCategories(); - - - /*** - * kpi查询问题满意度 - * @param metaDataFormDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author qushutong - * @date 2019/12/18 10:30 - */ - List statPeopleEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto); - - /** - * 统计项目处理数 包括：网格呼叫总数，网格呼叫被响应数，网格呼叫被关闭数 - * - * @param metaDataFormDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author qushutong - * @date 2019/12/18 16:02 - */ - List statItemHandleAmount(KpiMetaDataOfEventsFormDTO metaDataFormDto); - - /*** - * 绩效考核 - 项目 - 网格对项目处理的评价 不满意 满意 非常满意 统计 - * @param metaDataFormDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author qushutong - * @date 2019/12/20 15:40 - */ - List statGridEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java index 51d2d202a..4aa40316d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemEvaluateDeptServiceImpl.java @@ -16,7 +16,6 @@ */ package com.elink.esua.epdc.modules.item.service.impl; - import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.result.ItemDeptEvaluateResultDTO; @@ -31,7 +30,7 @@ import java.util.Arrays; import java.util.List; /** - * 部门满意度评价表 + * 部门满意度评价表 * * @author qu qu@elink-cn.com * @since v1.0.0 2019-09-17 @@ -50,7 +49,7 @@ public class ItemEvaluateDeptServiceImpl extends BaseServiceImpl evaluateDeptDTOS, String itemId, Long createdDeptId) { List evaluateDeptEntities = new ArrayList<>(); - for (ItemEvaluateDeptDTO dto : + for (ItemEvaluateDeptDTO dto: evaluateDeptDTOS) { ItemEvaluateDeptEntity entity = new ItemEvaluateDeptEntity(); entity.setDeptId(dto.getDeptId()); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 2000628df..f5ec9ff71 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -28,8 +28,6 @@ import com.elink.esua.epdc.commons.tools.enums.InterfaceLogBusinessTypeEnum; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.redis.RedisKeys; -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; @@ -44,18 +42,13 @@ import com.elink.esua.epdc.dto.MenuNoticeDTO; import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.events.EpdcEventsCommentsDTO; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueProgressResultDTO; import com.elink.esua.epdc.dto.item.*; import com.elink.esua.epdc.dto.item.form.*; import com.elink.esua.epdc.dto.item.result.*; -import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO; -import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO; -import com.elink.esua.epdc.dto.result.KpiItemTimeLimitByDeptResultDTO; import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum; import com.elink.esua.epdc.enums.ItemHandleCategoryEnum; -import com.elink.esua.epdc.enums.KpiMetaDataEnum; import com.elink.esua.epdc.gird.shibei.api.ShiBeiCityGridApi; import com.elink.esua.epdc.gird.shibei.constant.CommonConstants; import com.elink.esua.epdc.gird.shibei.contants.ApiConstants; @@ -82,7 +75,6 @@ import com.elink.esua.epdc.modules.item.dao.ItemGridPlatformDao; import com.elink.esua.epdc.modules.item.dao.ItemHandleProcessDao; import com.elink.esua.epdc.modules.item.entity.*; import com.elink.esua.epdc.modules.item.service.*; -import com.elink.esua.epdc.modules.rolecategory.service.HandleRoleCategoryService; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -132,10 +124,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Autowired private ImgService imgService; - - @Autowired - private RedisUtils redisUtils; - @Autowired private ImgDao imgDao; @@ -162,9 +150,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Autowired private IssueOverseeResultsTask issueOverseeResultsTask; - @Autowired - private HandleRoleCategoryService handleRoleCategoryService; - @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -183,10 +168,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { if (params.get("streetId") != null && !"".equals(params.get("streetId"))) { Result resultdept = adminFeignClient.getSysDeptInfo(Long.parseLong(params.get("streetId").toString())); - SysDeptDTO dept = resultdept.getData(); + SysDeptDTO dept =resultdept.getData(); Object deptId = params.get("streetId"); if (OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(dept.getTypeKey())) { - params.put("districtDeptId", deptId); + params.put("districtDeptId",deptId); params.remove("streetId"); } } @@ -271,12 +256,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem List data = baseDao.selectListOfItems(formDto, states); return new Result>().ok(data); } - /** * 项目列表-移动app端用 - * * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lipengfei * @Date: 2019/10/19 16:47 */ @@ -287,7 +270,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem List data = baseDao.selectListOfItemsByWork(formDto, SecurityUser.getUser().getDeptIdList()); return new Result>().ok(data); } - @Override public Result getItemDetailByWork(String id) { ItemDetailResultDTO resultDTO = baseDao.selectOneOfItemDetailForWork(id); @@ -332,8 +314,21 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 详情 ItemDetailForPCEndResultDTO resultDTO = baseDao.selectOneOfItemDetailForPCEnd(id); UserDetail user = SecurityUser.getUser(); + // 获取已流转部门 + List itemDeptDTOS = itemDeptService.listOfItemDept(id, user.getDeptId()); // 获取可操作处理和可流转部门 - resultDTO = getHandleCategoryAndCirculationDept(resultDTO, user.getId()); + switch (user.getTypeKey()) { + case OrganizationTypeConstant.ORG_TYPE_GRID_PARTY: + resultDTO = this.getHandleCategoryAndCirculationDeptOfGrid(resultDTO, itemDeptDTOS); + break; + case OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY: + case OrganizationTypeConstant.ORG_TYPE_STREET_DEPT: + case OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT: + resultDTO = this.getHandleCategory(resultDTO); + break; + case OrganizationTypeConstant.ORG_TYPE_STREET_PARTY: + resultDTO = this.getHandleCategoryAndCirculationDeptOfStreet(resultDTO, itemDeptDTOS); + } //获取项目基本信息 ItemEntity entity = this.selectById(id); // 获取项目处理进度 @@ -347,29 +342,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem return resultDTO; } - /** - * @param resultDTO - * @param userId - * @return com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO - * @Author yinzuomei - * @Description 可处理操作、吹哨部门数据来源改为从关系表获取 - * @Date 2020/2/3 8:02 - **/ - private ItemDetailForPCEndResultDTO getHandleCategoryAndCirculationDept(ItemDetailForPCEndResultDTO resultDTO, - Long userId) { - Result> roleIdList = adminFeignClient.getRoleIdList(userId); - if (!roleIdList.success() || roleIdList.getData().isEmpty()) { - throw new RenException("获取角色Id列表失败"); - } - //可处理操作 - List handleResultDTOS = handleRoleCategoryService.listItemHandleResultDTO(roleIdList.getData()); - //可流转部门 - List deptResultDTOS = handleRoleCategoryService.listItemCirculationDeptResultDTO(roleIdList.getData()); - resultDTO.setHandleResultDTOS(handleResultDTOS); - resultDTO.setDeptResultDTOS(deptResultDTOS); - return resultDTO; - } - /** * 项目详情-网格-可做操作和可流转部门 * @@ -458,16 +430,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem return resultDTO; } - /** * 工作端-获取可吹哨部门 - * * @Return: com.elink.esua.epdc.commons.tools.utils.Result * @Author: lipengfei * @Date: 2019/11/19 16:34 */ @Override - public Result> whistlingDept() { + public Result> whistlingDept(){ UserDetail user = SecurityUser.getUser(); List deptResultDTOS = new ArrayList<>(); // 网格-可做操作和可流转部门 @@ -645,10 +615,10 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 发送菜单消息-待处理项目-吹哨部门 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) { - boolean reportFlag = this.checkReport(dto.getId()); - if (reportFlag) { - return new Result().error("当前项目已上报网格化平台"); - } + boolean reportFlag = this.checkReport(dto.getId()); + if (reportFlag) { + return new Result().error("当前项目已上报网格化平台"); + } handleProcessEntity.setState(dto.getHandleCategory()); informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_REPORT); GridDto gridDto = null; @@ -711,7 +681,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 通知部门Id（网格） itemInfoDto.setDeptId(entity.getGridId().toString()); itemInformationService.insert(itemInfoDto); - // 街道部门和区直部门 + // 街道部门和区直部门 } else if (OrganizationTypeConstant.ORG_TYPE_STREET_DEPT.equals(user.getTypeKey()) || OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT.equals(user.getTypeKey())) { //插入项目消息表（网格和街道） // 通知部门Id（网格） @@ -719,20 +689,20 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemInformationService.insert(itemInfoDto); //修改通知部门Id（街道Id） ItemInformationEntity itemInfoStreetDto = new ItemInformationEntity(); - BeanUtils.copyProperties(itemInfoDto, itemInfoStreetDto); + BeanUtils.copyProperties(itemInfoDto,itemInfoStreetDto); itemInfoStreetDto.setId(null); - Result result = adminFeignClient.getCompleteDept(entity.getGridId()); + Result result =adminFeignClient.getCompleteDept(entity.getGridId()); CompleteDeptDTO comDeptDto = result.getData(); itemInfoStreetDto.setDeptId(comDeptDto.getStreetId().toString()); itemInformationService.insert(itemInfoStreetDto); } - // 吹哨处理 - } else if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { - List deptList = dto.getDeptResultDTOS(); + // 吹哨处理 + }else if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { + List deptList = dto.getDeptResultDTOS(); // 拼接被吹哨部门 String whistlDept = ""; - for (int i = 0; i < deptList.size(); i++) { - ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO) deptList.get(i); + for (int i =0; i < deptList.size(); i++) { + ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO)deptList.get(i); if (i == 0) { whistlDept += indexDto.getDeptName(); } else { @@ -744,12 +714,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem for (ItemCirculationDeptResultDTO itemDto : deptList) { // 通知部门Id（被吹哨部门） ItemInformationEntity itemInfoEachDto = new ItemInformationEntity(); - BeanUtils.copyProperties(itemInfoDto, itemInfoEachDto); + BeanUtils.copyProperties(itemInfoDto,itemInfoEachDto); itemInfoEachDto.setId(null); itemInfoEachDto.setDeptId(itemDto.getDeptId().toString()); itemInformationService.insert(itemInfoEachDto); } - // 关闭和结案处理 + // 关闭和结案处理 } else { // 查询已吹哨部门 List oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), SecurityUser.getDeptId()); @@ -757,7 +727,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem for (Long itemDeptId : oldDeptIds) { // 通知部门Id（被吹哨部门） ItemInformationEntity itemInfoEachDto = new ItemInformationEntity(); - BeanUtils.copyProperties(itemInfoDto, itemInfoEachDto); + BeanUtils.copyProperties(itemInfoDto,itemInfoEachDto); itemInfoEachDto.setId(null); itemInfoEachDto.setDeptId(itemDeptId.toString()); itemInformationService.insert(itemInfoEachDto); @@ -776,12 +746,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem this.sendWhistlingDeptItemHandleMenuNotice(Collections.singletonList(user.getDeptId()), null); } //项目外部处理意见图片保存 - if (dto.getOutHandleImages() != null && dto.getOutHandleImages().size() > 0) { - imgService.saveImages(dto.getOutHandleImages(), handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE); + if(dto.getOutHandleImages()!= null && dto.getOutHandleImages().size()>0){ + imgService.saveImages(dto.getOutHandleImages(),handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_OUT_HANDLE); } //项目处理意见图片保存 - if (dto.getHandleImages() != null && dto.getHandleImages().size() > 0) { - imgService.saveImages(dto.getHandleImages(), handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_HANDLE); + if(dto.getHandleImages()!= null && dto.getHandleImages().size()>0){ + imgService.saveImages(dto.getHandleImages(),handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_HANDLE); } //居民端项目关闭、结案-短信通知 if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || @@ -929,55 +899,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem newsTask.eventMenuNotice(menuNoticeDTO, userId); } } - @Override public Result getItemStatistics(ItemStatisticsFormDTO formDto) { ItemStatisticsResultDTO resultDTO = baseDao.selectOneItemStatistics(formDto); return new Result().ok(resultDTO); } - - - @Override - public List statPeopleEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto) { - return baseDao.selectListPeopleEvaluationMetaData(metaDataFormDto); - } - - @Override - public List statItemHandleAmount(KpiMetaDataOfEventsFormDTO metaDataFormDto) { - List kpiMetaDataDTOList = new ArrayList<>(); - // 按部门id查询 部门网格呼叫事件总数 - List callAmountOfDept = baseDao.selectListItemGridCallAmount(metaDataFormDto, KpiMetaDataEnum.GRID_CALL_SUPERIOR_AMOUNT.getValue()); - kpiMetaDataDTOList.addAll(callAmountOfDept); - - //查询各个街道的项目呼叫有效时间 有效结案时间 - List KpiItemTimeLimitByDeptList = baseDao.selctListItemTimeLimitByDept(metaDataFormDto); - for (KpiItemTimeLimitByDeptResultDTO itemTimeLimitByDept : KpiItemTimeLimitByDeptList) { - if (StringUtils.isBlank(itemTimeLimitByDept.getItemId()) || StringUtils.isBlank(itemTimeLimitByDept.getCatecoryId())) { - continue; - } - Map map = (Map) redisUtils.get(RedisKeys.getKpiItemTimeLimitKey(itemTimeLimitByDept.getCatecoryId())); - itemTimeLimitByDept.setValidCloseTime(map.get(KpiItemConstant.CLOSE_ITEM_TIME_LIMIT)); - itemTimeLimitByDept.setValidRespondTime(map.get(KpiItemConstant.RESPOND_ITEM_TIME_LIMIT)); - } - - // 按部门id查询与项目有效响应时限 网格呼叫被响应总数 - List itemRespondAmountByDeot = baseDao.selectListItemRespondAmount(KpiItemTimeLimitByDeptList, KpiMetaDataEnum.GRID_CALL_SUPERIOR_RESP_AMOUNT.getValue()); - kpiMetaDataDTOList.addAll(itemRespondAmountByDeot); - - // 按部门id查询与项目有效办结时限 网格呼叫被办结总数 - List itemCloseAmountByDeot = baseDao.selectListItemCloseAmount(KpiItemTimeLimitByDeptList, KpiMetaDataEnum.GRID_CALL_SUPERIOR_CLOSE_AMOUNT.getValue()); - kpiMetaDataDTOList.addAll(itemCloseAmountByDeot); - - return kpiMetaDataDTOList; - } - - @Override - public List statGridEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto) { - List list = baseDao.selectListGridEvaluationMetaData(metaDataFormDto); - return list; - } - /** * @param dto * @return void @@ -1003,10 +930,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem } /** + * * 保存接口调用日志 * - * @return void * @params [referenceId, businessType, interfaceName, successFlag, callMsgBody, returnMsgBody] + * @return void * @author liuchuang * @since 2019/12/26 11:08 */ @@ -1022,101 +950,101 @@ public class ItemServiceImpl extends BaseServiceImpl implem interfaceLogService.insert(interfaceLogEntity); } - /** - * @param itemEntity - * @return com.elink.esua.gird.shibei.dto.form.SendInputInfoFormDto - * @Author yinzuomei - * @Description 组装案件信息上报接口入参 - * @Date 2019/12/25 13:14 - **/ - private SendInputInfoFormDto packageReportEntity(ItemEntity itemEntity) throws Exception { - UserDetail user = SecurityUser.getUser(); - SendInputInfoFormDto formDto = new SendInputInfoFormDto(); - // 案件来源 - formDto.setInfoSourceID(CommonConstants.INFO_SOURCE_ID); - // 渠道来源 - formDto.setReportDept(CommonConstants.REPORT_DEPT); - // 案件属性 - formDto.setInfoTypeID(CommonConstants.INFO_TYPE_ID); - // 案件大类 - formDto.setInfoBC(CommonConstants.INFO_BC); - // 案件小类 - formDto.setInfoSC(CommonConstants.INFO_SC); - // 案件子类 - formDto.setInfoZC(CommonConstants.INFO_ZC); - // 发生地址 - formDto.setStandardAddress(itemEntity.getIssueAddress()); - // 问题描述 + /** + * @param itemEntity + * @return com.elink.esua.gird.shibei.dto.form.SendInputInfoFormDto + * @Author yinzuomei + * @Description 组装案件信息上报接口入参 + * @Date 2019/12/25 13:14 + **/ + private SendInputInfoFormDto packageReportEntity(ItemEntity itemEntity) throws Exception { + UserDetail user = SecurityUser.getUser(); + SendInputInfoFormDto formDto = new SendInputInfoFormDto(); + // 案件来源 + formDto.setInfoSourceID(CommonConstants.INFO_SOURCE_ID); + // 渠道来源 + formDto.setReportDept(CommonConstants.REPORT_DEPT); + // 案件属性 + formDto.setInfoTypeID(CommonConstants.INFO_TYPE_ID); + // 案件大类 + formDto.setInfoBC(CommonConstants.INFO_BC); + // 案件小类 + formDto.setInfoSC(CommonConstants.INFO_SC); + // 案件子类 + formDto.setInfoZC(CommonConstants.INFO_ZC); + // 发生地址 + formDto.setStandardAddress(itemEntity.getIssueAddress()); + // 问题描述 formDto.setDescription(itemEntity.getItemContent());// 测试999勿删谢谢 - // 反映人 - formDto.setReportPerson(itemEntity.getNickName());// itemEntity.getNickName()测试人员 - // 联系方式 - formDto.setContactMode(itemEntity.getMobile()); - double[] gps = GPSUtils.gcj02_To_Gps84(itemEntity.getIssueLatitude(), itemEntity.getIssueLongitude()); - // 坐标X + // 反映人 + formDto.setReportPerson(itemEntity.getNickName());// itemEntity.getNickName()测试人员 + // 联系方式 + formDto.setContactMode(itemEntity.getMobile()); + double[] gps= GPSUtils.gcj02_To_Gps84(itemEntity.getIssueLatitude(),itemEntity.getIssueLongitude()); + // 坐标X formDto.setCoordX(new BigDecimal(gps[1]).setScale(15, BigDecimal.ROUND_HALF_UP)); - // 坐标Y + // 坐标Y formDto.setCoordY(new BigDecimal(gps[0]).setScale(15, BigDecimal.ROUND_HALF_UP)); - // 监督员编号 - formDto.setKeepersn(""); - // 操作时间 - formDto.setInsertTime(new Date()); - // 操作人 - formDto.setInsertUser(user.getRealName());// - // 外系统编号 - formDto.setHotLinesn(itemEntity.getId()); - // 先查询网格对应街道id - Result completeDeptDTOResult = adminFeignClient.getCompleteDept(itemEntity.getGridId()); - if (!completeDeptDTOResult.success()) { - throw new Exception("根据网格ID获取所有上级机构信息失败" + completeDeptDTOResult.getMsg()); - } - // 根据街道id查询对应平台的deptCode、streetCode - Result deptGridPlatformDTOResult = adminFeignClient.getDeptGridPlatformDTO(completeDeptDTOResult.getData().getStreetId().toString()); - if (!deptGridPlatformDTOResult.success() || null == deptGridPlatformDTOResult.getData()) { - throw new Exception("根据街道查询平台部门信息失败" + deptGridPlatformDTOResult.getMsg()); - } - //外系统编码 必填!!!!!!! - formDto.setDeptCode(deptGridPlatformDTOResult.getData().getDeptCode());// 130099 - // 街道编码!!!!!!!!!!!! - formDto.setStreetCode(deptGridPlatformDTOResult.getData().getStreetCode()); - // 网格编码 - formDto.setGridCode(null); - - //查询图片列表 - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(itemEntity.getEventId()), "REFERENCE_ID", itemEntity.getEventId()); - List imageList = imgDao.selectList(wrapper); - if (null != imageList && !imageList.isEmpty()) { - String url = null; - String filename = null; - ReportFile reportFile = null; - List reportFiles = new ArrayList<>(); - for (ImgEntity image : imageList) { - url = image.getImgUrl(); - if (org.apache.commons.lang.StringUtils.isNotBlank(url)) { - filename = url.substring(url.lastIndexOf(CommonConstants.CHAR_ASCII_47) + CommonConstants.NUMBER_ONE); - reportFile = new ReportFile(); - reportFile.setName(filename); - reportFile.setUrl(url); - reportFile.setBase64string(""); - reportFiles.add(reportFile); - } - } - ImageFile imageFile = new ImageFile(); - imageFile.setReportFileList(reportFiles); - formDto.setImageFile(imageFile); - } - return formDto; - } - - /** - * @param gridDto - * @param handleProcessEntity - * @return void - * @Author yinzuomei - * @Description - * @Date 2019/12/25 15:29 - **/ + // 监督员编号 + formDto.setKeepersn(""); + // 操作时间 + formDto.setInsertTime(new Date()); + // 操作人 + formDto.setInsertUser(user.getRealName());// + // 外系统编号 + formDto.setHotLinesn(itemEntity.getId()); + // 先查询网格对应街道id + Result completeDeptDTOResult = adminFeignClient.getCompleteDept(itemEntity.getGridId()); + if (!completeDeptDTOResult.success()) { + throw new Exception("根据网格ID获取所有上级机构信息失败" + completeDeptDTOResult.getMsg()); + } + // 根据街道id查询对应平台的deptCode、streetCode + Result deptGridPlatformDTOResult = adminFeignClient.getDeptGridPlatformDTO(completeDeptDTOResult.getData().getStreetId().toString()); + if (!deptGridPlatformDTOResult.success() || null == deptGridPlatformDTOResult.getData()) { + throw new Exception("根据街道查询平台部门信息失败" + deptGridPlatformDTOResult.getMsg()); + } + //外系统编码 必填!!!!!!! + formDto.setDeptCode(deptGridPlatformDTOResult.getData().getDeptCode());// 130099 + // 街道编码!!!!!!!!!!!! + formDto.setStreetCode(deptGridPlatformDTOResult.getData().getStreetCode()); + // 网格编码 + formDto.setGridCode(null); + + //查询图片列表 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(itemEntity.getEventId()), "REFERENCE_ID", itemEntity.getEventId()); + List imageList = imgDao.selectList(wrapper); + if (null != imageList && !imageList.isEmpty()) { + String url = null; + String filename = null; + ReportFile reportFile = null; + List reportFiles = new ArrayList<>(); + for (ImgEntity image : imageList) { + url = image.getImgUrl(); + if (org.apache.commons.lang.StringUtils.isNotBlank(url)) { + filename = url.substring(url.lastIndexOf(CommonConstants.CHAR_ASCII_47) + CommonConstants.NUMBER_ONE); + reportFile = new ReportFile(); + reportFile.setName(filename); + reportFile.setUrl(url); + reportFile.setBase64string(""); + reportFiles.add(reportFile); + } + } + ImageFile imageFile = new ImageFile(); + imageFile.setReportFileList(reportFiles); + formDto.setImageFile(imageFile); + } + return formDto; + } + + /** + * @param gridDto + * @param handleProcessEntity + * @return void + * @Author yinzuomei + * @Description + * @Date 2019/12/25 15:29 + **/ private void saveItemGridPlatformInfo(GridDto gridDto, ItemHandleProcessEntity handleProcessEntity) { UserDetail user = SecurityUser.getUser(); ItemGridPlatformEntity itemGridPlatformEntity = new ItemGridPlatformEntity(); @@ -1144,7 +1072,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 获取已上报网格平台未结案的项目 List gridPlatformDTOList = itemGridPlatformService.listOfGridPlatformItemNotEnd(); // 拉取处理情况 - for (ItemGridPlatformDTO dto : + for (ItemGridPlatformDTO dto: gridPlatformDTOList) { SearchCaseProcessByTaskIdDto searchResultDot = shiBeiCityGridApi.searchCaseProcessByTaskId(dto.getTaskid()); String successFlag = YesOrNoEnum.NO.value(); @@ -1178,10 +1106,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem } /** + * * 删除历史网格化平台处理记录 * - * @return void * @params [id] + * @return void * @author liuchuang * @since 2019/12/25 19:08 */ @@ -1197,17 +1126,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem } /** + * * 保存新的网格化平台处理记录 * - * @return void * @params [progressList] + * @return void * @author liuchuang * @since 2019/12/25 19:27 */ private void insertNewHandleProcess(List progressList, String itemId, String itemGridPlatformId) { try { - for (SearchCaseProcessByTaskIdItemDto dto : + for (SearchCaseProcessByTaskIdItemDto dto: progressList) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm"); Date insertTime = sdf.parse(dto.getInserttime()); @@ -1290,14 +1220,14 @@ public class ItemServiceImpl extends BaseServiceImpl implem } } - /** + /** * @Description: 某三种情况下， 查询当前项目下的上级部门id，做去重处理，向部门下的所有人员发送短信 * @Description: 1.街道做吹哨, 做回应处理; 2.反馈回应; 3.上报网格化平台 - * @Param: [dto] - * @return: void - * @Author: zy - * @Date: 2020-01-14 - */ + * @Param: [dto] + * @return: void + * @Author: zy + * @Date: 2020-01-14 + */ private void superiorDeptSmsHandle(ItemHandleSubmitFormDTO dto){ UserDetail user = SecurityUser.getUser(); //获取当前登录人信息 List deptId = new ArrayList<>(); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/controller/HandleRoleCategoryController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/controller/HandleRoleCategoryController.java deleted file mode 100644 index 23fb71355..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/controller/HandleRoleCategoryController.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.rolecategory.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.dto.rulecategory.HandleRoleCategoryDTO; -import com.elink.esua.epdc.dto.rulecategory.form.HandleRoleCategoryFormDTO; -import com.elink.esua.epdc.modules.rolecategory.excel.HandleRoleCategoryExcel; -import com.elink.esua.epdc.modules.rolecategory.service.HandleRoleCategoryService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 角色和处理类别关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -@RestController -@RequestMapping("handlerolecategory") -public class HandleRoleCategoryController { - - @Autowired - private HandleRoleCategoryService handleRoleCategoryService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = handleRoleCategoryService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - HandleRoleCategoryDTO data = handleRoleCategoryService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody HandleRoleCategoryDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - handleRoleCategoryService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody HandleRoleCategoryDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - handleRoleCategoryService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - handleRoleCategoryService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = handleRoleCategoryService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, HandleRoleCategoryExcel.class); - } - - @PostMapping("saveOrUpdate") - public Result saveOrUpdate(@RequestBody HandleRoleCategoryFormDTO formDTO){ - return handleRoleCategoryService.saveOrUpdate(formDTO); - } - - @GetMapping("queryCategoryIdList/{roleId}") - public Result> queryCategoryIdList(@PathVariable("roleId") String roleId){ - return handleRoleCategoryService.listCategoryId(roleId); - } -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/dao/HandleRoleCategoryDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/dao/HandleRoleCategoryDao.java deleted file mode 100644 index dd5f709a5..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/dao/HandleRoleCategoryDao.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.rolecategory.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO; -import com.elink.esua.epdc.dto.rulecategory.result.HandleRoleCategoryPermissionDTO; -import com.elink.esua.epdc.modules.rolecategory.entity.HandleRoleCategoryEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 角色和处理类别关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -@Mapper -public interface HandleRoleCategoryDao extends BaseDao { - - /** - * @param roleId - * @return int - * @Author yinzuomei - * @Description 根据角色id删除角色对应处理类别权限记录 - * @Date 2019/12/26 15:16 - **/ - int deleteByRoleId(Long roleId); - - /** - * @param roleId - * @return java.util.List - * @Author yinzuomei - * @Description 根据角色id查询当前角色对应处理类别权限 - * @Date 2019/12/26 15:16 - **/ - List selectListCategoryId(String roleId); - - /** - * @param roleId - * @return java.util.List - * @Author yinzuomei - * @Description 根据角色id查询角色对应处理类别权限, 供下拉框使用 - * @Date 2019/12/26 15:16 - **/ - List listHandleRoleCategoryPermission(String roleId); - - /** - * @param roleIdList - * @return java.util.List - * @Author yinzuomei - * @Description 根据角色id查询可处理操作列表 - * @Date 2020/2/3 8:42 - **/ - List selectListItemHandleResultDTO(@Param("roleIdList") List roleIdList); - - /** - * @param roleIdList - * @return java.util.List - * @Author yinzuomei - * @Description 根据角色id可流转部门列表 - * @Date 2020/2/3 8:43 - **/ - List selectListItemCirculationDeptResultDTO(@Param("roleIdList") List roleIdList); -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/entity/HandleRoleCategoryEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/entity/HandleRoleCategoryEntity.java deleted file mode 100644 index 95abed9c8..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/entity/HandleRoleCategoryEntity.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.rolecategory.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 角色和处理类别关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_handle_role_category") -public class HandleRoleCategoryEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 角色ID - */ - private String roleId; - - /** - * 处理类别ID - */ - private String categoryId; - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/excel/HandleRoleCategoryExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/excel/HandleRoleCategoryExcel.java deleted file mode 100644 index 82a19ad9d..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/excel/HandleRoleCategoryExcel.java +++ /dev/null @@ -1,62 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.rolecategory.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 角色和处理类别关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -@Data -public class HandleRoleCategoryExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "角色ID") - private String roleId; - - @Excel(name = "处理类别ID") - private String categoryId; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - @Excel(name = "删除标识 0：未删除，1：已删除") - private String delFlag; - - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/redis/HandleRoleCategoryRedis.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/redis/HandleRoleCategoryRedis.java deleted file mode 100644 index 02e19ac68..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/redis/HandleRoleCategoryRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.rolecategory.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 角色和处理类别关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -@Component -public class HandleRoleCategoryRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/service/HandleRoleCategoryService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/service/HandleRoleCategoryService.java deleted file mode 100644 index 81b72d0c3..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/service/HandleRoleCategoryService.java +++ /dev/null @@ -1,147 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.rolecategory.service; - - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO; -import com.elink.esua.epdc.dto.rulecategory.HandleRoleCategoryDTO; -import com.elink.esua.epdc.dto.rulecategory.form.HandleRoleCategoryFormDTO; -import com.elink.esua.epdc.dto.rulecategory.result.HandleRoleCategoryPermissionDTO; -import com.elink.esua.epdc.modules.rolecategory.entity.HandleRoleCategoryEntity; - -import java.util.List; -import java.util.Map; - -/** - * 角色和处理类别关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -public interface HandleRoleCategoryService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-20 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-12-20 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return HandleRoleCategoryDTO - * @author generator - * @date 2019-12-20 - */ - HandleRoleCategoryDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-20 - */ - void save(HandleRoleCategoryDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-20 - */ - void update(HandleRoleCategoryDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-12-20 - */ - void delete(String[] ids); - - /** - * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 保存或修改 角色和处理类别关系 - * @Date 2019/12/24 12:46 - **/ - Result saveOrUpdate(HandleRoleCategoryFormDTO formDTO); - - /** - * @param roleId - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description - * @Date 2019/12/24 16:11 - **/ - Result> listCategoryId(String roleId); - - /** - * @param roleId - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 查询角色对应项目处理类别权限 供下拉框使用 - * @Date 2019/12/26 16:09 - **/ - @Deprecated - Result> listHandleRoleCategoryPermission(String roleId); - - /** - * @param roleIdList - * @return java.util.List - * @Author yinzuomei - * @Description 可处理操作 - * @Date 2020/2/3 8:27 - **/ - List listItemHandleResultDTO(List roleIdList); - - /** - * @param roleIdList - * @return java.util.List - * @Author yinzuomei - * @Description 可流转部门 - * @Date 2020/2/3 8:27 - **/ - List listItemCirculationDeptResultDTO(List roleIdList); -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/service/impl/HandleRoleCategoryServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/service/impl/HandleRoleCategoryServiceImpl.java deleted file mode 100644 index 7c0a7b0e1..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/rolecategory/service/impl/HandleRoleCategoryServiceImpl.java +++ /dev/null @@ -1,203 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.rolecategory.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO; -import com.elink.esua.epdc.dto.rulecategory.HandleRoleCategoryDTO; -import com.elink.esua.epdc.dto.rulecategory.form.HandleRoleCategoryFormDTO; -import com.elink.esua.epdc.dto.rulecategory.result.HandleRoleCategoryPermissionDTO; -import com.elink.esua.epdc.modules.rolecategory.dao.HandleRoleCategoryDao; -import com.elink.esua.epdc.modules.rolecategory.entity.HandleRoleCategoryEntity; -import com.elink.esua.epdc.modules.rolecategory.redis.HandleRoleCategoryRedis; -import com.elink.esua.epdc.modules.rolecategory.service.HandleRoleCategoryService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 角色和处理类别关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-20 - */ -@Service -public class HandleRoleCategoryServiceImpl extends BaseServiceImpl implements HandleRoleCategoryService { - - @Autowired - private HandleRoleCategoryRedis handleRoleCategoryRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, HandleRoleCategoryDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, HandleRoleCategoryDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public HandleRoleCategoryDTO get(String id) { - HandleRoleCategoryEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, HandleRoleCategoryDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(HandleRoleCategoryDTO dto) { - HandleRoleCategoryEntity entity = ConvertUtils.sourceToTarget(dto, HandleRoleCategoryEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(HandleRoleCategoryDTO dto) { - HandleRoleCategoryEntity entity = ConvertUtils.sourceToTarget(dto, HandleRoleCategoryEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - /** - * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 保存或修改 角色和处理类别关系 - * @Date 2019/12/24 12:39 - **/ - @Override - @Transactional(rollbackFor = Exception.class) - public Result saveOrUpdate(HandleRoleCategoryFormDTO formDTO) { - //先删除角色处理类别权限关系 - deleteByRoleId(formDTO.getRoleId()); - - //角色没有一个处理类别的情况 - if (CollUtil.isEmpty(formDTO.getCategoryIdList())) { - return new Result(); - } - - //保存角色和处理类别关系 - for (String categoryId : formDTO.getCategoryIdList()) { - HandleRoleCategoryEntity entity = new HandleRoleCategoryEntity(); - entity.setCategoryId(categoryId); - entity.setRoleId(formDTO.getRoleId().toString()); - //保存 - insert(entity); - } - - return new Result(); - } - - /** - * @param roleId - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 角色管理-查询角色对应项目处理类别权限 - * @Date 2019/12/24 16:11 - **/ - @Override - public Result> listCategoryId(String roleId) { - List list=baseDao.selectListCategoryId(roleId); - return new Result>().ok(list); - } - - /** - * @param roleId 角色id - * @return void - * @Author yinzuomei - * @Description - * @Date 2019/12/24 12:44 - **/ - private void deleteByRoleId(Long roleId) { - baseDao.deleteByRoleId(roleId); - } - - /** - * @param roleId - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 查询角色对应项目处理类别权限 供下拉框使用 - * @Date 2019/12/26 15:11 - **/ - @Override - public Result> listHandleRoleCategoryPermission(String roleId) { - if (StringUtils.isBlank(roleId)) { - return new Result>().error("角色id不能为空"); - } - List list = baseDao.listHandleRoleCategoryPermission(roleId); - return new Result>().ok(list); - } - - /** - * @param roleIdList - * @return java.util.List - * @Author yinzuomei - * @Description 可处理操作 - * @Date 2020/2/3 8:25 - **/ - @Override - public List listItemHandleResultDTO(List roleIdList) { - return baseDao.selectListItemHandleResultDTO(roleIdList); - } - - /** - * @param roleIdList - * @return java.util.List - * @Author yinzuomei - * @Description 可流转部门 - * @Date 2020/2/3 8:25 - **/ - @Override - public List listItemCirculationDeptResultDTO(List roleIdList) { - return baseDao.selectListItemCirculationDeptResultDTO(roleIdList); - } -} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml index 8b4534627..353ba573d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml @@ -1,23 +1,3 @@ -#server: -# port: @server.port@ -# servlet: -# context-path: /events -# -#nacos: -# config: -# server-addr: @nacos.server-addr@ -# type: YAML -# namespace: @nacos.config.namespace@ -# group: @nacos.config.group@ -# dataId: epdc-events-server -# bootstrap: -# enable: true -# log: -# enable: @nacos.config.bootstrap.log.enable@ -# -#spring: -# application: -# name: epdc-events-server server: port: @server.port@ servlet: diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/CategoryDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/CategoryDao.xml index 59a2edc2b..2eaa42e63 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/CategoryDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/category/CategoryDao.xml @@ -62,8 +62,7 @@ creator, create_date, updater, - update_date, - info_code) + update_date) values (#{item.id}, @@ -77,8 +76,7 @@ #{item.creator}, #{item.createDate}, #{item.updater}, - #{item.updateDate}, - #{item.infoCode}) + #{item.updateDate}) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml index 7a96898f5..a8c46c8ac 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml @@ -58,59 +58,59 @@ @@ -318,20 +318,5 @@ LIMIT #{pageIndex},#{pageSize} - diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/handlecategory/HandleCategoryDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/handlecategory/HandleCategoryDao.xml deleted file mode 100644 index bec0b4dde..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/handlecategory/HandleCategoryDao.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/handleroledept/HandleRoleDeptDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/handleroledept/HandleRoleDeptDao.xml deleted file mode 100644 index f55c03255..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/handleroledept/HandleRoleDeptDao.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - delete from epdc_handle_role_dept where ROLE_ID=#{roleId} - - diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 74a921d9a..82df755f8 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -890,106 +890,4 @@ AND d.ITEM_ID = #{itemId} - - - - - - - - - - - - diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/rolecategory/HandleRoleCategoryDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/rolecategory/HandleRoleCategoryDao.xml deleted file mode 100644 index 6a8e5e7e9..000000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/rolecategory/HandleRoleCategoryDao.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - delete from epdc_handle_role_category where ROLE_ID = #{roleId} - - - - - - - - - - - - - - diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/comment/TopicCommentFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/comment/TopicCommentFormDTO.java index 10424dd8f..d968ed85f 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/comment/TopicCommentFormDTO.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/comment/TopicCommentFormDTO.java @@ -45,9 +45,4 @@ public class TopicCommentFormDTO { */ private String userFace; - /** - * 党员标识 0：否，1：是 - */ - private String partyFlag; - } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml index 5a9394b74..fd32da726 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml @@ -51,10 +51,6 @@ feign-httpclient 10.3.0 - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - @@ -78,10 +74,10 @@ true - - - - + + com.spotify + dockerfile-maven-plugin + ${project.basedir}/src/main/java @@ -137,21 +133,6 @@ - - test @@ -173,14 +154,6 @@ true 47.104.224.45:8848 - @@ -206,14 +179,6 @@ true 10.5.34.164:8848 - diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java index 2ca8e88bb..5fd230415 100755 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/comment/service/impl/TopicCommentServiceImpl.java @@ -20,11 +20,12 @@ package com.elink.esua.epdc.modules.comment.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.comment.*; import com.elink.esua.epdc.dto.constant.TopicNoticeConstant; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; @@ -34,7 +35,9 @@ import com.elink.esua.epdc.dto.topic.form.TopicReviewFormDTO; import com.elink.esua.epdc.modules.async.NewsTask; import com.elink.esua.epdc.modules.comment.dao.TopicCommentDao; import com.elink.esua.epdc.modules.comment.entity.TopicCommentEntity; +import com.elink.esua.epdc.modules.comment.redis.TopicCommentRedis; import com.elink.esua.epdc.modules.comment.service.TopicCommentService; +import com.elink.esua.epdc.modules.feign.UserFeignClient; import com.elink.esua.epdc.modules.topic.service.TopicService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -60,6 +63,8 @@ public class TopicCommentServiceImpl extends BaseServiceImpl page(Map params) { @@ -122,7 +127,12 @@ public class TopicCommentServiceImpl extends BaseServiceImpl userDTOResult=userFeignClient.getUserInfoById(commentFormDTO.getUserId()); + if(!userDTOResult.success()){ + return new Result().error("获取用户信息失败"); + } + commentEntity.setPartyFlag(userDTOResult.getData().getPartyFlag()); + boolean isComment = true; // 评论类型 0-评论 diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml index 502734e85..ebf9e2d72 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/application.yml @@ -1,23 +1,3 @@ -#server: -# port: @server.port@ -# servlet: -# context-path: /group -# -#nacos: -# config: -# server-addr: @nacos.server-addr@ -# type: YAML -# namespace: @nacos.config.namespace@ -# group: @nacos.config.group@ -# dataId: epdc-group-server -# bootstrap: -# enable: true -# log: -# enable: @nacos.config.bootstrap.log.enable@ -# -#spring: -# application: -# name: epdc-group-server server: port: @server.port@ servlet: diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/pom.xml index c7d3f1614..43a03bffa 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/pom.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/pom.xml @@ -18,13 +18,6 @@ epdc-demo-client 1.0.0 - - com.esua.epdc - epdc-user-client - 1.0.0 - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java deleted file mode 100644 index fd850265a..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java +++ /dev/null @@ -1,101 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 爱心互助活动banner 爱心互助活动banner - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@Data -public class ActBannerDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 活动ID - */ - private String actId; - - /** - * 标题 - */ - private String title; - - /** - * banner图片 - */ - private String bannerImg; - - /** - * banner类型 0-活动，1-连接 - */ - private String bannerType; - - /** - * 连接地址 - */ - private String url; - - /** - * 上下架状态 0-下架，1-上架 - */ - private String status; - - /** - * 上下架时间 - */ - private Date statusTime; - - /** - * banner位置 0-顶部 - */ - private String bannerPosition; - /** - * 默认状态 - */ - private String actUserDefaultState; - - /** - * 浏览数量 - */ - private Integer browseNum; - - /** - * 创建部门ID - */ - private Long deptId; - - /** - * 创建时间 - */ - private Date createdTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActClockListDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActClockListDTO.java deleted file mode 100644 index 3ef9e0844..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActClockListDTO.java +++ /dev/null @@ -1,62 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 用户打卡列表 - * - * @author wanggongfeng - * @since v1.0.0 2019-12-17 - */ -@Data -public class ActClockListDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 打卡日志表主键ID - */ - private String id; - /** - * 用户姓名 - */ - private String nickname; - /** - * 头像 - */ - private String faceImg; - /** - * 党员标志 - */ - private String partyFlag; - /** - * 打卡时间 - */ - private Date clockTime; - /** - * 打卡描述 - */ - private String clockDesc; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActClockPicDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActClockPicDTO.java deleted file mode 100644 index d91b37500..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActClockPicDTO.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 活动打卡图片表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-18 - */ -@Data -public class ActClockPicDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 打卡ID - */ - private String clockId; - - /** - * 图片地址 - */ - private String clockPic; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java deleted file mode 100644 index 379cdcf7d..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActInfoDTO.java +++ /dev/null @@ -1,219 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Data -public class ActInfoDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 标题 - */ - private String title; - - /** - * 活动头图 - */ - private String headPic; - - /** - * 报名开始时间 - */ - private Date signupStartTime; - - /** - * 报名截止时间 - */ - private Date signupEndTime; - - /** - * 活动开始时间 - */ - private Date actStartTime; - - /** - * 打卡开始时间 - */ - private Date signinStartTime; - - /** - * 打卡截止时间 - */ - private Date signinEndTime; - - - - /** - * 活动结束时间 - */ - private Date actEndTime; - - /** - * 活动地点 - */ - private String actAddress; - - /** - * 活动位置经度 - */ - private BigDecimal actLongitude; - - /** - * 活动位置纬度 - */ - private BigDecimal actLatitude; - - /** - *活动报名默认状态 - */ - private String actUserDefaultState; - - - /** - * 活动签到打卡地点 - */ - private String signinAddress; - - /** - * 活动签到打卡位置经度 - */ - private BigDecimal signinLongitude; - - /** - * 活动签到打卡位置纬度 - */ - private BigDecimal signinLatitude; - - /** - * 活动签到打卡半径(单位：米) - */ - private Integer clockRadius; - - /** - * 活动名额 - */ - private Integer actQuota; - - /** - * 已报名人数 - */ - private Integer signupNum; - - /** - * 活动打卡人数 - */ - private Integer clockNum; - - /** - * 活动分享数 - */ - private Integer actShareNum; - - /** - * 活动浏览数 - */ - private Integer actBrowseNum; - - /** - * 联系人 - */ - private String contacts; - - /** - * 联系电话 - */ - private String tel; - - /** - * 招募要求 - */ - private String requirement; - - /** - * 活动内容 - */ - private String actContent; - - /** - * 活动发布状态（0-下架，1上架） - */ - private String actStatus; - - /** - * 活动发布时间 - */ - private Date publishTime; - - /** - * 活动主办方 - */ - private String sponsor; - - /** - * 创建部门ID - */ - private Long deptId; - - /** - * 活动惩罚积分 - */ - private Integer punishmentPoints; - - /** - * 活动奖励积分 - */ - private Integer reward; - - /** - * 活动名额类型 - */ - private Integer actQuotaCategory; - /** - * 活动下架原因 - */ - private String cancelReason; - - /** - * 是否展示banner - */ - private String isBanner; - /** - * banner地址 - */ - private String bannerUrl; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserClockLogDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserClockLogDTO.java deleted file mode 100644 index 9551fad19..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserClockLogDTO.java +++ /dev/null @@ -1,107 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 用户打卡日志表 用户打卡日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-17 - */ -@Data -public class ActUserClockLogDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 用户活动关系表ID - */ - private String actUserId; - - /** - * 打卡类型（0-打卡，1-更新打卡） - */ - private String clockType; - - /** - * 打卡时间 - */ - private Date clockTime; - - /** - * 打卡位置经度 - */ - private BigDecimal clockLongitude; - - /** - * 打卡位置纬度 - */ - private BigDecimal clockLatitude; - - /** - * 打卡地址 - */ - private String clockAddress; - - /** - * 打卡描述 - */ - private String clockDesc; - - /** - * 打卡是否有效（0-否，1-是） - */ - private String effectiveFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserLogDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserLogDTO.java deleted file mode 100644 index 8b29e8809..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserLogDTO.java +++ /dev/null @@ -1,97 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 用户活动日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Data -public class ActUserLogDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 活动ID - */ -// private String actId; - - /** - * 用户ID - */ -// private String userId; - - /** - * 用户活动关系表主键ACT_USER_RELATION_ID - */ - private String actUserRelationId; - - /** - * 操作类别（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过，5-确认积分，6-拒绝加积分） - */ - private String operationType; - - /** - * 审核不通过的原因 - */ - private String failureReason; - - /** - * 操作时间 - */ - private Date operationTime; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserPointsLogDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserPointsLogDTO.java deleted file mode 100644 index 2b29726db..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserPointsLogDTO.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-21 - */ -@Data -public class ActUserPointsLogDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 用户活动关系表ID - */ - private String actUserId; - - /** - * 操作类型 0-系统确认积分，2-管理员确认积分，4-取消报名扣减积分，6-管理员扣减积分，8-拒绝积分 - */ - private String operationType; - - /** - * 操作积分类型 0-减积分，1-加积分 - */ - private String operationPointsType; - - /** - * 操作积分值 - */ - private Integer points; - - /** - * 处理原因 - */ - private String operationReason; - - /** - * 删除标识 0-否，1-是 - */ - private String delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserRelationDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserRelationDTO.java deleted file mode 100644 index e365873d9..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActUserRelationDTO.java +++ /dev/null @@ -1,137 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 用户活动关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Data -public class ActUserRelationDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 活动ID - */ - private String actId; - - /** - * 用户ID - */ - private String userId; - - /** - * 用户昵称 - */ - private String nickname; - - /** - * 用户头像 - */ - private String faceImg; - - /** - * 党员标识（0-否，1-是） - */ - private String partyFlag; - - /** - * 报名人真实姓名 - */ - private String realName; - - /** - * 性别(0-女，1-男) - */ - private String sex; - - /** - * 年龄 - */ - private Integer age; - - /** - * 联系电话 - */ - private String mobile; - - /** - * 身份证号 - */ - private String identityNo; - - /** - * 当前状态（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过） - */ - private String status; - - /** - * 未通过原因（仅当未通过时录入，并读取） - */ - private String failureReason; - - /** - * 审核时间 - */ - private Date auditTime; - - /** - * 报名时间 - */ - private Date signupTime; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserCancelsignupDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserCancelsignupDTO.java deleted file mode 100644 index 8ed743d9e..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserCancelsignupDTO.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -/** - * 取消报名参数 - * - * @author wanggongfeng - * @since v1.0.0 2019-12-17 - */ -@Data -public class AppActUserCancelsignupDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - private String userId; - /** - * 活动ID - */ - @NotBlank(message = "活动ID不能为空") - private String actId; - /** - * 取消报名原因 - */ - @NotBlank(message = "取消报名原因不能为空") - private String failureReason; -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java deleted file mode 100644 index 54a16100b..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java +++ /dev/null @@ -1,80 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.ArrayList; - -/** - * 用户打卡参数 - * - * @author wanggongfeng - * @since v1.0.0 2019-12-17 - */ -@Data -public class AppActUserClockLogDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 用户ID - */ - private String userId; - /** - * 活动ID - */ - @NotBlank(message = "活动ID不能为空") - private String actId; - /** - * 打卡描述 - */ - @NotBlank(message = "打卡描述不能为空") - private String clockDesc; - /** - * 打卡位置经度 - */ - private BigDecimal clockLongitude; - /** - * 打卡位置纬度 - */ - private BigDecimal clockLatitude; - /** - * 打卡地址 - */ - @NotBlank(message = "打卡地址不能为空") - private String clockAddress; - /** - * 打卡图片 - */ - private ArrayList images; - /** - * 打卡类型（0-打卡，1-更新打卡） - */ - @NotBlank(message = "打卡类型不能为空") - private String clockType; - /** - * 打卡是否有效（0-否，1-是） - */ - @NotBlank(message = "打卡是否有效不能为空") - private String effectiveFlag; - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppClockListDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppClockListDTO.java deleted file mode 100644 index 1ad95cf1e..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppClockListDTO.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity; - -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * 用户打卡列表 - * - * @author wanggongfeng - * @since v1.0.0 2019-12-17 - */ -@Data -public class AppClockListDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 活动打卡人次 - */ - private int clockNum; - - /** - * 打卡列表 - */ - private List clocks; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActInfoAppFormDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActInfoAppFormDTO.java deleted file mode 100644 index a90e174a1..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActInfoAppFormDTO.java +++ /dev/null @@ -1,70 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity.form; - -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Data -public class ActInfoAppFormDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 页码，从1开始 - */ - @Min(value = 1, message = "页码必须大于0") - private int pageIndex; - - private String userId; - - private String id; - /** - * 页容量，默认20页 - */ - @Min(value = 1, message = "每页条数必须大于必须大于0") - private int pageSize = 20; - /** - * 第一页查询发起时的时间 - */ - @NotBlank(message = "时间戳不能为空") - private String timestamp; - - /** - * 活动列表类型 - */ - @NotBlank(message = "类型不能为空") - private String actType; - - /** - * 活动id - */ - private String actId; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActInfoFormDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActInfoFormDTO.java deleted file mode 100644 index 32f90f099..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActInfoFormDTO.java +++ /dev/null @@ -1,210 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Data -public class ActInfoFormDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @NotBlank(message = "id不能为空") - private String id; - - /** - * 标题 - */ - private String title; - - /** - * 活动头图 - */ - private String headPic; - - /** - * 报名开始时间 - */ - private Date signupStartTime; - - /** - * 报名截止时间 - */ - private Date signupEndTime; - - /** - * 活动开始时间 - */ - private Date actStartTime; - /** - *活动报名默认状态 - */ - private String actUserDefaultState; - - /** - * 活动结束时间 - */ - private Date actEndTime; - /** - * 打卡开始时间 - */ - private Date signinStartTime; - - /** - * 打卡截止时间 - */ - private Date signinEndTime; - - - /** - * 活动地点 - */ - private String actAddress; - - /** - * 活动位置经度 - */ - private BigDecimal actLongitude; - - /** - * 活动位置纬度 - */ - private BigDecimal actLatitude; - - /** - * 活动签到打卡地点 - */ - private String signinAddress; - - /** - * 活动签到打卡位置经度 - */ - private BigDecimal signinLongitude; - - /** - * 活动签到打卡位置纬度 - */ - private BigDecimal signinLatitude; - - /** - * 活动签到打卡半径(单位：米) - */ - private Integer clockRadius; - - /** - * 活动名额 - */ - private Integer actQuota; - - /** - * 已报名人数 - */ - private Integer signupNum; - - /** - * 活动打卡人数 - */ - private Integer clockNum; - - /** - * 活动分享数 - */ - private Integer actShareNum; - - /** - * 活动浏览数 - */ - private Integer actBrowseNum; - - /** - * 联系人 - */ - private String contacts; - - /** - * 联系电话 - */ - private String tel; - - /** - * 招募要求 - */ - private String requirement; - - /** - * 活动内容 - */ - private String actContent; - - /** - * 活动发布状态（0-下架，1上架） - */ - private String actStatus; - - /** - * 活动发布时间 - */ - private Date publishTime; - - /** - * 活动主办方 - */ - private String sponsor; - - /** - * 创建部门ID - */ - private Long deptId; - - /** - * 活动惩罚积分 - */ - private Integer punishmentPoints; - - /** - * 活动奖励积分 - */ - private Integer reward; - - /** - * 活动名额类型 - */ - private Integer actQuotaCategory; - - /** - * 活动下架原因 - */ - @NotBlank(message = "下架原因不能为空") - private String cancelReason; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActPointCheckFormDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActPointCheckFormDTO.java deleted file mode 100644 index b47ed5f82..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActPointCheckFormDTO.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Data -public class ActPointCheckFormDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * epdc_act_user_relation表主键 - */ - @NotBlank(message = "id不能为空") - private String id; - /** - * 活动 - */ - private String actId; - - /** - * 状态 - */ - @NotBlank(message = "状态不能为空") - private String status; - /** - * 未通过原因（仅当未通过时录入，并读取） - */ - @NotBlank(message = "原因不能为空") - private String failureReason; - - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActUserRelationAuditFormDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActUserRelationAuditFormDTO.java deleted file mode 100644 index 190b1becc..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActUserRelationAuditFormDTO.java +++ /dev/null @@ -1,116 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; -import java.util.Date; - - -/** - * 用户活动关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Data -public class ActUserRelationAuditFormDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - @NotBlank(message = "id不能为空") - private String id; - - /** - * 活动ID - */ - private String actId; - - /** - * 用户ID - */ - private String userId; - - /** - * 用户昵称 - */ - private String nickname; - - /** - * 用户头像 - */ - private String faceImg; - - /** - * 党员标识（0-否，1-是） - */ - private String partyFlag; - - /** - * 报名人真实姓名 - */ - private String realName; - - /** - * 性别(0-女，1-男) - */ - private String sex; - - /** - * 年龄 - */ - private Integer age; - - /** - * 联系电话 - */ - private String mobile; - - /** - * 身份证号 - */ - private String identityNo; - - /** - * 当前状态（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过） - */ - private String status; - - /** - * 未通过原因（仅当未通过时录入，并读取） - */ - @NotBlank(message = "原因不能为空") - private String failureReason; - - /** - * 审核时间 - */ - private Date auditTime; - - /** - * 报名时间 - */ - private Date signupTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoAppResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoAppResultDTO.java deleted file mode 100644 index 9ade34503..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoAppResultDTO.java +++ /dev/null @@ -1,108 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity.result; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Data -public class ActInfoAppResultDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 标题 - */ - private String title; - - - - /** - * 活动开始时间 - */ - private Date actStartTime; - - private String headPic; - - /** - * 活动结束时间 - */ - private Date actEndTime; - - /** - * 活动地点 - */ - private String actAddress; - - - /** - * 活动名额 - */ - private Integer actQuota; - - /** - * 已报名人数 - */ - private Integer signupNum; - - /** - * 活动打卡人数 - */ - private Integer clockNum; - /** - *活动报名默认状态 - */ - private String actUserDefaultState; - /** - * 活动当前状态（0-报名中，1-已报满，2-未开始，3-进行中，4-已结束） - */ - private String actCurrentState; - - /** - * 用户报名状态（0-未报名，1已报名） - */ - private String signupFlag; - - /** - * 用户打卡状态（0-未打卡，1-已打卡） - */ - private String clockFlag; - /** - * 活动用户关联表ID - */ - private String actUserId; - - private String actQuotaCategory; - - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoClockResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoClockResultDTO.java deleted file mode 100644 index e670cb27f..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoClockResultDTO.java +++ /dev/null @@ -1,75 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity.result; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Data -public class ActInfoClockResultDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - /** - * 活动 - */ - private String actId; - - /** - * 活动签到打卡地点 - */ - private String address; - - /** - * 状态 - */ - private String status; - /** - * 原因 - */ - private String failureReason; - - /** - * 活动签到打卡位置经度 - */ - private BigDecimal longitude; - - /** - * 活动签到打卡位置纬度 - */ - private BigDecimal latitude; - - /** - * 活动签到打卡半径(单位：米) - */ - private Integer radius; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java deleted file mode 100644 index d03cd1f68..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailAppResultDTO.java +++ /dev/null @@ -1,227 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity.result; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Data -public class ActInfoDetailAppResultDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 标题 - */ - private String title; - - /** - * 联系人 - */ - private String contacts; - - /** - * 联系电话 - */ - private String tel; - - /** - * 报名开始时间（yyyy-MM-dd HH:ss） - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") - private Date signupStartTime; - - /** - * 报名截止时间（yyyy-MM-dd HH:ss） - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") - private Date signupEndTime; - - /** - * 活动开始时间（yyyy-MM-dd HH:ss） - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") - private Date actStartTime; - - /** - * 活动结束时间（yyyy-MM-dd HH:ss） - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") - private Date actEndTime; - - /** - * 活动地点 - */ - private String actAddress; - - /** - * 活动名额类型 - */ - private Integer actQuotaCategory; - - /** - * 活动名额 - */ - private Integer actQuota; - - /** - * 已报名人数 - */ - private Integer signupNum; - - /** - * 活动奖励积分 - */ - private Integer reward; - - /** - * 活动惩罚积分 - */ - private Integer punishmentPoints; - - /** - * 招募要求 - */ - private String requirement; - - /** - * 活动内容 - */ - private String actContent; - - /** - * 用户当前状态（0-我要报名，1-取消报名，2-已报满，3-未开始，4-我要打卡，5-更新打卡，6-已结束，7-已取消） - */ - private String currentUserStatus; - - /** - * 用户认证志愿者标识（0-待审核，1-认证通过，2-待认证，3-黑名单） - */ - private String userVolunteerFlag; - -/**********************************************************************/ -/**********************************************************************/ -/**********************************************************************/ - /** - * 活动头图 - */ - private String headPic; - - /** - * 活动报名默认状态 - */ - private String actUserDefaultState; - - /** - * 打卡开始时间 - */ - private Date signinStartTime; - - /** - * 打卡截止时间 - */ - private Date signinEndTime; - - /** - * 活动位置经度 - */ - private BigDecimal actLongitude; - - /** - * 活动位置纬度 - */ - private BigDecimal actLatitude; - - /** - * 活动签到打卡地点 - */ - private String signinAddress; - - /** - * 活动签到打卡位置经度 - */ - private BigDecimal signinLongitude; - - /** - * 活动签到打卡位置纬度 - */ - private BigDecimal signinLatitude; - - /** - * 活动签到打卡半径(单位：米) - */ - private Integer clockRadius; - - /** - * 活动打卡人数 - */ - private Integer clockNum; - - /** - * 活动分享数 - */ - private Integer actShareNum; - - /** - * 活动浏览数 - */ - private Integer actBrowseNum; - - /** - * 活动发布状态（0-下架，1上架） - */ - private String actStatus; - - /** - * 活动发布时间 - */ - private Date publishTime; - - /** - * 活动主办方 - */ - private String sponsor; - - /** - * 创建部门ID - */ - private Long deptId; - - /** - * 活动下架原因 - */ - private String cancelReason; - - private String failureReason; - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java deleted file mode 100644 index 6c65730bd..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoDetailResultDTO.java +++ /dev/null @@ -1,123 +0,0 @@ -package com.elink.esua.epdc.activity.result; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * @Description 爱心互助-活动详情接口反参DTO - * @Author yinzuomei - * @Date 2020/2/5 14:34 - */ -@Data -public class ActInfoDetailResultDTO implements Serializable { - private static final long serialVersionUID = -4313589227925153627L; - /** - * 主键 - */ - private String id; - - /** - * 标题 - */ - private String title; - - /** - * 联系人 - */ - private String contacts; - - /** - * 联系电话 - */ - private String tel; - - /** - * 报名开始时间（yyyy-MM-dd HH:ss） - */ - private Date signupStartTime; - - /** - * 报名截止时间（yyyy-MM-dd HH:ss） - */ - private Date signupEndTime; - - /** - * 活动开始时间（yyyy-MM-dd HH:ss） - */ - private Date actStartTime; - - /** - * 活动结束时间（yyyy-MM-dd HH:ss） - */ - private Date actEndTime; - - /** - * 活动地点 - */ - private String actAddress; - - /** - * 活动名额类型 - */ - private Integer actQuotaCategory; - - /** - * 活动名额 - */ - private Integer actQuota; - - /** - * 已报名人数 - */ - private Integer signupNum; - - /** - * 活动奖励积分 - */ - private Integer reward; - - /** - * 活动惩罚积分 - */ - private Integer punishmentPoints; - - /** - * 招募要求 - */ - private String requirement; - - /** - * 活动内容 - */ - private String actContent; - - /** - * 用户当前状态（0-我要报名，1-取消报名，2-已报满，3-未开始，4-我要打卡，5-更新打卡，6-已结束，7-已取消） - */ - private String currentUserStatus; - - /** - * 用户认证志愿者标识（0-待审核，1-认证通过，2-待认证，3-黑名单） - */ - private String userVolunteerFlag; - - /***************以下是拓展字段 **************************************************/ - /***************以下是拓展字段 **************************************************/ - /***************以下是拓展字段 **************************************************/ - /** - * 活动发布状态（0-下架，1上架） - */ - private String actStatus; - - /** - * 打卡开始时间 - */ - private Date signinStartTime; - - /** - * 打卡截止时间 - */ - private Date signinEndTime; -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoResultDTO.java deleted file mode 100644 index 8623a50b6..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActInfoResultDTO.java +++ /dev/null @@ -1,208 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity.result; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Data -public class ActInfoResultDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 标题 - */ - private String title; - - /** - * 活动头图 - */ - private String headPic; - - /** - * 报名开始时间 - */ - private Date signupStartTime; - /** - *活动报名默认状态 - */ - private String actUserDefaultState; - - /** - * 报名截止时间 - */ - private Date signupEndTime; - - /** - * 活动开始时间 - */ - private Date actStartTime; - - /** - * 活动结束时间 - */ - private Date actEndTime; - - /** - * 打卡开始时间 - */ - private Date signinStartTime; - - /** - * 打卡截止时间 - */ - private Date signinEndTime; - - - /** - * 活动地点 - */ - private String actAddress; - - /** - * 活动位置经度 - */ - private BigDecimal actLongitude; - - /** - * 活动位置纬度 - */ - private BigDecimal actLatitude; - - /** - * 活动签到打卡地点 - */ - private String signinAddress; - - /** - * 活动签到打卡位置经度 - */ - private BigDecimal signinLongitude; - - /** - * 活动签到打卡位置纬度 - */ - private BigDecimal signinLatitude; - - /** - * 活动签到打卡半径(单位：米) - */ - private Integer clockRadius; - - /** - * 活动名额 - */ - private Integer actQuota; - - /** - * 已报名人数 - */ - private Integer signupNum; - - /** - * 活动打卡人数 - */ - private Integer clockNum; - - /** - * 活动分享数 - */ - private Integer actShareNum; - - /** - * 活动浏览数 - */ - private Integer actBrowseNum; - - /** - * 联系人 - */ - private String contacts; - - /** - * 联系电话 - */ - private String tel; - - /** - * 招募要求 - */ - private String requirement; - - /** - * 活动内容 - */ - private String actContent; - - /** - * 活动发布状态（0-下架，1上架） - */ - private String actStatus; - - /** - * 活动发布时间 - */ - private Date publishTime; - - /** - * 活动主办方 - */ - private String sponsor; - - /** - * 创建部门ID - */ - private Long deptId; - - /** - * 活动惩罚积分 - */ - private Integer punishmentPoints; - - /** - * 活动奖励积分 - */ - private Integer reward; - - /** - * 活动名额类型 - */ - private Integer actQuotaCategory; - - /** - * 活动下架原因 - */ - private String cancelReason; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockLogResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockLogResultDTO.java deleted file mode 100644 index 09d78d872..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockLogResultDTO.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity.result; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 用户打卡日志表 用户打卡日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-17 - */ -@Data -public class ActUserClockLogResultDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - /** - * 打卡时间 - */ - private Date clockTime; - - /** - * 打卡位置经度 - */ - private BigDecimal clockLongitude; - - /** - * 打卡位置纬度 - */ - private BigDecimal clockLatitude; - - /** - * 打卡地址 - */ - private String clockAddress; - - /** - * 打卡描述 - */ - private String clockDesc; - - /** - * 报名人真实姓名 - */ - private String realName; - - /** - * 性别(0-女，1-男) - */ - private String sex; - - /** - * 年龄 - */ - private Integer age; - - /** - * 联系电话 - */ - private String mobile; - /** - * 打卡详情图片地址集合 - */ - private String[] clockPic; - private String clockPics; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockResultDTO.java deleted file mode 100644 index 474db6acc..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserClockResultDTO.java +++ /dev/null @@ -1,131 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity.result; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 用户活动关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Data -public class ActUserClockResultDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 活动ID - */ - private String actId; - - /** - * 用户ID - */ - private String userId; - - /** - * 用户昵称 - */ - private String nickname; - - /** - * 用户头像 - */ - private String faceImg; - - /** - * 党员标识（0-否，1-是） - */ - private String partyFlag; - - /** - * 报名人真实姓名 - */ - private String realName; - - /** - * 性别(0-女，1-男) - */ - private String sex; - - /** - * 年龄 - */ - private Integer age; - - /** - * 联系电话 - */ - private String mobile; - /** - * 打卡地点 - */ - private String clockAddress; - - /** - * 打卡次数 - */ - private String clockCount; - - /** - * 是否发放积分 - */ - private String checkPoint; - /** - * 是否发放积分 - */ - private String point; - - /** - * 身份证号 - */ - private String identityNo; - - /** - * 当前状态（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过） - */ - private String status; - - /** - * 未通过原因（仅当未通过时录入，并读取） - */ - private String failureReason; - - /** - * 审核时间 - */ - private Date auditTime; - - /** - * 报名时间 - */ - private Date signupTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java deleted file mode 100644 index e6b54b0c4..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/ActUserRelationResultDTO.java +++ /dev/null @@ -1,113 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity.result; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 用户活动关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Data -public class ActUserRelationResultDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 活动ID - */ - private String actId; - - /** - * 用户ID - */ - private String userId; - - /** - * 用户昵称 - */ - private String nickname; - - /** - * 用户头像 - */ - private String faceImg; - - /** - * 党员标识（0-否，1-是） - */ - private String partyFlag; - - /** - * 报名人真实姓名 - */ - private String realName; - - /** - * 性别(0-女，1-男) - */ - private String sex; - - /** - * 年龄 - */ - private Integer age; - - /** - * 联系电话 - */ - private String mobile; - - /** - * 身份证号 - */ - private String identityNo; - - /** - * 当前状态（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过） - */ - private String status; - - /** - * 未通过原因（仅当未通过时录入，并读取） - */ - private String failureReason; - - /** - * 审核时间 - */ - private Date auditTime; - - /** - * 报名时间 - */ - private Date signupTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/AppActInfoDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/AppActInfoDTO.java deleted file mode 100644 index 735ce1227..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/AppActInfoDTO.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.activity.result; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Data -public class AppActInfoDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - /** - * 活动签到打卡地点 - */ - private String signinAddress; - - /** - * 活动签到打卡位置经度 - */ - private BigDecimal signinLongitude; - - /** - * 活动签到打卡位置纬度 - */ - private BigDecimal signinLatitude; - - /** - * 活动签到打卡半径(单位：米) - */ - private Integer clockRadius; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActStateConstant.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActStateConstant.java deleted file mode 100644 index a5a06e49f..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActStateConstant.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.elink.esua.epdc.constant; - -public interface ActStateConstant { - /** - * 活动状态-上架 - */ - String ACT_INFO_STATUS_GROUNDING = "1"; - /** - * 活动状态-下架 - */ - String ACT_INFO_STATUS_UNDERCARRIAGE = "0"; - - /** - * 活动BANNER状态-上架 - */ - String ACT_BANNER_STATUS_GROUNDING = "1"; - /** - * 活动BANNER状态-下架 - */ - String ACT_BANNER_STATUS_UNDERCARRIAGE = "0"; - - /** - * 活动报名状态-报名 - */ - String ACT_USER_RELATION_STATUS_APPLY = "0"; - /** - * 活动报名状态-通过 - */ - String ACT_USER_RELATION_STATUS_AUDITPASS = "1"; - - /** - * 活动报名状态-打卡 - */ - String ACT_USER_RELATION_STATUS_CLOCK = "2"; - - /** - * 活动报名状态-取消 - */ - String ACT_USER_RELATION_STATUS_CANCEL = "3"; - /** - * 活动报名状态-审核驳回 - */ - String ACT_USER_RELATION_STATUS_AUDITREJECT = "4"; - - /** - * 活动报名状态-确认积分 - */ - String ACT_USER_RELATION_STATUS_POINTPASS = "5"; - - /** - * 活动报名状态-拒绝积分 - */ - String ACT_USER_RELATION_STATUS_POINTREJECT = "6"; - - /** - * 积分操作类型-系统通过 - */ - String POINT_OPERATION_TYPE_SYSTEMPASS = "0"; - - /** - * 积分操作类型-管理员通过 - */ - String POINT_OPERATION_TYPE_ADMINPASS = "1"; - /** - * 积分操作类型-取消扣除 - */ - String POINT_OPERATION_TYPE_CANCELDEDUCT = "4"; - /** - * 积分操作类型-管理员扣除 - */ - String POINT_OPERATION_TYPE_ADMINDEDUCT = "6"; - /** - * 积分操作类型-管理员拒绝 - */ - String POINT_OPERATION_TYPE_ADMINREJECT = "8"; - /** - * 积分类型-增加 - */ - String OPERATION_POINTS_TYPE_ADD = "1"; - /** - * 积分类型-扣除 - */ - String OPERATION_POINTS_TYPE_DEDUCT = "0"; - - -} - diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserPointsOperationTypeConstant.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserPointsOperationTypeConstant.java deleted file mode 100644 index cfd1f7329..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserPointsOperationTypeConstant.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.elink.esua.epdc.constant; - -/** - * @Description 操作类型 0-系统确认积分，2-管理员确认积分，4-取消报名扣减积分，6-管理员扣减积分，8-拒绝积分 - * @Author yinzuomei - * @Date 2020/2/6 12:03 - */ -public interface ActUserPointsOperationTypeConstant { - /** - * 系统确认积分 - */ - String SYS_CONFIRM_ADD = "0"; - - /** - * 管理员确认积分 - */ - String ADMIN_CONFIRM="2"; - /** - * 取消报名扣减积分 - */ - String CANCEL_ACT_SUBTRACT="4"; - - /** - * 管理员扣减积分 - */ - String ADMIN_OPERATE_POINTS="6"; - /** - * 拒绝积分 - */ - String REFUSE_POINTS="8"; -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserRelationStatusConstant.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserRelationStatusConstant.java deleted file mode 100644 index e087f504f..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserRelationStatusConstant.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.elink.esua.epdc.constant; - -/** - * @Description 用户活动关系表当前状态（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过，5-确认积分，6-拒绝加积分） - * @Author yinzuomei - * @Date 2020/2/5 21:35 - */ -public interface ActUserRelationStatusConstant { - /** - * 报名 - */ - String SIGN_UP="0"; - - /** - * 审核通过 - */ - String APPROVED="1"; - - /** - * 打卡 - */ - String CLOCK="2"; - - /** - * 取消报名 - */ - String CANCEL_SIGN_UP = "3"; - - /** - * 审核不通过 - */ - String NOT_APPROVED = "4"; - - /** - * 确认积分 - */ - String CONFIRM_ADD_POINTS = "5"; - - /** - * 拒绝加积分 - */ - String REFUSE_ADD_POINTS = "6"; -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserStatusConstant.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserStatusConstant.java deleted file mode 100644 index 99c835d8c..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/ActUserStatusConstant.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.elink.esua.epdc.constant; - -/** - * @Description 用户当前状态（0-我要报名，1-取消报名，2-已报满，3-未开始，4-我要打卡，5-更新打卡，6-已结束，7-已取消） - * @Author yinzuomei - * @Date 2020/2/5 14:49 - */ -public interface ActUserStatusConstant { - /** - * 我要报名 - */ - String SIGN_UP="0"; - - /** - * 取消报名 - */ - String CANCEL_SIGN_UP="1"; - - /** - * 已报满 - */ - String FULL_SIGN_UP="2"; - - /** - * 未开始 - */ - String NOT_STARTED="3"; - - /** - * 我要打卡 - */ - String CLOCK="4"; - - /** - * 更新打卡 - */ - String UPDATE_CLOCK = "5"; - /** - * 已结束 - */ - String FINISHED = "6"; - /** - * 已取消 - */ - String CANCELED = "7"; - - /** - * 进行中 - */ - String ON_GOING = "8"; -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java deleted file mode 100644 index ff53def03..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/constant/HeartNoticeConstant.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.elink.esua.epdc.constant; - -/** - * @Description 爱心互助模块发送消息常量 - * @Author yinzuomei - * @Date 2020/2/7 20:14 - */ -public interface HeartNoticeConstant { - /** - * 活动报名审核未通过 - */ - String NOTICE_SIGN_UP_NOT_PASSED = "您报名的活动【审核未通过】"; - - /** - * 活动报名审核通过 - */ - String NOTICE_SIGN_UP_PASSED = "您报名的活动【审核通过】"; - - /** - * 活动取消 - */ - String NOTICE_CANCEL_ACT = "您报名的活动【已经取消】"; - - /** - * 消息所属业务类型：activity活动 - */ - String NOTICE__BUSINESS_TYPE_ACTIVITY = "activity"; - - /** - * 我的消息类型：0审核通知 - */ - String NOTICE_TYPE_AUDIT_NOTICE = "0"; - - /** - * 我的消息类型：1互动通知 - */ - String NOTICE_TYPE_INTERACTIVE_NOTICE = "1"; - - /** - * 打卡积分-拒绝加积分 - */ - String NOTICE_REFUSE_ADD_ACT_POINTS = "您参与的活动【拒绝积分】"; - - /** - * 打卡积分-确认加积分 - */ - String NOTICE_CONFIRM_ADD_ACT_POINTS = "您参与的活动【确认积分】"; - - /** - * 取消报名title - */ - String CANCEL_ACT_TITLE = "取消报名【扣减积分】"; - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/phrases/ActPhraseDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/phrases/ActPhraseDTO.java deleted file mode 100644 index cb1143675..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/phrases/ActPhraseDTO.java +++ /dev/null @@ -1,92 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.phrases; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 常用语表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Data -public class ActPhraseDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 常用语 - */ - private String phrase; - - /** - * 显示顺序 - */ - private Integer sort; - - /** - * 是否显示(0-否，1-是) - */ - private String showFlag; - - /** - * 使用次数 0 - */ - private Integer usageNum; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - - /** - * code - */ - private String code; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java deleted file mode 100644 index c847ccd62..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/EpdcVolunteerRankDTO.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.volunteer; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * 志愿者排名 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-18 - */ -@Data -public class EpdcVolunteerRankDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 排名 - */ - private Integer sort; - - /** - * 头像 - */ - private String faceImg; - - /** - * 用户名 - */ - private String nickname; - - /** - * 是否党员(0-否，1-是) - */ - private String partyFlag; - - /** - * 爱心时长(单位：小时) - */ - private BigDecimal kindnessTime; - - /** - * 参加次数 - */ - private Integer participationNum; - - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerRankDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerRankDTO.java deleted file mode 100644 index ca09f0839..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/volunteer/VolunteerRankDTO.java +++ /dev/null @@ -1,122 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.volunteer; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 志愿者排名 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@Data -public class VolunteerRankDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 排名 - */ - private Integer sort; - - /** - * 志愿者ID - */ - private String volunteerId; - - /** - * 用户ID - */ - private String userId; - - /** - * 头像 - */ - private String faceImg; - - /** - * 用户名 - */ - private String nickname; - - /** - * 是否党员(0-否，1-是) - */ - private String partyFlag; - - /** - * 爱心时长(单位：小时) - */ - private BigDecimal kindnessTime; - - /** - * 参加次数 - */ - private Integer participationNum; - - /** - * 排行生成日期 - */ - private Date generateDate; - - /** - * 是否显示(0-不显示，1-显示) - */ - private String showFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - - /** - * 删除标志 - */ - private String delFlag; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/Dockerfile b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/Dockerfile deleted file mode 100755 index d9a1f64c6..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -# 基础镜像 -FROM adoptopenjdk/openjdk11 -# 作者 -MAINTAINER rongchao@elink-cn.com -# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 -ARG JAR_FILE -# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_NAME的值 -ARG JAR_NAME -# 对应pom.xml文件中的dockerfile-maven-plugin插件SERVER_PORT的值 -ARG SERVER_PORT -# 复制打包完成后的jar文件到/opt目录下 -ENV JAR_PATH /mnt/epdc/${JAR_NAME}.jar -ADD ${JAR_FILE} $JAR_PATH -# /data设为环境变量 -ENV DATAPATH /data -# 挂载/data目录到主机 -VOLUME $DATAPATH -# 启动容器时执行 -ENTRYPOINT java -jar -Xmx1024m $JAR_PATH -EXPOSE ${SERVER_PORT} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml index 99594d0db..5d379be3b 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml @@ -50,34 +50,6 @@ org.springframework.cloud spring-cloud-starter-zipkin - - com.esua.epdc - epdc-points-client - 1.0.0 - compile - - - com.esua.epdc - epdc-job-client - 1.0.0 - compile - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - com.esua.epdc - epdc-common-clienttoken - 1.0.0 - compile - - - com.esua.epdc - epdc-news-client - 1.0.0 - compile - @@ -106,30 +78,6 @@ dockerfile-maven-plugin - - ${project.basedir}/src/main/java - - - - true - ${basedir}/src/main/resources - - **/application*.yml - **/*.properties - logback-spring.xml - registry.conf - - - - ${basedir}/src/main/resources - - **/application*.yml - **/*.properties - logback-spring.xml - registry.conf - - - @@ -142,7 +90,7 @@ dev - 9072 + 9060 2 47.104.224.45 @@ -150,23 +98,16 @@ elink@888 - + - epdc - elink833066 + root + shibei@888 - false + true 47.104.224.45:8848 http://localhost:9411 - @@ -174,7 +115,7 @@ test - 9072 + 9060 2 47.104.224.45 @@ -182,23 +123,16 @@ elink@888 - + epdc - elink833066 + elink888 - true + false 47.104.224.45:8848 http://localhost:9411 - @@ -206,7 +140,7 @@ prod - 9072 + 9060 2 47.104.224.45 @@ -214,7 +148,7 @@ elink@888 - + epdc elink888 @@ -231,7 +165,7 @@ prod - 9072 + 9060 0 diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java deleted file mode 100644 index 19e430ff3..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java +++ /dev/null @@ -1,107 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.controller; - -import com.elink.esua.epdc.activity.ActBannerDTO; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.modules.activity.excel.ActBannerExcel; -import com.elink.esua.epdc.modules.activity.service.ActBannerService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - -/** - * 爱心互助活动banner 爱心互助活动banner - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@RestController -@RequestMapping("actbanner") -public class ActBannerController { - - @Autowired - private ActBannerService actBannerService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = actBannerService.getActBannerPage(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - ActBannerDTO data = actBannerService.get(id); - return new Result().ok(data); - } - @GetMapping("grounding/{id}") - public Result grounding(@PathVariable("id") String id){ - return actBannerService.grounding(id); - } - - @GetMapping("bannerlist") - public Result> getBannerList(){ - Map params =new HashMap(); - params.put("status","1"); - List data = actBannerService.list(params); - return new Result>().ok(data); - } - - @PostMapping - public Result save(@RequestBody ActBannerDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - actBannerService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody ActBannerDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - actBannerService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - actBannerService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = actBannerService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ActBannerExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActClockPicController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActClockPicController.java deleted file mode 100644 index a974d5968..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActClockPicController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.activity.ActClockPicDTO; -import com.elink.esua.epdc.modules.activity.excel.ActClockPicExcel; -import com.elink.esua.epdc.modules.activity.service.ActClockPicService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 活动打卡图片表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-18 - */ -@RestController -@RequestMapping("actclockpic") -public class ActClockPicController { - - @Autowired - private ActClockPicService actClockPicService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = actClockPicService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - ActClockPicDTO data = actClockPicService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody ActClockPicDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - actClockPicService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody ActClockPicDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - actClockPicService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - actClockPicService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = actClockPicService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ActClockPicExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java deleted file mode 100644 index 269974089..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java +++ /dev/null @@ -1,135 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.controller; - -import com.elink.esua.epdc.activity.ActBannerDTO; -import com.elink.esua.epdc.activity.ActInfoDTO; -import com.elink.esua.epdc.activity.form.ActInfoFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoClockResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoResultDTO; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.constant.ActStateConstant; -import com.elink.esua.epdc.dto.ScheduleJobDTO; -import com.elink.esua.epdc.modules.activity.excel.ActInfoExcel; -import com.elink.esua.epdc.modules.activity.service.ActBannerService; -import com.elink.esua.epdc.modules.activity.service.ActInfoService; -import com.elink.esua.epdc.modules.feign.JobFeignClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.Map; - - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@RestController -@RequestMapping("actinfo") -public class ActInfoController { - - @Autowired - private ActInfoService actInfoService; - - - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - if(SecurityUser.getDeptId() != null){ - params.put("deptId", SecurityUser.getDeptId()); - } - System.out.println(params); - PageData page = actInfoService.getActInfoPageFromPC(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - ActInfoDTO data = actInfoService.get(id); - return new Result().ok(data); - } - - - @PostMapping - @Transactional(rollbackFor=Exception.class) - public Result save(@RequestBody ActInfoDTO dto){ - //效验数据 - dto.setActStatus(ActStateConstant.ACT_INFO_STATUS_GROUNDING); - dto.setPublishTime(new Date()); - if(SecurityUser.getDeptId() != null){ - dto.setDeptId(SecurityUser.getDeptId()); - } - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - return actInfoService.save(dto); - } - - @PutMapping - public Result update(@RequestBody ActInfoDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - actInfoService.update(dto); - return new Result(); - } - - /** - * - * 取消活动 - * - * @params [dto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2020/2/6 21:18 - */ - @PostMapping("cancel") - public Result cancel(@RequestBody ActInfoFormDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - return actInfoService.cancel(dto); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - actInfoService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = actInfoService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ActInfoExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserClockLogController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserClockLogController.java deleted file mode 100644 index 98e078a22..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserClockLogController.java +++ /dev/null @@ -1,122 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.controller; - -import com.elink.esua.epdc.activity.ActInfoDTO; -import com.elink.esua.epdc.activity.form.ActPointCheckFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoClockResultDTO; -import com.elink.esua.epdc.activity.result.ActUserClockLogResultDTO; -import com.elink.esua.epdc.activity.result.ActUserClockResultDTO; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.activity.ActUserClockLogDTO; -import com.elink.esua.epdc.modules.activity.excel.ActUserClockLogExcel; -import com.elink.esua.epdc.modules.activity.service.ActUserClockLogService; -import com.elink.esua.epdc.modules.activity.service.ActUserRelationService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 用户打卡日志表 用户打卡日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-17 - */ -@RestController -@RequestMapping("actuserclocklog") -public class ActUserClockLogController { - - @Autowired - private ActUserClockLogService actUserClockLogService; - - @Autowired - private ActUserRelationService actUserRelationService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = actUserClockLogService.getActUserClockLogFromPC(params); - System.out.println(page); - return new Result>().ok(page); - } - - @GetMapping("clockPage") - public Result> clockPage(@RequestParam Map params){ - PageData page = actUserRelationService.getActUserClockPageFromPC(params); - return new Result>().ok(page); - } - @GetMapping("clockDetail/{id}") - public Result clockDetail(@PathVariable("id") String id){ - ActInfoClockResultDTO data = actUserRelationService.getActDetail(id); - return new Result().ok(data); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - ActUserClockLogDTO data = actUserClockLogService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody ActUserClockLogDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - actUserClockLogService.save(dto); - return new Result(); - } - @PostMapping("pointCheck") - public Result pointCheck(@RequestBody ActPointCheckFormDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - actUserClockLogService.pointCheck(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody ActUserClockLogDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - actUserClockLogService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - actUserClockLogService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = actUserClockLogService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ActUserClockLogExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserLogController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserLogController.java deleted file mode 100644 index 50b8188f2..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserLogController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.activity.ActUserLogDTO; -import com.elink.esua.epdc.modules.activity.excel.ActUserLogExcel; -import com.elink.esua.epdc.modules.activity.service.ActUserLogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 用户活动日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@RestController -@RequestMapping("actuserlog") -public class ActUserLogController { - - @Autowired - private ActUserLogService actUserLogService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = actUserLogService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - ActUserLogDTO data = actUserLogService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody ActUserLogDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - actUserLogService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody ActUserLogDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - actUserLogService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - actUserLogService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = actUserLogService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ActUserLogExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserPointsLogController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserPointsLogController.java deleted file mode 100644 index 3407156a9..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserPointsLogController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.controller; - -import com.elink.esua.epdc.activity.ActUserPointsLogDTO; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.modules.activity.excel.ActUserPointsLogExcel; -import com.elink.esua.epdc.modules.activity.service.ActUserPointsLogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-21 - */ -@RestController -@RequestMapping("actuserpointslog") -public class ActUserPointsLogController { - - @Autowired - private ActUserPointsLogService actUserPointsLogService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = actUserPointsLogService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - ActUserPointsLogDTO data = actUserPointsLogService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody ActUserPointsLogDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - actUserPointsLogService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody ActUserPointsLogDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - actUserPointsLogService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - actUserPointsLogService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = actUserPointsLogService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ActUserPointsLogExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java deleted file mode 100644 index b71d136c4..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActUserRelationController.java +++ /dev/null @@ -1,101 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.controller; - -import com.elink.esua.epdc.activity.ActUserRelationDTO; -import com.elink.esua.epdc.activity.form.ActUserRelationAuditFormDTO; -import com.elink.esua.epdc.activity.result.ActUserRelationResultDTO; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.modules.activity.excel.ActUserRelationExcel; -import com.elink.esua.epdc.modules.activity.service.ActUserRelationService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - -/** - * 用户活动关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@RestController -@RequestMapping("actuserrelation") -public class ActUserRelationController { - - @Autowired - private ActUserRelationService actUserRelationService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = actUserRelationService.getActUserRelationPageFromPC(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - ActUserRelationDTO data = actUserRelationService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody ActUserRelationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - actUserRelationService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody ActUserRelationDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - actUserRelationService.update(dto); - return new Result(); - } - @PostMapping("audit") - public Result audit(@RequestBody ActUserRelationAuditFormDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - return actUserRelationService.audit(dto); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - actUserRelationService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = actUserRelationService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ActUserRelationExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java deleted file mode 100644 index c482222f2..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java +++ /dev/null @@ -1,118 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.controller; - -import com.elink.esua.epdc.activity.ActInfoDTO; -import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; -import com.elink.esua.epdc.activity.result.AppActInfoDTO; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.modules.activity.service.ActInfoService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@RestController -@RequestMapping("appactinfo") -public class AppActInfoController { - - @Autowired - private ActInfoService actInfoService; - - /** - * 获取活动打卡地点详情 - * @param actId - * @return - */ - @GetMapping("clockAddressDetail/{actId}") - public Result clockAddressDetail(@PathVariable("actId")String actId){ - ActInfoDTO actInfoDTO = actInfoService.get(actId); - AppActInfoDTO appActInfoDTO = ConvertUtils.sourceToTarget(actInfoDTO, AppActInfoDTO.class); - return new Result().ok(appActInfoDTO); - } - /** - * 活动列表--App端 - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:46 - */ - @GetMapping("list") - public Result> listItems(@RequestBody ActInfoAppFormDTO formDto) { - ValidatorUtils.validateEntity(formDto); - return this.actInfoService.listItemsByApp(formDto); - } - /** - * 活动列表--App端 - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/11/19 16:46 - */ - @GetMapping("signupList") - public Result> signupListItems(@RequestBody ActInfoAppFormDTO formDto) { - ValidatorUtils.validateEntity(formDto); - return this.actInfoService.signupListItemsByApp(formDto); - } - /** - * 项目详情--工作端 - * @Params: [id] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: lipengfei - * @Date: 2019/11/19 16:46 - */ - @GetMapping("detail") - public Result getDetail(@RequestBody ActInfoAppFormDTO formDto) { - return this.actInfoService.queryActInfoDetail(formDto); - } - - /** - * 项目详情--工作端 - * @Params: [id] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: lipengfei - * @Date: 2019/11/19 16:46 - */ - @GetMapping("rejectdetail") - public Result getRejectDetail(@RequestBody ActInfoAppFormDTO formDto) { - return this.actInfoService.getRejectDetailByApp(formDto); - } - /** - * 项目详情--工作端 - * @Params: [id] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: lipengfei - * @Date: 2019/11/19 16:46 - */ - @GetMapping("canceldetail/{id}") - public Result getCancelDetail(@PathVariable String id) { - return this.actInfoService.getCancelDetailByApp(id); - } - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserClockLogController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserClockLogController.java deleted file mode 100644 index 909ab547a..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserClockLogController.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.controller; - -import com.elink.esua.epdc.activity.AppActUserClockLogDTO; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.modules.activity.service.ActUserClockLogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - - -/** - * App打卡操作 - * - * @author wanggongfeng - * @since v1.0.0 2019-12-17 - */ -@RestController -@RequestMapping("appactuserclocklog") -public class AppActUserClockLogController { - - @Autowired - private ActUserClockLogService actUserClockLogService; - - /** - * 活动打卡 - * @param appActUserClockLogDTO - * @return - */ - @GetMapping("activityClock") - public Result activityClock(@RequestBody AppActUserClockLogDTO appActUserClockLogDTO){ - //效验数据 - ValidatorUtils.validateEntity(appActUserClockLogDTO, UpdateGroup.class, DefaultGroup.class); - return actUserClockLogService.activityClock(appActUserClockLogDTO); - - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java deleted file mode 100644 index d36946a8c..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.controller; - -import com.elink.esua.epdc.activity.ActUserRelationDTO; -import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO; -import com.elink.esua.epdc.activity.AppClockListDTO; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.modules.activity.service.ActUserRelationService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - * 用户活动关系表 - * - * @author wanggongfeng - * @since v1.0.0 2019-12-16 - */ -@RestController -@RequestMapping("appactuserrelation") -public class AppActUserRelationController { - - @Autowired - private ActUserRelationService actUserRelationService; - - /** - * 活动报名 - * @param actUserRelationDTO - * @return - */ - @GetMapping("activitySignUp") - public Result activitySignUp(@RequestBody ActUserRelationDTO actUserRelationDTO){ - return actUserRelationService.activitySignUp(actUserRelationDTO); - } - - /** - * 取消活动报名 - * @param appActUserCancelsignupDTO - * @return - */ - @GetMapping("activityCancelSignUp") - public Result activityCancelSignUp(@RequestBody AppActUserCancelsignupDTO appActUserCancelsignupDTO){ - ValidatorUtils.validateEntity(appActUserCancelsignupDTO); - return actUserRelationService.activityCancelSignUp(appActUserCancelsignupDTO); - } - - /** - * 通过活动ID查询打卡列表 - * @param actId - * @return - */ - @GetMapping("selectListActUserRelation/{actId}") - public Result selectListActUserRelation(@PathVariable("actId")String actId){ - return actUserRelationService.selectListActUserRelation(actId); - } - - /** - * 活动时间到自动审核通过未审核的报名人员 - * @param actId - * @return - */ - @GetMapping("AutoAuditActUser/{actId}") - public Result AutoAuditActUser(@PathVariable("actId")String actId){ - return actUserRelationService.updateAuditDefaultStatus(actId); - } - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java deleted file mode 100644 index 190060322..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java +++ /dev/null @@ -1,78 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.dao; - -import com.elink.esua.epdc.activity.ActBannerDTO; -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; -import java.util.Map; - -/** - * 爱心互助活动banner 爱心互助活动banner - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@Mapper -public interface ActBannerDao extends BaseDao { - List getActBannerlist(Map params); - - /** - * 根据actId查询banner单条数据 - * - * @param actId - * @return ActBannerDTO - * @author zy - * @date 2020-02-06 - */ - ActBannerDTO getBannerInfo(String actId); - - /** - * - * 下架第十条及以后的banner数据 - * - * @params [] - * @return void - * @author liuchuang - * @since 2020/2/6 21:05 - */ - void takeOffOtherBanners(); - - /** - * - * 根据活动ID下架banner - * - * @params [actId] - * @return void - * @author liuchuang - * @since 2020/2/6 21:24 - */ - void updateBannerByActId(String actId); - - /** - * @Description: 手机端banner查询，根据创建时间 正序排列 - * @Param: [params] - * @return: java.util.List - * @Author: zy - * @Date: 2020-02-08 - */ - List getAppActBannerlist(Map params); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActClockPicDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActClockPicDao.java deleted file mode 100644 index 34b83b451..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActClockPicDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.activity.entity.ActClockPicEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 活动打卡图片表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-18 - */ -@Mapper -public interface ActClockPicDao extends BaseDao { - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java deleted file mode 100644 index 9e8b86eb2..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActInfoDao.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.dao; - -import com.elink.esua.epdc.activity.ActInfoDTO; -import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoDetailResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoResultDTO; -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.activity.entity.ActInfoEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; -import java.util.Map; - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Mapper -public interface ActInfoDao extends BaseDao { - /** - * 活动列表 - * @Params: [params] - * @Return: java.util.List - * @Author: liuchuang - * @Date: 2019/9/5 19:42 - */ - List getActInfoPageFromPC(Map params); - - /** - * 移动端-活动列表 - * @Params: [formDto] - * @Return: java.util.List - * @Author: liuchuang - * @Date: 2019/9/9 16:50 - */ - List listItemsByApp(ActInfoAppFormDTO formDto); - /** - * 移动端-活动列表（已报名） - * @Params: [formDto] - * @Return: java.util.List - * @Author: liuchuang - * @Date: 2019/9/9 16:50 - */ - List signupListItemsByApp(ActInfoAppFormDTO formDto); - - /** - * 工作端-项目详情 - * @Params: [formDto] - * @Return: com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO - * @Author: lipengfei - * @Date: 2019/9/10 20:57 - */ - ActInfoDetailAppResultDTO getDetailByApp(ActInfoAppFormDTO formDto); - - ActInfoDetailAppResultDTO getRejectDetailByApp(ActInfoAppFormDTO formDto); - - ActInfoDetailAppResultDTO getCancelDetailByApp(ActInfoAppFormDTO formDto); - - /** - * @Description: 根据活动id，查询活动已报名人数 - * @Param: [actId] - * @return: ActInfoDTO - * @Author: zy - * @Date: 2020-02-05 - */ - ActInfoDTO queryActSignupNum(String actId); - - /** - * @param actId - * @return com.elink.esua.epdc.activity.result.ActInfoDetailResultDTO - * @Author yinzuomei - * @Description 活动详情 - * @Date 2020/2/5 16:31 - **/ - ActInfoDetailResultDTO selectActInfoDetailResultDTO(String actId); - - /** - * @param actId - * @return void - * @Author yinzuomei - * @Description 活动打卡人数+1 - * @Date 2020/2/8 13:08 - **/ - void addClockNum(String actId); -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserClockLogDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserClockLogDao.java deleted file mode 100644 index 275f386ad..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserClockLogDao.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.dao; - -import com.elink.esua.epdc.activity.result.ActUserClockLogResultDTO; -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.activity.entity.ActUserClockLogEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; -import java.util.Map; - -/** - * 用户打卡日志表 用户打卡日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-17 - */ -@Mapper -public interface ActUserClockLogDao extends BaseDao { - - List getActUserClockLogFromPC(Map params); - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserLogDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserLogDao.java deleted file mode 100644 index 1fdf0379b..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserLogDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.activity.entity.ActUserLogEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 用户活动日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Mapper -public interface ActUserLogDao extends BaseDao { - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserPointsLogDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserPointsLogDao.java deleted file mode 100644 index 623b6131c..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserPointsLogDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-21 - */ -@Mapper -public interface ActUserPointsLogDao extends BaseDao { - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserRelationDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserRelationDao.java deleted file mode 100644 index a6fb4cad3..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserRelationDao.java +++ /dev/null @@ -1,119 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.dao; - -import com.elink.esua.epdc.activity.ActClockListDTO; -import com.elink.esua.epdc.activity.ActClockPicDTO; -import com.elink.esua.epdc.activity.ActUserRelationDTO; -import com.elink.esua.epdc.activity.result.ActInfoClockResultDTO; -import com.elink.esua.epdc.activity.result.ActUserClockResultDTO; -import com.elink.esua.epdc.activity.result.ActUserRelationResultDTO; -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -/** - * 用户活动关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Mapper -public interface ActUserRelationDao extends BaseDao { - /** - * 查询用户是否已报名活动 - * @param userId - * @param actId - * @return - */ - int isSignUp(@Param("userId")String userId, @Param("actId")String actId); - - /** - * 获取用户活动关系表主键ID - * - * @param userId - * @param actId - * @param statusList - * @return - */ - List selectOneActUserRelationInfo(@Param("userId") String userId, - @Param("actId") String actId, - @Param("statusList") List statusList); - - /** - * 通过活动ID查询人员活动关系信息 - * @param actId - * @return - */ - List selectListActUserRelation(@Param("actId")String actId); - - /** - * 通过人员活动关系信息 - * @param id - * @return - */ - ActInfoClockResultDTO getActDetail(@Param("id")String id); - - /** - * 查询打卡图片 - * @param idArr - * @return - */ - List selectListClockImg(@Param("idArr")String[] idArr); - /** - * 报名列表 - * @Params: [params] - * @Return: java.util.List - * @Author: liuchuang - * @Date: 2019/9/5 19:42 - */ - List getActUserRelationPageFromPC(Map params); - - /** - * 自动审核 - * - * @param actId - * @return - */ - List selectListActUserInfo(@Param("actId") String actId); - - List getActUserClockPageFromPC(Map params); - - /** - * @param userId 用户id - * @param actId 活动id - * @return com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity - * @Author yinzuomei - * @Description 根据用户id+活动id活动信息表 - * @Date 2020/2/6 0:10 - **/ - ActUserRelationEntity selectOneByUserIdAndActId(@Param("userId") String userId, @Param("actId") String actId); - - /** - * @param actId - * @return java.util.List - * @Author yinzuomei - * @Description 根据活动id查询所有已经报名的用户 - * @Date 2020/2/7 20:53 - **/ - List selectAllSignUpUsers(String actId); -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java deleted file mode 100644 index ac89c08e3..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 爱心互助活动banner 爱心互助活动banner - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_act_banner") -public class ActBannerEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 活动ID - */ - private String actId; - - /** - * 标题 - */ - private String title; - - /** - * banner图片 - */ - private String bannerImg; - - /** - * banner类型 0-活动，1-连接 - */ - private String bannerType; - - /** - * 连接地址 - */ - private String url; - - /** - * 上下架状态 0-下架，1-上架 - */ - private String status; - - /** - * 上下架时间 - */ - private Date statusTime; - - /** - * banner位置 0-顶部 - */ - private String bannerPosition; - - /** - * 浏览数量 - */ - private Integer browseNum; - - /** - * 创建部门ID - */ - private Long deptId; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActClockPicEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActClockPicEntity.java deleted file mode 100644 index 924367c52..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActClockPicEntity.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 活动打卡图片表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-18 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_act_clock_pic") -public class ActClockPicEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 打卡ID - */ - private String clockId; - - /** - * 图片地址 - */ - private String clockPic; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java deleted file mode 100644 index 68e6cc86d..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActInfoEntity.java +++ /dev/null @@ -1,205 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_act_info") -public class ActInfoEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 标题 - */ - private String title; - - /** - * 活动头图 - */ - private String headPic; - - /** - * 报名开始时间 - */ - private Date signupStartTime; - - /** - * 报名截止时间 - */ - private Date signupEndTime; - - /** - * 活动开始时间 - */ - private Date actStartTime; - - /** - * 活动结束时间 - */ - private Date actEndTime; - /** - * 打卡开始时间 - */ - private Date signinStartTime; - - /** - * 打卡截止时间 - */ - private Date signinEndTime; - - - /** - * 活动地点 - */ - private String actAddress; - - /** - * 默认状态 - */ - private String actUserDefaultState; - - /** - * 活动位置经度 - */ - private BigDecimal actLongitude; - - /** - * 活动位置纬度 - */ - private BigDecimal actLatitude; - - /** - * 活动签到打卡地点 - */ - private String signinAddress; - /** - * 活动下架原因 - */ - private String cancelReason; - - /** - * 活动签到打卡位置经度 - */ - private BigDecimal signinLongitude; - - /** - * 活动签到打卡位置纬度 - */ - private BigDecimal signinLatitude; - - /** - * 活动签到打卡半径(单位：米) - */ - private Integer clockRadius; - - /** - * 活动名额 - */ - private Integer actQuota; - - /** - * 已报名人数 - */ - private Integer signupNum; - - /** - * 活动打卡人数 - */ - private Integer clockNum; - - /** - * 活动分享数 - */ - private Integer actShareNum; - - /** - * 活动浏览数 - */ - private Integer actBrowseNum; - - /** - * 联系人 - */ - private String contacts; - - /** - * 联系电话 - */ - private String tel; - - /** - * 招募要求 - */ - private String requirement; - - /** - * 活动内容 - */ - private String actContent; - - /** - * 活动发布状态（0-下架，1上架） - */ - private String actStatus; - - /** - * 活动发布时间 - */ - private Date publishTime; - - /** - * 活动主办方 - */ - private String sponsor; - - /** - * 创建部门ID - */ - private Long deptId; - - /** - * 活动惩罚积分 - */ - private Integer punishmentPoints; - - /** - * 活动奖励积分 - */ - private Integer reward; - /** - * 活动名额类型(0-不限名额，1-固定名额) - */ - private Integer actQuotaCategory; - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserClockLogEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserClockLogEntity.java deleted file mode 100644 index f4c15b077..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserClockLogEntity.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 用户打卡日志表 用户打卡日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-17 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_act_user_clock_log") -public class ActUserClockLogEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 用户活动关系表ID - */ - private String actUserId; - - /** - * 打卡类型（0-打卡，1-更新打卡） - */ - private String clockType; - - /** - * 打卡时间 - */ - private Date clockTime; - - /** - * 打卡位置经度 - */ - private BigDecimal clockLongitude; - - /** - * 打卡位置纬度 - */ - private BigDecimal clockLatitude; - - /** - * 打卡地址 - */ - private String clockAddress; - - /** - * 打卡描述 - */ - private String clockDesc; - - /** - * 打卡是否有效（0-否，1-是） - */ - private String effectiveFlag; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserLogEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserLogEntity.java deleted file mode 100644 index 46b6e18d0..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserLogEntity.java +++ /dev/null @@ -1,70 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 用户活动日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_act_user_log") -public class ActUserLogEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 活动ID - */ -// private String actId; - - /** - * 用户ID - */ -// private String userId; - - /** - * 用户活动关系表主键ACT_USER_RELATION_ID - */ - private String actUserRelationId; - - /** - * 操作类别（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过） - */ - private String operationType; - - /** - * 审核不通过的原因 - */ - private String failureReason; - - /** - * 操作时间 - */ - private Date operationTime; - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserPointsLogEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserPointsLogEntity.java deleted file mode 100644 index 57b080f0c..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserPointsLogEntity.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-21 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_act_user_points_log") -public class ActUserPointsLogEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 用户活动关系表ID - */ - private String actUserId; - - /** - * 操作类型 0-系统确认积分，2-管理员确认积分，4-取消报名扣减积分，6-管理员扣减积分，8-拒绝积分 - */ - private String operationType; - - /** - * 操作积分类型 0-减积分，1-加积分 - */ - private String operationPointsType; - - /** - * 操作积分值 - */ - private Integer points; - - /** - * 处理原因 - */ - private String operationReason; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserRelationEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserRelationEntity.java deleted file mode 100644 index 751a2c228..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActUserRelationEntity.java +++ /dev/null @@ -1,111 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 用户活动关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_act_user_relation") -public class ActUserRelationEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 活动ID - */ - private String actId; - - /** - * 用户ID - */ - private String userId; - - /** - * 用户昵称 - */ - private String nickname; - - /** - * 用户头像 - */ - private String faceImg; - - /** - * 党员标识（0-否，1-是） - */ - private String partyFlag; - - /** - * 报名人真实姓名 - */ - private String realName; - - /** - * 性别(0-女，1-男) - */ - private String sex; - - /** - * 年龄 - */ - private Integer age; - - /** - * 联系电话 - */ - private String mobile; - - /** - * 身份证号 - */ - private String identityNo; - - /** - * 当前状态（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过） - */ - private String status; - - /** - * 未通过原因（仅当未通过时录入，并读取） - */ - private String failureReason; - - /** - * 审核时间 - */ - private Date auditTime; - - /** - * 报名时间 - */ - private Date signupTime; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActBannerExcel.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActBannerExcel.java deleted file mode 100644 index d0e75687d..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActBannerExcel.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 爱心互助活动banner 爱心互助活动banner - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@Data -public class ActBannerExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "活动ID") - private String actId; - - @Excel(name = "标题") - private String title; - - @Excel(name = "banner图片") - private String bannerImg; - - @Excel(name = "banner类型 0-活动，1-连接") - private String bannerType; - - @Excel(name = "连接地址") - private String url; - - @Excel(name = "上下架状态 0-下架，1-上架") - private String status; - - @Excel(name = "上下架时间") - private Date statusTime; - - @Excel(name = "banner位置 0-顶部") - private String bannerPosition; - - @Excel(name = "浏览数量") - private Integer browseNum; - - @Excel(name = "创建部门ID") - private Long deptId; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "删除标识 0-否，1-是") - private String delFlag; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActClockPicExcel.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActClockPicExcel.java deleted file mode 100644 index 658430b80..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActClockPicExcel.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 活动打卡图片表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-18 - */ -@Data -public class ActClockPicExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "打卡ID") - private String clockId; - - @Excel(name = "图片地址") - private String clockPic; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActInfoExcel.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActInfoExcel.java deleted file mode 100644 index c34943fc3..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActInfoExcel.java +++ /dev/null @@ -1,138 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Data -public class ActInfoExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "标题") - private String title; - - @Excel(name = "活动头图") - private String headPic; - - @Excel(name = "报名开始时间") - private Date signupStartTime; - - @Excel(name = "报名截止时间") - private Date signupEndTime; - - @Excel(name = "活动开始时间") - private Date actStartTime; - - @Excel(name = "活动结束时间") - private Date actEndTime; - - @Excel(name = "活动地点") - private String actAddress; - - @Excel(name = "活动位置经度") - private BigDecimal actLongitude; - - @Excel(name = "活动位置纬度") - private BigDecimal actLatitude; - - @Excel(name = "活动签到打卡地点") - private String signinAddress; - - @Excel(name = "活动签到打卡位置经度") - private BigDecimal signinLongitude; - - @Excel(name = "活动签到打卡位置纬度") - private BigDecimal signinLatitude; - - @Excel(name = "活动签到打卡半径(单位：米)") - private Integer clockRadius; - - @Excel(name = "活动名额") - private Integer actQuota; - - @Excel(name = "已报名人数") - private Integer signupNum; - - @Excel(name = "活动打卡人数") - private Integer clockNum; - - @Excel(name = "活动分享数") - private Integer actShareNum; - - @Excel(name = "活动浏览数") - private Integer actBrowseNum; - - @Excel(name = "联系人") - private String contacts; - - @Excel(name = "联系电话") - private String tel; - - @Excel(name = "招募要求") - private String requirement; - - @Excel(name = "活动内容") - private String actContent; - - @Excel(name = "活动发布状态（0-下架，1上架）") - private String actStatus; - - @Excel(name = "活动发布时间") - private Date publishTime; - - @Excel(name = "活动主办方") - private String sponsor; - - @Excel(name = "创建部门ID") - private Long deptId; - - @Excel(name = "活动惩罚积分") - private Integer punishmentPoints; - - @Excel(name = "活动奖励积分") - private Integer reward; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserClockLogExcel.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserClockLogExcel.java deleted file mode 100644 index a209bb495..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserClockLogExcel.java +++ /dev/null @@ -1,75 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 用户打卡日志表 用户打卡日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-17 - */ -@Data -public class ActUserClockLogExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "用户活动关系表ID") - private String actUserId; - - @Excel(name = "打卡类型（0-打卡，1-更新打卡）") - private String clockType; - - @Excel(name = "打卡时间") - private Date clockTime; - - @Excel(name = "打卡位置经度") - private BigDecimal clockLongitude; - - @Excel(name = "打卡位置纬度") - private BigDecimal clockLatitude; - - @Excel(name = "打卡地址") - private String clockAddress; - - @Excel(name = "打卡描述") - private String clockDesc; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserLogExcel.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserLogExcel.java deleted file mode 100644 index db0a0e475..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserLogExcel.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 用户活动日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Data -public class ActUserLogExcel { - - @Excel(name = "主键") - private String id; - -// @Excel(name = "活动ID") -// private String actId; -// -// @Excel(name = "用户ID") -// private String userId; - - /** - * 用户活动关系表主键ACT_USER_RELATION_ID - */ - @Excel(name = "用户活动关系表主键") - private String actUserRelationId; - - @Excel(name = "操作类别（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过）") - private String operationType; - - @Excel(name = "审核不通过的原因") - private String failureReason; - - @Excel(name = "操作时间") - private Date operationTime; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserPointsLogExcel.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserPointsLogExcel.java deleted file mode 100644 index 77a2aff46..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserPointsLogExcel.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-21 - */ -@Data -public class ActUserPointsLogExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "用户活动关系表ID") - private String actUserId; - - @Excel(name = "操作类型 0-系统确认积分，2-管理员确认积分，4-取消报名扣减积分，6-管理员扣减积分，8-拒绝积分") - private String operationType; - - @Excel(name = "操作积分类型 0-减积分，1-加积分") - private String operationPointsType; - - @Excel(name = "操作积分值") - private Integer points; - - @Excel(name = "处理原因") - private String operationReason; - - @Excel(name = "删除标识 0-否，1-是") - private String delFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserRelationExcel.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserRelationExcel.java deleted file mode 100644 index 89fd60f88..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/excel/ActUserRelationExcel.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 用户活动关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Data -public class ActUserRelationExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "活动ID") - private String actId; - - @Excel(name = "用户ID") - private String userId; - - @Excel(name = "用户昵称") - private String nickname; - - @Excel(name = "用户头像") - private String faceImg; - - @Excel(name = "党员标识（0-否，1-是）") - private String partyFlag; - - @Excel(name = "报名人真实姓名") - private String realName; - - @Excel(name = "性别(0-女，1-男)") - private String sex; - - @Excel(name = "年龄") - private Integer age; - - @Excel(name = "联系电话") - private String mobile; - - @Excel(name = "身份证号") - private String identityNo; - - @Excel(name = "当前状态（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过）") - private String status; - - @Excel(name = "未通过原因（仅当未通过时录入，并读取）") - private String failureReason; - - @Excel(name = "审核时间") - private Date auditTime; - - @Excel(name = "报名时间") - private Date signupTime; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActBannerRedis.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActBannerRedis.java deleted file mode 100644 index c4e3632b2..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActBannerRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 爱心互助活动banner 爱心互助活动banner - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@Component -public class ActBannerRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActClockPicRedis.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActClockPicRedis.java deleted file mode 100644 index 0e12109bc..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActClockPicRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 活动打卡图片表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-18 - */ -@Component -public class ActClockPicRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActInfoRedis.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActInfoRedis.java deleted file mode 100644 index 8d00799c6..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActInfoRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Component -public class ActInfoRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserClockLogRedis.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserClockLogRedis.java deleted file mode 100644 index 85757a14a..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserClockLogRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 用户打卡日志表 用户打卡日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-17 - */ -@Component -public class ActUserClockLogRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserLogRedis.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserLogRedis.java deleted file mode 100644 index 165d528f0..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserLogRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 用户活动日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Component -public class ActUserLogRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserPointsLogRedis.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserPointsLogRedis.java deleted file mode 100644 index d80d75161..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserPointsLogRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-21 - */ -@Component -public class ActUserPointsLogRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserRelationRedis.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserRelationRedis.java deleted file mode 100644 index e013353ff..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/redis/ActUserRelationRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 用户活动关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Component -public class ActUserRelationRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java deleted file mode 100644 index 40b4d88cc..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java +++ /dev/null @@ -1,133 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.service; - -import com.elink.esua.epdc.activity.ActBannerDTO; -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity; - -import java.util.List; -import java.util.Map; - -/** - * 爱心互助活动banner 爱心互助活动banner - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -public interface ActBannerService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-19 - */ - PageData page(Map params); - - PageData getActBannerPage(Map params); - - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-12-19 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return ActBannerDTO - * @author generator - * @date 2019-12-19 - */ - ActBannerDTO get(String id); - - Result grounding(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-19 - */ - void save(ActBannerDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-19 - */ - void update(ActBannerDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-12-19 - */ - void delete(String[] ids); - - /** - * 根据actId查询banner单条数据 - * - * @param actId - * @return ActBannerDTO - * @author zy - * @date 2020-02-06 - */ - ActBannerDTO getBannerInfo(String actId); - - /** - * - * 下架第十条及以后的banner数据 - * - * @params [] - * @return void - * @author liuchuang - * @since 2020/2/6 20:50 - */ - void takeOffOtherBanners(); - - /** - * - * 根据活动ID下架banner - * - * @params [actId] - * @return void - * @author liuchuang - * @since 2020/2/6 21:22 - */ - void takeOffBannerByActId(String actId); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActClockPicService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActClockPicService.java deleted file mode 100644 index 323ec9890..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActClockPicService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.activity.ActClockPicDTO; -import com.elink.esua.epdc.modules.activity.entity.ActClockPicEntity; - -import java.util.List; -import java.util.Map; - -/** - * 活动打卡图片表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-18 - */ -public interface ActClockPicService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-18 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-12-18 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return ActClockPicDTO - * @author generator - * @date 2019-12-18 - */ - ActClockPicDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-18 - */ - void save(ActClockPicDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-18 - */ - void update(ActClockPicDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-12-18 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java deleted file mode 100644 index 47a4e35d2..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java +++ /dev/null @@ -1,179 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.service; - -import com.elink.esua.epdc.activity.ActInfoDTO; -import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; -import com.elink.esua.epdc.activity.form.ActInfoFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoResultDTO; -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.modules.activity.entity.ActInfoEntity; - -import java.util.List; -import java.util.Map; - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -public interface ActInfoService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-11 - */ - PageData page(Map params); - - PageData getActInfoPageFromPC(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-12-11 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return ActInfoDTO - * @author generator - * @date 2019-12-11 - */ - ActInfoDTO get(String id); - - /** - * 活动列表-移动app端用 - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/10/19 16:47 - */ - Result> listItemsByApp(ActInfoAppFormDTO formDto); - /** - * 活动列表(已报名)-移动app端用 - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/10/19 16:47 - */ - Result> signupListItemsByApp(ActInfoAppFormDTO formDto); - - /** - * 移动端-项目详情 - * - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: liuchuang - * @Date: 2019/9/10 20:54 - */ - @Deprecated - Result getDetailByApp(ActInfoAppFormDTO formDto); - - /** - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 移动端-活动详情实现 - * @Date 2020/2/5 16:59 - **/ - Result queryActInfoDetail(ActInfoAppFormDTO formDto); - - /** - * 移动端-项目详情 - * - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: liuchuang - * @Date: 2019/9/10 20:54 - */ - Result getRejectDetailByApp(ActInfoAppFormDTO formDto); - - /** - * 移动端-项目详情 - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: liuchuang - * @Date: 2019/9/10 20:54 - */ - Result getCancelDetailByApp(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-11 - */ - Result save(ActInfoDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-11 - */ - void update(ActInfoDTO dto); - - /** - * - * 取消活动 - * - * @params [dto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2020/2/6 21:18 - */ - Result cancel(ActInfoFormDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-12-11 - */ - void delete(String[] ids); - - /** - * @param actId - * @return void - * @Author yinzuomei - * @Description 活动打卡人数+1 - * @Date 2020/2/8 13:07 - **/ - void addClockNum(String actId); -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserClockLogService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserClockLogService.java deleted file mode 100644 index 74379cd8b..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserClockLogService.java +++ /dev/null @@ -1,116 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.service; - -import com.elink.esua.epdc.activity.ActUserClockLogDTO; -import com.elink.esua.epdc.activity.AppActUserClockLogDTO; -import com.elink.esua.epdc.activity.form.ActPointCheckFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoResultDTO; -import com.elink.esua.epdc.activity.result.ActUserClockLogResultDTO; -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.modules.activity.entity.ActUserClockLogEntity; - -import java.util.List; -import java.util.Map; - -/** - * 用户打卡日志表 用户打卡日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-17 - */ -public interface ActUserClockLogService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-17 - */ - PageData page(Map params); - - PageData getActUserClockLogFromPC(Map params); - - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-12-17 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return ActUserClockLogDTO - * @author generator - * @date 2019-12-17 - */ - ActUserClockLogDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-17 - */ - void save(ActUserClockLogDTO dto); - - Result pointCheck(ActPointCheckFormDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-17 - */ - void update(ActUserClockLogDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-12-17 - */ - void delete(String[] ids); - - /** - * 活动打卡 - * - * @param appActUserClockLogDTO - * @author wanggongfeng - * @date 2019-12-16 - */ - Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO); - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserLogService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserLogService.java deleted file mode 100644 index 4f25afed4..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserLogService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.activity.ActUserLogDTO; -import com.elink.esua.epdc.modules.activity.entity.ActUserLogEntity; - -import java.util.List; -import java.util.Map; - -/** - * 用户活动日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -public interface ActUserLogService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-16 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-12-16 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return ActUserLogDTO - * @author generator - * @date 2019-12-16 - */ - ActUserLogDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-16 - */ - void save(ActUserLogDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-16 - */ - void update(ActUserLogDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-12-16 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserPointsLogService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserPointsLogService.java deleted file mode 100644 index 573c2f883..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserPointsLogService.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.service; - -import com.elink.esua.epdc.activity.ActUserPointsLogDTO; -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity; - -import java.util.List; -import java.util.Map; - -/** - * - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-21 - */ -public interface ActUserPointsLogService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-21 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-12-21 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return ActUserPointsLogDTO - * @author generator - * @date 2019-12-21 - */ - ActUserPointsLogDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-21 - */ - void save(ActUserPointsLogDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-21 - */ - void update(ActUserPointsLogDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-12-21 - */ - void delete(String[] ids); - - /** - * @param actUserPointsLogDTO - * @return com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity - * @Author yinzuomei - * @Description 返回插入对象 - * @Date 2020/2/6 16:47 - **/ - ActUserPointsLogEntity insertActUserPointsLogDTO(ActUserPointsLogDTO actUserPointsLogDTO); -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java deleted file mode 100644 index 85b287273..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java +++ /dev/null @@ -1,169 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.service; - -import com.elink.esua.epdc.activity.ActUserRelationDTO; -import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO; -import com.elink.esua.epdc.activity.AppClockListDTO; -import com.elink.esua.epdc.activity.form.ActUserRelationAuditFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoClockResultDTO; -import com.elink.esua.epdc.activity.result.ActUserClockResultDTO; -import com.elink.esua.epdc.activity.result.ActUserRelationResultDTO; -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity; - -import java.util.List; -import java.util.Map; - -/** - * 用户活动关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -public interface ActUserRelationService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-16 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-12-16 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return ActUserRelationDTO - * @author generator - * @date 2019-12-16 - */ - ActUserRelationDTO get(String id); - - PageData getActUserRelationPageFromPC (Map params); - - PageData getActUserClockPageFromPC (Map params); - - ActInfoClockResultDTO getActDetail(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-16 - */ - void save(ActUserRelationDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-16 - */ - void update(ActUserRelationDTO dto); - - Result audit(ActUserRelationAuditFormDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-12-16 - */ - void delete(String[] ids); - - /** - * 活动报名 - * - * @param actUserRelationDTO - * @author wanggongfeng - * @date 2019-12-16 - */ - Result activitySignUp(ActUserRelationDTO actUserRelationDTO); - - /** - * 取消活动报名 - * - * @param appActUserCancelsignupDTO - * @author wanggongfeng - * @date 2019-12-16 - */ - Result activityCancelSignUp(AppActUserCancelsignupDTO appActUserCancelsignupDTO); - - /** - * 查询人员活动关系Id - * - * @param userId - * @param actId - * @param statusList - * @return ActUserRelationDTO - * @author wanggongfeng - * @date 2019-12-16 - */ - ActUserRelationDTO getActUserRelationId(String userId, String actId, List statusList); - - /** - * 活动打卡，更新活动人员关系表当前状态 - * - * @param actUserRelationDTO - * @author wanggongfeng - * @date 2019-12-16 - */ - Result updateActivityStatus(ActUserRelationDTO actUserRelationDTO); - - /** - * 通过活动ID查询打卡列表 - * - * @param actId - * @return ActUserRelationDTO - * @author wanggongfeng - * @date 2019-12-16 - */ - Result selectListActUserRelation(String actId); - - /** - * 默认活动报名审核通过 - * - * @param actId - * @author wanggongfeng - * @date 2019-12-16 - */ - Result updateAuditDefaultStatus(String actId); - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java deleted file mode 100644 index 4a16fe7bd..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java +++ /dev/null @@ -1,155 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.activity.ActBannerDTO; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.constant.ActStateConstant; -import com.elink.esua.epdc.modules.activity.dao.ActBannerDao; -import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity; -import com.elink.esua.epdc.modules.activity.redis.ActBannerRedis; -import com.elink.esua.epdc.modules.activity.service.ActBannerService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * 爱心互助活动banner 爱心互助活动banner - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@Service -public class ActBannerServiceImpl extends BaseServiceImpl implements ActBannerService { - - @Autowired - private ActBannerRedis actBannerRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, ActBannerDTO.class); - } - @Override - public PageData getActBannerPage(Map params) { - IPage page = getPage(params); - List list = baseDao.getActBannerlist(params); - return new PageData<>(list, page.getTotal()); - } - - @Override - public List list(Map params) { - List entityList = baseDao.getAppActBannerlist(params); - return entityList; - } - - private QueryWrapper getWrapper(Map params) { - String id = ""; - String status = ""; - if (params.containsKey(FieldConstant.ID_HUMP)) { - id = (String) params.get(FieldConstant.ID_HUMP); - } - if (params.containsKey("status")) { - status = params.get("status").toString(); - } - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id) - .eq(StringUtils.isNotBlank(status), "STATUS", status); - return wrapper; - } - - @Override - public ActBannerDTO get(String id) { - ActBannerEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, ActBannerDTO.class); - } - @Override - public Result grounding(String id) { - ActBannerEntity entity = baseDao.selectById(id); - ActBannerEntity updateEntity = new ActBannerEntity(); - updateEntity.setId(id); - updateEntity.setStatusTime(new Date()); - // 上架 - if (ActStateConstant.ACT_BANNER_STATUS_UNDERCARRIAGE.equals(entity.getStatus())) { - // 上架前banner表处理 - this.takeOffOtherBanners(); - updateEntity.setStatus(ActStateConstant.ACT_BANNER_STATUS_GROUNDING); - updateById(updateEntity); - // 下架 - } else if (ActStateConstant.ACT_BANNER_STATUS_GROUNDING.equals(entity.getStatus())) { - updateEntity.setStatus(ActStateConstant.ACT_BANNER_STATUS_UNDERCARRIAGE); - updateById(updateEntity); - } - return new Result(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(ActBannerDTO dto) { - ActBannerEntity entity = ConvertUtils.sourceToTarget(dto, ActBannerEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(ActBannerDTO dto) { - ActBannerEntity entity = ConvertUtils.sourceToTarget(dto, ActBannerEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - @Override - public ActBannerDTO getBannerInfo(String actId) { - ActBannerDTO bannerDto = baseDao.getBannerInfo(actId); - return bannerDto; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void takeOffOtherBanners() { - // 下架第十条及以后的banner数据 - baseDao.takeOffOtherBanners(); - } - - @Override - public void takeOffBannerByActId(String actId) { - baseDao.updateBannerByActId(actId); - } - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActClockPicServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActClockPicServiceImpl.java deleted file mode 100644 index 489ff518e..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActClockPicServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.modules.activity.dao.ActClockPicDao; -import com.elink.esua.epdc.activity.ActClockPicDTO; -import com.elink.esua.epdc.modules.activity.entity.ActClockPicEntity; -import com.elink.esua.epdc.modules.activity.redis.ActClockPicRedis; -import com.elink.esua.epdc.modules.activity.service.ActClockPicService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 活动打卡图片表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-18 - */ -@Service -public class ActClockPicServiceImpl extends BaseServiceImpl implements ActClockPicService { - - @Autowired - private ActClockPicRedis actClockPicRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, ActClockPicDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, ActClockPicDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public ActClockPicDTO get(String id) { - ActClockPicEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, ActClockPicDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(ActClockPicDTO dto) { - ActClockPicEntity entity = ConvertUtils.sourceToTarget(dto, ActClockPicEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(ActClockPicDTO dto) { - ActClockPicEntity entity = ConvertUtils.sourceToTarget(dto, ActClockPicEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java deleted file mode 100644 index ca69888da..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java +++ /dev/null @@ -1,481 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.activity.ActBannerDTO; -import com.elink.esua.epdc.activity.ActInfoDTO; -import com.elink.esua.epdc.activity.ActUserRelationDTO; -import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; -import com.elink.esua.epdc.activity.form.ActInfoFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoDetailResultDTO; -import com.elink.esua.epdc.activity.result.ActInfoResultDTO; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.constant.ActStateConstant; -import com.elink.esua.epdc.constant.ActUserRelationStatusConstant; -import com.elink.esua.epdc.constant.ActUserStatusConstant; -import com.elink.esua.epdc.constant.HeartNoticeConstant; -import com.elink.esua.epdc.dto.ScheduleJobDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; -import com.elink.esua.epdc.modules.activity.dao.ActInfoDao; -import com.elink.esua.epdc.modules.activity.dao.ActUserClockLogDao; -import com.elink.esua.epdc.modules.activity.dao.ActUserRelationDao; -import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity; -import com.elink.esua.epdc.modules.activity.entity.ActInfoEntity; -import com.elink.esua.epdc.modules.activity.entity.ActUserClockLogEntity; -import com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity; -import com.elink.esua.epdc.modules.activity.redis.ActInfoRedis; -import com.elink.esua.epdc.modules.activity.service.ActBannerService; -import com.elink.esua.epdc.modules.activity.service.ActInfoService; -import com.elink.esua.epdc.modules.async.NewsTask; -import com.elink.esua.epdc.modules.feign.JobFeignClient; -import com.elink.esua.epdc.modules.feign.UserInfoFeignClient; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.text.SimpleDateFormat; -import java.util.*; - -/** - * 活动信息表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Service -public class ActInfoServiceImpl extends BaseServiceImpl implements ActInfoService { - - @Autowired - private ActInfoRedis actInfoRedis; - @Autowired - private ActBannerService actBannerService; - @Autowired - private JobFeignClient jobFeignClient; - @Autowired - private ActUserRelationDao actUserRelationDao; - @Autowired - private ActUserClockLogDao actUserClockLogDao; - @Autowired - private UserInfoFeignClient userInfoFeignClient; - @Autowired - private NewsTask newsTask; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, ActInfoDTO.class); - } - - @Override - public PageData getActInfoPageFromPC(Map params) { - IPage page = getPage(params); - List list = baseDao.getActInfoPageFromPC(params); - return new PageData<>(list, page.getTotal()); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, ActInfoDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public ActInfoDTO get(String id) { - ActInfoEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, ActInfoDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Result save(ActInfoDTO dto) { - ActInfoEntity entity = ConvertUtils.sourceToTarget(dto, ActInfoEntity.class); - if (insert(entity)) { - if (NumConstant.ONE_STR.equals(dto.getIsBanner())) { - // 保存到banner - this.saveActInfoToBanner(entity.getId(), dto); - } - // 创建定时任务（活动开始后将未审核的报名人员自动置为审核通过或不通过） - return this.saveActToScheduleJob(entity.getId(), dto.getActStartTime()); - } - - return new Result().error(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(ActInfoDTO dto) { - ActInfoEntity entity = ConvertUtils.sourceToTarget(dto, ActInfoEntity.class); - updateById(entity); - } - /** - * 活动列表-移动app端用 - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/10/19 16:47 - */ - @Override - public Result> signupListItemsByApp(ActInfoAppFormDTO formDto) { - int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); - formDto.setPageIndex(pageIndex); - List data = baseDao.signupListItemsByApp(formDto); - return new Result>().ok(data); - } - /** - * 活动列表-移动app端用 - * @Params: [formDto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> - * @Author: lipengfei - * @Date: 2019/10/19 16:47 - */ - @Override - public Result> listItemsByApp(ActInfoAppFormDTO formDto) { - int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); - formDto.setPageIndex(pageIndex); - List data = baseDao.listItemsByApp(formDto); - return new Result>().ok(data); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Result cancel(ActInfoFormDTO dto) { - ActInfoEntity entity = baseDao.selectById(dto.getId()); - if (ActStateConstant.ACT_INFO_STATUS_UNDERCARRIAGE.equals(entity.getActStatus())) { - return new Result().error("活动已取消"); - } else if (new Date().compareTo(entity.getSignupEndTime()) > 0) { - return new Result().error("已过报名时间不可取消"); - } - ActInfoEntity updateEntity = new ActInfoEntity(); - updateEntity.setId(dto.getId()); - updateEntity.setTitle(entity.getTitle()); - updateEntity.setCancelReason(dto.getCancelReason()); - updateEntity.setActStatus(ActStateConstant.ACT_INFO_STATUS_UNDERCARRIAGE); - updateById(updateEntity); - - // 下架banner - actBannerService.takeOffBannerByActId(dto.getId()); - // 通知用户 - this.sendUserCancelActNotice(updateEntity); - return new Result(); - } - - /** - * @param actInfoEntity - * @return void - * @Author yinzuomei - * @Description 取消活动时通知所有已经报名的 用户 - * @Date 2020/2/7 20:43 - **/ - private void sendUserCancelActNotice(ActInfoEntity actInfoEntity) { - List userList = actUserRelationDao.selectAllSignUpUsers(actInfoEntity.getId()); - if (null == userList || userList.size() == 0) { - return; - } - List epdcInformationFormDTOList = new ArrayList<>(); - for (ActUserRelationDTO user : userList) { - EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO(); - informationFormDTO.setTitle(HeartNoticeConstant.NOTICE_CANCEL_ACT); - informationFormDTO.setUserId(user.getUserId()); - informationFormDTO.setType(HeartNoticeConstant.NOTICE_TYPE_INTERACTIVE_NOTICE); - informationFormDTO.setBusinessType(HeartNoticeConstant.NOTICE__BUSINESS_TYPE_ACTIVITY); - informationFormDTO.setBusinessId(actInfoEntity.getId()); - informationFormDTO.setContent(actInfoEntity.getCancelReason()); - informationFormDTO.setRelBusinessContent(actInfoEntity.getTitle()); - epdcInformationFormDTOList.add(informationFormDTO); - } - newsTask.insertBatchUserInformation(epdcInformationFormDTOList); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - @Override - public void addClockNum(String actId) { - baseDao.addClockNum(actId); - } - - @Override - public Result getDetailByApp(ActInfoAppFormDTO formDto) { - - Date currentTime = new Date(); - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - String dateString = formatter.format(currentTime); - formDto.setTimestamp(dateString); - ActInfoDetailAppResultDTO resultDTO = baseDao.getDetailByApp(formDto); - return new Result().ok(resultDTO); - } - - /** - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description - * @Date 2020/2/5 14:42 - **/ - @Override - public Result queryActInfoDetail(ActInfoAppFormDTO formDto) { - ActInfoDetailResultDTO detailResultDTO = baseDao.selectActInfoDetailResultDTO(formDto.getId()); - String currentUserStatus = getCurrentUserStatus(formDto.getId(), formDto.getUserId()); - detailResultDTO.setCurrentUserStatus(currentUserStatus); - Result userVolunteerFlagResult = userInfoFeignClient.queryUserVolunteerFlag(formDto.getUserId()); - detailResultDTO.setUserVolunteerFlag(userVolunteerFlagResult.getData()); - ActInfoDetailAppResultDTO resultDTO = ConvertUtils.sourceToTarget(detailResultDTO, ActInfoDetailAppResultDTO.class); - //获取活动详情 活动信息表 浏览数+1 banner表 浏览数+1 - this.addActBrowseNumber(resultDTO.getId()); - return new Result().ok(resultDTO); - } - - /** - * @param actId 活动id - * @param userId 用户id - * @return java.lang.String - * @Author yinzuomei - * @Description 返回当前活动下，用户状态：（0-我要报名，1-取消报名，2-已报满，3-未开始，4-我要打卡，5-更新打卡，6-已结束，7-已取消） - * @Date 2020/2/5 21:54 - **/ - public String getCurrentUserStatus(String actId, String userId) { - ActInfoEntity actInfoEntity = baseDao.selectById(actId); - String currentUserStatus = ""; - //用户当前状态（0-我要报名，1-取消报名，2-已报满，3-未开始，4-我要打卡，5-更新打卡，6-已结束，7-已取消） - //1、查询用户活动关系 - QueryWrapper actUserRelationWrapper = new QueryWrapper<>(); - actUserRelationWrapper.eq("ACT_ID", actId) - .eq("USER_ID", userId) - .orderByDesc("CREATED_TIME").last("limit 1"); - ActUserRelationEntity actUserRelationEntity = actUserRelationDao.selectOne(actUserRelationWrapper); - //2、查询用户打卡记录 - List actUserClockLogList = new ArrayList(); - if (null != actUserRelationEntity) { - QueryWrapper actUserClockLogWrapper = new QueryWrapper<>(); - actUserClockLogWrapper.eq("ACT_USER_ID", actUserRelationEntity.getId()); - actUserClockLogList = actUserClockLogDao.selectList(actUserClockLogWrapper); - } - Date currentTime = new Date(); -// 活动取消：已取消 - if (ActStateConstant.ACT_INFO_STATUS_UNDERCARRIAGE.equals(actInfoEntity.getActStatus())) { - currentUserStatus = ActUserStatusConstant.CANCELED; - } else if (currentTime.after(actInfoEntity.getActEndTime()) && currentTime.after(actInfoEntity.getSigninEndTime())) { -// 活动已经结束：当前时间已经过了活动结束时间并且也已经过了打卡截止时间 - currentUserStatus = ActUserStatusConstant.FINISHED; - } else if (currentTime.after(actInfoEntity.getActEndTime()) && currentTime.before(actInfoEntity.getSigninEndTime())) { - /*活动结束-打卡截止时间 - 1、当前用户未报名 显示一结束 - 2、当前用户已报名（审核通过）未打卡的显示 我要打卡 - 3、当前用户已报名（已经打过卡的）显示更新打卡 - 4、当前用户已经报名（未审核的、审核未通过、已经取消报名的）-已结束*/ - if (null == actUserRelationEntity) { - currentUserStatus = ActUserStatusConstant.FINISHED; - } else if (null != actUserRelationEntity - && ActUserRelationStatusConstant.APPROVED.equals(actUserRelationEntity.getStatus()) - && CollUtil.isEmpty(actUserClockLogList)) { - currentUserStatus = ActUserStatusConstant.CLOCK; - } else if (null != actUserRelationEntity - && ActUserRelationStatusConstant.CLOCK.equals(actUserRelationEntity.getStatus()) - && CollUtil.isNotEmpty(actUserClockLogList)) { - currentUserStatus = ActUserStatusConstant.UPDATE_CLOCK; - } else if (null != actUserRelationEntity && (ActUserRelationStatusConstant.SIGN_UP.equals(actUserRelationEntity.getStatus()) - || ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserRelationEntity.getStatus()) - || ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserRelationEntity.getStatus()))) { - currentUserStatus = ActUserStatusConstant.FINISHED; - } - } else if (currentTime.after(actInfoEntity.getSigninStartTime()) && currentTime.before(actInfoEntity.getSigninEndTime())) { - /*活动打卡时间段内： - 1、当前用户未报名 不显示:进行中 - 2、当前用户已报名且未打卡 我要打卡 - 3、当前用户已报名且已打卡 更新打卡 - 4、当前用户报名未审核、取消报名、或者审核不通过的-显示进行中*/ - if (null == actUserRelationEntity) { - currentUserStatus = ActUserStatusConstant.ON_GOING; - } else if (null != actUserRelationEntity - && ActUserRelationStatusConstant.APPROVED.equals(actUserRelationEntity.getStatus()) - && CollUtil.isEmpty(actUserClockLogList)) { - currentUserStatus = ActUserStatusConstant.CLOCK; - } else if (null != actUserRelationEntity - && ActUserRelationStatusConstant.CLOCK.equals(actUserRelationEntity.getStatus()) - && CollUtil.isNotEmpty(actUserClockLogList)) { - currentUserStatus = ActUserStatusConstant.UPDATE_CLOCK; - } else if (null != actUserRelationEntity - && (ActUserRelationStatusConstant.SIGN_UP.equals(actUserRelationEntity.getStatus()) - || ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserRelationEntity.getStatus()) - || ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserRelationEntity.getStatus()))) { - currentUserStatus = ActUserStatusConstant.ON_GOING; - } - } else if (currentTime.before(actInfoEntity.getSignupEndTime())) { - /*报名截至时间前： - 1、当前用户未报名底部显示按钮 我要报名(不限名额或者未报满的) - 2、当前用户未报名且活动名额已满底部显示按钮 已报满（限制名额且已经报满的） - 3、当前用户已报名（未审核、审核通过的）底部显示按钮 取消报名 - 4、当前用户（报名审核未通过或者已经取消报名的）可再次报名-我要报名*/ - if (null == actUserRelationEntity && (NumConstant.ZERO==actInfoEntity.getActQuotaCategory() - ||actInfoEntity.getActQuota() > actInfoEntity.getSignupNum())) { - currentUserStatus = ActUserStatusConstant.SIGN_UP; - } else if (null == actUserRelationEntity && (NumConstant.ONE==actInfoEntity.getActQuotaCategory() - &&actInfoEntity.getActQuota().equals(actInfoEntity.getSignupNum()))) { - currentUserStatus = ActUserStatusConstant.FULL_SIGN_UP; - } else if (null != actUserRelationEntity - && (ActUserRelationStatusConstant.SIGN_UP.equals(actUserRelationEntity.getStatus()) - || ActUserRelationStatusConstant.APPROVED.equals(actUserRelationEntity.getStatus()))) { - currentUserStatus = ActUserStatusConstant.CANCEL_SIGN_UP; - } else if (null != actUserRelationEntity - && (ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserRelationEntity.getStatus()) - || ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserRelationEntity.getStatus()))) { - currentUserStatus = ActUserStatusConstant.SIGN_UP; - } - } else if (currentTime.after(actInfoEntity.getSignupEndTime()) && currentTime.before(actInfoEntity.getActStartTime())) { - /*报名截至时间到活动未开始时间段内： - 1、当前用户未报名底部显示按钮 -未开始 - 2、当前用户已经取消报名的-未开始 - 3、当前用户已报名且审核通过、未审核 -取消报名 - 4、当前用户已报名审核不通过 -未开始*/ - if (null == actUserRelationEntity) { - currentUserStatus = ActUserStatusConstant.NOT_STARTED; - } else if (null != actUserRelationEntity && ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserRelationEntity.getStatus())) { - currentUserStatus = ActUserStatusConstant.NOT_STARTED; - } else if (null != actUserRelationEntity - && (ActUserRelationStatusConstant.APPROVED.equals(actUserRelationEntity.getStatus()) - || ActUserRelationStatusConstant.SIGN_UP.equals(actUserRelationEntity.getStatus()))) { - currentUserStatus = ActUserStatusConstant.CANCEL_SIGN_UP; - } else if (null != actUserRelationEntity && ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserRelationEntity.getStatus())) { - currentUserStatus = ActUserStatusConstant.NOT_STARTED; - } - } - return currentUserStatus; - } - - @Override - public Result getRejectDetailByApp(ActInfoAppFormDTO formDto) { - ActInfoDetailAppResultDTO resultDTO = baseDao.getRejectDetailByApp(formDto); - return new Result().ok(resultDTO); - } - - @Override - public Result getCancelDetailByApp(String id) { - ActInfoAppFormDTO formDto = new ActInfoAppFormDTO(); - formDto.setId(id); - ActInfoDetailAppResultDTO resultDTO = baseDao.getCancelDetailByApp(formDto); - return new Result().ok(resultDTO); - } - - /** - * @Description: 增加活动浏览数 - * @Param: [dto] - * @return: void - * @Author: zy - * @Date: 2020-02-06 - */ - private void addActBrowseNumber(String actId) { - //活动信息表 浏览数+1 - ActInfoEntity infoEntity = baseDao.selectById(actId); - infoEntity.setActBrowseNum(infoEntity.getActBrowseNum() + 1); - updateById(infoEntity); - //banner表 浏览数+1 - ActBannerDTO bannerDto = actBannerService.getBannerInfo(actId); - if (bannerDto != null){ - bannerDto.setBrowseNum(bannerDto.getBrowseNum() + 1); - ActBannerEntity bannerEntity = ConvertUtils.sourceToTarget(bannerDto, ActBannerEntity.class); - actBannerService.updateById(bannerEntity); - } - } - - /** - * - * 活动保存到banner - * - * @params [entity] - * @return void - * @author liuchuang - * @since 2020/2/6 20:44 - */ - private void saveActInfoToBanner(String actId, ActInfoDTO dto) { - // banner表处理：banner图限制最多10个，超出10个再发布就把最早顶下去 - actBannerService.takeOffOtherBanners(); - - ActBannerDTO bannerDto = new ActBannerDTO(); - bannerDto.setActId(actId); - bannerDto.setTitle(dto.getTitle()); - bannerDto.setBannerImg(dto.getBannerUrl()); - bannerDto.setBannerType(NumConstant.ONE_STR); - bannerDto.setBannerPosition(NumConstant.ONE_STR); - bannerDto.setUrl(""); - bannerDto.setStatus(dto.getIsBanner()); - bannerDto.setStatusTime(new Date()); - bannerDto.setDeptId(dto.getDeptId()); - ValidatorUtils.validateEntity(bannerDto, AddGroup.class, DefaultGroup.class); - actBannerService.save(bannerDto); - } - - /** - * - * 创建定时任务（活动开始后将未审核的报名人员自动置为审核通过或不通过） - * - * @params [actId, actStartTime] - * @return Result - * @author liuchuang - * @since 2020/2/6 21:10 - */ - private Result saveActToScheduleJob(String actId, Date actStartTime) { - ScheduleJobDTO jobDTO = new ScheduleJobDTO(); - jobDTO.setBeanName("AutoAuditActUserTask"); - jobDTO.setParams(actId); - jobDTO.setStatus(NumConstant.ONE); - String cron = ""; - Calendar calendar = Calendar.getInstance(); - calendar.setTime(actStartTime); - int year = calendar.get(Calendar.YEAR); - int month = calendar.get(Calendar.MONTH) + 1; - int day = calendar.get(Calendar.DATE); - int hours = calendar.get(Calendar.HOUR_OF_DAY); - int minutes = calendar.get(Calendar.MINUTE); - int second=calendar.get(Calendar.SECOND); - - cron = second +" "+ minutes +" "+ hours + " " + day + " " + month + " ? " + year + "-" + year; - jobDTO.setCronExpression(cron); - return jobFeignClient.save(jobDTO); - } -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java deleted file mode 100644 index 60eccac5d..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java +++ /dev/null @@ -1,357 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.activity.*; -import com.elink.esua.epdc.activity.form.ActPointCheckFormDTO; -import com.elink.esua.epdc.activity.result.ActUserClockLogResultDTO; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; -import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsBehaviorCodeEnum; -import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum; -import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationModeEnum; -import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsRuleCodeEnum; -import com.elink.esua.epdc.commons.tools.exception.RenException; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.constant.ActStateConstant; -import com.elink.esua.epdc.constant.ActUserRelationStatusConstant; -import com.elink.esua.epdc.constant.HeartNoticeConstant; -import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.dto.VolunteerInfoDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO; -import com.elink.esua.epdc.dto.logs.PointsLogsDTO; -import com.elink.esua.epdc.modules.activity.dao.ActUserClockLogDao; -import com.elink.esua.epdc.modules.activity.entity.ActUserClockLogEntity; -import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity; -import com.elink.esua.epdc.modules.activity.service.*; -import com.elink.esua.epdc.modules.async.NewsTask; -import com.elink.esua.epdc.modules.feign.PointsFeignClient; -import com.elink.esua.epdc.modules.feign.UserInfoFeignClient; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.util.*; - -/** - * 用户打卡日志表 用户打卡日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-17 - */ -@Service -public class ActUserClockLogServiceImpl extends BaseServiceImpl implements ActUserClockLogService { - - @Autowired - private ActUserRelationService actUserRelationService; - - @Autowired - private ActClockPicService actClockPicService; - - @Autowired - private ActUserLogService actUserLogService; - - @Autowired - private ActUserPointsLogService actUserPointsLogService; - - @Autowired - private ActInfoService actInfoService; - - @Autowired - private UserInfoFeignClient userInfoFeignClient; - - @Autowired - private PointsFeignClient pointsFeignClient; - - @Autowired - private NewsTask newsTask; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, ActUserClockLogDTO.class); - } - - @Override - public PageData getActUserClockLogFromPC(Map params) { - IPage page = getPage(params); - System.out.println(params); - List list = baseDao.getActUserClockLogFromPC(params); - //图片处理 - for (ActUserClockLogResultDTO dto :list){ - if (dto.getClockPics() != null){ - String[] strArr = dto.getClockPics().split(","); - dto.setClockPic(strArr); - } - } - return new PageData<>(list, page.getTotal()); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, ActUserClockLogDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public ActUserClockLogDTO get(String id) { - ActUserClockLogEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, ActUserClockLogDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(ActUserClockLogDTO dto) { - ActUserClockLogEntity entity = ConvertUtils.sourceToTarget(dto, ActUserClockLogEntity.class); - insert(entity); - } - @Override - @Transactional(rollbackFor = Exception.class) - public Result pointCheck(ActPointCheckFormDTO dto) { - ActUserRelationDTO actUserRelationDTO = actUserRelationService.get(dto.getId()); - ActInfoDTO actInfoDTO = actInfoService.get(dto.getActId()); - ActUserPointsLogDTO actUserPointsLogDTO = new ActUserPointsLogDTO(); - actUserPointsLogDTO.setActUserId(dto.getId()); - actUserPointsLogDTO.setOperationReason(dto.getFailureReason()); - //确认加积分 - if (ActStateConstant.ACT_USER_RELATION_STATUS_POINTPASS.equals(dto.getStatus())) { - //操作类型 0-系统确认积分，2-管理员确认积分，4-取消报名扣减积分，6-管理员扣减积分，8-拒绝积分 - actUserPointsLogDTO.setOperationType(NumConstant.TWO_STR); - actUserPointsLogDTO.setOperationPointsType(ActStateConstant.OPERATION_POINTS_TYPE_ADD);//0-减积分，1-加积分 - actUserPointsLogDTO.setPoints(actInfoDTO.getReward()); - // 志愿者增加爱心时长 - Result result = this.calculationKindnessTime(actInfoDTO, dto.getId()); - if (!result.success()) { - return result; - } - //增加用户活动积分记录 - ActUserPointsLogEntity actUserPointsLogEntity = actUserPointsLogService.insertActUserPointsLogDTO(actUserPointsLogDTO); - //更新用户积分余额、插入积分日志表 - Result updateUserPointsResult = this.updateUserPoints(dto, actInfoDTO, actUserRelationDTO, actUserPointsLogEntity); - if (!updateUserPointsResult.success()) { - return updateUserPointsResult; - } - //拒绝加积分 - } else if (ActStateConstant.ACT_USER_RELATION_STATUS_POINTREJECT.equals(dto.getStatus())) { - actUserPointsLogDTO.setOperationType(ActStateConstant.POINT_OPERATION_TYPE_ADMINREJECT); - actUserPointsLogDTO.setOperationPointsType(ActStateConstant.OPERATION_POINTS_TYPE_DEDUCT); - actUserPointsLogDTO.setPoints(actInfoDTO.getReward()); - //增加用户活动积分记录 - ActUserPointsLogEntity actUserPointsLogEntity = actUserPointsLogService.insertActUserPointsLogDTO(actUserPointsLogDTO); - } - //更新用户活动关系表状态 - this.updateActUserRelation(dto); - //插入用户活动关系日志表记录 - this.insertActUserLogDTO(dto); - //发送消息通知 - this.insertUserInformation(dto, actInfoDTO, actUserRelationDTO); - return new Result(); - } - - private void updateActUserRelation(ActPointCheckFormDTO dto) { - //用户关系表状态更新 - ActUserRelationDTO actUserRelationEntity = new ActUserRelationDTO(); - actUserRelationEntity.setId(dto.getId()); - actUserRelationEntity.setStatus(dto.getStatus()); - actUserRelationEntity.setFailureReason(dto.getFailureReason()); - actUserRelationService.update(actUserRelationEntity); - } - - private void insertActUserLogDTO(ActPointCheckFormDTO dto) { - //存储活动日志表 epdc_act_user_log - ActUserLogDTO actUserLogDTO = new ActUserLogDTO(); - actUserLogDTO.setActUserRelationId(dto.getId()); - actUserLogDTO.setOperationType(dto.getStatus()); - actUserLogDTO.setOperationTime(new Date()); - actUserLogDTO.setFailureReason(dto.getFailureReason()); - actUserLogService.save(actUserLogDTO); - } - - private Result updateUserPoints(ActPointCheckFormDTO actPointCheckFormDTO, ActInfoDTO actInfoDTO, ActUserRelationDTO actUserRelationDTO, ActUserPointsLogEntity actUserPointsLogEntity) { - PointsLogsDTO pointsLogsDTO = new PointsLogsDTO(); - //根据用户id查询志愿者信息 - Result volunteerInfoDTOResult = userInfoFeignClient.getVolunteerInfoDTOByUserId(actUserRelationDTO.getUserId()); - if (!volunteerInfoDTOResult.success() || null == volunteerInfoDTOResult.getData()) { - throw new RenException("查询志愿者信息异常"); - } - //直接调用fegin，返回剩余积分值 - EpdcUserPointsFormDTO userPointsFormDTO = new EpdcUserPointsFormDTO(); - userPointsFormDTO.setUserId(actUserRelationDTO.getUserId()); - userPointsFormDTO.setPoints(actInfoDTO.getReward()); - userPointsFormDTO.setOperationType(PointsOperationEnum.OPERATION_TYPE_ADD.getOperationType()); - Result result = userInfoFeignClient.handleUserPoints(userPointsFormDTO); - if (!result.success()) { - throw new RenException("更新用户积分异常"); - } - pointsLogsDTO.setVolunteerId(volunteerInfoDTOResult.getData().getId()); - pointsLogsDTO.setUserId(actUserRelationDTO.getUserId()); - pointsLogsDTO.setOperationType(PointsOperationEnum.OPERATION_TYPE_ADD.getOperationType());//（0-减积分，1-加积分） - pointsLogsDTO.setPoints(actInfoDTO.getReward()); - pointsLogsDTO.setOperationTime(new Date()); - pointsLogsDTO.setOperationMode(PointsOperationModeEnum.OPERATION_MODE_ADMIN.getOperationMode()); - pointsLogsDTO.setRuleCode(PointsRuleCodeEnum.CONFIRM_JOIN_ACT.getRuleCode()); - pointsLogsDTO.setLavePoints(result.getData().getPoints());//剩余积分值 - pointsLogsDTO.setBehaviorCode(PointsBehaviorCodeEnum.JOIN_ACT.getBehaviorCode()); - pointsLogsDTO.setStatus(YesOrNoEnum.YES.value()); - pointsLogsDTO.setReferenceId(actUserPointsLogEntity.getId()); - pointsLogsDTO.setOperationDesc(actPointCheckFormDTO.getFailureReason()); - return pointsFeignClient.addPointsLog(pointsLogsDTO); - } - - /** - * @param dto - * @param actInfoDTO - * @param actUserRelationDTO - * @return void - * @Author yinzuomei - * @Description 管理员确认积分、拒绝积分后给用户发送通知 - * @Date 2020/2/8 12:06 - **/ - private void insertUserInformation(ActPointCheckFormDTO dto, ActInfoDTO actInfoDTO, ActUserRelationDTO actUserRelationDTO) { - EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO(); - //确认积分或者拒绝积分 - if (ActStateConstant.ACT_USER_RELATION_STATUS_POINTPASS.equals(dto.getStatus())) { - informationFormDTO.setTitle(HeartNoticeConstant.NOTICE_CONFIRM_ADD_ACT_POINTS); - } else if (ActStateConstant.ACT_USER_RELATION_STATUS_POINTREJECT.equals(dto.getStatus())) { - informationFormDTO.setTitle(HeartNoticeConstant.NOTICE_REFUSE_ADD_ACT_POINTS); - } else { - return; - } - informationFormDTO.setUserId(actUserRelationDTO.getUserId()); - informationFormDTO.setType(HeartNoticeConstant.NOTICE_TYPE_INTERACTIVE_NOTICE); - informationFormDTO.setBusinessType(HeartNoticeConstant.NOTICE__BUSINESS_TYPE_ACTIVITY); - informationFormDTO.setBusinessId(actUserRelationDTO.getActId()); - informationFormDTO.setContent(dto.getFailureReason()); - informationFormDTO.setRelBusinessContent(actInfoDTO.getTitle()); - newsTask.insertUserInformation(informationFormDTO); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(ActUserClockLogDTO dto) { - ActUserClockLogEntity entity = ConvertUtils.sourceToTarget(dto, ActUserClockLogEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - /** - * 活动打卡 - * @param appActUserClockLogDTO - * @return - */ - @Override - public Result activityClock(AppActUserClockLogDTO appActUserClockLogDTO) { - //查询人员活动关系Id(可打卡的) - List statusList = new ArrayList<>(); - statusList.add(ActUserRelationStatusConstant.APPROVED); - statusList.add(ActUserRelationStatusConstant.CLOCK); - ActUserRelationDTO actUserRelationDTO = actUserRelationService.getActUserRelationId(appActUserClockLogDTO.getUserId(), appActUserClockLogDTO.getActId(), statusList); - ActUserClockLogDTO actUserClockLogDTO = ConvertUtils.sourceToTarget(appActUserClockLogDTO, ActUserClockLogDTO.class); - if (actUserRelationDTO.getId() == null) { - return new Result().error("打卡失败"); - } - actUserClockLogDTO.setActUserId(actUserRelationDTO.getId()); - actUserClockLogDTO.setClockTime(new Date()); - //存储打卡日志 - ActUserClockLogEntity entity = ConvertUtils.sourceToTarget(actUserClockLogDTO, ActUserClockLogEntity.class); - insert(entity); - String clockId = entity.getId(); - //存储活动日志表 epdc_act_user_log - ActUserLogDTO actUserLogDTO = new ActUserLogDTO(); - actUserLogDTO.setActUserRelationId(actUserRelationDTO.getId()); - actUserLogDTO.setOperationType(ActUserRelationStatusConstant.CLOCK);//打卡 - actUserLogDTO.setOperationTime(new Date()); - actUserLogService.save(actUserLogDTO); - //更新人员活动关系表当前状态 - actUserRelationDTO.setStatus(ActUserRelationStatusConstant.CLOCK); - actUserRelationService.updateActivityStatus(actUserRelationDTO); - //存储打卡图片 - List imgList = appActUserClockLogDTO.getImages(); - for(int i = 0 ; i < imgList.size() ; i++){ - String imgUrl = imgList.get(i); - ActClockPicDTO actClockPicDTO = new ActClockPicDTO(); - actClockPicDTO.setClockId(clockId); - actClockPicDTO.setClockPic(imgUrl); - actClockPicService.save(actClockPicDTO); - } - actInfoService.addClockNum(appActUserClockLogDTO.getActId()); - return new Result().ok("打卡成功"); - } - - /** - * - * 确认积分时志愿者增加爱心时长 - * - * @params [actInfoDTO, actUserId] - * @return Result - * @author liuchuang - * @since 2020/2/7 17:06 - */ - private Result calculationKindnessTime(ActInfoDTO actInfoDTO, String actUserId) { - ActUserRelationDTO actUserRelationDto = actUserRelationService.get(actUserId); - if (null != actUserRelationDto) { - try { - // 计算爱心时长（单位：小时，保留两位小数） - DecimalFormat df = new DecimalFormat("0.00"); - String kindnessTime = df.format((float) actInfoDTO.getActEndTime().getTime() / actInfoDTO.getActStartTime().getTime()); - - EpdcVolunteerKindnessTimeFormDTO formDto = new EpdcVolunteerKindnessTimeFormDTO(); - BigDecimal b = new BigDecimal(kindnessTime); - formDto.setKindnessTime(b); - formDto.setUserId(actUserRelationDto.getUserId()); - return userInfoFeignClient.addKindnessTime(formDto); - } catch (Exception e) { - e.printStackTrace(); - return new Result().error(); - } - } - - return new Result(); - } - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserLogServiceImpl.java deleted file mode 100644 index e06e4f44d..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserLogServiceImpl.java +++ /dev/null @@ -1,104 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.modules.activity.dao.ActUserLogDao; -import com.elink.esua.epdc.activity.ActUserLogDTO; -import com.elink.esua.epdc.modules.activity.entity.ActUserLogEntity; -import com.elink.esua.epdc.modules.activity.redis.ActUserLogRedis; -import com.elink.esua.epdc.modules.activity.service.ActUserLogService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 用户活动日志表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Service -public class ActUserLogServiceImpl extends BaseServiceImpl implements ActUserLogService { - - @Autowired - private ActUserLogRedis actUserLogRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, ActUserLogDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, ActUserLogDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public ActUserLogDTO get(String id) { - ActUserLogEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, ActUserLogDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(ActUserLogDTO dto) { - ActUserLogEntity entity = ConvertUtils.sourceToTarget(dto, ActUserLogEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(ActUserLogDTO dto) { - ActUserLogEntity entity = ConvertUtils.sourceToTarget(dto, ActUserLogEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserPointsLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserPointsLogServiceImpl.java deleted file mode 100644 index 4ef603086..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserPointsLogServiceImpl.java +++ /dev/null @@ -1,118 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.activity.ActUserPointsLogDTO; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.modules.activity.dao.ActUserPointsLogDao; -import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity; -import com.elink.esua.epdc.modules.activity.redis.ActUserPointsLogRedis; -import com.elink.esua.epdc.modules.activity.service.ActUserPointsLogService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-21 - */ -@Service -public class ActUserPointsLogServiceImpl extends BaseServiceImpl implements ActUserPointsLogService { - - @Autowired - private ActUserPointsLogRedis actUserPointsLogRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, ActUserPointsLogDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, ActUserPointsLogDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public ActUserPointsLogDTO get(String id) { - ActUserPointsLogEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, ActUserPointsLogDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(ActUserPointsLogDTO dto) { - ActUserPointsLogEntity entity = ConvertUtils.sourceToTarget(dto, ActUserPointsLogEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(ActUserPointsLogDTO dto) { - ActUserPointsLogEntity entity = ConvertUtils.sourceToTarget(dto, ActUserPointsLogEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - /** - * @param actUserPointsLogDTO - * @return com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity - * @Author yinzuomei - * @Description 返回插入对象 - * @Date 2020/2/6 16:47 - **/ - @Override - public ActUserPointsLogEntity insertActUserPointsLogDTO(ActUserPointsLogDTO actUserPointsLogDTO) { - ActUserPointsLogEntity entity = ConvertUtils.sourceToTarget(actUserPointsLogDTO, ActUserPointsLogEntity.class); - insert(entity); - return entity; - } - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java deleted file mode 100644 index 3a5cb6e69..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java +++ /dev/null @@ -1,468 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.activity.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.activity.*; -import com.elink.esua.epdc.activity.form.ActUserRelationAuditFormDTO; -import com.elink.esua.epdc.activity.result.ActInfoClockResultDTO; -import com.elink.esua.epdc.activity.result.ActUserClockResultDTO; -import com.elink.esua.epdc.activity.result.ActUserRelationResultDTO; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; -import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsBehaviorCodeEnum; -import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum; -import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationModeEnum; -import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsRuleCodeEnum; -import com.elink.esua.epdc.commons.tools.exception.RenException; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.constant.ActStateConstant; -import com.elink.esua.epdc.constant.ActUserPointsOperationTypeConstant; -import com.elink.esua.epdc.constant.ActUserRelationStatusConstant; -import com.elink.esua.epdc.constant.HeartNoticeConstant; -import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.dto.VolunteerInfoDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; -import com.elink.esua.epdc.dto.logs.PointsLogsDTO; -import com.elink.esua.epdc.modules.activity.dao.ActInfoDao; -import com.elink.esua.epdc.modules.activity.dao.ActUserPointsLogDao; -import com.elink.esua.epdc.modules.activity.dao.ActUserRelationDao; -import com.elink.esua.epdc.modules.activity.entity.ActUserPointsLogEntity; -import com.elink.esua.epdc.modules.activity.entity.ActUserRelationEntity; -import com.elink.esua.epdc.modules.activity.redis.ActUserRelationRedis; -import com.elink.esua.epdc.modules.activity.service.ActInfoService; -import com.elink.esua.epdc.modules.activity.service.ActUserLogService; -import com.elink.esua.epdc.modules.activity.service.ActUserPointsLogService; -import com.elink.esua.epdc.modules.activity.service.ActUserRelationService; -import com.elink.esua.epdc.modules.async.NewsTask; -import com.elink.esua.epdc.modules.feign.PointsFeignClient; -import com.elink.esua.epdc.modules.feign.UserInfoFeignClient; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.*; - -/** - * 用户活动关系表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Service -public class ActUserRelationServiceImpl extends BaseServiceImpl implements ActUserRelationService { - protected Logger logger = LoggerFactory.getLogger(getClass()); - @Autowired - private ActUserRelationRedis actUserRelationRedis; - - @Autowired - private ActUserLogService actUserLogService; - - @Autowired - private ActInfoService actInfoService; - - @Autowired - private ActInfoDao actInfoDao; - - @Autowired - private ActUserPointsLogDao actUserPointsLogDao; - @Autowired - private ActUserPointsLogService actUserPointsLogService; - @Autowired - private UserInfoFeignClient userInfoFeignClient; - - @Autowired - private PointsFeignClient pointsFeignClient; - - @Autowired - private NewsTask newsTask; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, ActUserRelationDTO.class); - } - - @Override - public PageData getActUserRelationPageFromPC(Map params) { - IPage page = getPage(params); - List list = baseDao.getActUserRelationPageFromPC(params); - return new PageData<>(list, page.getTotal()); - } - @Override - public PageData getActUserClockPageFromPC(Map params) { - IPage page = getPage(params); - List list = baseDao.getActUserClockPageFromPC(params); - return new PageData<>(list, page.getTotal()); - } - - @Override - public ActInfoClockResultDTO getActDetail(String id) { - ActInfoClockResultDTO resultDTO = baseDao.getActDetail(id); - System.out.println(resultDTO); - return resultDTO; - } - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, ActUserRelationDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public ActUserRelationDTO get(String id) { - ActUserRelationEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, ActUserRelationDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(ActUserRelationDTO dto) { - ActUserRelationEntity entity = ConvertUtils.sourceToTarget(dto, ActUserRelationEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(ActUserRelationDTO dto) { - ActUserRelationEntity entity = ConvertUtils.sourceToTarget(dto, ActUserRelationEntity.class); - updateById(entity); - } - @Override - @Transactional(rollbackFor = Exception.class) - public Result audit(ActUserRelationAuditFormDTO dto) { - ActUserRelationEntity entity = baseDao.selectById(dto.getId()); - if (ActStateConstant.ACT_USER_RELATION_STATUS_APPLY.equals(entity.getStatus())) { - ActUserRelationEntity updateEntity = new ActUserRelationEntity(); - updateEntity.setId(dto.getId()); - updateEntity.setUserId(entity.getUserId()); - updateEntity.setActId(entity.getActId()); - updateEntity.setStatus(dto.getStatus()); - updateEntity.setFailureReason(dto.getFailureReason()); - updateEntity.setAuditTime(new Date()); - updateById(updateEntity); - //存储活动日志表 epdc_act_user_log - ActUserLogDTO actUserLogDTO = new ActUserLogDTO(); - actUserLogDTO.setActUserRelationId(dto.getId()); - actUserLogDTO.setOperationType(dto.getStatus()); - actUserLogDTO.setFailureReason(dto.getFailureReason()); - actUserLogDTO.setOperationTime(new Date()); - actUserLogService.save(actUserLogDTO); - this.insertUserInformation(updateEntity); - return new Result(); - } - return new Result().error("不可操作"); - } - - /** - * @param actUserRelationEntity - * @return void - * @Author yinzuomei - * @Description 报名审核-用户发送消息通知 - * @Date 2020/2/7 20:08 - **/ - private void insertUserInformation(ActUserRelationEntity actUserRelationEntity) { - EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO(); - // 当前状态（0-报名，1-审核通过，2-打卡，3-取消报名，4-审核不通过） - if (ActUserRelationStatusConstant.APPROVED.equals(actUserRelationEntity.getStatus())) { - informationFormDTO.setTitle(HeartNoticeConstant.NOTICE_SIGN_UP_PASSED); - } else if (ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserRelationEntity.getStatus())) { - informationFormDTO.setTitle(HeartNoticeConstant.NOTICE_SIGN_UP_NOT_PASSED); - } else { - return; - } - informationFormDTO.setUserId(actUserRelationEntity.getUserId()); - informationFormDTO.setType(HeartNoticeConstant.NOTICE_TYPE_AUDIT_NOTICE); - informationFormDTO.setBusinessType(HeartNoticeConstant.NOTICE__BUSINESS_TYPE_ACTIVITY); - informationFormDTO.setBusinessId(actUserRelationEntity.getActId()); - informationFormDTO.setContent(actUserRelationEntity.getFailureReason()); - ActInfoDTO actInfoDTO = actInfoService.get(actUserRelationEntity.getActId()); - if (null != actInfoDTO) { - informationFormDTO.setRelBusinessContent(actInfoDTO.getTitle()); - } - newsTask.insertUserInformation(informationFormDTO); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - @Override - public Result activitySignUp(ActUserRelationDTO actUserRelationDTO) { - ActInfoDTO actInfoDTO = actInfoDao.queryActSignupNum(actUserRelationDTO.getActId()); - //判断报名是否已满 - if (actInfoDTO.getActQuotaCategory() != 0 && actInfoDTO.getActQuota().equals(actInfoDTO.getSignupNum())) { - return new Result().error("活动已报满"); - } - //查询是否已报名 - ActUserRelationEntity actUserRelationEntity = baseDao.selectOneByUserIdAndActId(actUserRelationDTO.getUserId(), actUserRelationDTO.getActId()); - if (null == actUserRelationEntity || (ActUserRelationStatusConstant.CANCEL_SIGN_UP.equals(actUserRelationEntity.getStatus()) - || ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserRelationEntity.getStatus()))) { - //未报名该活动，进行报名 - //存储活动人员关系表 - ActUserRelationEntity entity = ConvertUtils.sourceToTarget(actUserRelationDTO, ActUserRelationEntity.class); - if (null != actUserRelationEntity) { - entity.setId(actUserRelationEntity.getId()); - baseDao.updateById(entity); - } else { - insert(entity); - } - //存储活动日志表 - ActUserLogDTO actUserLogDTO = new ActUserLogDTO(); - actUserLogDTO.setActUserRelationId(entity.getId()); - actUserLogDTO.setOperationType(ActUserRelationStatusConstant.SIGN_UP); - actUserLogDTO.setOperationTime(new Date()); - actUserLogService.save(actUserLogDTO); - //更新epdc_act_info的已报名名额 - actInfoDTO.setSignupNum(actInfoDTO.getSignupNum() + 1); - actInfoService.update(actInfoDTO); - } else { - return new Result().error("您已报名"); - } - return new Result().ok("报名成功"); - } - - @Override - public Result activityCancelSignUp(AppActUserCancelsignupDTO appActUserCancelsignupDTO) { - //查询是否已报名 - List statusList = new ArrayList<>(); - statusList.add(ActUserRelationStatusConstant.SIGN_UP); - statusList.add(ActUserRelationStatusConstant.APPROVED); - List data = baseDao.selectOneActUserRelationInfo(appActUserCancelsignupDTO.getUserId(), appActUserCancelsignupDTO.getActId(), statusList); - if (data != null && data.size() > 0) { - ActUserRelationDTO actUserRelationDTO = data.get(0); - actUserRelationDTO.setStatus(ActUserRelationStatusConstant.CANCEL_SIGN_UP);//取消报名 - actUserRelationDTO.setFailureReason(appActUserCancelsignupDTO.getFailureReason());//取消报名原因 - //已报名该活动，进行取消报名 - //1、更新活动人员关系表 - ActUserRelationEntity entity = ConvertUtils.sourceToTarget(actUserRelationDTO, ActUserRelationEntity.class); - updateById(entity); - //2、存储活动日志表 - Date currentTime = new Date(); - ActUserLogDTO actUserLogDTO = new ActUserLogDTO(); - actUserLogDTO.setActUserRelationId(actUserRelationDTO.getId()); - actUserLogDTO.setOperationType(ActUserRelationStatusConstant.CANCEL_SIGN_UP);//取消报名 - actUserLogDTO.setOperationTime(currentTime); - actUserLogDTO.setFailureReason(appActUserCancelsignupDTO.getFailureReason()); - actUserLogService.save(actUserLogDTO); - //3、更新epdc_act_info的已报名名额 - //ActInfoDTO actInfoDTO = actInfoDao.queryActSignupNum(actUserRelationDTO.getActId()); - ActInfoDTO actInfoDTO = actInfoService.get(actUserRelationDTO.getActId()); - actInfoDTO.setSignupNum(actInfoDTO.getSignupNum() - 1); - actInfoService.update(actInfoDTO); - //4、判断是否扣除用户积分 - if (currentTime.after(actInfoDTO.getSignupEndTime()) && currentTime.before(actInfoDTO.getActStartTime())) { - this.cancelActSubtractPoint(actUserRelationDTO, actInfoDTO); - } - - } else { - return new Result().error("未报名"); - } - return new Result().ok("取消报名成功"); - } - - /** - * @param actUserRelationDTO - * @param actInfoDTO - * @return void - * @Author yinzuomei - * @Description 活动报名结束到活动开始时间段内取消报名要扣除用户积分，扣除积分值为当前活动的惩罚积分 - * @Date 2020/2/6 12:00 - **/ - private void cancelActSubtractPoint(ActUserRelationDTO actUserRelationDTO, ActInfoDTO actInfoDTO) { - if (null == actInfoDTO.getPunishmentPoints() || actInfoDTO.getPunishmentPoints() == 0) { - return; - } - Result volunteerInfoDTOResult = userInfoFeignClient.getVolunteerInfoDTOByUserId(actUserRelationDTO.getUserId()); - if (!volunteerInfoDTOResult.success()) { - throw new RenException("查询志愿者信息异常"); - } - //4、更新epdc_user表积分 - //直接调用fegin，返回剩余积分值 - EpdcUserPointsFormDTO userPointsFormDTO = new EpdcUserPointsFormDTO(); - userPointsFormDTO.setUserId(actUserRelationDTO.getUserId()); - userPointsFormDTO.setPoints(actInfoDTO.getPunishmentPoints()); - userPointsFormDTO.setOperationType(PointsOperationEnum.OPERATION_TYPE_SUBSTRACT.getOperationType()); - Result result = userInfoFeignClient.handleUserPoints(userPointsFormDTO); - if (!result.success()) { - throw new RenException("更新用户积分异常"); - } - //5、插入epdc_act_user_points_log记录 - ActUserPointsLogDTO actUserPointsLogDTO = new ActUserPointsLogDTO(); - actUserPointsLogDTO.setActUserId(actUserRelationDTO.getId()); - actUserPointsLogDTO.setOperationType(ActUserPointsOperationTypeConstant.CANCEL_ACT_SUBTRACT); - actUserPointsLogDTO.setOperationPointsType(PointsOperationEnum.OPERATION_TYPE_SUBSTRACT.getOperationType()); - actUserPointsLogDTO.setPoints(actInfoDTO.getPunishmentPoints()); - ActUserPointsLogEntity actUserPointsLog = actUserPointsLogService.insertActUserPointsLogDTO(actUserPointsLogDTO); - //6、插入points记录 - PointsLogsDTO pointsLogsDTO = new PointsLogsDTO(); - pointsLogsDTO.setVolunteerId(volunteerInfoDTOResult.getData().getId()); - pointsLogsDTO.setUserId(actUserRelationDTO.getUserId()); - pointsLogsDTO.setOperationType(PointsOperationEnum.OPERATION_TYPE_SUBSTRACT.getOperationType()); - pointsLogsDTO.setPoints(actInfoDTO.getPunishmentPoints()); - pointsLogsDTO.setOperationTime(new Date()); - pointsLogsDTO.setOperationMode(PointsOperationModeEnum.OPERATION_MODE_USER.getOperationMode()); - pointsLogsDTO.setRuleCode(PointsRuleCodeEnum.CANCEL_ACT.getRuleCode());//积分规则编码 - pointsLogsDTO.setLavePoints(result.getData().getPoints());//剩余积分值 - pointsLogsDTO.setBehaviorCode(PointsBehaviorCodeEnum.BREAK_PROMISE.getBehaviorCode());//积分行为编码 - pointsLogsDTO.setStatus(YesOrNoEnum.YES.value()); - pointsLogsDTO.setReferenceId(actUserPointsLog.getId()); - pointsFeignClient.addPointsLog(pointsLogsDTO); - //发送消息通知 - this.sendUserInformation(actUserRelationDTO, actInfoDTO); - } - - /** - * @param actUserRelationDTO - * @param actInfoDTO - * @return void - * @Author yinzuomei - * @Description 取消活动扣减积分发送用户消息 - * @Date 2020/2/8 19:37 - **/ - private void sendUserInformation(ActUserRelationDTO actUserRelationDTO, ActInfoDTO actInfoDTO) { - EpdcInformationFormDTO informationFormDTO = new EpdcInformationFormDTO(); - informationFormDTO.setTitle(HeartNoticeConstant.CANCEL_ACT_TITLE); - informationFormDTO.setUserId(actUserRelationDTO.getUserId()); - informationFormDTO.setType(HeartNoticeConstant.NOTICE_TYPE_INTERACTIVE_NOTICE); - informationFormDTO.setBusinessType(HeartNoticeConstant.NOTICE__BUSINESS_TYPE_ACTIVITY); - informationFormDTO.setBusinessId(actUserRelationDTO.getActId()); -// 您未参加“活动名称”，根据规则未参加将扣除积分 - informationFormDTO.setContent("您未参加“" + actInfoDTO.getTitle() + "”，根据规则未参加将扣除积分" + actInfoDTO.getPunishmentPoints()); - informationFormDTO.setRelBusinessContent(actInfoDTO.getTitle()); - newsTask.insertUserInformation(informationFormDTO); - } - - @Override - - public ActUserRelationDTO getActUserRelationId(String userId, String actId, List statusList) { - List data = baseDao.selectOneActUserRelationInfo(userId, actId, statusList); - ActUserRelationDTO actUserRelationDTO = new ActUserRelationDTO(); - if (data != null && data.size() > 0) { - actUserRelationDTO = data.get(0); - - } - return actUserRelationDTO; - } - - @Override - public Result updateActivityStatus(ActUserRelationDTO actUserRelationDTO) { - //更新活动人员关系表当前状态为打卡 - ActUserRelationEntity entity = ConvertUtils.sourceToTarget(actUserRelationDTO, ActUserRelationEntity.class); - updateById(entity); - return new Result().ok("更新成功"); - } - - @Override - public Result selectListActUserRelation(String actId) { - List list = baseDao.selectListActUserRelation(actId); - if (null == list || list.size() == 0) { - return new Result(); - } - List resultList = new ArrayList(); - String[] idArr = new String[list.size()]; - for (int k = 0; k < list.size(); k++) { - Map map = new HashMap(); - map.put("nickname", list.get(k).getNickname()); - map.put("faceImg", list.get(k).getFaceImg()); - map.put("partyFlag", list.get(k).getPartyFlag()); - map.put("clockDesc", list.get(k).getClockDesc()); - map.put("createdTime", list.get(k).getClockTime()); - map.put("clockId", list.get(k).getId() == null ? "" : list.get(k).getId()); - //查询打卡对应图片 - idArr[k] = list.get(k).getId(); - resultList.add(map); - } - List listLogImg = baseDao.selectListClockImg(idArr); - for (Object objMap : resultList) { - Map mm = (Map) objMap; - List imgList = new ArrayList(); - for (int i = listLogImg.size() - 1; i >= 0; i--) { - if (mm.get("clockId").equals(listLogImg.get(i).getClockId())) { - imgList.add(listLogImg.get(i).getClockPic()); - listLogImg.remove(i); - } - } - mm.put("images", imgList); - mm.remove("clockId"); - } - AppClockListDTO appClockListDTO = new AppClockListDTO(); - appClockListDTO.setClockNum(resultList.size()); - appClockListDTO.setClocks(resultList); - return new Result().ok(appClockListDTO); - } - - /** - * 自动审核 - * @param actId - * @return - */ - @Override - public Result updateAuditDefaultStatus(String actId) { - // 根据actID查询活动开始未审核报名人默认状态 - ActInfoDTO actInfoDTO = actInfoService.get(actId); - String actUserDefaultState = actInfoDTO.getActUserDefaultState(); // 活动开始未审核报名人默认状态 - - // 查询已报名未审核的志愿者 - List data = baseDao.selectListActUserInfo(actId); - if(data != null && data.size() > 0){ - for(int i = 0 ; i < data.size() ; i++){ - // 更新人员活动关系表 - ActUserRelationDTO actUserRelationDTO = data.get(i); - actUserRelationDTO.setStatus(actUserDefaultState);// 默认状态 - actUserRelationDTO.setAuditTime(new Date()); //自动审核时间 - ActUserRelationEntity entity = ConvertUtils.sourceToTarget(actUserRelationDTO, ActUserRelationEntity.class); - updateById(entity); - // 存储活动日志表 - ActUserLogDTO actUserLogDTO = new ActUserLogDTO(); - actUserLogDTO.setActUserRelationId(entity.getId()); - actUserLogDTO.setOperationType(actUserDefaultState);// 默认状态 - actUserLogDTO.setOperationTime(new Date()); - actUserLogService.save(actUserLogDTO); - } - }else{ - return new Result().ok("该活动暂时没有未审核的志愿者"); - } - - return new Result().ok("该活动对已报名的志愿者自动审核成功"); - } - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/async/NewsTask.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/async/NewsTask.java deleted file mode 100644 index 25afb8351..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/async/NewsTask.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.elink.esua.epdc.modules.async; - -import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; -import com.elink.esua.epdc.modules.feign.NewsFeignClient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * 新闻通知消息模块 线程任务 - * - * @author yujintao - * @email yujintao@elink-cn.com - * @date 2019/9/10 10:02 - */ -@Component -public class NewsTask { - - @Autowired - private NewsFeignClient newsFeignClient; - - /** - * 给用户发送消息 - * - * @param informationDto - * @return void - * @author yujintao - * @date 2019/9/10 10:33 - */ - @Async - public void insertUserInformation(EpdcInformationFormDTO informationDto) { - newsFeignClient.saveInformation(informationDto); - } - - /** - * @param epdcInformationFormDTOList - * @return void - * @Author yinzuomei - * @Description 批量给用户发消息 - * @Date 2020/2/7 21:01 - **/ - public void insertBatchUserInformation(List epdcInformationFormDTOList) { - newsFeignClient.saveInformationList(epdcInformationFormDTOList); - } -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/JobFeignClient.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/JobFeignClient.java deleted file mode 100644 index 06a84d45c..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/JobFeignClient.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.elink.esua.epdc.modules.feign; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.ScheduleJobDTO; -import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.modules.feign.fallback.JobFeignClientFallback; -import com.elink.esua.epdc.modules.feign.fallback.UserInfoFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; - -/** - * - * 调用用户模块 - * - * @Author：wanggongfeng - * @Date：2019/12/16 17:36 - */ -@FeignClient(name = ServiceConstant.EPDC_JOB_SERVER, fallback = JobFeignClientFallback.class) -public interface JobFeignClient { - - - - /** - * 定时任务 - * - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @params [userDTO] - * @author liuchuang - * @since 2019/10/25 17:07 - */ - @PostMapping("job/schedule") - Result save(ScheduleJobDTO dto); - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/NewsFeignClient.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/NewsFeignClient.java deleted file mode 100644 index 662dc2192..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/NewsFeignClient.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.elink.esua.epdc.modules.feign; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; -import com.elink.esua.epdc.modules.feign.fallback.NewsFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -import java.util.List; - -/** - * 消息模块 - * - * @author work@yujt.net.cn - * @date 2019/9/18 15:37 - */ -@FeignClient(name = ServiceConstant.EPDC_NEWS_SERVER, fallback = NewsFeignClientFallback.class) -public interface NewsFeignClient { - - /** - * 给用户发消息 - * - * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author work@yujt.net.cn - * @date 2019/9/18 15:40 - */ - @PostMapping(value = "news/epdc-app/information/save", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) - Result saveInformation(@RequestBody EpdcInformationFormDTO formDto); - - /** - * @param epdcInformationFormDTOList - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 批量给用户发消息 - * @Date 2020/2/7 21:00 - **/ - @PostMapping(value = "news/epdc-app/information/saveList", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) - Result saveInformationList(List epdcInformationFormDTOList); -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/PointsFeignClient.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/PointsFeignClient.java deleted file mode 100644 index 077ec117c..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/PointsFeignClient.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.elink.esua.epdc.modules.feign; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.logs.PointsLogsDTO; -import com.elink.esua.epdc.modules.feign.fallback.PointsFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * - * 调用用户模块 - * - * @Author：wanggongfeng - * @Date：2019/12/16 17:36 - */ -@FeignClient(name = ServiceConstant.EPDC_POINTS_SERVER, fallback = PointsFeignClientFallback.class) -public interface PointsFeignClient { - - @PostMapping("/points/pointslogs/addPointsLog") - Result addPointsLog(@RequestBody PointsLogsDTO dto); - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java deleted file mode 100644 index d68636c33..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.elink.esua.epdc.modules.feign; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.dto.VolunteerInfoDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO; -import com.elink.esua.epdc.modules.feign.fallback.UserInfoFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; - -/** - * - * 调用用户模块 - * - * @Author：wanggongfeng - * @Date：2019/12/16 17:36 - */ -@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserInfoFeignClientFallback.class) -public interface UserInfoFeignClient { - - - @GetMapping("app-user/epdc-app/user/getById/{userId}") - Result getUserInfoById(@PathVariable("userId") String userId); - - /** - * 更新用户信息 - * - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @params [userDTO] - * @author liuchuang - * @since 2019/10/25 17:07 - */ - @PostMapping("app-user/epdc-app/user/updateUserInfo") - Result updateUserInfo(UserDTO userDTO); - - /** - * @param userId 用户主键 - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 根据用户主键获取用户志愿者标识（0-未认证1-已认证） - * @Date 2020/2/5 16:45 - **/ - @GetMapping("app-user/volunteerinfo/queryUserVolunteerFlag/{userId}") - Result queryUserVolunteerFlag(@PathVariable("userId") String userId); - - /** - * @param userId 用户id - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei 根据用户id查询志愿者信息 - * @Description 根据用户id - * @Date 2020/2/6 12:20 - **/ - @GetMapping("app-user/volunteerinfo/getVolunteerInfoDTOByUserId/{userId}") - Result getVolunteerInfoDTOByUserId(@PathVariable("userId") String userId); - - /** - * @param formDTO - * @return com.elink.esua.epdc.dto.UserDTO - * @Author yinzuomei - * @Description 根据操作类型更新用户积分 - * @Date 2019/12/13 15:12 - **/ - @PostMapping(value = "app-user/user/handleUserPoints", consumes = MediaType.APPLICATION_JSON_VALUE) - Result handleUserPoints(EpdcUserPointsFormDTO formDTO); - - /** - * - * 志愿者增加参与活动爱心时长 - * - * @params [formDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2020/2/7 18:16 - */ - @PostMapping(value = "app-user/volunteerinfo/addKindnessTime", consumes = MediaType.APPLICATION_JSON_VALUE) - Result addKindnessTime(EpdcVolunteerKindnessTimeFormDTO formDto); -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/JobFeignClientFallback.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/JobFeignClientFallback.java deleted file mode 100644 index 2f7bb69e3..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/JobFeignClientFallback.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.elink.esua.epdc.modules.feign.fallback; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.ScheduleJobDTO; -import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.modules.feign.JobFeignClient; -import com.elink.esua.epdc.modules.feign.UserInfoFeignClient; -import org.springframework.stereotype.Component; - -/** - * @author 86185 - */ -@Component -public class JobFeignClientFallback implements JobFeignClient { - - @Override - public Result save(ScheduleJobDTO dto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_JOB_SERVER, "save", dto); - } -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/NewsFeignClientFallback.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/NewsFeignClientFallback.java deleted file mode 100644 index 9d91e8372..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/NewsFeignClientFallback.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.elink.esua.epdc.modules.feign.fallback; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; -import com.elink.esua.epdc.modules.feign.NewsFeignClient; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @author work@yujt.net.cn - * @date 2019/9/18 15:38 - */ -@Component -public class NewsFeignClientFallback implements NewsFeignClient { - - @Override - public Result saveInformation(EpdcInformationFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "saveInformation", formDto); - } - - @Override - public Result saveInformationList(List epdcInformationFormDTOList) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_NEWS_SERVER, "saveInformationList", epdcInformationFormDTOList); - } -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java deleted file mode 100644 index 01597dd98..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/PointsFeignClientFallback.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.elink.esua.epdc.modules.feign.fallback; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.logs.PointsLogsDTO; -import com.elink.esua.epdc.modules.feign.PointsFeignClient; -import org.springframework.stereotype.Component; - - -/** - * @Author：wanggongfeng - * @Date：2019/12/16 15:11 - */ -@Component -public class PointsFeignClientFallback implements PointsFeignClient { - - - @Override - public Result addPointsLog(PointsLogsDTO dto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_POINTS_SERVER, "addPointsLog", dto); - } -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java deleted file mode 100644 index 95f0d4b4b..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.elink.esua.epdc.modules.feign.fallback; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.dto.VolunteerInfoDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO; -import com.elink.esua.epdc.modules.feign.UserInfoFeignClient; -import org.springframework.stereotype.Component; - -/** - * @author 86185 - */ -@Component -public class UserInfoFeignClientFallback implements UserInfoFeignClient { - @Override - public Result getUserInfoById(String userId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoById", userId); - } - - @Override - public Result updateUserInfo(UserDTO userDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateUserInfo", userDTO); - } - - @Override - public Result queryUserVolunteerFlag(String userId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "queryUserVolunteerFlag", userId); - } - - @Override - public Result getVolunteerInfoDTOByUserId(String userId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getVolunteerInfoDTOByUserId", userId); - } - - @Override - public Result handleUserPoints(EpdcUserPointsFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "handleUserPoints", formDTO); - } - - @Override - public Result addKindnessTime(EpdcVolunteerKindnessTimeFormDTO formDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "addKindnessTime", formDto); - } - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/ActPhraseController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/ActPhraseController.java deleted file mode 100644 index a07ca3a68..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/ActPhraseController.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.phrases.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.modules.phrases.excel.ActPhraseExcel; -import com.elink.esua.epdc.modules.phrases.service.ActPhraseService; -import com.elink.esua.epdc.phrases.ActPhraseDTO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 常用语表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@RestController -@RequestMapping("actphrase") -public class ActPhraseController { - - @Autowired - private ActPhraseService actPhraseService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - //PageData page = actPhraseService.page(params); - PageData page = actPhraseService.getPhrasePage(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - ActPhraseDTO data = actPhraseService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody ActPhraseDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - actPhraseService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody ActPhraseDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - actPhraseService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - actPhraseService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = actPhraseService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, ActPhraseExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/AppActPhraseController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/AppActPhraseController.java deleted file mode 100644 index 4e5630f8b..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/AppActPhraseController.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.phrases.controller; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.modules.phrases.entity.ActPhraseRedisEntity; -import com.elink.esua.epdc.modules.phrases.service.ActPhraseService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - - -/** - * 常用语表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11sagenumAddOneById - */ -@RestController -@RequestMapping("appactphrase") -public class AppActPhraseController { - - @Autowired - private ActPhraseService actPhraseService; - - /** - * 使用次数加一 - * @param id 常用语ID - * @return - */ - @GetMapping(value="sagenumAddOneById/{id}") - public Result sagenumAddOneById(@PathVariable("id")String id) { - actPhraseService.updateUsagenumAddOne(id); - return new Result().ok("使用次数加一成功"); - } - - /** - * redis获取常用语 - * @return - */ - @GetMapping(value="getPhraseList") - public Result getPhraseList() { - List object = actPhraseService.getPhraseList(); - return new Result().ok(object); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/dao/ActPhraseDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/dao/ActPhraseDao.java deleted file mode 100644 index 3076a6c2d..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/dao/ActPhraseDao.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.phrases.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.phrases.entity.ActPhraseEntity; -import com.elink.esua.epdc.modules.phrases.entity.ActPhraseRedisEntity; -import com.elink.esua.epdc.phrases.ActPhraseDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; -import java.util.Map; - -/** - * 常用语表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Mapper -public interface ActPhraseDao extends BaseDao { - - /** - * 按序号顺序查询常用语 - * @return - */ - List selectListPhraseInOrder(); - - void updateUsagenumAddOne(@Param("id")String id); - - /** - * 条件查询 - * @param params - * @return - */ - List getPhrasePage(Map params); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/entity/ActPhraseEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/entity/ActPhraseEntity.java deleted file mode 100644 index 453fa00b7..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/entity/ActPhraseEntity.java +++ /dev/null @@ -1,63 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.phrases.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 常用语表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_act_phrase") -public class ActPhraseEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 常用语 - */ - private String phrase; - - /** - * 显示顺序 - */ - private Integer sort; - - /** - * 是否显示(0-否，1-是) - */ - private String showFlag; - - /** - * 使用次数 0 - */ - private Integer usageNum; - - /** - * code - */ - private String code; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/entity/ActPhraseRedisEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/entity/ActPhraseRedisEntity.java deleted file mode 100644 index 883ed5b53..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/entity/ActPhraseRedisEntity.java +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.phrases.entity; - -import lombok.Data; - -/** - * 常用语表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Data -public class ActPhraseRedisEntity { - - /** - * ID - */ - private String id; - - /** - * 常用语 - */ - private String phrase; - - /** - * code - */ - private String code; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/excel/ActPhraseExcel.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/excel/ActPhraseExcel.java deleted file mode 100644 index c6b06076d..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/excel/ActPhraseExcel.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.phrases.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.util.Date; - -/** - * 常用语表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Data -public class ActPhraseExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "常用语") - private String phrase; - - @Excel(name = "显示顺序") - private Integer sort; - - @Excel(name = "是否显示(0-否，1-是)") - private String showFlag; - - @Excel(name = "使用次数 0") - private Integer usageNum; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/redis/ActPhraseRedis.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/redis/ActPhraseRedis.java deleted file mode 100644 index da46cccab..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/redis/ActPhraseRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.phrases.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 常用语表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Component -public class ActPhraseRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/ActPhraseService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/ActPhraseService.java deleted file mode 100644 index d2724726a..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/ActPhraseService.java +++ /dev/null @@ -1,126 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.phrases.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.modules.phrases.entity.ActPhraseEntity; -import com.elink.esua.epdc.modules.phrases.entity.ActPhraseRedisEntity; -import com.elink.esua.epdc.phrases.ActPhraseDTO; - -import java.util.List; -import java.util.Map; - -/** - * 常用语表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -public interface ActPhraseService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-11 - */ - PageData page(Map params); - - /** - * 分页条件查询 - * @param params - * @return - */ - PageData getPhrasePage(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-12-11 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return ActPhraseDTO - * @author generator - * @date 2019-12-11 - */ - ActPhraseDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-11 - */ - void save(ActPhraseDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-11 - */ - void update(ActPhraseDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-12-11 - */ - void delete(String[] ids); - - /** - * 查询常用语，更新Radis - */ - void insertPhraseListToRedis(); - - /** - * 更新使用次数（+1） - * - * @param id - * @return void - * @author wanggongfeng - * @date 2019-12-12 - */ - void updateUsagenumAddOne(String id); - - /** - * 从redis直接读取常用语 - * @author wanggongfeng - * @date 2019-12-12 - * @return 常用语列表 - */ - List getPhraseList(); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java deleted file mode 100644 index 85a0c75a5..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java +++ /dev/null @@ -1,202 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.phrases.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.exception.RenException; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.redis.RedisKeys; -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.modules.phrases.dao.ActPhraseDao; -import com.elink.esua.epdc.modules.phrases.entity.ActPhraseEntity; -import com.elink.esua.epdc.modules.phrases.entity.ActPhraseRedisEntity; -import com.elink.esua.epdc.modules.phrases.redis.ActPhraseRedis; -import com.elink.esua.epdc.modules.phrases.service.ActPhraseService; -import com.elink.esua.epdc.phrases.ActPhraseDTO; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 常用语表 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-11 - */ -@Service -public class ActPhraseServiceImpl extends BaseServiceImpl implements ActPhraseService { - - @Autowired - private ActPhraseRedis actPhraseRedis; - @Autowired - private RedisUtils redisUtils; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, ActPhraseDTO.class); - } - - /** - * 条件查询 - * @param params - * @return - */ - @Override - public PageData getPhrasePage(Map params) { - IPage page = getPage(params); - List list = baseDao.getPhrasePage(params); - return new PageData<>(list, page.getTotal()); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, ActPhraseDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public ActPhraseDTO get(String id) { - ActPhraseEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, ActPhraseDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(ActPhraseDTO dto) { - String categoryCode = dto.getCode(); - if (StringUtils.isNotBlank(categoryCode)) { - if (getCodeCount(dto) > 0) { - throw new RenException("您输入的编码已存在"); - } - } - ActPhraseEntity entity = ConvertUtils.sourceToTarget(dto, ActPhraseEntity.class); - entity.setUsageNum(0); - if (insert(entity)) { - //redis存储 - String key = RedisKeys.getPhraseListKey(); - List list = baseDao.selectListPhraseInOrder(); - if (null != list && list.size() > 0) { - redisUtils.set(key, list); - } - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(ActPhraseDTO dto) { - ActPhraseEntity entity = ConvertUtils.sourceToTarget(dto, ActPhraseEntity.class); - updateById(entity); - - //redis存储 - String key = RedisKeys.getPhraseListKey(); - redisUtils.delete(key); - List list = baseDao.selectListPhraseInOrder(); - redisUtils.set(key,list); - - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - - //redis存储 - String key = RedisKeys.getPhraseListKey(); - redisUtils.delete(key); - List list = baseDao.selectListPhraseInOrder(); - redisUtils.set(key,list); - } - - /** - * 统计编码数量 - * @param dto - * @return - */ - public Integer getCodeCount(ActPhraseDTO dto) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("code", dto.getCode()); - String id = dto.getId(); - wrapper.ne(id != null, "id", dto.getId()); - wrapper.eq("del_flag", "0"); - return baseDao.selectCount(wrapper); - } - - /** - * 查询启动时需存入radis内的常用语 - * @return - */ - @Override - @Transactional(rollbackFor = Exception.class) - public void insertPhraseListToRedis(){ - //redis存储 - String key = RedisKeys.getPhraseListKey(); - redisUtils.delete(key); - List list = baseDao.selectListPhraseInOrder(); - redisUtils.set(key,list); - } - - /** - * 使用次数加一 - * @param id - */ - @Override - public void updateUsagenumAddOne(String id){ - baseDao.updateUsagenumAddOne(id); - } - - /** - * 从redis直接读取常用语 - * @return - */ - @Override - public List getPhraseList(){ - String key = RedisKeys.getPhraseListKey(); - Object object = redisUtils.get(key); - List list = new ArrayList(); - if(object != null){ - list = (List)object; - } - return list; - } - -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/AppVolunteerRankController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/AppVolunteerRankController.java deleted file mode 100644 index e7e699609..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/AppVolunteerRankController.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.volunteer.controller; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; -import com.elink.esua.epdc.modules.volunteer.service.VolunteerRankService; -import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - - -/** - * 志愿者排名接口 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@RestController -@RequestMapping("volunteer") -public class AppVolunteerRankController { - - @Autowired - private VolunteerRankService volunteerRankService; - - /** - * 获取排行榜 - * @return - */ - @GetMapping(value="leaderboard") - public Result> leaderboard() { - List list = volunteerRankService.leaderboard(); - return new Result().ok(list); - } - - /** - * 定时更新排行榜 - * @return - */ - @PostMapping(value="generateRankingList") - public Result generateRankingList(@RequestBody List list) { - return volunteerRankService.generateRankingList(list); - - } - - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerRankController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerRankController.java deleted file mode 100644 index 79398e8d2..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/controller/VolunteerRankController.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.volunteer.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.volunteer.VolunteerRankDTO; -import com.elink.esua.epdc.modules.volunteer.excel.VolunteerRankExcel; -import com.elink.esua.epdc.modules.volunteer.service.VolunteerRankService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 志愿者排名 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@RestController -@RequestMapping("volunteerrank") -public class VolunteerRankController { - - @Autowired - private VolunteerRankService volunteerRankService; - - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = volunteerRankService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - VolunteerRankDTO data = volunteerRankService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody VolunteerRankDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - volunteerRankService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody VolunteerRankDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - volunteerRankService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - volunteerRankService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = volunteerRankService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, VolunteerRankExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java deleted file mode 100644 index d56556bcf..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerRankDao.java +++ /dev/null @@ -1,41 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.volunteer.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.modules.volunteer.entity.VolunteerRankEntity; -import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 志愿者排名 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@Mapper -public interface VolunteerRankDao extends BaseDao { - /** - * 获取排行榜 - * @Author wanggongfeng - * @return - */ - List leaderboard(); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java deleted file mode 100644 index 26201329d..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/entity/VolunteerRankEntity.java +++ /dev/null @@ -1,92 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.volunteer.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 志愿者排名 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_volunteer_rank") -public class VolunteerRankEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 排名 - */ - private Integer sort; - - /** - * 志愿者ID - */ - private String volunteerId; - - /** - * 用户ID - */ - private String userId; - - /** - * 头像 - */ - private String faceImg; - - /** - * 用户名 - */ - private String nickname; - - /** - * 是否党员(0-否，1-是) - */ - private String partyFlag; - - /** - * 爱心时长(单位：小时) - */ - private BigDecimal kindnessTime; - - /** - * 参加次数 - */ - private Integer participationNum; - - /** - * 排行生成日期 - */ - private Date generateDate; - - /** - * 是否显示(0-不显示，1-显示) - */ - private String showFlag; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/excel/VolunteerRankExcel.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/excel/VolunteerRankExcel.java deleted file mode 100644 index c3e8854ce..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/excel/VolunteerRankExcel.java +++ /dev/null @@ -1,87 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.volunteer.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 志愿者排名 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@Data -public class VolunteerRankExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "排名") - private Integer sort; - - @Excel(name = "志愿者ID") - private String volunteerId; - - @Excel(name = "用户ID") - private String userId; - - @Excel(name = "头像") - private String faceImg; - - @Excel(name = "用户名") - private String nickname; - - @Excel(name = "是否党员(0-否，1-是)") - private String partyFlag; - - @Excel(name = "爱心时长(单位：小时)") - private BigDecimal kindnessTime; - - @Excel(name = "参加次数") - private Integer participationNum; - - @Excel(name = "排行生成日期") - private Date generateDate; - - @Excel(name = "是否显示(0-不显示，1-显示)") - private String showFlag; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - @Excel(name = "删除标志") - private String delFlag; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/redis/VolunteerRankRedis.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/redis/VolunteerRankRedis.java deleted file mode 100644 index df6b5e58b..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/redis/VolunteerRankRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.volunteer.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 志愿者排名 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@Component -public class VolunteerRankRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerRankService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerRankService.java deleted file mode 100644 index 757a41d68..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/VolunteerRankService.java +++ /dev/null @@ -1,114 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.volunteer.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; -import com.elink.esua.epdc.modules.volunteer.entity.VolunteerRankEntity; -import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; -import com.elink.esua.epdc.volunteer.VolunteerRankDTO; - -import java.util.List; -import java.util.Map; - -/** - * 志愿者排名 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -public interface VolunteerRankService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-19 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-12-19 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return VolunteerRankDTO - * @author generator - * @date 2019-12-19 - */ - VolunteerRankDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-19 - */ - void save(VolunteerRankDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-19 - */ - void update(VolunteerRankDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-12-19 - */ - void delete(String[] ids); - - /** - * 获取排行榜 - * @Author wanggongfeng - * @return - */ - List leaderboard(); - - /** - * 生成排行榜 - * @Author wanggongfeng - * @return - */ - Result generateRankingList(List list); - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java deleted file mode 100644 index 5b8434bd8..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerRankServiceImpl.java +++ /dev/null @@ -1,136 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.modules.volunteer.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; -import com.elink.esua.epdc.modules.volunteer.dao.VolunteerRankDao; -import com.elink.esua.epdc.modules.volunteer.entity.VolunteerRankEntity; -import com.elink.esua.epdc.modules.volunteer.redis.VolunteerRankRedis; -import com.elink.esua.epdc.modules.volunteer.service.VolunteerRankService; -import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; -import com.elink.esua.epdc.volunteer.VolunteerRankDTO; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 志愿者排名 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@Service -public class VolunteerRankServiceImpl extends BaseServiceImpl implements VolunteerRankService { - - @Autowired - private VolunteerRankRedis volunteerRankRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, VolunteerRankDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, VolunteerRankDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public VolunteerRankDTO get(String id) { - VolunteerRankEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, VolunteerRankDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(VolunteerRankDTO dto) { - VolunteerRankEntity entity = ConvertUtils.sourceToTarget(dto, VolunteerRankEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(VolunteerRankDTO dto) { - VolunteerRankEntity entity = ConvertUtils.sourceToTarget(dto, VolunteerRankEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - /** - * 获取排行榜 - * @Author wanggongfeng - * @return - */ - @Override - public List leaderboard(){ - List list = baseDao.leaderboard(); - return list; - } - - /** - * 更新排行榜 - * @Author wanggongfeng - * @return - */ - @Override - public Result generateRankingList(List list){ - if(list != null && list.size() > 0){ - for(int i = 0 ; i < list.size(); i++ ){ - EpdcGetVolunteerRankDTO epdcGetVolunteerRankDTO = list.get(i); - VolunteerRankEntity entity = ConvertUtils.sourceToTarget(epdcGetVolunteerRankDTO, VolunteerRankEntity.class); - insert(entity); - } - return new Result().ok("排名更新成功"); - } - return new Result().error("更新排名失败"); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/support/initbean/InitRedisCache.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/support/initbean/InitRedisCache.java deleted file mode 100644 index 53f4593c6..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/support/initbean/InitRedisCache.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.elink.esua.epdc.support.initbean; - -import com.elink.esua.epdc.modules.phrases.service.ActPhraseService; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -public class InitRedisCache implements InitializingBean { - - @Autowired - private ActPhraseService actPhraseService; - - @Override - public void afterPropertiesSet() throws Exception{ - //redis存储常用语 - actPhraseService.insertPhraseListToRedis(); - } -} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml index d0994ac88..b9b4844a1 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml @@ -1,30 +1,9 @@ -#server: -# port: @server.port@ -# servlet: -# context-path: /heart -# -#nacos: -# config: -# server-addr: @nacos.server-addr@ -# type: YAML -# namespace: @nacos.config.namespace@ -# group: @nacos.config.group@ -# dataId: epdc-heart-server -# bootstrap: -# enable: true -# log: -# enable: @nacos.config.bootstrap.log.enable@ -#spring: -# application: -# name: epdc-heart-server server: port: @server.port@ servlet: context-path: /heart spring: - main: - allow-bean-definition-overriding: true application: name: epdc-heart-server # 环境 dev|test|prod @@ -64,23 +43,6 @@ spring: # 将采样比例设置为 1.0，也就是全部都需要。默认是 0.1 probability: 1.0 -feign: - hystrix: - enabled: true - httpclient: - enabled: true - -hystrix: - command: - default: - execution: - isolation: - thread: - timeoutInMilliseconds: 60000 #缺省为1000 - -ribbon: - ReadTimeout: 300000 - ConnectTimeout: 300000 management: endpoints: diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml deleted file mode 100644 index db4c75ee5..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE epdc_act_banner - SET `STATUS` = '0' - WHERE - ID NOT IN ( - SELECT - t.ID - FROM - ( SELECT ID FROM epdc_act_banner WHERE `STATUS` = '1' AND DEL_FLAG = '0' ORDER BY CREATED_TIME DESC LIMIT 9 ) AS t - ) - - - - UPDATE epdc_act_banner SET `STATUS` = '0' WHERE ACT_ID = #{actId} - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActClockPicDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActClockPicDao.xml deleted file mode 100644 index 37dd9f15b..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActClockPicDao.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml deleted file mode 100644 index 028e2b916..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml +++ /dev/null @@ -1,509 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - update epdc_act_info eai - set eai.CLOCK_NUM=eai.CLOCK_NUM+1 - where eai.DEL_FLAG='0' - and eai.id=#{actId} - - diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserClockLogDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserClockLogDao.xml deleted file mode 100644 index b871e8823..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserClockLogDao.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserLogDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserLogDao.xml deleted file mode 100644 index aaf472d71..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserLogDao.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserPointsLogDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserPointsLogDao.xml deleted file mode 100644 index 7410a2662..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserPointsLogDao.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml deleted file mode 100644 index bd004480c..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/phrases/ActPhraseDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/phrases/ActPhraseDao.xml deleted file mode 100644 index 084868edf..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/phrases/ActPhraseDao.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - update epdc_act_phrase set USAGE_NUM = USAGE_NUM + 1 where id = #{id} - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml deleted file mode 100644 index ad0ac000e..000000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerRankDao.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/registry.conf index fb64abd71..9cfedf9cc 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/registry.conf +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/registry.conf @@ -3,7 +3,7 @@ registry { type = "nacos" nacos { - serverAddr = "@nacos.server-addr@" + serverAddr = "47.104.224.45" namespace = "public" cluster = "default" } @@ -14,7 +14,7 @@ config { type = "nacos" nacos { - serverAddr = "@nacos.server-addr@" + serverAddr = "47.104.224.45" namespace = "public" cluster = "default" } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-client/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-client/pom.xml index 65c2e075d..1bd888898 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-client/pom.xml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-client/pom.xml @@ -18,11 +18,6 @@ epdc-commons-tools 1.0.0 - - com.esua.epdc - epdc-user-client - 1.0.0 - diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/Dockerfile b/esua-epdc/epdc-module/epdc-job/epdc-job-server/Dockerfile deleted file mode 100755 index d9a1f64c6..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -# 基础镜像 -FROM adoptopenjdk/openjdk11 -# 作者 -MAINTAINER rongchao@elink-cn.com -# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_FILE的值 -ARG JAR_FILE -# 对应pom.xml文件中的dockerfile-maven-plugin插件JAR_NAME的值 -ARG JAR_NAME -# 对应pom.xml文件中的dockerfile-maven-plugin插件SERVER_PORT的值 -ARG SERVER_PORT -# 复制打包完成后的jar文件到/opt目录下 -ENV JAR_PATH /mnt/epdc/${JAR_NAME}.jar -ADD ${JAR_FILE} $JAR_PATH -# /data设为环境变量 -ENV DATAPATH /data -# 挂载/data目录到主机 -VOLUME $DATAPATH -# 启动容器时执行 -ENTRYPOINT java -jar -Xmx1024m $JAR_PATH -EXPOSE ${SERVER_PORT} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml index 7c34795bc..b5e3eb9bc 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml @@ -75,10 +75,6 @@ springfox-swagger-ui ${swagger.version} - io.github.openfeign @@ -164,13 +160,6 @@ false 47.104.224.45:8848 - @@ -194,13 +183,6 @@ true 47.104.224.45:8848 - diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/controller/ScheduleJobController.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/controller/ScheduleJobController.java index e0ec14bec..26c92a43c 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/controller/ScheduleJobController.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/controller/ScheduleJobController.java @@ -67,7 +67,6 @@ public class ScheduleJobController { @ApiOperation("保存") @LogOperation("保存") public Result save(@RequestBody ScheduleJobDTO dto){ - dto.setId(null); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); scheduleJobService.save(dto); diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/dao/ScheduleJobDao.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/dao/ScheduleJobDao.java index 4d5e139ff..e537a63db 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/dao/ScheduleJobDao.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/dao/ScheduleJobDao.java @@ -8,10 +8,10 @@ package com.elink.esua.epdc.dao; +import com.elink.esua.epdc.entity.ScheduleJobEntity; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.entity.ScheduleJobEntity; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.Map; @@ -27,9 +27,4 @@ public interface ScheduleJobDao extends BaseDao { * 批量更新状态 */ int updateBatch(Map map); - - /** - * 根据params删除某一个定时任务 - */ - void deleteJobByParams(@Param("params")String params); } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/HeartFeignClient.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/HeartFeignClient.java deleted file mode 100644 index 230d38575..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/HeartFeignClient.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.elink.esua.epdc.feign; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; -import com.elink.esua.epdc.feign.fallback.HeartFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; - -import java.util.List; - -/** - * - * 调用用户模块 - * - * @Author：wanggongfeng - * @Date：2019/12/16 17:36 - */ -@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = HeartFeignClientFallback.class) -public interface HeartFeignClient { - - /** - * 更新当日排行榜 - * - * @return - */ - @PostMapping("heart/volunteer/generateRankingList") - Result generateRankingList(List list); - - /** - * 活动时间到自动审核通过未审核的报名人员 - * - * @return - */ - @GetMapping("heart/appactuserrelation/AutoAuditActUser/{actId}") - Result AutoAuditActUser(@PathVariable("actId") String actId); - -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/KpiFeignClient.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/KpiFeignClient.java deleted file mode 100644 index b4c17cbbb..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/KpiFeignClient.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.elink.esua.epdc.feign; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.feign.fallback.KpiFeignClientFallBack; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; - -/** - * @author: qushutong - * @Date: 2019/12/12 18:46 - * @Description: kpi模块 - */ -@FeignClient(name = ServiceConstant.EPDC_KPI_SERVER, fallback = KpiFeignClientFallBack.class) -public interface KpiFeignClient { - - /*** - * 调用kpi模块执行获取元数据的定时任务 - * @param kpiScheduleCode - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author qushutong - * @date 2019/12/12 18:55 - */ - @GetMapping("kpi/metaData/buildMetaData/{kpiScheduleCode}") - Result runKpiMateData(@PathVariable("kpiScheduleCode") String kpiScheduleCode); - - /** - * 根据规则编码启动公式计算 - * - * @param ruleCode - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author work@yujt.net.cn - * @date 2019/12/25 14:06 - */ - @GetMapping("kpi/rule/calcByCode/{ruleCode}") - Result startTaskByRuleCode(@PathVariable("ruleCode") String ruleCode); - - /** - * 将手动打分存入元数据表 - * - * @param params - * @return void - * @author work@yujt.net.cn - * @date 2019/12/25 14:06 - */ - @GetMapping("kpi/manualScore/initMetaData/{params}") - Result manualScoreToMetaData(@PathVariable("params") String params); -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java deleted file mode 100644 index 975afbe24..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.elink.esua.epdc.feign; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; -import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; - -import java.util.List; - -/** - * - * 调用用户模块 - * - * @Author：wanggongfeng - * @Date：2019/12/16 17:36 - */ -@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class) -public interface UserFeignClient { - - /** - * 获取当日排行榜 - * - * @return - */ - @GetMapping("app-user/epdc-app/volunteerinfo/getRankingList") - Result> getRankingList(); - - - @GetMapping("app-user/epdc-app/user/getById/{userId}") - Result getUserInfoById(@PathVariable("userId") String userId); - - /** - * 更新用户信息 - * - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @params [userDTO] - * @author liuchuang - * @since 2019/10/25 17:07 - */ - @PostMapping("app-user/epdc-app/user/updateUserInfo") - Result updateUserInfo(UserDTO userDTO); - -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/HeartFeignClientFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/HeartFeignClientFallback.java deleted file mode 100644 index 0bcf90b3f..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/HeartFeignClientFallback.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.elink.esua.epdc.feign.fallback; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; -import com.elink.esua.epdc.feign.HeartFeignClient; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @Author：wanggongfeng - * @Date：2019/12/16 15:11 - */ -@Component -public class HeartFeignClientFallback implements HeartFeignClient { - - /** - * 更新排行榜 - * - * @return - */ - @Override - public Result generateRankingList(List list) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "generateRankingList",list); - } - - /** - * 活动时间到自动审核通过未审核的报名人员 - * - * @return - */ - @Override - public Result AutoAuditActUser(String actId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "AutoAuditActUser",actId); - } - -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/KpiFeignClientFallBack.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/KpiFeignClientFallBack.java deleted file mode 100644 index 8c3d024a3..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/KpiFeignClientFallBack.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.elink.esua.epdc.feign.fallback; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.feign.KpiFeignClient; -import org.springframework.stereotype.Component; - - -@Component -public class KpiFeignClientFallBack implements KpiFeignClient { - - @Override - public Result runKpiMateData(String kpiScheduleCode) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_KPI_SERVER, "runKpiMateData", kpiScheduleCode); - } - - @Override - public Result startTaskByRuleCode(String ruleCode) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_KPI_SERVER, "startTaskByRuleCode", ruleCode); - } - - @Override - public Result manualScoreToMetaData(String params) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_KPI_SERVER, "manualScoreToMetaData", params); - } -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java deleted file mode 100644 index d3ab4b71f..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.elink.esua.epdc.feign.fallback; - -import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; -import com.elink.esua.epdc.feign.UserFeignClient; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @Author：wanggongfeng - * @Date：2019/12/16 15:11 - */ -@Component -public class UserFeignClientFallback implements UserFeignClient { - - /** - * 获取排行榜 - * - * @return - */ - @Override - public Result> getRankingList() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getRankingList"); - } - @Override - public Result getUserInfoById(String userId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserInfoById", userId); - } - @Override - public Result updateUserInfo(UserDTO userDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateUserInfo", userDTO); - } -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ActivityService.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ActivityService.java deleted file mode 100644 index 44fee92f4..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ActivityService.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.commons.tools.utils.Result; - -/** - * 定时更新排行榜 - * - * @author Mark sunlightcs@gmail.com - */ -public interface ActivityService { - - /** - * 活动时间到自动审核通过未审核的报名人员 - * @Author wanggongfeng - * @return - */ - Result AutoAuditActUser(String actId); - -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobKpiService.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobKpiService.java deleted file mode 100644 index 0899e7aff..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobKpiService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.elink.esua.epdc.service; - -/** - * @author: qushutong - * @Date: 2019/12/12 16:52 - * @Description: kpi 模块查原始数据 - */ -public interface ScheduleJobKpiService { - - /*** - * 启动kpi模块获取原始数据 - * @param params - * @return void - * @author qushutong - * @date 2019/12/12 16:56 - */ - void startKpiMetaData(String params); - - /** - * 启动与规则编码匹配的相关任务 - * - * @param ruleCode - * @return void - * @author work@yujt.net.cn - * @date 2019/12/17 14:43 - */ - void startTaskByRuleCode(String params); - - /** - * 将手动打分存入元数据表 - * - * @param jobParams - * @return void - * @author work@yujt.net.cn - * @date 2019/12/25 14:05 - */ - void manualScoreToMetaData(String jobParams); -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobService.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobService.java index a8ff4a1c9..66b96fff4 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobService.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/ScheduleJobService.java @@ -8,6 +8,7 @@ package com.elink.esua.epdc.service; +import com.elink.esua.epdc.entity.ScheduleJobEntity; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.ScheduleJobDTO; @@ -60,9 +61,4 @@ public interface ScheduleJobService extends BaseService { * 恢复运行 */ void resume(Long[] ids); - - /** - * 根据params删除某一个定时任务 - */ - void deleteJobByParams(String params); } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/VolunteerService.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/VolunteerService.java deleted file mode 100644 index ce6343dd5..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/VolunteerService.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.commons.tools.utils.Result; - -/** - * 定时更新排行榜 - * - * @author Mark sunlightcs@gmail.com - */ -public interface VolunteerService { - - /** - * 生成排行榜 - * @Author wanggongfeng - * @return - */ - Result generateRankingList(); - -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ActivityServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ActivityServiceImpl.java deleted file mode 100644 index ba4cc19b9..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ActivityServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - * Copyright (c) 2018 人人开源 All rights reserved. - * - * https://www.renren.io - * - * 版权所有，侵权必究！ - */ - -package com.elink.esua.epdc.service.impl; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.feign.HeartFeignClient; -import com.elink.esua.epdc.feign.UserFeignClient; -import com.elink.esua.epdc.service.ActivityService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class ActivityServiceImpl implements ActivityService { - - @Autowired - private UserFeignClient userFeignClient; - - @Autowired - private HeartFeignClient heartFeignClient; - - /** - * 活动时间到自动审核通过未审核的报名人员 - * @Author wanggongfeng - * @return - */ - @Override - public Result AutoAuditActUser(String actId){ - return heartFeignClient.AutoAuditActUser(actId); - } - -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobKpiServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobKpiServiceImpl.java deleted file mode 100644 index fd6e2defe..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobKpiServiceImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.elink.esua.epdc.service.impl; - -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import com.elink.esua.epdc.feign.KpiFeignClient; -import com.elink.esua.epdc.service.ScheduleJobKpiService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * @author: qushutong - * @Date: 2019/12/12 16:53 - * @Description: 查询gridId - */ -@Component -public class ScheduleJobKpiServiceImpl implements ScheduleJobKpiService { - - @Autowired - private KpiFeignClient kpiFeignClient; - - @Override - public void startKpiMetaData(String params) { - kpiFeignClient.runKpiMateData(ModuleUtils.encodeByBase64(params)); - } - - @Override - public void startTaskByRuleCode(String params) { - kpiFeignClient.startTaskByRuleCode(ModuleUtils.encodeByBase64(params)); - } - - @Override - public void manualScoreToMetaData(String params) { - kpiFeignClient.manualScoreToMetaData(ModuleUtils.encodeByBase64(params)); - } - - -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java index 5e31f78e8..6ca410703 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/service/impl/ScheduleJobServiceImpl.java @@ -130,10 +130,4 @@ public class ScheduleJobServiceImpl extends BaseServiceImpl> result = userFeignClient.getRankingList(); - List list = result.getData(); - return heartFeignClient.generateRankingList(list); - } - -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiManualScoreTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiManualScoreTask.java deleted file mode 100644 index 613b2e967..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiManualScoreTask.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.elink.esua.epdc.task; - -import com.elink.esua.epdc.service.ScheduleJobKpiService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 绩效考核规则的相关任务 - * - * @author work@yujt.net.cn - * @date 2019/12/17 14:40 - */ -@Component("kpiManualScoreTask") -public class KpiManualScoreTask implements ITask { - - @Autowired - private ScheduleJobKpiService kpiService; - - /** - * 将手动打分存入元数据表 - * @param jobParams - * @return void - * @author work@yujt.net.cn - * @date 2019/12/25 14:02 - */ - @Override - public void run(String jobParams) { - kpiService.manualScoreToMetaData(jobParams); - } -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiMetaDataTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiMetaDataTask.java deleted file mode 100644 index 43fd263f7..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiMetaDataTask.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.elink.esua.epdc.task; - -import com.elink.esua.epdc.service.ScheduleJobKpiService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 绩效考核元数据统计任务 - * - * @author: qushutong - * @Date: 2019/12/12 16:50 - * @Description: kpi - */ -@Component("kpiMetaDataTask") -public class KpiMetaDataTask implements ITask { - - @Autowired - private ScheduleJobKpiService scheduleJobKpiService; - - /*** - * 查询所有gruidID 统计kpi元数据 - * @param params - * @return void - * @author qushutong - * @date 2019/12/12 16:51 - */ - @Override - public void run(String params) { - if (StringUtils.isNotBlank(params)) { - //群众反应问题网格响应数 总数 - scheduleJobKpiService.startKpiMetaData(params); - } - } -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiRuleTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiRuleTask.java deleted file mode 100644 index 6c5edf27a..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/KpiRuleTask.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.elink.esua.epdc.task; - -import com.elink.esua.epdc.service.ScheduleJobKpiService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 绩效考核规则的相关任务 - * - * @author work@yujt.net.cn - * @date 2019/12/17 14:40 - */ -@Component("kpiRuleTask") -public class KpiRuleTask implements ITask { - - @Autowired - private ScheduleJobKpiService kpiService; - - /** - * 根据规则编码执行计划任务 - * - * @param ruleCode - * @return void - * @author work@yujt.net.cn - * @date 2019/12/17 14:42 - */ - @Override - public void run(String ruleCode) { - if (StringUtils.isNotBlank(ruleCode)) { - kpiService.startTaskByRuleCode(ruleCode); - } - } -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/activity/AutoAuditActUserTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/activity/AutoAuditActUserTask.java deleted file mode 100644 index 44aca3e46..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/activity/AutoAuditActUserTask.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.task.activity; - -/** - * 志愿者排名 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -public interface AutoAuditActUserTask { - - void run(String actId); - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/activity/AutoAuditActUserTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/activity/AutoAuditActUserTaskImpl.java deleted file mode 100644 index d75336440..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/activity/AutoAuditActUserTaskImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.task.activity; - -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.service.ActivityService; -import com.elink.esua.epdc.service.ScheduleJobService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 自动审核通过未审核的报名人员 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@Component("AutoAuditActUserTask") -public class AutoAuditActUserTaskImpl implements AutoAuditActUserTask { - - @Autowired - private ActivityService activityService; - - @Autowired - private ScheduleJobService scheduleJobService; - - @Override - public void run(String actId){ - //活动时间到自动审核通过未审核的报名人员 - Result result = activityService.AutoAuditActUser(actId); - - //删除对应job - if(result.getCode() == 0){ - scheduleJobService.deleteJobByParams(actId); - } - - - } - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/volunteer/UpdateVolunteerRankTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/volunteer/UpdateVolunteerRankTask.java deleted file mode 100644 index fcba26c11..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/volunteer/UpdateVolunteerRankTask.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.task.volunteer; - -/** - * 志愿者排名 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -public interface UpdateVolunteerRankTask { - - void run(String param); - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/volunteer/UpdateVolunteerRankTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/volunteer/UpdateVolunteerRankTaskImpl.java deleted file mode 100644 index 667b19a78..000000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/volunteer/UpdateVolunteerRankTaskImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.task.volunteer; - -import com.elink.esua.epdc.service.VolunteerService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 定时更新志愿者排名 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-19 - */ -@Component("UpdateVolunteerRankTask") -public class UpdateVolunteerRankTaskImpl implements UpdateVolunteerRankTask { - - @Autowired - private VolunteerService volunteerService; - - @Override - public void run(String param){ - //每日定时更新排行榜 - volunteerService.generateRankingList(); - } - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml index cfd80c920..a54b30eaf 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml @@ -1,30 +1,9 @@ -#server: -# port: @server.port@ -# servlet: -# context-path: /job -# -#nacos: -# config: -# server-addr: @nacos.server-addr@ -# type: YAML -# namespace: @nacos.config.namespace@ -# group: @nacos.config.group@ -# dataId: epdc-job-server -# bootstrap: -# enable: true -# log: -# enable: @nacos.config.bootstrap.log.enable@ -#spring: -# application: -# name: epdc-job-server server: port: @server.port@ servlet: context-path: /job spring: - main: - allow-bean-definition-overriding: true application: name: epdc-job-server # 环境 dev|test|prod diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/mapper/ScheduleJobDao.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/mapper/ScheduleJobDao.xml index 836c17b76..57cb6edb5 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/mapper/ScheduleJobDao.xml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/mapper/ScheduleJobDao.xml @@ -11,8 +11,4 @@ - - delete from schedule_job where params = #{params} - - diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiFieldConstant.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiFieldConstant.java deleted file mode 100644 index d8cb8cc3f..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiFieldConstant.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.elink.esua.epdc.constant; - -/** - * 绩效考核一些字段常量 - * - * @author work@yujt.net.cn - * @date 2019/12/18 19:41 - */ -public interface KpiFieldConstant { - - String RULE_ID = "RULE_ID"; - - String RULE_NAME = "RULE_NAME"; - String RULE_MODE = "RULE_MODE"; - String SCORE_START_DATE = "SCORE_START_DATE"; - String START_DATE = "START_DATE"; - String SCORE_END_DATE = "SCORE_END_DATE"; - String END_DATE = "END_DATE"; - String DEPT_ID = "DEPT_ID"; - String KPI_CYCLE = "KPI_CYCLE"; - - String REFERENCE_ID = "REFERENCE_ID"; - String DATA_CODE = "DATA_CODE"; -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiItemConstant.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiItemConstant.java deleted file mode 100644 index 01f512de4..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiItemConstant.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.elink.esua.epdc.constant; - -/** - * 绩效考核项目相关常量 - * - * @author work@yujt.net.cn - * @date 2019/12/17 10:35 - */ -public interface KpiItemConstant { - - String RESPOND_ITEM_TIME_LIMIT = "validCloseTime"; - - String CLOSE_ITEM_TIME_LIMIT = "validRespondTime"; - -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiScheduleCodeConstant.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiScheduleCodeConstant.java deleted file mode 100644 index 1a032642e..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/constant/KpiScheduleCodeConstant.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.elink.esua.epdc.constant; - -/** - * 考核规则编码常量 - * - * @author work@yujt.net.cn - * @date 2019/12/19 14:45 - */ -public interface KpiScheduleCodeConstant { - - /** - * 元数据统计：群众事件上报总数 与 被响应总数 - */ - String META_DATA_PEOPLE_REPORT_AMOUNT = "statPeopleReportAmount"; - /** - * 元数据统计：群众对网格问题办理 满意度评价 - */ - String META_DATA_PEOPLE_EVALUATION = "statPeopleEvaluation"; - /** - * 元数据统计：包括网格呼叫数，网格呼叫被响应数，网格呼叫被办结数 - */ - String META_DATA_ITEM_HANDLE_AMOUNT = "statItemHandleAmount"; - /** - * 元数据统计：网格对项目处理 满意度评价 - */ - String META_DATA_GRID_EVALUATION = "statGridEvaluation"; - - /** - * 考核规则：基础网格 平时工作成效得分 月度 - */ - String GRID_WORK_SCORE_MONTH = "calcGridWorkScoreByMonth"; - /** - * 考核规则：基础网格 平时工作成效得分 季度 - */ - String GRID_WORK_SCORE_QUARTER = "calcGridWorkScoreByQuarter"; - /** - * 考核规则：基础网格 平时工作成效得分 年度 - */ - String GRID_WORK_SCORE_YEAR = "calcGridWorkScoreByYear"; - /** - * 考核规则：基础网格 考核最终得分 月度 - */ - String GRID_FINAL_SCORE_MONTH = "calcGridFinalScoreByMonth"; - /** - * 考核规则：基础网格 考核最终得分 季度 - */ - String GRID_FINAL_SCORE_QUARTER = "calcGridFinalScoreByQuarter"; - /** - * 考核规则：基础网格 考核最终得分 年度 - */ - String GRID_FINAL_SCORE_YEAR = "calcGridFinalScoreByYear"; - /** - * 考核规则：街道/区直 考核最终得分 月度 - */ - String SUPERIOR_FINAL_SCORE_MONTH = "calcSuperiorFinalScoreByMonth"; - /** - * 考核规则：街道/区直 考核最终得分 季度 - */ - String SUPERIOR_FINAL_SCORE_QUARTER = "calcSuperiorFinalScoreByQuarter"; - /** - * 考核规则：街道/区直 考核最终得分 年度 - */ - String SUPERIOR_FINAL_SCORE_YEAR = "calcSuperiorFinalScoreByYear"; - -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/EventCountFromDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/EventCountFromDTO.java deleted file mode 100644 index 8d27ad97f..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/EventCountFromDTO.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.elink.esua.epdc.dto; - - -import lombok.Data; - -import java.util.List; - -/** - * @author: qushutong - * @Date: 2019/12/17 10:23 - * @Description: kpi 群众反应问题数 - */ -@Data -public class EventCountFromDTO { - - /*** - * 所有网格 - */ - private List gridIdList; - - /*** - * 0 是群众反应问题总数 1 群众反应问题响应数 - */ - private String responseType; -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreDTO.java index 11886c1d6..0626f2f75 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreDTO.java @@ -18,11 +18,9 @@ package com.elink.esua.epdc.dto; import java.io.Serializable; -import java.math.BigDecimal; import java.util.Date; import com.alibaba.fastjson.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import javax.validation.constraints.Min; @@ -39,7 +37,7 @@ import javax.validation.constraints.NotEmpty; @Data public class KpiManualScoreDTO implements Serializable { - private static final long serialVersionUID = 866931079518321362L; + private static final long serialVersionUID = 1L; /** * 主键 @@ -56,25 +54,23 @@ public class KpiManualScoreDTO implements Serializable { * 被打分的部门id */ @NotBlank(message = "考核部门id不能为空") - private Long deptId; + private String deptId; /** * 得分 */ @NotBlank(message = "得分不能为空") @Min(0) - private BigDecimal score; + private Integer score; /** * 考核起止日期 */ - @JSONField(format = "yyyy-MM-dd") private Date scoreStartDate; /** * 考核终止日期 */ - @JSONField(format = "yyyy-MM-dd") private Date scoreEndDate; /** @@ -127,21 +123,6 @@ public class KpiManualScoreDTO implements Serializable { */ private String allDeptNames; - /** - * 打分者的部门id - */ - private String creatorDeptName; - - /** - * 打分者的部门名称 - */ - private Long creatorDeptId; - - /** - * 被考核部门的网格长姓名 - */ - private String leaderName; - /** * 考核周期起始月 */ diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreRuleDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreRuleDTO.java index c55555435..d37d96a28 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreRuleDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreRuleDTO.java @@ -32,7 +32,7 @@ import java.math.BigDecimal; @Data public class KpiManualScoreRuleDTO implements Serializable { - private static final long serialVersionUID = -3127206787305914421L; + private static final long serialVersionUID = 1L; /** * 主键 @@ -57,7 +57,7 @@ public class KpiManualScoreRuleDTO implements Serializable { /** * 满分 */ - private BigDecimal fullMarks; + private Integer fullMarks; /** * 乐观锁 diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreTempDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreTempDTO.java index e1cd8e90f..1db797349 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreTempDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiManualScoreTempDTO.java @@ -46,7 +46,7 @@ public class KpiManualScoreTempDTO implements Serializable { /** * 被打分的部门id */ - private Long deptId; + private String deptId; /** * 得分 diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiMetaDataDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiMetaDataDTO.java deleted file mode 100644 index 6456a5b45..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiMetaDataDTO.java +++ /dev/null @@ -1,113 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto; - -import java.io.Serializable; -import java.util.Date; - -import lombok.Data; - -import java.math.BigDecimal; - -/** - * 绩效考核的元数据 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Data -public class KpiMetaDataDTO implements Serializable { - - private static final long serialVersionUID = -5970791269666802942L; - - /** - * 主键 - */ - private String id; - - /** - * 数据项编码 - */ - private String dataCode; - - /** - * 数据项名称 - */ - private String dataName; - - /** - * 元数据值 - */ - private BigDecimal dataValue; - - /** - * 考核周期(字典值 代表月，季，年) - */ - private String kpiCycle; - - /** - * 考核周期开始日 - */ - private Date startDate; - - /** - * 考核周期结束日 - */ - private Date endDate; - - /** - * 部门ID - */ - private Long deptId; - - /** - * 部门类别 - */ - private String deptTypeKey; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - - /** - * 删除标记 - */ - private String delFlag; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiResultGridDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiResultGridDTO.java deleted file mode 100644 index 9a07190a3..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiResultGridDTO.java +++ /dev/null @@ -1,177 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * 网格考核最终得分 - * - * @author work@yujt.net.cn - * @since v1.0.0 2019-12-17 - */ -@Data -public class KpiResultGridDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 网格ID - */ - private Long gridId; - - /** - * 手动打分得分 - */ - private BigDecimal manualScore; - - /** - * 工作得分 - */ - private BigDecimal workScore; - - /** - * 投票得分 - */ - private BigDecimal voteScore; - - /** - * 最终得分 - */ - private BigDecimal finalScore; - - /** - * 考核周期开始日 - */ - private Date startDate; - - /** - * 考核周期结束日 - */ - private Date endDate; - - /** - * 被考核部门的网格长姓名 - */ - private String leaderName; - - /** - * 考核周期(字典值 代表月，季，年) - */ - private String kpiCycle; - - /** - * 所有上级机构id - */ - private String parentDeptIds; - - /** - * 所有上级机构名称 - */ - private String parentDeptNames; - - /** - * 所有机构id - */ - private String allDeptIds; - - /** - * 所有机构名称 - */ - private String allDeptNames; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - - /** - * 删除标记 - */ - private String delFlag; - - //虚字段 - - /** - * 街道名 - */ - private String street; - - /** - * 社区名 - */ - private String community; - - /** - * 网格名 - */ - private String grid; - - /** - * 伪列 - */ - private int rownum; - - /** - * 规则 - */ - private String rule; - - /** - * 详情 - */ - private String detail; - - - //虚字段----------------------- - - //考核周期开始日 - private String startDateString; - - //考核周期结束日 - private String endDateString; -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiResultSuperiorDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiResultSuperiorDTO.java deleted file mode 100644 index a66f37390..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiResultSuperiorDTO.java +++ /dev/null @@ -1,144 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dto; - -import java.io.Serializable; -import java.util.Date; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * 街道或区直绩效考核最终得分 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-23 - */ -@Data -public class KpiResultSuperiorDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 网格ID - */ - private Long deptId; - - /** - * 最终得分 - */ - private BigDecimal finalScore; - - /** - * 考核周期开始日 - */ - private Date startDate; - - /** - * 考核周期结束日 - */ - private Date endDate; - - /** - * 考核周期(字典值 代表月，季，年) - */ - private String kpiCycle; - - /** - * 机构类别 - */ - private String deptTypeKey; - - /** - * 所有上级机构id - */ - private String parentDeptIds; - - /** - * 所有上级机构名称 - */ - private String parentDeptNames; - - /** - * 所有机构id - */ - private String allDeptIds; - - /** - * 所有机构名称 - */ - private String allDeptNames; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - - /** - * 删除标记 - */ - private String delFlag; - - //虚字段----------------------- - - //考核周期开始日 - private String startDateString; - - //考核周期结束日 - private String endDateString; - - //详情页 网格呼叫事项总数 - private BigDecimal gridCallSuperiorAmount; - //详情页 响应网格呼叫事项数 - private BigDecimal gridCallSuperiorRespAmount; - //详情页 办结网格呼叫事项数 - private BigDecimal gridCallSuperiorCloseAmount; - //详情页 工作评议满意数 - private BigDecimal gridHighEvaluationAmount; - //详情页 工作评议基本满意数 - private BigDecimal gridMediumEvaluationAmount; - //详情页 工作评议不满意数 - private BigDecimal gridLowEvaluationAmount; -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiTimeLimitItemDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiTimeLimitItemDTO.java index 02ee5b09e..57cdc6650 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiTimeLimitItemDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiTimeLimitItemDTO.java @@ -53,7 +53,7 @@ public class KpiTimeLimitItemDTO implements Serializable { /** * 项目类别id */ - private Long categoryId; + private String categoryId; /** * 所有上级项目类别id @@ -108,6 +108,6 @@ public class KpiTimeLimitItemDTO implements Serializable { /** * 项目类别集合 */ - private List categoryIds; + private List categoryIds; } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java deleted file mode 100644 index 82b0a2b41..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/ScheduleJobParamDTO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.elink.esua.epdc.dto; - -import com.alibaba.fastjson.JSONObject; -import com.elink.esua.epdc.commons.tools.exception.RenException; -import com.elink.esua.epdc.commons.tools.utils.DateUtils; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; - -/** - * 定时任务参数 - * - * @author work@yujt.net.cn - * @date 2020/2/6 14:00 - */ -@Slf4j -@Data -public class ScheduleJobParamDTO { - - /** - * 规则编码，取值范围{@link com.elink.esua.epdc.constant.KpiScheduleCodeConstant} - */ - String ruleCode; - - - /** - * 日期 格式：yyyy-MM-dd - */ - String dateStr; - - - public ScheduleJobParamDTO getByJobParams(String params) { - ScheduleJobParamDTO scheduleJobParam; - try { - scheduleJobParam = JSONObject.parseObject(params, ScheduleJobParamDTO.class); - if (null != scheduleJobParam) { - String dateStr = scheduleJobParam.getDateStr(); - if (StringUtils.isBlank(dateStr) || !ModuleUtils.isValidDate(dateStr, DateUtils.DATE_PATTERN)) { - scheduleJobParam.setDateStr(null); - } - } - } catch (Exception e) { - log.error("定时任务参数格式错误，错误参数：{}", params); - throw new RenException("定时任务参数格式错误"); - } - return scheduleJobParam; - } - -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/CategoryInfoFormDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/CategoryInfoFormDTO.java deleted file mode 100644 index 66915f16e..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/CategoryInfoFormDTO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.elink.esua.epdc.dto.form; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description - * @Author yinzuomei - * @Date 2019/12/4 10:29 - */ -@Data -public class CategoryInfoFormDTO implements Serializable { - private static final long serialVersionUID = -8214790072156444793L; - - /** - * 主键集合 - */ - private Long[] ids; -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiMetaDataOfEventsFormDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiMetaDataOfEventsFormDTO.java deleted file mode 100644 index 5d919c060..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiMetaDataOfEventsFormDTO.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.elink.esua.epdc.dto.form; - -import lombok.Data; - -import java.util.Date; -import java.util.List; - -/** - * 参数：用于统计事件上报数与事件受理数 - * - * @author work@yujt.net.cn - * @date 2019/12/19 18:43 - */ -@Data -public class KpiMetaDataOfEventsFormDTO { - - private static final long serialVersionUID = 9029313054917612850L; - - /** - * 所有网格 - */ - private List deptIdList; - - /** - * 统计周期开始日 - */ - private Date startDate; - - /** - * 统计周期结束日 - */ - private Date endDate; -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiRuleSaveOrUpdateFormDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiRuleSaveOrUpdateFormDTO.java index ad68645e7..061d241ab 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiRuleSaveOrUpdateFormDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/KpiRuleSaveOrUpdateFormDTO.java @@ -56,12 +56,6 @@ public class KpiRuleSaveOrUpdateFormDTO implements Serializable { @NotBlank(message = "考核部门类别不能为空") private String deptTypeKey; - - /** - * 考核部门类别 - */ - private String[] deptTypeKeys; - /** * 乐观锁 */ diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/CategoryInfoResultDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/CategoryInfoResultDTO.java deleted file mode 100644 index 3f47137ec..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/CategoryInfoResultDTO.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.elink.esua.epdc.dto.result; - -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - * @Description - * @Author yinzuomei - * @Date 2019/12/4 9:05 - */ -@Data -public class CategoryInfoResultDTO implements Serializable { - private static final long serialVersionUID = 229431634619504645L; - - /** - * 主键 - */ - private Long id; - /** - * 分类名称 - */ - private String categoryName; - /** - * 上级分类ID - */ - private Long pid; - /** - * 所有上级分类ID，用逗号分开 - */ - private String pids; - - /** - * 所有上级分类名称，用逗号分开 - */ - private String parentNames; -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiEvaluationAmountResultDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiEvaluationAmountResultDTO.java deleted file mode 100644 index b8aea5874..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiEvaluationAmountResultDTO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.elink.esua.epdc.dto.result; - -import lombok.Data; - - -/** - * 满意数统计结果 - * - * @author work@yujt.net.cn - * @date 2019/12/19 18:56 - */ -@Data -public class KpiEvaluationAmountResultDTO { - - private static final long serialVersionUID = 2661466688976182183L; - - /** - * 机构Id - */ - private Long deptId; - - /** - * 满意数 - */ - private Integer highAmount; - - /** - * 基本满意数 - */ - private Integer mediumAmount; - - /** - * 不满意数 - */ - private Integer lowAmount; -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiEventReportAmountResultDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiEventReportAmountResultDTO.java deleted file mode 100644 index 80c31a4aa..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiEventReportAmountResultDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.elink.esua.epdc.dto.result; - -import lombok.Data; - - -/** - * 时间上报数统计结果 - * @author work@yujt.net.cn - * @date 2019/12/19 18:56 - */ -@Data -public class KpiEventReportAmountResultDTO { - - private static final long serialVersionUID = 9029313054917612850L; - - /** - * 网格Id - */ - private Long gridId; - - /** - * 事件上报数 - */ - private Integer reportAmount; - - /** - * 网格响应数 - */ - private Integer respondAmount; -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiItemHandleAmountResultDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiItemHandleAmountResultDTO.java deleted file mode 100644 index be2331930..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiItemHandleAmountResultDTO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.elink.esua.epdc.dto.result; - -import lombok.Data; - -/** - * 绩效考核统计：项目处理相关数量 - * - * @author work@yujt.net.cn - * @date 2019/12/23 10:50 - */ -@Data -public class KpiItemHandleAmountResultDTO { - - private static final long serialVersionUID = -4265085165992694474L; - /** - * 部门id - */ - private Long deptId; - - /** - * 元数据值（统计数） - */ - private Integer metaDataValue; - - /** - * 对应绩效考核元数据编码 - */ - private String metaDataCode; - -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiItemTimeLimitByDeptResultDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiItemTimeLimitByDeptResultDTO.java deleted file mode 100644 index 1eba87670..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiItemTimeLimitByDeptResultDTO.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.elink.esua.epdc.dto.result; - - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * @author: qushutong - * @Date: 2019/12/19 16:48 - * @Description: 项目 街道 时间规则绑定 - */ -@Data -public class KpiItemTimeLimitByDeptResultDTO implements Serializable { - - private static final long serialVersionUID = 3349393132985690393L; - - /*** - * 街道 区直 deptId - */ - private Long deptId; - - /*** - * 项目ID - */ - private String itemId; - - /*** - * 事件分类字典id - */ - private String catecoryId; - - /*** - * 创建时间 - */ - private Date createdTime; - - /** - * 有效响应时间（小时数） - */ - private Integer validRespondTime; - - /** - * 有效结案时间（小时数） - */ - private Integer validCloseTime; -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiManualScoreTemplateResultDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiManualScoreTemplateResultDTO.java index 682393607..cd5d571cb 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiManualScoreTemplateResultDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiManualScoreTemplateResultDTO.java @@ -12,7 +12,6 @@ import java.util.Date; */ @Data public class KpiManualScoreTemplateResultDTO implements Serializable { - private static final long serialVersionUID = 3228442740296126765L; /** * 规则名称 @@ -34,16 +33,43 @@ public class KpiManualScoreTemplateResultDTO implements Serializable { */ private String grid; + /** + * 部门名称 + */ + private String deptName; + /** * 考核周期 */ private String kpiCycleName; + /** + * 考核起止日期 + */ + private String scoreStartTime; + + /** + * 考核终止日期 + */ + private String scoreEndTime; + /** * 得分 */ private Integer score; + /*********************************************************************************************************/ + + /** + * epdc_kpi_rule表主键 + */ + private String ruleId; + + /** + * 被打分的部门id + */ + private String deptId; + /** * 考核起止日期yyyy-MM-dd */ @@ -54,5 +80,28 @@ public class KpiManualScoreTemplateResultDTO implements Serializable { */ private Date scoreEndDate; + /** + * 所有父级部门id + */ + private String parentDeptIds; + + /** + * 所有父级部门名称 + */ + private String parentDeptNames; + /** + * 完整部门名称 + */ + private String allDeptNames; + + /** + * 完整部门id + */ + private String allDeptIds; + + /** + * 导出用户id + */ + private String userId; } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiRuleQueryResultDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiRuleQueryResultDTO.java index 5c2eafe17..a25a78cbc 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiRuleQueryResultDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/result/KpiRuleQueryResultDTO.java @@ -50,11 +50,6 @@ public class KpiRuleQueryResultDTO implements Serializable { */ private String deptTypeKey; - /** - * 考核部门类别 - */ - private String[] deptTypeKeys; - /** * 乐观锁 */ diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiCycleEnum.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiCycleEnum.java index 7f185372f..476e9196c 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiCycleEnum.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiCycleEnum.java @@ -1,54 +1,44 @@ package com.elink.esua.epdc.enums; -import org.apache.commons.lang3.StringUtils; - /** - * @author: yinzuomei + * @Auther: yinzuomei * @Date: 2019/12/5 12:41 * @Description: 考核周期枚举 */ public enum KpiCycleEnum { - /** - * 月month quarter year - */ - KPI_CYCLE_MONTH("month", "月"), - /** - * 季 - */ - KPI_CYCLE_QUARTER("quarter", "季"), - /** - * 年 - */ - KPI_CYCLE_YEAR("year", "年"); - - private String value; - - private String name; - - KpiCycleEnum(String value, String name) { - this.value = value; - this.name = name; - } - - public String getValue() { - return value; - } - - - public String getName() { - return name; - } - - public static KpiCycleEnum getByValue(String value){ - if(StringUtils.isNotBlank(value)){ - KpiCycleEnum[] enums = KpiCycleEnum.values(); - for (KpiCycleEnum kpiCycleEnum : enums) { - if(kpiCycleEnum.getValue().equals(value)){ - return kpiCycleEnum; - } - } - } - return null; - } - + /** + * 月month quarter year + */ + KPI_CYCLE_MONTH("month","月"), + /** + * 季 + */ + KPI_CYCLE_QUARTER("quarter","季"), + /** + * 年 + */ + KPI_CYCLE_YEAR("year","年"); + private String value; + private String name; + + KpiCycleEnum(String value, String name) { + this.value = value; + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiMetaDataEnum.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiMetaDataEnum.java deleted file mode 100644 index b058b325c..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiMetaDataEnum.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.elink.esua.epdc.enums; - -import org.apache.commons.lang3.StringUtils; - -/** - * @author: qushutong - * @Date: 2019/12/17 19:53 - * @Description: 数据项名称 - */ -public enum KpiMetaDataEnum { - - /*** - * 群众反映问题总数 - */ - PEOPLE_REPORT_AMOUNT("people_report_amount", "群众反映问题总数"), - - /*** - * 群众反映问题被响应数 - */ - PEOPLE_REPORT_RESP_AMOUNT("people_report_resp_amount", "群众反映问题被响应数"), - - /*** - * 居民对项目处理评为“满意”的评价数量 - */ - PEOPLE_HIGH_EVALUATION_AMOUNT("people_high_evaluation_amount", "问题办理满意数"), - - /*** - * 居民对项目处理评为“基本满意”的评价数量 - */ - PEOPLE_MEDIUM_EVALUATION_AMOUNT("people_medium_evaluation_amount", "问题办理基本满意数"), - - /*** - * 居民对项目处理评为“不满意”的评价数量 - */ - PEOPLE_LOW_EVALUATION_AMOUNT("people_low_evaluation_amount", "问题办理不满意数"), - - /*** - * 履行抓基层党建工作得分(上级为网格打分) - */ - GRID_SCORE_BY_SUPERIOR_MANUAL("grid_score_by_superior_manual", "履行抓基层党建工作得分"), - - /*** - * 网格呼叫上级部门总数 - */ - GRID_CALL_SUPERIOR_AMOUNT("grid_call_superior_amount", "网格呼叫总数"), - - /*** - * 上级部门响应网格呼叫总数 - */ - GRID_CALL_SUPERIOR_RESP_AMOUNT("grid_call_superior_resp_amount", "网格呼叫被响应数"), - - /*** - * 上级部门办结网格呼叫总数 - */ - GRID_CALL_SUPERIOR_CLOSE_AMOUNT("grid_call_superior_close_amount", "网格呼叫被办结数"), - - /*** - * 网格对上级部门处理项目评为“满意” - */ - GRID_HIGH_EVALUATION_AMOUNT("grid_high_evaluation_amount", "网格评议满意数"), - - /*** - * 网格对上级部门处理项目评为“基本满意” - */ - GRID_MEDIUM_EVALUATION_AMOUNT("grid_medium_evaluation_amount", "网格评议基本满意数"), - - /*** - * 网格对上级部门处理项目评为“不满意” - */ - GRID_LOW_EVALUATION_AMOUNT("grid_low_evaluation_amount", "网格评议不满意数"), - - /*** - * 群众满意度投票，投票“满意”的数量 - */ - VOTE_HIGH_EVALUATION_AMOUNT("vote_high_evaluation_amount", "群众投票满意数"), - - /*** - * 群众满意度投票，投票“基本满意”的数量 - */ - VOTE_MEDIUM_EVALUATION_AMOUNT("vote_medium_evaluation_amount", "群众投票基本满意数"), - - /*** - * 群众满意度投票，投票“不满意”的数量 - */ - VOTE_LOW_EVALUATION_AMOUNT("vote_low_evaluation_amount", "群众投票不满意数"); - - - private String value; - - private String name; - - KpiMetaDataEnum(String value, String name) { - this.value = value; - this.name = name; - } - - public String getValue() { - return value; - } - - public String getName() { - return name; - } - - public static KpiMetaDataEnum getByValue(String value) { - if (StringUtils.isNotBlank(value)) { - KpiMetaDataEnum[] metaDataEnums = KpiMetaDataEnum.values(); - for (KpiMetaDataEnum metaDataEnum : metaDataEnums) { - if (value.equals(metaDataEnum.getValue())) { - return metaDataEnum; - } - } - } - return null; - } -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java deleted file mode 100644 index 342d357c8..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.elink.esua.epdc.enums; - -/** - * @author: zy - * @Date: 2019/12/20 - * @Description: 数据项名称 - */ -public enum KpiResultGridDataEnum { - - /*** - * 履行抓基层党建工作职责得分 - */ - BASIC_LEVEL_WORK_SCORE("basic_level_work_score", "履行抓基层党建工作职责得分"), - - /*** - * 群众反映问题网格响应率得分 - */ - GRID_PROBLEM_RESPONSE_RATE_SCORE("grid_problem_response_rate_score","群众反映问题网格响应率得分"), - - /*** - * 群众反映问题网格办理满意率得分 - */ - GRID_PROBLEM_SATISFACTION_RATE_SCORE("grid_problem_satisfaction_rate_score","群众反映问题网格办理满意率得分"); - - - private String value; - - private String name; - - KpiResultGridDataEnum(String value, String name) { - this.value = value; - this.name = name; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiRuleModeEnum.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiRuleModeEnum.java deleted file mode 100644 index 0af051be1..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiRuleModeEnum.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.elink.esua.epdc.enums; - -import com.elink.esua.epdc.commons.tools.constant.NumConstant; - -/** - * 规则来源枚举类 - * - * @author work@yujt.net.cn - * @date 2019/12/18 19:10 - */ -public enum KpiRuleModeEnum { - - /** - * 元公式 - */ - FORMULA(NumConstant.ZERO_STR), - - /** - * 手动打分 - */ - MANMUAL_SCORE(NumConstant.ONE_STR), - - /** - * 投票 - */ - VOTE(NumConstant.TWO_STR); - - private String value; - - KpiRuleModeEnum(String value) { - this.value = value; - } - - public String value() { - return value; - } -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml index 776de628a..5faa821e5 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml @@ -20,7 +20,7 @@ com.esua.epdc - epdc-admin-client + epdc-events-client 1.0.0 @@ -50,10 +50,7 @@ spring-boot-admin-starter-client ${spring.boot.admin.version} - + @@ -118,7 +115,7 @@ dev - 9069 + 9987 2 47.104.224.45 @@ -134,13 +131,6 @@ false 47.104.224.45:8848 - @@ -148,7 +138,7 @@ test - 9069 + 9987 2 47.104.224.45 @@ -164,13 +154,6 @@ true 47.104.224.45:8848 - @@ -179,7 +162,7 @@ prod prod - 9069 + 9987 0 10.5.34.164 diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiFormulaController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiFormulaController.java index c30b0a683..853f50dcc 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiFormulaController.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiFormulaController.java @@ -44,7 +44,7 @@ import java.util.Map; * @since v1.0.0 2019-11-26 */ @RestController -@RequestMapping("formula") +@RequestMapping("kpiformula") public class KpiFormulaController { @Autowired diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java index 81976c768..9e0763fb8 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreController.java @@ -17,9 +17,7 @@ package com.elink.esua.epdc.controller; -import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter; import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; @@ -38,6 +36,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; import java.util.Map; @@ -50,41 +49,41 @@ import java.util.Map; * @since v1.0.0 2019-12-04 */ @RestController -@RequestMapping("manualScore") +@RequestMapping("kpimanualscore") public class KpiManualScoreController { @Autowired private KpiManualScoreService kpiManualScoreService; - + private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");//设置日期格式 @GetMapping("page") - @DataFilter(prefix = "and", tableAlias = "kmc", isPendingCreator = false) - public Result> page(@RequestParam Map params) { + public Result> page(@RequestParam Map params){ +// PageData page = kpiManualScoreService.page(params); PageData page = kpiManualScoreService.listKpiManualScoreResultDTO(params); return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id) { + public Result get(@PathVariable("id") String id){ KpiManualScoreDTO data = kpiManualScoreService.get(id); return new Result().ok(data); } @PostMapping - public Result save(@RequestBody KpiManualScoreDTO dto) { + public Result save(@RequestBody KpiManualScoreDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); return kpiManualScoreService.save(dto); } @PutMapping - public Result update(@RequestBody KpiManualScoreDTO dto) { + public Result update(@RequestBody KpiManualScoreDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); return kpiManualScoreService.update(dto); } @DeleteMapping - public Result delete(@RequestBody String[] ids) { + public Result delete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); kpiManualScoreService.delete(ids); @@ -97,19 +96,6 @@ public class KpiManualScoreController { ExcelUtils.exportExcelToTarget(response, null, list, KpiManualScoreExcel.class); } - /** - * 导出打分模版前，校验选项 - * - * @param params - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author work@yujt.net.cn - * @date 2019/12/16 14:17 - */ - @GetMapping("checkExportTemplate") - public Result checkExportTemplate(@RequestParam Map params) { - return kpiManualScoreService.checkExportTemplate(params); - } - /** * @param params * @return void @@ -120,8 +106,8 @@ public class KpiManualScoreController { @GetMapping("exportTemplate") public void exportTemplate(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = kpiManualScoreService.listKpiManualScoreTemplateResultDTO(params); - ExcelUtils.exportExcelToTarget(response, - DateUtils.format(new Date(), DateUtils.DATE_TIME_NO_SPLIT), list, KpiManualScoreTemplateExcel.class); + ExcelUtils.exportExcelToTarget(response, simpleDateFormat.format(new Date()), list, KpiManualScoreTemplateExcel.class); + } /** @@ -135,17 +121,4 @@ public class KpiManualScoreController { public Result importManualScoreExcel(@RequestParam("file") MultipartFile file) { return kpiManualScoreService.importManualScoreExcel(file); } - - /** - * 将手动打分初始化为元数据项 - * - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author work@yujt.net.cn - * @date 2019/12/25 14:10 - */ - @GetMapping("initMetaData/{params}") - public Result initManualScoreToMetaData(@PathVariable("params") String params) { - kpiManualScoreService.initManualScoreToMetaData(params); - return new Result(); - } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreRuleController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreRuleController.java index fc08d03b5..64386d001 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreRuleController.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiManualScoreRuleController.java @@ -44,7 +44,7 @@ import java.util.Map; * @since v1.0.0 2019-12-02 */ @RestController -@RequestMapping("manualScoreRule") +@RequestMapping("kpimanualscorerule") public class KpiManualScoreRuleController { @Autowired diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java deleted file mode 100644 index 450ea65f7..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiMetaDataController.java +++ /dev/null @@ -1,110 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.constant.KpiScheduleCodeConstant; -import com.elink.esua.epdc.dto.KpiMetaDataDTO; -import com.elink.esua.epdc.excel.KpiMetaDataExcel; -import com.elink.esua.epdc.service.KpiMetaDataService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 绩效考核的元数据 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@RestController -@RequestMapping("metaData") -public class KpiMetaDataController { - - @Autowired - private KpiMetaDataService kpiMetaDataService; - - @GetMapping("page") - public Result> page(@RequestParam Map params) { - PageData page = kpiMetaDataService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id) { - KpiMetaDataDTO data = kpiMetaDataService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody KpiMetaDataDTO dto) { - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - kpiMetaDataService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody KpiMetaDataDTO dto) { - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - kpiMetaDataService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids) { - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - kpiMetaDataService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = kpiMetaDataService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, KpiMetaDataExcel.class); - } - - /*** - * 构建元数据 - * @param - * @return void - * @author qushutong - * @date 2019/12/16 10:17 - */ - @GetMapping("buildMetaData/{kpiScheduleCode}") - public Result buildMetaData(@PathVariable("kpiScheduleCode") String kpiScheduleCode) { - - kpiMetaDataService.buildMetaData(kpiScheduleCode); - - return new Result(); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultGridController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultGridController.java deleted file mode 100644 index e84774f21..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultGridController.java +++ /dev/null @@ -1,125 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.dto.KpiResultGridDTO; -import com.elink.esua.epdc.excel.KpiResultGridDetailExcel; -import com.elink.esua.epdc.excel.KpiResultGridExcel; -import com.elink.esua.epdc.service.KpiResultGridService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 网格考核最终得分 - * - * @author work@yujt.net.cn - * @since v1.0.0 2019-12-17 - */ -@RestController -@RequestMapping("gridResult") -public class KpiResultGridController { - - @Autowired - private KpiResultGridService kpiResultGridService; - - @GetMapping("page") - @DataFilter(tableAlias = "g", deptId = "grid_id", prefix = "AND", isPendingCreator = false) - public Result> page(@RequestParam Map params){ - PageData page = kpiResultGridService.page(params); - return new Result>().ok(page); - } - - /** - * @Description: 考核统计 详情页查询 - * @Param: [id] - * @return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: zy - * @Date: 2019-12-20 - */ - @GetMapping("{id}") - public Result> get(@PathVariable("id") String id){ - List data = kpiResultGridService.get(id); - return new Result>().ok(data); - } - - @PostMapping - public Result save(@RequestBody KpiResultGridDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - kpiResultGridService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody KpiResultGridDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - kpiResultGridService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - kpiResultGridService.delete(ids); - return new Result(); - } - - /** - * @Description: 考核统计首页导出 - * @Param: [params, response] - * @return: void - * @Author: zy - * @Date: 2019-12-20 - */ - @GetMapping("export") - @DataFilter(tableAlias = "g", deptId = "grid_id", prefix = "AND", isPendingCreator = false) - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = kpiResultGridService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, KpiResultGridExcel.class); - } - - - /** - * @Description: 详情页表格导出 - * @Param: [params, response] - * @return: void - * @Author: zy - * @Date: 2019-12-20 - */ - @GetMapping("tableExport") - public void tableExport(@RequestParam Map params, HttpServletResponse response) throws Exception { - List data = kpiResultGridService.get(params.get("id").toString()); - ExcelUtils.exportExcelToTarget(response, "考核统计得分详情", data, KpiResultGridDetailExcel.class); - } -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultSuperiorController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultSuperiorController.java deleted file mode 100644 index a3e77a4c3..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiResultSuperiorController.java +++ /dev/null @@ -1,111 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.controller; - -import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.commons.tools.validator.AssertUtils; -import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.dto.KpiResultSuperiorDTO; -import com.elink.esua.epdc.excel.KpiResultSuperiorDetailExcel; -import com.elink.esua.epdc.excel.KpiResultSuperiorExcel; -import com.elink.esua.epdc.service.KpiResultSuperiorService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 街道或区直绩效考核最终得分 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-23 - */ -@RestController -@RequestMapping("kpiresultsuperior") -public class KpiResultSuperiorController { - - @Autowired - private KpiResultSuperiorService kpiResultSuperiorService; - - @GetMapping("page") - @DataFilter(tableAlias = "s", deptId = "dept_id", prefix = "AND", isPendingCreator = false) - public Result> page(@RequestParam Map params){ - PageData page = kpiResultSuperiorService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result> get(@PathVariable("id") String id){ - List data = kpiResultSuperiorService.get(id); - return new Result>().ok(data); - } - - @PostMapping - public Result save(@RequestBody KpiResultSuperiorDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - kpiResultSuperiorService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody KpiResultSuperiorDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - kpiResultSuperiorService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - kpiResultSuperiorService.delete(ids); - return new Result(); - } - - @GetMapping("export") - @DataFilter(tableAlias = "s", deptId = "dept_id", prefix = "AND", isPendingCreator = false) - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = kpiResultSuperiorService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, KpiResultSuperiorExcel.class); - } - - /** - * @Description: 详情页表格导出 - * @Param: [params, response] - * @return: void - * @Author: zy - * @Date: 2019-12-24 - */ - @GetMapping("tableExport") - public void tableExport(@RequestParam Map params, HttpServletResponse response) throws Exception { - List data = kpiResultSuperiorService.get(params.get("id").toString()); - ExcelUtils.exportExcelToTarget(response, "区直街道考核统计得分详情", data, KpiResultSuperiorDetailExcel.class); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiRuleController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiRuleController.java index 7d651d06b..1012930b1 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiRuleController.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiRuleController.java @@ -45,122 +45,114 @@ import java.util.Map; * @since v1.0.0 2019-11-27 */ @RestController -@RequestMapping("rule") +@RequestMapping("kpirule") public class KpiRuleController { - @Autowired - private KpiRuleService kpiRuleService; - - @GetMapping("page") - public Result> page(@RequestParam Map params) { - PageData page = kpiRuleService.page(params); - return new Result>().ok(page); - } - - @PostMapping - public Result save(@RequestBody KpiRuleDTO dto) { - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - kpiRuleService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody KpiRuleDTO dto) { - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - kpiRuleService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids) { - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - kpiRuleService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = kpiRuleService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, KpiRuleExcel.class); - } - - /** - * @param params - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 列表查询 - * @Date 2019/11/27 13:22 - **/ - @GetMapping("query") - public Result> query(@RequestParam Map params) { - PageData page = kpiRuleService.query(params); - return new Result>().ok(page); - } - - /** - * @param id - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 查询详情 - * @Date 2019/11/27 15:17 - **/ - @GetMapping("{id}") - public Result queryDetailInfo(@PathVariable("id") String id) { - KpiRuleQueryResultDTO data = kpiRuleService.queryDetailInfo(id); - return new Result().ok(data); - } - - /** - * @param dto - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 新增 - * @Date 2019/11/27 16:23 - **/ - @PostMapping("saveOrUpdate") - public Result add(@RequestBody KpiRuleSaveOrUpdateFormDTO dto) { - ValidatorUtils.validateEntity(dto); - return kpiRuleService.add(dto); - } - - /** - * @param dto - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 修改 - * @Date 2019/11/27 16:20 - **/ - @PutMapping("saveOrUpdate") - public Result edit(@RequestBody KpiRuleSaveOrUpdateFormDTO dto) { - ValidatorUtils.validateEntity(dto); - return kpiRuleService.edit(dto); - } - - /** - * @return - * @Author yinzuomei - * @Description 已绑定手动打分的考核规则 手动打分下拉框使用 - * @Date 2019/12/4 15:52 - **/ - @GetMapping("getKpiManualRule") - public Result> getKpiManualRule() { - return kpiRuleService.listKpiRuleDTO(); - } - - /** - * 根据考核规则编码，计算考核规则绑定公式的运算结果 - * - * @param ruleCode - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author work@yujt.net.cn - * @date 2019/12/17 17:04 - */ - @GetMapping("calcByCode/{ruleCode}") - public Result calcByRuleCode(@PathVariable("ruleCode") String ruleCode) { - kpiRuleService.calcByRuleCode(ruleCode); - return new Result(); - } + @Autowired + private KpiRuleService kpiRuleService; + + @GetMapping("page") + public Result> page(@RequestParam Map params) { + PageData page = kpiRuleService.page(params); + return new Result>().ok(page); + } + + /*@GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + KpiRuleDTO data = kpiRuleService.get(id); + return new Result().ok(data); + }*/ + + @PostMapping + public Result save(@RequestBody KpiRuleDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + kpiRuleService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody KpiRuleDTO dto) { + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + kpiRuleService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids) { + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + kpiRuleService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = kpiRuleService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, KpiRuleExcel.class); + } + + /** + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 列表查询 + * @Date 2019/11/27 13:22 + **/ + @GetMapping("query") + public Result> query(@RequestParam Map params) { + PageData page = kpiRuleService.query(params); + return new Result>().ok(page); + } + + /** + * @param id + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 查询详情 + * @Date 2019/11/27 15:17 + **/ + @GetMapping("{id}") + public Result queryDetailInfo(@PathVariable("id") String id) { + KpiRuleQueryResultDTO data = kpiRuleService.queryDetailInfo(id); + return new Result().ok(data); + } + + /** + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 新增 + * @Date 2019/11/27 16:23 + **/ + @PostMapping("saveOrUpdate") + public Result add(@RequestBody KpiRuleSaveOrUpdateFormDTO dto) { + ValidatorUtils.validateEntity(dto); + return kpiRuleService.add(dto); + } + + /** + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 修改 + * @Date 2019/11/27 16:20 + **/ + @PutMapping("saveOrUpdate") + public Result edit(@RequestBody KpiRuleSaveOrUpdateFormDTO dto) { + ValidatorUtils.validateEntity(dto); + return kpiRuleService.edit(dto); + } + + /** + * @return + * @Author yinzuomei + * @Description 已绑定手动打分的考核规则 手动打分下拉框使用 + * @Date 2019/12/4 15:52 + **/ + @GetMapping("getKpiManualRule") + public Result> getKpiManualRule() { + return kpiRuleService.listKpiRuleDTO(); + } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiRuleParamController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiRuleParamController.java index c9cef461f..ce1c501e3 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiRuleParamController.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiRuleParamController.java @@ -43,7 +43,7 @@ import java.util.Map; * @since v1.0.0 2019-11-27 */ @RestController -@RequestMapping("ruleParam") +@RequestMapping("kpiruleparam") public class KpiRuleParamController { @Autowired diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiTimeLimitIssueController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiTimeLimitIssueController.java index 6c65ba482..102ca1681 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiTimeLimitIssueController.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiTimeLimitIssueController.java @@ -43,7 +43,7 @@ import java.util.Map; * @since v1.0.0 2019-12-02 */ @RestController -@RequestMapping("timeLimitIssue") +@RequestMapping("kpitimelimitissue") public class KpiTimeLimitIssueController { @Autowired diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiTimeLimitItemController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiTimeLimitItemController.java index e00c1862c..90ce500a8 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiTimeLimitItemController.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/KpiTimeLimitItemController.java @@ -43,7 +43,7 @@ import java.util.Map; * @since v1.0.0 2019-12-02 */ @RestController -@RequestMapping("timeLimitItem") +@RequestMapping("kpitimelimititem") public class KpiTimeLimitItemController { @Autowired diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiFormulaDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiFormulaDao.java index d4b0c0cb1..a08084cef 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiFormulaDao.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiFormulaDao.java @@ -17,7 +17,6 @@ package com.elink.esua.epdc.dao; -import com.elink.esua.epdc.dto.KpiFormulaDTO; import com.elink.esua.epdc.dto.result.KpiFormulaDictResultDTO; import com.elink.esua.epdc.entity.KpiFormulaEntity; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; @@ -42,13 +41,4 @@ public interface KpiFormulaDao extends BaseDao { * @Date 2019/11/27 14:11 **/ List selectListKpiFormulaDictResultDTO(); - - /** - * @Description: 查询公式运行方法 - * @Param: [id] - * @return: com.elink.esua.epdc.dto.KpiFormulaDTO - * @Author: zy - * @Date: 2019-12-18 - */ - KpiFormulaDTO queryFormula(String id); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiManualScoreDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiManualScoreDao.java index 17185bdca..48c7be0c8 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiManualScoreDao.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiManualScoreDao.java @@ -20,11 +20,8 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.result.KpiManualScoreResultDTO; import com.elink.esua.epdc.entity.KpiManualScoreEntity; -import com.elink.esua.epdc.excel.KpiManualScoreTemplateExcel; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; import java.util.Map; @@ -37,19 +34,5 @@ import java.util.Map; @Mapper public interface KpiManualScoreDao extends BaseDao { - List selectListKpiManualScoreResultDTO(Map params); - - /** - * 删除手动打分 - * - * @param ruleId - * @param deptId - * @param scoreStartDate - * @param scoreEndDate - * @return int - * @author work@yujt.net.cn - * @date 2019/12/26 14:38 - */ - int deleteManualScore(@Param("ruleId") String ruleId, @Param("deptId") Long deptId, - @Param("scoreStartDate") Date scoreStartDate, @Param("scoreEndDate") Date scoreEndDate); + List selectListKpiManualScoreResultDTO(Map params); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMetaDataDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMetaDataDao.java deleted file mode 100644 index 3662281b8..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiMetaDataDao.java +++ /dev/null @@ -1,48 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.KpiMetaDataDTO; -import com.elink.esua.epdc.dto.KpiResultGridDTO; -import com.elink.esua.epdc.entity.KpiMetaDataEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 绩效考核的元数据 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Mapper -public interface KpiMetaDataDao extends BaseDao { - - /*** - * 插入之前删除数据 防止插入部分出异常 - * @param metaList - * @return void - * @author qushutong - * @date 2019/12/20 13:32 - */ - void deleteListRepetitionMeta(@Param("metaList") List metaList); - - List queryGridProblemHandlingScore(KpiResultGridDTO kpiResultGridDTO); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultGridDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultGridDao.java deleted file mode 100644 index b98b210f1..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultGridDao.java +++ /dev/null @@ -1,86 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.dto.KpiResultGridDTO; -import com.elink.esua.epdc.entity.KpiResultGridEntity; -import org.apache.ibatis.annotations.Mapper; - -import java.math.BigInteger; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * 网格考核最终得分 - * - * @author work@yujt.net.cn - * @since v1.0.0 2019-12-17 - */ -@Mapper -public interface KpiResultGridDao extends BaseDao { - - /** - * @Description: 查询网格考核最终得分表中，当前考核规则数据是否存在 - * @Param: [] - * @return: java.util.List - * @Author: zy - * @Date: 2019-12-17 - */ - KpiResultGridDTO selectManualScoringISExist(Map map); - - /** - * @Description: 查询网格考核最终得分列表 - * @Param: [kpiResultGridEntity] 开始时间、结束时间 - * @return: java.util.List - * @Author: zy - * @Date: 2019-12-17 - */ - List selectKpiResultGrid(KpiResultGridEntity kpiResultGridEntity); - - /** - * 自定义分页列表 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-17 - */ - List selectStatisticalInfoList(Map params); - - /** - * @Description: 自定义分页总数 - * @Param: [params] - * @return: int - * @Author: zy - * @Date: 2019-12-19 - */ - int selectStatisticalInfoCount(Map params); - - /** - * 自定义默认查询首页统计列表 - * - * @param params - * @return List - * @author zy - * @date 2019-12-20 - */ - List list(Map params); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultSuperiorDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultSuperiorDao.java deleted file mode 100644 index 27d732f42..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiResultSuperiorDao.java +++ /dev/null @@ -1,81 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.dao; - -import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.KpiResultGridDTO; -import com.elink.esua.epdc.dto.KpiResultSuperiorDTO; -import com.elink.esua.epdc.entity.KpiResultSuperiorEntity; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * 街道或区直绩效考核最终得分 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-23 - */ -@Mapper -public interface KpiResultSuperiorDao extends BaseDao { - /** - * 自定义分页列表 - * - * @param params - * @return List - * @author generator - * @date 2019-12-17 - */ - List selectSuperiorInfoList(Map params); - - /** - * @Description: 自定义分页总数 - * @Param: [params] - * @return: int - * @Author: zy - * @Date: 2019-12-19 - */ - int selectSuperiorInfoCount(Map params); - - /** - * 自定义导出查询列表 - * - * @param params - * @return List - * @author generator - * @date 2019-12-17 - */ - List exportSuperiorList(Map params); - - /** - * 根据部门id与考核周期 删除 - * - * @param deptId - * @param startDate - * @param endDate - * @return void - * @author work@yujt.net.cn - * @date 2019/12/25 18:56 - */ - int deleteByDeptIdAndKpiDate(@Param("deptId") Long deptId, - @Param("startDate") Date startDate, - @Param("endDate") Date endDate); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiRuleDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiRuleDao.java index a3495ad20..a64fd10f4 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiRuleDao.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiRuleDao.java @@ -18,7 +18,6 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.KpiRuleDTO; import com.elink.esua.epdc.dto.KpiRuleParamDTO; import com.elink.esua.epdc.dto.result.KpiRuleQueryResultDTO; import com.elink.esua.epdc.entity.KpiRuleEntity; @@ -63,13 +62,4 @@ public interface KpiRuleDao extends BaseDao { **/ KpiRuleQueryResultDTO queryDetailInfo(String id); - /** - * @Description: 根据考核规则编码，查询符合考核规则 的 元公式 - * @Param: [ruleCode] 考核规则编码 - * 规则生成方式为：0 元公式 - * @return: com.elink.esua.epdc.dao.KpiRuleDao - * @Author: zy - * @Date: 2019-12-18 - */ - KpiRuleDTO queryKpiRuleMetaFormula(String ruleCode); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiRuleParamDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiRuleParamDao.java index 262466dcb..bd585ed2d 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiRuleParamDao.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiRuleParamDao.java @@ -18,12 +18,9 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; -import com.elink.esua.epdc.dto.KpiRuleParamDTO; import com.elink.esua.epdc.entity.KpiRuleParamEntity; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - /** * 公式参数表 * @@ -41,13 +38,4 @@ public interface KpiRuleParamDao extends BaseDao { * @Date 2019/11/27 16:36 **/ int deleteByRuleId(String id); - - /** - * @Description: 根据 考核规则表-主键，查询公式参数表 - * @Param: [ruleId] 规则ID - * @return: java.util.List - * @Author: zy - * @Date: 2019-12-18 - */ - List queryFormulaParam(String ruleId); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiTimeLimitItemDao.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiTimeLimitItemDao.java index bbd50990e..864818d4b 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiTimeLimitItemDao.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiTimeLimitItemDao.java @@ -20,9 +20,6 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.entity.KpiTimeLimitItemEntity; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; /** * 项目响应时限 @@ -32,16 +29,5 @@ import java.util.List; */ @Mapper public interface KpiTimeLimitItemDao extends BaseDao { - - - /** - * 按类别id，批量删除配置 - * - * @param categoryIds - * @return int - * @author work@yujt.net.cn - * @date 2019/12/16 19:19 - */ - int deleteBatchByCategoryIds(@Param("categoryIds") List categoryIds); - + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreEntity.java index e489f0d10..24b7f293f 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreEntity.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreEntity.java @@ -23,7 +23,6 @@ import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.math.BigDecimal; import java.util.Date; /** @@ -33,70 +32,55 @@ import java.util.Date; * @since v1.0.0 2019-12-04 */ @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper=false) @TableName("epdc_kpi_manual_score") public class KpiManualScoreEntity extends BaseEpdcEntity { - private static final long serialVersionUID = -8994029691874794620L; + private static final long serialVersionUID = 1L; /** * epdc_kpi_rule表主键 */ - private String ruleId; + private String ruleId; /** * 被打分的部门id */ - private Long deptId; + private String deptId; /** * 得分 */ - private BigDecimal score; + private Integer score; - /** - * 考核起止日期 - */ - private Date scoreStartDate; + /** + * 考核起止日期 + */ + private Date scoreStartDate; - /** - * 考核终止日期 - */ - private Date scoreEndDate; + /** + * 考核终止日期 + */ + private Date scoreEndDate; /** * 所有父级部门id */ - private String parentDeptIds; + private String parentDeptIds; /** * 所有父级部门名称 */ - private String parentDeptNames; + private String parentDeptNames; /** * 完整部门id */ - private String allDeptIds; + private String allDeptIds; /** * 完整部门名称 */ - private String allDeptNames; - - /** - * 打分者的部门id - */ - private String creatorDeptName; - - /** - * 打分者的部门名称 - */ - private Long creatorDeptId; - - /** - * 被考核部门的网格长姓名 - */ - private String leaderName; + private String allDeptNames; } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreRuleEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreRuleEntity.java index 773a7bcb4..dd6565885 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreRuleEntity.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiManualScoreRuleEntity.java @@ -24,6 +24,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; +import java.util.Date; /** * 手动打分项 @@ -36,7 +37,7 @@ import java.math.BigDecimal; @TableName("epdc_kpi_manual_score_rule") public class KpiManualScoreRuleEntity extends BaseEpdcEntity { - private static final long serialVersionUID = 1073211664180968064L; + private static final long serialVersionUID = 1L; /** * 打分项名称 @@ -56,6 +57,6 @@ public class KpiManualScoreRuleEntity extends BaseEpdcEntity { /** * 满分 */ - private BigDecimal fullMarks; + private Integer fullMarks; } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiMetaDataEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiMetaDataEntity.java deleted file mode 100644 index 36fac4299..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiMetaDataEntity.java +++ /dev/null @@ -1,82 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 绩效考核的元数据 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("epdc_kpi_meta_data") -public class KpiMetaDataEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = -27618138854750989L; - - /** - * 数据项编码 - */ - private String dataCode; - - /** - * 数据项名称 - */ - private String dataName; - - /** - * 元数据值 - */ - private BigDecimal dataValue; - - /** - * 考核周期(字典值 代表月，季，年) - */ - private String kpiCycle; - - /** - * 考核周期开始日 - */ - private Date startDate; - - /** - * 考核周期结束日 - */ - private Date endDate; - - /** - * 部门ID - */ - private Long deptId; - - /** - * 部门类别 - */ - private String deptTypeKey; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiResultGridEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiResultGridEntity.java deleted file mode 100644 index 97bea0f16..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiResultGridEntity.java +++ /dev/null @@ -1,107 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 网格考核最终得分 - * - * @author work@yujt.net.cn - * @since v1.0.0 2019-12-17 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_kpi_result_grid") -public class KpiResultGridEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 网格ID - */ - private Long gridId; - - /** - * 手动打分得分 - */ - private BigDecimal manualScore; - - /** - * 工作得分 - */ - private BigDecimal workScore; - - /** - * 投票得分 - */ - private BigDecimal voteScore; - - /** - * 最终得分 - */ - private BigDecimal finalScore; - - /** - * 考核周期开始日 - */ - private Date startDate; - - /** - * 考核周期结束日 - */ - private Date endDate; - - /** - * 被考核部门的网格长姓名 - */ - private String leaderName; - - /** - * 考核周期(字典值 代表月，季，年) - */ - private String kpiCycle; - - /** - * 所有上级机构id - */ - private String parentDeptIds; - - /** - * 所有上级机构名称 - */ - private String parentDeptNames; - - /** - * 所有机构id - */ - private String allDeptIds; - - /** - * 所有机构名称 - */ - private String allDeptNames; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiResultSuperiorEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiResultSuperiorEntity.java deleted file mode 100644 index 2cb59ee29..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiResultSuperiorEntity.java +++ /dev/null @@ -1,92 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 街道或区直绩效考核最终得分 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-23 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("epdc_kpi_result_superior") -public class KpiResultSuperiorEntity extends BaseEpdcEntity { - - private static final long serialVersionUID = 1L; - - /** - * 网格ID - */ - private Long deptId; - - /** - * 最终得分 - */ - private BigDecimal finalScore; - - /** - * 考核周期开始日 - */ - private Date startDate; - - /** - * 考核周期结束日 - */ - private Date endDate; - - /** - * 考核周期(字典值 代表月，季，年) - */ - private String kpiCycle; - - /** - * 机构类别 - */ - private String deptTypeKey; - - /** - * 所有上级机构id - */ - private String parentDeptIds; - - /** - * 所有上级机构名称 - */ - private String parentDeptNames; - - /** - * 所有机构id - */ - private String allDeptIds; - - /** - * 所有机构名称 - */ - private String allDeptNames; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiTimeLimitItemEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiTimeLimitItemEntity.java index 9a0ce5a83..d29045146 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiTimeLimitItemEntity.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiTimeLimitItemEntity.java @@ -51,7 +51,7 @@ public class KpiTimeLimitItemEntity extends BaseEpdcEntity { /** * 项目类别id */ - private Long categoryId; + private String categoryId; /** * 所有上级项目类别id diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiManualScoreTemplateExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiManualScoreTemplateExcel.java index 88c119c5e..15376ed2c 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiManualScoreTemplateExcel.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiManualScoreTemplateExcel.java @@ -13,52 +13,105 @@ import java.util.Date; @Data public class KpiManualScoreTemplateExcel { - /** - * 街道 - */ - @Excel(name = "街道") - private String street; - - /** - * 社区 - */ - @Excel(name = "社区") - private String community; - - /** - * 网格 - */ - @Excel(name = "网格") - private String grid; - - /** - * 规则名称 - */ - @Excel(name = "规则名称") - private String ruleName; - - /** - * 考核周期 - */ - @Excel(name = "考核周期") - private String kpiCycleName; - - /** - * 考核起始日期 - */ - @Excel(name = "考核起始日", format = "yyyy-MM-dd") - private Date scoreStartDate; - - /** - * 考核终止日期 - */ - @Excel(name = "考核终止日", format = "yyyy-MM-dd") - private Date scoreEndDate; - - /** - * 得分 - */ - @Excel(name = "得分") - private Integer score; + /** + * 街道 + */ + @Excel(name = "街道") + private String street; + /** + * 社区 + */ + @Excel(name = "社区") + private String community; + + /** + * 网格 + */ + @Excel(name = "网格") + private String grid; + + /** + * 规则名称 + */ + @Excel(name = "规则名称") + private String ruleName; + + /** + * 考核周期 + */ + @Excel(name = "考核周期") + private String kpiCycleName; + + /** + * 考核起止日期 + */ + @Excel(name = "考核起止日期") + private String scoreStartTime; + + /** + * 考核终止日期 + */ + @Excel(name = "考核终止日期") + private String scoreEndTime; + + /** + * 得分 + */ + @Excel(name = "得分") + private Integer score; + + /************************************************ 我 是 一 条 分 割 线 ************************************************************************/ + /************************************************ 我 是 一 条 分 割 线 ************************************************************************/ + /************************************************ 我 是 一 条 分 割 线 ************************************************************************/ + /** + * 部门名称 + * + */ + private String deptName; + + /************************************************ 组装数据 ************************************************************************/ + /** + * epdc_kpi_rule表主键 + */ + private String ruleId; + + /** + * 被打分的部门id + */ + private String deptId; + /** + * 考核起止日期 + */ + private Date scoreStartDate; + + /** + * 考核终止日期 + */ + private Date scoreEndDate; + + /** + * 所有父级部门id + */ + private String parentDeptIds; + + /** + * 所有父级部门名称 + */ + private String parentDeptNames; + + /** + * 完整部门id + */ + private String allDeptIds; + + /** + * 完整部门名称 + */ + private String allDeptNames; + + /** + * 导出用户id + */ + private String userId; } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiMetaDataExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiMetaDataExcel.java deleted file mode 100644 index c1e27f67a..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiMetaDataExcel.java +++ /dev/null @@ -1,78 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 绩效考核的元数据 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Data -public class KpiMetaDataExcel { - - @Excel(name = "主键") - private String id; - - @Excel(name = "数据项编码") - private String dataCode; - - @Excel(name = "数据项名称") - private String dataName; - - @Excel(name = "元数据值") - private BigDecimal dataValue; - - @Excel(name = "考核周期(字典值 代表月，季，年)") - private String kpiCycle; - - @Excel(name = "考核周期开始日") - private Date startDate; - - @Excel(name = "考核周期结束日") - private Date endDate; - - @Excel(name = "部门ID") - private Long deptId; - - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "创建人") - private String createdBy; - - @Excel(name = "创建时间") - private Date createdTime; - - @Excel(name = "更新人") - private String updatedBy; - - @Excel(name = "更新时间") - private Date updatedTime; - - @Excel(name = "删除标记") - private String delFlag; - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridDetailExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridDetailExcel.java deleted file mode 100644 index 410aeec01..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridDetailExcel.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.elink.esua.epdc.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; -/** - * 网格考核详情导出 - * - * @author zy - * @since v1.0.0 2019-12-17 - */ -@Data -public class KpiResultGridDetailExcel { - - @Excel(name = "序号") - private int rownum; - - @Excel(name = "规则") - private String rule; - - @Excel(name = "详情") - private String detail; -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridExcel.java deleted file mode 100644 index e12800f06..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultGridExcel.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 网格考核最终得分 - * - * @author work@yujt.net.cn - * @since v1.0.0 2019-12-17 - */ -@Data -public class KpiResultGridExcel { - - @Excel(name = "所属机构") - private String allDeptNames; - - @Excel(name = "网格长") - private String leaderName; - - @Excel(name = "考核周期开始日") - private String startDateString; - - @Excel(name = "考核周期结束日") - private String endDateString; - - @Excel(name = "基层党建工作职责得分") - private BigDecimal manualScore; - - @Excel(name = "平时工作得分") - private BigDecimal workScore; - - @Excel(name = "总分") - private BigDecimal finalScore; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultSuperiorDetailExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultSuperiorDetailExcel.java deleted file mode 100644 index b4f76b9d4..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultSuperiorDetailExcel.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.elink.esua.epdc.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * 街道或区直绩效考核最终得分 - * - * @author zy - * @since v1.0.0 2019-12-24 - */ -@Data -public class KpiResultSuperiorDetailExcel { - - @Excel(name = "网格呼叫事项总数") - private BigDecimal gridCallSuperiorAmount; - - @Excel(name = "响应网格呼叫事项数") - private BigDecimal gridCallSuperiorRespAmount; - - @Excel(name = "办结网格呼叫事项数") - private BigDecimal gridCallSuperiorCloseAmount; - - @Excel(name = "工作评议满意数") - private BigDecimal gridHighEvaluationAmount; - - @Excel(name = "工作评议基本满意数") - private BigDecimal gridMediumEvaluationAmount; - - @Excel(name = "工作评议不满意数") - private BigDecimal gridLowEvaluationAmount; - -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultSuperiorExcel.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultSuperiorExcel.java deleted file mode 100644 index 745fbd97a..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiResultSuperiorExcel.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.excel; - -import cn.afterturn.easypoi.excel.annotation.Excel; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 街道或区直绩效考核最终得分 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-23 - */ -@Data -public class KpiResultSuperiorExcel { - - @Excel(name = "所属机构") - private String allDeptNames; - - @Excel(name = "最终得分") - private BigDecimal finalScore; - - @Excel(name = "考核周期开始日") - private String startDateString; - - @Excel(name = "考核周期结束日") - private String endDateString; - - @Excel(name = "考核周期") - private String kpiCycle; - - @Excel(name = "机构类别") - private String deptTypeKey; - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index 6d16111c7..1c7d950a8 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -2,7 +2,8 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO; +import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; +import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback; @@ -27,7 +28,7 @@ public interface AdminFeignClient { /** * @param userSysDeptInfoFormDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author yinzuomei * @Description 获取用户数据权限下各部门基本信息 * @Date 2019/12/6 19:40 @@ -36,31 +37,22 @@ public interface AdminFeignClient { Result> queryUserSysDeptInfo(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO); /** - * 按部门类型，分页查询部门列表 - * - * @param typeKey 部门类型 - * @param pageSize 页容量 - * @param pageIndex 页码 - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author work@yujt.net.cn - * @date 2019/12/17 16:03 - */ - @GetMapping("/sys/dept/pageDeptIdByTypeKey/{typeKey}/{pageSize}/{pageIndex}") - Result> pageDeptIdByTypeKey(@PathVariable("typeKey") String typeKey, - @PathVariable("pageSize") Integer pageSize, - @PathVariable("pageIndex") Integer pageIndex); + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 根据部门ID获取上级所有部门信息 + * @Date 2019/12/6 19:49 + **/ + @GetMapping("/sys/dept/getParentAndAllDept/{deptId}") + Result getParentAndAllDept(@PathVariable("deptId") String deptId); /** - * 根据部门id，获取部门层级关系，获取部门领导姓名 - * - * @param deptId 部门id - * @param leaderFlag 是否需要查询网格长姓名 0 否 、1 是 - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author work@yujt.net.cn - * @date 2019/12/18 13:54 - */ - @GetMapping("/sys/dept/getDeptInfoById/{deptId}/{leaderFlag}") - Result getDeptInfoById(@PathVariable("deptId") Long deptId, - @PathVariable("leaderFlag") String leaderFlag); - + * @param id + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 根据部门id获取部门信息 + * @Date 2019/12/6 20:22 + **/ + @GetMapping("/sys/dept/{id}") + Result getSysDeptDTO(@PathVariable("id") Long id); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java index 566898e68..e5c06cb0d 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java @@ -2,18 +2,11 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.KpiMetaDataDTO; -import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; -import com.elink.esua.epdc.dto.form.*; -import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO; -import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO; -import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO; -import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO; +import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO; +import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO; import com.elink.esua.epdc.feign.fallback.EventFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import java.util.List; @@ -26,56 +19,13 @@ import java.util.List; @FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = EventFeignClientFallback.class) public interface EventFeignClient { - /** - * @param categoryInfoFormDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 根据id查询事件分类基本信息 - * @Date 2019/12/4 10:37 - **/ - @GetMapping(value = "events/category/queryCategoryInfo", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> queryCategoryInfo(CategoryInfoFormDTO categoryInfoFormDTO); - - /** - * 统计网格指定时间段内事件上报数与事件受理数 - * - * @param eventReportAmountFormDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author work@yujt.net.cn - * @date 2019/12/19 19:06 - */ - @PostMapping(value = "events/epdcevents/statEventReportAmount", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> statEventReportAmount(KpiMetaDataOfEventsFormDTO eventReportAmountFormDto); - - /** - * 统计群众对问题处理的满意度 - * - * @param metaDataFormDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author work@yujt.net.cn - * @date 2019/12/20 14:46 - */ - @PostMapping(value = "events/item/statPeopleEvaluationMetaData", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> statPeopleEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto); - - /*** - * 获取网格工作评议 - * @param metaDataFormDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author qushutong - * @date 2019/12/20 15:16 - */ - @PostMapping(value = "events/item/statGridEvaluationMetaData", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> statGridEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto); - - /** - * 统计项目处理数 包括：网格呼叫总数，网格呼叫被响应数，网格呼叫被关闭数 - * - * @param metaDataFormDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author work@yujt.net.cn - * @date 2019/12/23 13:46 - */ - @PostMapping(value = "events/item/statItemHandleAmountMetaData", consumes = MediaType.APPLICATION_JSON_VALUE) - Result> statItemHandleAmount(KpiMetaDataOfEventsFormDTO metaDataFormDto); + /** + * @param categoryInfoFormDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 根据id查询事件分类基本信息 + * @Date 2019/12/4 10:37 + **/ + @PostMapping(value = "events/category/queryCategoryInfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> queryCategoryInfo(CategoryInfoFormDTO categoryInfoFormDTO); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index 07fd7fc1a..5062da0bf 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -3,7 +3,8 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO; +import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; +import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; import com.elink.esua.epdc.feign.AdminFeignClient; @@ -18,26 +19,40 @@ import java.util.List; */ @Component public class AdminFeignClientFallback implements AdminFeignClient { - /** - * @param userSysDeptInfoFormDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description - * @Date 2019/12/6 20:15 - **/ - @Override - public Result> queryUserSysDeptInfo(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "queryUserSysDeptInfo", userSysDeptInfoFormDTO); - } + /** + * @param userSysDeptInfoFormDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author yinzuomei + * @Description + * @Date 2019/12/6 20:15 + **/ + @Override + public Result> queryUserSysDeptInfo(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "queryUserSysDeptInfo", userSysDeptInfoFormDTO); + } - @Override - public Result> pageDeptIdByTypeKey(String typeKey, Integer pageSize, Integer pageIndex) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "pageDeptIdByTypeKey", typeKey, pageSize, pageIndex); - } + /** + * @param deptId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 根据部门ID获取上级所有部门信息 + * @Date 2019/12/6 19:49 + **/ + @Override + public Result getParentAndAllDept(String deptId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getParentAndAllDept", deptId); + } - @Override - public Result getDeptInfoById(Long deptId, String leaderFlag) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptInfoById", deptId, leaderFlag); - } + /** + * @param id + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 根据部门id获取部门信息 + * @Date 2019/12/6 20:22 + **/ + @Override + public Result getSysDeptDTO(Long id) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getSysDeptDTO", id); + } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java index c8390dc88..8c83f4f01 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/fallback/EventFeignClientFallback.java @@ -3,14 +3,8 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.KpiMetaDataDTO; -import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; -import com.elink.esua.epdc.dto.form.*; -import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO; -import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO; -import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO; -import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO; +import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO; +import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO; import com.elink.esua.epdc.feign.EventFeignClient; import org.springframework.stereotype.Component; @@ -24,28 +18,8 @@ import java.util.List; @Component public class EventFeignClientFallback implements EventFeignClient { - @Override - public Result> queryCategoryInfo(CategoryInfoFormDTO categoryInfoFormDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryCategoryInfo", categoryInfoFormDTO); - } - - @Override - public Result> statEventReportAmount(KpiMetaDataOfEventsFormDTO eventReportAmountFormDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "statEventReportAmount", eventReportAmountFormDto); - } - - @Override - public Result> statPeopleEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "statPeopleEvaluationMetaData", metaDataFormDto); - } - - @Override - public Result> statGridEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "statGridEvaluationMetaData", metaDataFormDto); - } - - @Override - public Result> statItemHandleAmount(KpiMetaDataOfEventsFormDTO metaDataFormDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "statItemHandleAmount", metaDataFormDto); - } + @Override + public Result> queryCategoryInfo(CategoryInfoFormDTO categoryInfoFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryCategoryInfo", categoryInfoFormDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiMetaDataRedis.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiMetaDataRedis.java deleted file mode 100644 index 0ef6cb409..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiMetaDataRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 绩效考核的元数据 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Component -public class KpiMetaDataRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiResultGridRedis.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiResultGridRedis.java deleted file mode 100644 index 70a85ca56..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiResultGridRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 网格考核最终得分 - * - * @author work@yujt.net.cn - * @since v1.0.0 2019-12-17 - */ -@Component -public class KpiResultGridRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiResultSuperiorRedis.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiResultSuperiorRedis.java deleted file mode 100644 index 2cd65460f..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiResultSuperiorRedis.java +++ /dev/null @@ -1,47 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.redis; - -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 街道或区直绩效考核最终得分 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-23 - */ -@Component -public class KpiResultSuperiorRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiTimeLimitItemRedis.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiTimeLimitItemRedis.java index b8c271490..387cd1325 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiTimeLimitItemRedis.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/redis/KpiTimeLimitItemRedis.java @@ -17,16 +17,10 @@ package com.elink.esua.epdc.redis; -import com.elink.esua.epdc.commons.tools.redis.RedisKeys; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import com.elink.esua.epdc.constant.KpiItemConstant; -import com.elink.esua.epdc.entity.KpiTimeLimitItemEntity; -import com.google.common.collect.Maps; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.Map; - /** * 项目响应时限 * @@ -35,27 +29,19 @@ import java.util.Map; */ @Component public class KpiTimeLimitItemRedis { - @Autowired private RedisUtils redisUtils; - /** - * 将项目类别时限设置存入缓存 - * - * @param timelimitItem - * @return void - * @author work@yujt.net.cn - * @date 2019/12/17 10:27 - */ - public void setTimelimitItem(KpiTimeLimitItemEntity timelimitItem) { - - Map map = Maps.newHashMap(); - map.put(KpiItemConstant.CLOSE_ITEM_TIME_LIMIT, timelimitItem.getValidCloseTime()); - map.put(KpiItemConstant.RESPOND_ITEM_TIME_LIMIT, timelimitItem.getValidRespondTime()); - - String key = RedisKeys.getKpiItemTimeLimitKey(String.valueOf(timelimitItem.getCategoryId())); - redisUtils.set(key, map); + public void delete(Object[] ids) { + } + public void set(){ + + } + + public String get(String id){ + return null; + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreService.java index 4a73c7804..0fb4ed3f5 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreService.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiManualScoreService.java @@ -123,23 +123,4 @@ public interface KpiManualScoreService extends BaseService * @Date 2019/12/5 15:46 **/ Result importManualScoreExcel(MultipartFile file); - - /** - * 导出打分模版前，校验选项 - * - * @param params - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author work@yujt.net.cn - * @date 2019/12/16 14:12 - */ - Result checkExportTemplate(Map params); - - /** - * 将手动打分初始化为元数据项 - * - * @return void - * @author work@yujt.net.cn - * @date 2019/12/25 14:11 - */ - void initManualScoreToMetaData(String params); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMetaDataService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMetaDataService.java deleted file mode 100644 index 448654563..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiMetaDataService.java +++ /dev/null @@ -1,107 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.dto.KpiMetaDataDTO; -import com.elink.esua.epdc.entity.KpiMetaDataEntity; - -import java.util.List; -import java.util.Map; - -/** - * 绩效考核的元数据 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -public interface KpiMetaDataService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-16 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-12-16 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return KpiMetaDataDTO - * @author generator - * @date 2019-12-16 - */ - KpiMetaDataDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-16 - */ - void save(KpiMetaDataDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-16 - */ - void update(KpiMetaDataDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-12-16 - */ - void delete(String[] ids); - - /** - * 先删除已有数据再批量插入元数据表 - * - * @param metaDateList - * @return void - * @author qushutong - * @date 2019/12/24 14:38 - */ - void deleteAndInsertBatch(List metaDateList); - - void buildMetaData(String kpiScheduleCode); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiResultGridService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiResultGridService.java deleted file mode 100644 index c7c8a8636..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiResultGridService.java +++ /dev/null @@ -1,95 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.dto.KpiResultGridDTO; -import com.elink.esua.epdc.entity.KpiResultGridEntity; - -import java.util.List; -import java.util.Map; - -/** - * 网格考核最终得分 - * - * @author work@yujt.net.cn - * @since v1.0.0 2019-12-17 - */ -public interface KpiResultGridService extends BaseService { - - /** - * 自定义分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-17 - */ - PageData page(Map params); - - /** - * 自定义默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-12-17 - */ - List list(Map params); - - /** - * 详情查询 - * - * @param id - * @return KpiResultGridDTO - * @author generator - * @date 2019-12-17 - */ - List get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-17 - */ - void save(KpiResultGridDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-17 - */ - void update(KpiResultGridDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-12-17 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiResultSuperiorService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiResultSuperiorService.java deleted file mode 100644 index baf35e197..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiResultSuperiorService.java +++ /dev/null @@ -1,97 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.service; - -import com.elink.esua.epdc.commons.mybatis.service.BaseService; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.KpiResultSuperiorDTO; -import com.elink.esua.epdc.entity.KpiResultSuperiorEntity; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; -import java.util.Map; - -/** - * 街道或区直绩效考核最终得分 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-23 - */ -public interface KpiResultSuperiorService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-12-23 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-12-23 - */ - List list(Map params); - - /** - * 根据id列表查询 - * - * @param id - * @return KpiResultSuperiorDTO - * @author generator - * @date 2019-12-23 - */ - List get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-23 - */ - void save(KpiResultSuperiorDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-12-23 - */ - void update(KpiResultSuperiorDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-12-23 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiRuleService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiRuleService.java index 7fea02c7f..02eefcd39 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiRuleService.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/KpiRuleService.java @@ -36,127 +36,117 @@ import java.util.Map; */ public interface KpiRuleService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2019-11-27 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2019-11-27 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return KpiRuleDTO - * @author generator - * @date 2019-11-27 - */ - KpiRuleDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2019-11-27 - */ - void save(KpiRuleDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2019-11-27 - */ - void update(KpiRuleDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2019-11-27 - */ - void delete(String[] ids); - - /** - * @param params - * @return com.elink.esua.epdc.commons.tools.page.PageData - * @Author yinzuomei - * @Description 列表查询 - * @Date 2019/11/27 13:29 - **/ - PageData query(Map params); - - /** - * @param id 考核规则表主键 - * @return com.elink.esua.epdc.dto.result.KpiRuleQueryResultDTO - * @Author yinzuomei - * @Description 查询详情 - * @Date 2019/11/27 15:17 - **/ - KpiRuleQueryResultDTO queryDetailInfo(String id); - - /** - * @param dto - * @return void - * @Author yinzuomei - * @Description 新增 - * @Date 2019/11/27 16:27 - **/ - Result add(KpiRuleSaveOrUpdateFormDTO dto); - - /** - * @param dto - * @return void - * @Author yinzuomei - * @Description 修改 - * @Date 2019/11/27 16:27 - **/ - Result edit(KpiRuleSaveOrUpdateFormDTO dto); - - /** - * @param referenceIds - * @return java.util.List - * @Author yinzuomei - * @Description 根据引用id查询考核规则表记录 - * @Date 2019/12/2 14:59 - **/ - List listKpiRuleEntityByRereferenceId(String[] referenceIds); - - /** - * @param - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 已绑定手动打分的考核规则 手动打分下拉框使用 - * @Date 2019/12/4 15:52 - **/ - Result> listKpiRuleDTO(); - - /** - * 根据考核规则编码，计算考核规则绑定公式的运算结果 - * - * @param ruleCode 考核规则编码 - * @return void - * @author work@yujt.net.cn - * @date 2019/12/17 17:20 - */ - void calcByRuleCode(String ruleCode); + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2019-11-27 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2019-11-27 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return KpiRuleDTO + * @author generator + * @date 2019-11-27 + */ + KpiRuleDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2019-11-27 + */ + void save(KpiRuleDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2019-11-27 + */ + void update(KpiRuleDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2019-11-27 + */ + void delete(String[] ids); + + /** + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @Author yinzuomei + * @Description 列表查询 + * @Date 2019/11/27 13:29 + **/ + PageData query(Map params); + + /** + * @param id 考核规则表主键 + * @return com.elink.esua.epdc.dto.result.KpiRuleQueryResultDTO + * @Author yinzuomei + * @Description 查询详情 + * @Date 2019/11/27 15:17 + **/ + KpiRuleQueryResultDTO queryDetailInfo(String id); + + /** + * @param dto + * @return void + * @Author yinzuomei + * @Description 新增 + * @Date 2019/11/27 16:27 + **/ + Result add(KpiRuleSaveOrUpdateFormDTO dto); + + /** + * @param dto + * @return void + * @Author yinzuomei + * @Description 修改 + * @Date 2019/11/27 16:27 + **/ + Result edit(KpiRuleSaveOrUpdateFormDTO dto); + + /** + * @param referenceIds + * @return java.util.List + * @Author yinzuomei + * @Description 根据引用id查询考核规则表记录 + * @Date 2019/12/2 14:59 + **/ + List listKpiRuleEntityByRereferenceId(String[] referenceIds); + + /** + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 已绑定手动打分的考核规则 手动打分下拉框使用 + * @Date 2019/12/4 15:52 + **/ + Result> listKpiRuleDTO(); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiFormulaServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiFormulaServiceImpl.java index d6edd767a..72051af4b 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiFormulaServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiFormulaServiceImpl.java @@ -53,9 +53,10 @@ import java.util.Map; @Service public class KpiFormulaServiceImpl extends BaseServiceImpl implements KpiFormulaService { + @Autowired + private KpiFormulaRedis kpiFormulaRedis; @Autowired private KpiRuleDao kpiRuleDao; - @Override public PageData page(Map params) { QueryWrapper wrapper=new QueryWrapper<>(); diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreRuleServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreRuleServiceImpl.java index d79d6e29b..24184f2a4 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreRuleServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreRuleServiceImpl.java @@ -100,7 +100,7 @@ public class KpiManualScoreRuleServiceImpl extends BaseServiceImpl kpiRuleEntityList = kpiRuleService.listKpiRuleEntityByRereferenceId(referenceIds); if (null != kpiRuleEntityList && kpiRuleEntityList.size() > 0) { diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java index e92d04823..0e81638ed 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java @@ -1,3 +1,19 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package com.elink.esua.epdc.service.impl; @@ -8,38 +24,36 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; -import com.elink.esua.epdc.commons.tools.constant.StrConstant; -import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; -import com.elink.esua.epdc.commons.tools.exception.RenException; +import com.elink.esua.epdc.commons.tools.exception.ErrorCode; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.constant.KpiFieldConstant; -import com.elink.esua.epdc.dao.*; -import com.elink.esua.epdc.dto.*; +import com.elink.esua.epdc.dao.KpiManualScoreDao; +import com.elink.esua.epdc.dao.KpiManualScoreRuleDao; +import com.elink.esua.epdc.dao.KpiManualScoreTempDao; +import com.elink.esua.epdc.dao.KpiRuleDao; +import com.elink.esua.epdc.dto.KpiManualScoreDTO; +import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; +import com.elink.esua.epdc.dto.SysDeptDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; +import com.elink.esua.epdc.dto.result.ImportExcelErrorResultDTO; import com.elink.esua.epdc.dto.result.KpiManualScoreResultDTO; import com.elink.esua.epdc.dto.result.KpiManualScoreTemplateResultDTO; -import com.elink.esua.epdc.entity.*; +import com.elink.esua.epdc.entity.KpiManualScoreEntity; +import com.elink.esua.epdc.entity.KpiManualScoreRuleEntity; +import com.elink.esua.epdc.entity.KpiManualScoreTempEntity; +import com.elink.esua.epdc.entity.KpiRuleEntity; import com.elink.esua.epdc.enums.KpiCycleEnum; -import com.elink.esua.epdc.enums.KpiMetaDataEnum; import com.elink.esua.epdc.excel.KpiManualScoreTemplateExcel; import com.elink.esua.epdc.feign.AdminFeignClient; +import com.elink.esua.epdc.redis.KpiManualScoreRedis; import com.elink.esua.epdc.service.KpiManualScoreService; -import com.elink.esua.epdc.service.KpiMetaDataService; -import com.elink.esua.epdc.utils.DeptUtils; -import com.elink.esua.epdc.utils.KpiLocalDateUtils; +import com.elink.esua.epdc.service.KpiManualScoreTempService; import com.elink.esua.epdc.utils.StreamUtils; -import com.google.common.collect.Lists; -import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,9 +63,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.File; -import java.math.BigDecimal; -import java.time.LocalDate; -import java.time.YearMonth; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -63,776 +76,411 @@ import java.util.*; @Service public class KpiManualScoreServiceImpl extends BaseServiceImpl implements KpiManualScoreService { - private Logger logger = LoggerFactory.getLogger(getClass()); - - @Autowired - private KpiManualScoreRuleDao kpiManualScoreRuleDao; - - @Autowired - private KpiRuleDao kpiRuleDao; - - @Autowired - private KpiResultGridDao kpiResultGridDao; - - @Autowired - private KpiMetaDataService kpiMetaDataService; - - @Autowired - private DeptUtils deptUtils; - - @Autowired - private AdminFeignClient adminFeignClient; - - @Override - public PageData page(Map params) { - String ruleId = params.containsKey("ruleId") ? params.get("ruleId").toString() : null; - String createdTime = params.containsKey(FieldConstant.CREATED_TIME_HUMP) ? params.get(FieldConstant.CREATED_TIME_HUMP).toString() : null; - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(ruleId), KpiFieldConstant.RULE_ID, ruleId); - wrapper.between(StringUtils.isNotBlank(createdTime), "DATE_FORMAT(CREATED_TIME, '%Y-%m' )", createdTime, createdTime); - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - wrapper - ); - PageData list = getPageData(page, KpiManualScoreDTO.class); - return list; - } - - /** - * @param params - * @return com.elink.esua.epdc.commons.tools.page.PageData - * @Author yinzuomei - * @Description 列表查询 - * @Date 2019/12/4 17:37 - **/ - @Override - public PageData listKpiManualScoreResultDTO(Map params) { - String allDeptIds = ""; - if (params.get("streetId") != "" && params.get("streetId") != null) { - allDeptIds = params.get("streetId").toString(); //查询条件 街道 - } - if (params.get("communityId") != "" && params.get("communityId") != null) { - allDeptIds = params.get("communityId").toString(); //查询条件 社区 - } - if (params.get("gridId") != "" && params.get("gridId") != null) { - allDeptIds = params.get("gridId").toString(); //查询条件 网格 - } - params.put("allDeptIds", allDeptIds); - IPage page = getPage(params); - List list = baseDao.selectListKpiManualScoreResultDTO(params); - return new PageData<>(list, page.getTotal()); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, KpiManualScoreDTO.class); - } - - @Override - public Result checkExportTemplate(Map params) { - //用户所选规则 - String ruleId = params.get("ruleId").toString(); - // yyyy-MM - String scoreStartMonth = params.get("scoreStartDate").toString(); - // 考核周期开始月 - YearMonth scoreStartDateMonth = YearMonth.parse(scoreStartMonth); - // 考核规则 - KpiRuleEntity kpiRuleEntity = kpiRuleDao.selectById(ruleId); - // 考核周期 - String kpiCycle = kpiRuleEntity.getKpiCycle(); - checkMonthAndCycle(kpiCycle, scoreStartDateMonth); - - return new Result(); - } - - /** - * 根据选择的月份和考核周期，判断是否可以进行考核打分 - * - * @param kpiCycle - * @param scoreStartDateMonth - * @return void - * @author work@yujt.net.cn - * @date 2019/12/16 15:38 - */ - private void checkMonthAndCycle(String kpiCycle, YearMonth scoreStartDateMonth) { - - YearMonth now = YearMonth.now(); - if (now.compareTo(scoreStartDateMonth) < NumConstant.ZERO) { - throw new RenException("不能针对未来的月份进行考核打分"); - } - - int monthValue = scoreStartDateMonth.getMonthValue(); - LocalDate localDate = LocalDate.now(); - - // 季度打分 - if (kpiCycle.equals(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue())) { - if (monthValue != NumConstant.ONE && monthValue != NumConstant.FOUR - && monthValue != NumConstant.SEVEN && monthValue != NumConstant.TEN) { - throw new RenException("季度打分只能在1/4/7/10月份进行"); - } - if (localDate.compareTo(scoreStartDateMonth.plusMonths(NumConstant.TWO).atEndOfMonth()) <= NumConstant.ZERO) { - throw new RenException("考核期尚未结束，无法打分"); - } - } else if (kpiCycle.equals(KpiCycleEnum.KPI_CYCLE_YEAR.getValue())) { - if (monthValue != NumConstant.ONE) { - throw new RenException("年度打分只能在1月份进行"); - } - if (localDate.compareTo(scoreStartDateMonth.plusMonths(NumConstant.ELEVEN).atEndOfMonth()) <= NumConstant.ZERO) { - throw new RenException("考核期尚未结束，无法打分"); - } - } - } - - /** - * @param - * @return java.util.List - * @Author yinzuomei - * @Description 导出录入模板 - * @Date 2019/12/4 18:00 - **/ - @Override - public List listKpiManualScoreTemplateResultDTO(Map params) { - - //用户所选规则 - String ruleId = params.get("ruleId").toString(); - // yyyy-MM - String scoreStartMonth = params.get("scoreStartDate").toString(); - // 考核周期开始月 - YearMonth scoreStartDateMonth = YearMonth.parse(scoreStartMonth); - // 考核规则 - KpiRuleEntity kpiRuleEntity = kpiRuleDao.selectById(ruleId); - // 考核周期结束日 - LocalDate scoreEndDate; - // 考核周期赋值 - String kpiCycleName; - if (kpiRuleEntity.getKpiCycle().equals(KpiCycleEnum.KPI_CYCLE_MONTH.getValue())) { - kpiCycleName = KpiCycleEnum.KPI_CYCLE_MONTH.getName(); - scoreEndDate = scoreStartDateMonth.atEndOfMonth(); - } else if (kpiRuleEntity.getKpiCycle().equals(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue())) { - kpiCycleName = KpiCycleEnum.KPI_CYCLE_QUARTER.getName(); - scoreEndDate = scoreStartDateMonth.plusMonths(NumConstant.TWO).atEndOfMonth(); - } else { - kpiCycleName = KpiCycleEnum.KPI_CYCLE_YEAR.getName(); - scoreEndDate = scoreStartDateMonth.plusMonths(NumConstant.ELEVEN).atEndOfMonth(); - } - - // 用户拥有的所有部门权限 - List dataScopeDeptList = SecurityUser.getUser().getDeptIdList(); - Result> result = queryUserSysDeptInfo(dataScopeDeptList, kpiRuleEntity.getDeptTypeKey()); - - if (!result.success() || CollUtil.isEmpty(result.getData())) { - return Lists.newArrayList(); - } - List list = Lists.newArrayList(); - - List userSysDeptInfoResultDTOList = result.getData(); - for (UserSysDeptInfoResultDTO userSysDeptInfoResultDTO : userSysDeptInfoResultDTOList) { - - KpiManualScoreTemplateResultDTO kpiManualScoreTemplateResultDTO = new KpiManualScoreTemplateResultDTO(); - - kpiManualScoreTemplateResultDTO.setRuleName(kpiRuleEntity.getRuleName()); - kpiManualScoreTemplateResultDTO.setStreet(userSysDeptInfoResultDTO.getStreet()); - kpiManualScoreTemplateResultDTO.setCommunity(userSysDeptInfoResultDTO.getCommunity()); - kpiManualScoreTemplateResultDTO.setGrid(userSysDeptInfoResultDTO.getGrid()); - kpiManualScoreTemplateResultDTO.setKpiCycleName(kpiCycleName); - kpiManualScoreTemplateResultDTO.setScore(null); - kpiManualScoreTemplateResultDTO.setScoreStartDate(LocalDateUtils.localDateToDate(scoreStartDateMonth.atDay(NumConstant.ONE))); - kpiManualScoreTemplateResultDTO.setScoreEndDate(LocalDateUtils.localDateToDate(scoreEndDate)); - - list.add(kpiManualScoreTemplateResultDTO); - } - return list; - } - - /** - * 调用admin模块查询部门信息详情 - * - * @param dataScopeDeptList 用户数据权限 - * @param deptTypeKey 部门类别 - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author work@yujt.net.cn - * @date 2019/12/13 14:38 - */ - private Result> queryUserSysDeptInfo(List dataScopeDeptList, String deptTypeKey) { - - UserSysDeptInfoFormDTO userSysDeptInfoFormDTO = new UserSysDeptInfoFormDTO(); - - List typeKeyList = new ArrayList<>(); - typeKeyList.add(deptTypeKey); - userSysDeptInfoFormDTO.setTypeKeyList(typeKeyList); - - userSysDeptInfoFormDTO.setDeptIdList(dataScopeDeptList); - - return adminFeignClient.queryUserSysDeptInfo(userSysDeptInfoFormDTO); - } - - /** - * @param file - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 导入手动打分记录 - * @Date 2019/12/5 15:46 - **/ - @Override - @Transactional(rollbackFor = Exception.class) - public Result importManualScoreExcel(MultipartFile file) { - File f = StreamUtils.conversionFile(file); - try { - //判断上传文件类型 - String originalFilename = file.getOriginalFilename(); - if (!originalFilename.endsWith(StrConstant.EXCEL_SUFFIX_2003) && !originalFilename.endsWith(StrConstant.EXCEL_SUFFIX_2007)) { - return new Result().error("请选择.xls或者.xlsx格式文件"); - } - List recordList = ExcelImportUtil.importExcel(f, KpiManualScoreTemplateExcel.class, new ImportParams()); - if (CollUtil.isEmpty(recordList)) { - return new Result().error("导入内容不能为空"); - } - UserDetail user = SecurityUser.getUser(); - // 校验excel数据 - List checkResult = checkExcelForManualScore(recordList, user.getDeptIdList()); - if (CollUtil.isNotEmpty(checkResult)) { - Result result = new Result().error(); - result.setData(checkResult); - return result; - } - // 规则名 - String ruleName = ""; - // 考核规则 - KpiRuleEntity kpiRuleEntity = null; - for (KpiManualScoreTemplateExcel kpiManualScoreTemplateExcel : recordList) { - - // 根据规则名，查询考核规则和打分规则 - if (!ruleName.equals(kpiManualScoreTemplateExcel.getRuleName())) { - ruleName = kpiManualScoreTemplateExcel.getRuleName(); - kpiRuleEntity = getRuleByName(ruleName); - } - - KpiManualScoreEntity manualScoreEntity = packageManualScoreByExcelData(kpiManualScoreTemplateExcel, user, kpiRuleEntity.getId()); - - baseDao.deleteManualScore(manualScoreEntity.getRuleId(), manualScoreEntity.getDeptId() - , manualScoreEntity.getScoreStartDate(), manualScoreEntity.getScoreEndDate()); - - baseDao.insert(manualScoreEntity); - - this.saveOrUpdateKpiResult(manualScoreEntity, kpiRuleEntity.getKpiCycle()); - } - - } catch (Exception e) { - return new Result().error("数据异常，解析excel文件失败"); - } finally { - // 删除文件 - this.deleteAllFilesOfDir(f); - } - return new Result(); - } - - /** - * 组装手动打分实体 - * - * @param excelData excel中的一条数据 - * @param user 当前用户 - * @param ruleId 所属考核规则id - * @return com.elink.esua.epdc.entity.KpiManualScoreEntity - * @author work@yujt.net.cn - * @date 2019/12/26 14:42 - */ - private KpiManualScoreEntity packageManualScoreByExcelData(KpiManualScoreTemplateExcel excelData, UserDetail user, String ruleId) { - - // 获取用户所有数据权限对应的部门 - List deptList = getDeptListByDateScope(user.getDeptIdList()); - DeptLevelAndLeaderDTO deptByExcelData = getDeptByExcelData(excelData, deptList); - if (null == deptByExcelData) { - throw new RenException("匹配数据权限失败"); - } - - DeptLevelAndLeaderDTO deptLevelInfo = deptUtils.getDeptLevelInfo(deptByExcelData.getDeptId(), YesOrNoEnum.YES); - KpiManualScoreEntity manualScoreEntity = new KpiManualScoreEntity(); - manualScoreEntity.setDeptId(deptLevelInfo.getDeptId()); - manualScoreEntity.setAllDeptIds(deptLevelInfo.getAllDeptIds()); - manualScoreEntity.setAllDeptNames(deptLevelInfo.getAllDeptNames()); - manualScoreEntity.setParentDeptIds(deptLevelInfo.getParentDeptIds()); - manualScoreEntity.setParentDeptNames(deptLevelInfo.getParentDeptNames()); - manualScoreEntity.setLeaderName(deptLevelInfo.getLeaderName()); - manualScoreEntity.setScore(new BigDecimal(excelData.getScore())); - manualScoreEntity.setScoreStartDate(excelData.getScoreStartDate()); - manualScoreEntity.setScoreEndDate(excelData.getScoreEndDate()); - manualScoreEntity.setCreatorDeptId(user.getDeptId()); - manualScoreEntity.setCreatorDeptName(user.getDeptName()); - manualScoreEntity.setRuleId(ruleId); - - return manualScoreEntity; - } - - /** - * 通过数据权限获取所有部门列表 - * - * @param deptIdList - * @return java.util.List - * @author work@yujt.net.cn - * @date 2019/12/26 14:11 - */ - private List getDeptListByDateScope(List deptIdList) { - List deptList = Lists.newArrayList(); - DeptLevelAndLeaderDTO deptLevelInfo; - for (Long deptId : deptIdList) { - deptLevelInfo = deptUtils.getDeptLevelInfo(deptId, YesOrNoEnum.NO); - deptList.add(deptLevelInfo); - } - return deptList; - } - - /** - * 从数据权限的所有部门中，匹配excel中的一行数据 - * - * @param excelData excel中的某一行 - * @param deptList 用户部门权限中的所有部门 - * @return com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO - * @author work@yujt.net.cn - * @date 2019/12/26 14:15 - */ - private DeptLevelAndLeaderDTO getDeptByExcelData(KpiManualScoreTemplateExcel excelData, List deptList) { - String allDeptNames = excelData.getStreet().trim() - .concat(StrConstant.HYPHEN).concat(excelData.getCommunity().trim()) - .concat(StrConstant.HYPHEN).concat(excelData.getGrid().trim()); - for (DeptLevelAndLeaderDTO oneDept : deptList) { - if (oneDept.getAllDeptNames().contains(allDeptNames)) { - return oneDept; - } - } - return null; - } - - /** - * 根据规则名称查询考核规则 - * - * @param ruleName - * @return com.elink.esua.epdc.entity.KpiRuleEntity - * @author work@yujt.net.cn - * @date 2019/12/26 14:26 - */ - private KpiRuleEntity getRuleByName(String ruleName) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(KpiFieldConstant.RULE_NAME, ruleName); - return kpiRuleDao.selectOne(wrapper); - } - - /** - * 校验手动打分上传的数据 - * - * @param recordList excel中的数据 - * @param deptIdList 用户的部门权限 - * @return java.util.List - * @author work@yujt.net.cn - * @date 2019/12/26 14:04 - */ - private List checkExcelForManualScore(List recordList, List deptIdList) { - - if (CollUtil.isEmpty(deptIdList)) { - throw new RenException("数据权限异常"); - } - // 获取用户所有数据权限对应的部门 - List deptList = getDeptListByDateScope(deptIdList); - // 考核规则 - KpiRuleEntity kpiRuleEntity = null; - // 规则名 - String ruleName = ""; - // 打分规则 - KpiManualScoreRuleEntity scoreRuleEntity = null; - // excel错误信息 - List checkExcel = Lists.newArrayList(); - int rowNum; - // 用户导入的每条打分数据 - KpiManualScoreTemplateExcel kpiManualScore; - for (int i = 0; i < recordList.size(); i++) { - kpiManualScore = recordList.get(i); - // 第几行 - rowNum = i + NumConstant.ONE; - // 是否有打分某部门权限 - if (null == getDeptByExcelData(kpiManualScore, deptList)) { - checkExcel.add(packageExcelError(rowNum, "没有为该部门打分的权限")); - } - // 根据规则名，查询考核规则和打分规则 - if (!ruleName.equals(kpiManualScore.getRuleName())) { - ruleName = kpiManualScore.getRuleName(); - // 根据规则名称获取考核规则 - kpiRuleEntity = getRuleByName(ruleName); - if (null != kpiRuleEntity) { - // 根据考核规则，获取关联的打分规则 - scoreRuleEntity = kpiManualScoreRuleDao.selectById(kpiRuleEntity.getReferenceId()); - } - } - if (null == kpiRuleEntity || null == scoreRuleEntity) { - checkExcel.add(packageExcelError(rowNum, "无法根据考核规则匹配手动打分项")); - continue; - } - // 校验考核周期相关字段数据 - List list = checkKpiCycleOfExcel(rowNum, KpiCycleEnum.getByValue(kpiRuleEntity.getKpiCycle()), kpiManualScore); - if (CollUtil.isNotEmpty(list)) { - checkExcel.addAll(list); - } - if (null == kpiManualScore.getScore()) { - checkExcel.add(packageExcelError(rowNum, "考核得分不能为空")); - } else if (scoreRuleEntity.getFullMarks().compareTo(new BigDecimal(kpiManualScore.getScore())) == NumConstant.ONE_NEG) { - checkExcel.add(packageExcelError(rowNum, "考核得分[" + kpiManualScore.getScore() + "]不能超过满分：" + scoreRuleEntity.getFullMarks().toString())); - } - } - return checkExcel; - } - - /** - * 校验excel中考核周期相关信息 - * - * @param rowNum 第几行 - * @param kpiCycleEnum 考核周期 - * @param kpiManualScore 打分时倒入的excel - * @return java.util.List - * @author work@yujt.net.cn - * @date 2019/12/26 14:02 - */ - private List checkKpiCycleOfExcel(int rowNum, KpiCycleEnum kpiCycleEnum, KpiManualScoreTemplateExcel kpiManualScore) { - List checkExcel = Lists.newArrayList(); - if (!kpiCycleEnum.getName().equals(kpiManualScore.getKpiCycleName())) { - checkExcel.add(packageExcelError(rowNum, "考核规则[" + kpiManualScore.getRuleName() + "]与考核周期[" + kpiManualScore.getKpiCycleName() + "]不匹配")); - } - LocalDate startDate = LocalDateUtils.dateToLocalDate(kpiManualScore.getScoreStartDate()); - if (startDate.getDayOfMonth() != NumConstant.ONE) { - checkExcel.add(packageExcelError(rowNum, "考核起始日[" + startDate.toString() + "]错误")); - } - LocalDate endDate = LocalDateUtils.dateToLocalDate(kpiManualScore.getScoreEndDate()); - if (endDate.compareTo(LocalDate.now()) > NumConstant.ZERO) { - checkExcel.add(packageExcelError(rowNum, "不能针对未来的日期进行考核")); - } - int monthValue = startDate.getMonthValue(); - switch (kpiCycleEnum) { - case KPI_CYCLE_MONTH: - if (startDate.lengthOfMonth() != endDate.getDayOfMonth()) { - checkExcel.add(packageExcelError(rowNum, "考核终止日[" + endDate.toString() + "]错误")); - } - break; - case KPI_CYCLE_QUARTER: - if (monthValue != NumConstant.ONE && monthValue != NumConstant.FOUR && monthValue != NumConstant.SEVEN && monthValue != NumConstant.TEN) { - checkExcel.add(packageExcelError(rowNum, "考核周期[" + kpiManualScore.getKpiCycleName() + "]不能从[" + startDate.toString() + "]开始")); - } else if (startDate.plusMonths(NumConstant.TWO).lengthOfMonth() != endDate.getDayOfMonth()) { - checkExcel.add(packageExcelError(rowNum, "考核终止日[" + endDate.toString() + "]错误")); - } - break; - case KPI_CYCLE_YEAR: - if (monthValue != NumConstant.ONE) { - checkExcel.add(packageExcelError(rowNum, "考核周期[" + kpiManualScore.getKpiCycleName() + "]不能从[" + startDate.toString() + "]开始")); - } else if (startDate.plusMonths(NumConstant.ELEVEN).lengthOfMonth() != endDate.getDayOfMonth()) { - checkExcel.add(packageExcelError(rowNum, "考核终止日[" + endDate.toString() + "]错误")); - } - break; - default: - break; - } - return checkExcel; - } - - @Data - class ExcelError { - /** - * excel错误行 - */ - private int rowNum; - /** - * 错误信息 - */ - private String errorMsg; - } - - /** - * 组装内部类ExcelError - * - * @param rowNum - * @param errorMsg - * @return com.elink.esua.epdc.service.impl.KpiManualScoreServiceImpl.ExcelError - * @author work@yujt.net.cn - * @date 2019/12/26 14:02 - */ - private ExcelError packageExcelError(int rowNum, String errorMsg) { - ExcelError excelError = new ExcelError(); - excelError.setRowNum(rowNum); - excelError.setErrorMsg(errorMsg); - return excelError; - } - - /** - * 更新或插入考核结果 - * - * @param manualScore 收到打分 - * @param kpiCycle 考核周期 - * @return void - * @author zhangyong - * @date 2019/12/18 15:56 - */ - private void saveOrUpdateKpiResult(KpiManualScoreEntity manualScore, String kpiCycle) { - //查询网格考核最终得分表:条件(deptId,scoreStartDate,scoreEndDate) - KpiResultGridDTO kpiResultGridDto = getKpiresultGrid(manualScore.getDeptId(), manualScore.getScoreStartDate(), manualScore.getScoreEndDate()); - if (null == kpiResultGridDto) { - KpiResultGridEntity kpiResultGridEntity = ConvertUtils.sourceToTarget(manualScore, KpiResultGridEntity.class); - kpiResultGridEntity.setGridId(manualScore.getDeptId()); - kpiResultGridEntity.setManualScore(manualScore.getScore()); - kpiResultGridEntity.setStartDate(manualScore.getScoreStartDate()); - kpiResultGridEntity.setEndDate(manualScore.getScoreEndDate()); - //查询考核部门类别 - kpiResultGridEntity.setKpiCycle(kpiCycle); - kpiResultGridDao.insert(kpiResultGridEntity); - } else { - //查询考核部门类别 - KpiResultGridEntity kpiResultGridEntity = new KpiResultGridEntity(); - kpiResultGridEntity.setId(kpiResultGridDto.getId()); - kpiResultGridEntity.setManualScore(manualScore.getScore()); - kpiResultGridEntity.setLeaderName(manualScore.getLeaderName()); - kpiResultGridDao.updateById(kpiResultGridEntity); - } - } - - /** - * 查询考核结果 - * - * @param deptId 部门id - * @param stateDate 开始日期 - * @param endDate 结束日期 - * @return com.elink.esua.epdc.dto.KpiResultGridDTO - * @author work@yujt.net.cn - * @date 2019/12/18 15:56 - */ - private KpiResultGridDTO getKpiresultGrid(Long deptId, Date stateDate, Date endDate) { - Map map = new HashMap<>(); - map.put("deptId", deptId); - map.put("scoreStartDate", stateDate); - map.put("scoreEndDate", endDate); - return kpiResultGridDao.selectManualScoringISExist(map); - } - - /** - * 删除文件夹（强制删除） - * - * @param path - */ - public void deleteAllFilesOfDir(File path) { - if (null != path) { - if (!path.exists()) { - return; - } - if (path.isFile()) { - boolean result = path.delete(); - int tryCount = 0; - while (!result && tryCount++ < 10) { - System.gc(); // 回收资源 - result = path.delete(); - } - } - File[] files = path.listFiles(); - if (null != files) { - for (int i = 0; i < files.length; i++) { - deleteAllFilesOfDir(files[i]); - } - } - path.delete(); - } - } - - @Override - public KpiManualScoreDTO get(String id) { - KpiManualScoreEntity entity = baseDao.selectById(id); - KpiManualScoreDTO kpiManualScoreDTO = ConvertUtils.sourceToTarget(entity, KpiManualScoreDTO.class); - kpiManualScoreDTO.setScoreStartMonth(kpiManualScoreDTO.getScoreStartDate()); - return kpiManualScoreDTO; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Result save(KpiManualScoreDTO dto) { - KpiRuleEntity kpiRuleEntity = kpiRuleDao.selectById(dto.getRuleId()); - //得分不能大于满分 - KpiManualScoreRuleEntity kpiManualScoreRuleEntity = kpiManualScoreRuleDao.selectOneKpiManualScoreRuleByRuleId(kpiRuleEntity.getId()); - if (null == kpiManualScoreRuleEntity) { - return new Result().error("没有找到关联的手动打分项"); - } else if (dto.getScore().compareTo(kpiManualScoreRuleEntity.getFullMarks()) == NumConstant.ONE) { - return new Result().error("得分不能高于满分:" + kpiManualScoreRuleEntity.getFullMarks()); - } - - YearMonth scoreStartMonth = LocalDateUtils.dateToYearMonth(dto.getScoreStartMonth()); - - DeptLevelAndLeaderDTO deptLevel = deptUtils.getDeptLevelInfo(dto.getDeptId(), YesOrNoEnum.YES); - - if (!kpiManualScoreRuleEntity.getDeptTypeKey().equals(deptLevel.getTypeKey())) { - return new Result().error("所选部门不在当前规则考核范围内"); - } - - // 考核周期 - String kpiCycle = kpiRuleEntity.getKpiCycle(); - checkMonthAndCycle(kpiCycle, scoreStartMonth); - - // 考核开始日 - dto.setScoreStartDate(LocalDateUtils.localDateToDate(scoreStartMonth.atDay(NumConstant.ONE))); - - // 考核结束日 - if (kpiCycle.equals(KpiCycleEnum.KPI_CYCLE_MONTH.getValue())) { - dto.setScoreEndDate(LocalDateUtils.localDateToDate(scoreStartMonth.atEndOfMonth())); - } else if (kpiCycle.equals(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue())) { - dto.setScoreEndDate(LocalDateUtils.localDateToDate(scoreStartMonth.plusMonths(NumConstant.TWO).atEndOfMonth())); - } else if (kpiCycle.equals(KpiCycleEnum.KPI_CYCLE_YEAR.getValue())) { - dto.setScoreEndDate(LocalDateUtils.localDateToDate(scoreStartMonth.plusMonths(NumConstant.ELEVEN).atEndOfMonth())); - } - - dto.setAllDeptNames(deptLevel.getAllDeptNames()); - dto.setAllDeptIds(deptLevel.getAllDeptIds()); - dto.setParentDeptNames(deptLevel.getParentDeptNames()); - dto.setParentDeptIds(deptLevel.getParentDeptIds()); - dto.setLeaderName(deptLevel.getLeaderName()); - UserDetail user = SecurityUser.getUser(); - dto.setCreatorDeptId(user.getDeptId()); - dto.setCreatorDeptName(user.getDeptName()); - - KpiManualScoreEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreEntity.class); - - baseDao.delete(getUniqueWrapper(entity)); - insert(entity); - return new Result(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Result update(KpiManualScoreDTO dto) { - KpiManualScoreEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreEntity.class); - //得分不能大于满分 - KpiManualScoreRuleEntity kpiManualScoreRuleEntity = kpiManualScoreRuleDao.selectOneKpiManualScoreRuleByRuleId(dto.getRuleId()); - if (null == kpiManualScoreRuleEntity) { - return new Result().error("没有找到关联的手动打分项"); - } else if (dto.getScore().compareTo(kpiManualScoreRuleEntity.getFullMarks()) == NumConstant.ONE) { - return new Result().error("得分不能高于满分"); - } - updateById(entity); - - entity = baseDao.selectById(entity.getId()); - - this.saveOrUpdateKpiResult(entity, kpiManualScoreRuleEntity.getScoreCycle()); - - return new Result(); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - @Override - public void initManualScoreToMetaData(String params) { - ScheduleJobParamDTO byJobParams = new ScheduleJobParamDTO().getByJobParams(ModuleUtils.decodeFromBase64(params)); - initManualScoreToMetaDataByCycle(byJobParams, KpiCycleEnum.KPI_CYCLE_MONTH.getValue()); - initManualScoreToMetaDataByCycle(byJobParams, KpiCycleEnum.KPI_CYCLE_QUARTER.getValue()); - initManualScoreToMetaDataByCycle(byJobParams, KpiCycleEnum.KPI_CYCLE_YEAR.getValue()); - } - - /** - * @param entity - * @return com.baomidou.mybatisplus.core.conditions.query.QueryWrapper - * @Author yinzuomei - * @Description - * @Date 2019/12/6 13:58 - **/ - private QueryWrapper getUniqueWrapper(KpiManualScoreEntity entity) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(entity.getRuleId()), KpiFieldConstant.RULE_ID, entity.getRuleId()) - .eq(null != entity.getDeptId(), KpiFieldConstant.DEPT_ID, entity.getDeptId()) - .eq(KpiFieldConstant.SCORE_END_DATE, entity.getScoreEndDate()) - .eq(KpiFieldConstant.SCORE_START_DATE, entity.getScoreStartDate()); - return wrapper; - } - - private QueryWrapper getWrapper(Map params) { - String id = (String) params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - /** - * 根据考核周期，将手动打分初始化为元数据 - * - * @param jobParams 定时任务传入的参数 - * @param kpiCycle 考核周期 - * @return void - * @author work@yujt.net.cn - * @date 2019/12/25 14:28 - */ - private void initManualScoreToMetaDataByCycle(ScheduleJobParamDTO jobParams, String kpiCycle) { - // 获取考核周期开始日期和结束日期 - KpiMetaDataOfEventsFormDTO metaDataOfEventsForm = - KpiLocalDateUtils.packKpiStartAndEndDate(kpiCycle, null != jobParams ? jobParams.getDateStr() : null); - if (null == metaDataOfEventsForm) { - return; - } - Date startDate = metaDataOfEventsForm.getStartDate(); - Date endDate = metaDataOfEventsForm.getEndDate(); - - int pageIndex = NumConstant.ONE; - List deptIdList = deptUtils.getDeptIdList(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, NumConstant.TWENTY, pageIndex); - List metaDataList; - do { - metaDataList = Lists.newArrayList(); - for (Long deptId : deptIdList) { - KpiManualScoreEntity scoreEntity = this.getKpiManualScoreEntity(deptId, startDate, endDate); - metaDataList.add(packageKpiMetaDataEntity(deptId, startDate, endDate, kpiCycle, null == scoreEntity ? BigDecimal.ZERO : scoreEntity.getScore())); - } - kpiMetaDataService.deleteAndInsertBatch(metaDataList); - pageIndex++; - deptIdList = deptUtils.getDeptIdList(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, NumConstant.TWENTY, pageIndex); - } while (CollUtil.isNotEmpty(deptIdList)); - } - - /** - * 组装元数据对象 - * - * @param deptId - * @param startDate - * @param endDate - * @param kpiCycle - * @param score - * @return com.elink.esua.epdc.entity.KpiMetaDataEntity - * @author work@yujt.net.cn - * @date 2019/12/25 15:53 - */ - private KpiMetaDataEntity packageKpiMetaDataEntity(Long deptId, Date startDate, Date endDate, String kpiCycle, BigDecimal score) { - KpiMetaDataEntity metaDataEntity = new KpiMetaDataEntity(); - metaDataEntity.setDeptTypeKey(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY); - metaDataEntity.setEndDate(endDate); - metaDataEntity.setStartDate(startDate); - metaDataEntity.setKpiCycle(kpiCycle); - metaDataEntity.setDeptId(deptId); - metaDataEntity.setDataValue(BigDecimal.ZERO); - metaDataEntity.setDataValue(score); - metaDataEntity.setDataCode(KpiMetaDataEnum.GRID_SCORE_BY_SUPERIOR_MANUAL.getValue()); - metaDataEntity.setDataName(KpiMetaDataEnum.GRID_SCORE_BY_SUPERIOR_MANUAL.getName()); - return metaDataEntity; - } - - - /** - * 查询手动打分对象 - * - * @param deptId 部门id - * @param startDate 开始日 - * @param endDate 结束日 - * @return com.elink.esua.epdc.entity.KpiManualScoreEntity - * @author work@yujt.net.cn - * @date 2019/12/25 14:28 - */ - private KpiManualScoreEntity getKpiManualScoreEntity(Long deptId, Date startDate, Date endDate) { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(KpiFieldConstant.DEPT_ID, deptId) - .eq(KpiFieldConstant.SCORE_START_DATE, startDate) - .eq(KpiFieldConstant.SCORE_END_DATE, endDate); - return baseDao.selectOne(wrapper); - } - + private Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired + private KpiManualScoreRedis kpiManualScoreRedis; + @Autowired + private KpiManualScoreRuleDao kpiManualScoreRuleDao; + @Autowired + private KpiRuleDao kpiRuleDao; + @Autowired + private UserDetailRedis userDetailRedis; + @Autowired + private AdminFeignClient adminFeignClient; + @Autowired + private KpiManualScoreTempDao kpiManualScoreTempDao; + @Autowired + private KpiManualScoreTempService kpiManualScoreTempService; + //设置日期格式 + private SimpleDateFormat monthFormat = new SimpleDateFormat("yyyy-MM"); + private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + + @Override + public PageData page(Map params) { + String ruleId = params.containsKey("ruleId") ? params.get("ruleId").toString() : null; + String createdTime = params.containsKey("createdTime") ? params.get("createdTime").toString() : null; + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(ruleId), "RULE_ID", ruleId); + wrapper.between(StringUtils.isNotBlank(createdTime), "DATE_FORMAT(CREATED_TIME, '%Y-%m' )", createdTime, createdTime); + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + wrapper + ); + PageData list = getPageData(page, KpiManualScoreDTO.class); + return list; + } + + /** + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @Author yinzuomei + * @Description 列表查询 + * @Date 2019/12/4 17:37 + **/ + @Override + public PageData listKpiManualScoreResultDTO(Map params) { + IPage page = getPage(params); + List list = baseDao.selectListKpiManualScoreResultDTO(params); + return new PageData<>(list, page.getTotal()); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, KpiManualScoreDTO.class); + } + + /** + * @param + * @return java.util.List + * @Author yinzuomei + * @Description 导出录入模板 + * @Date 2019/12/4 18:00 + **/ + @Override + public List listKpiManualScoreTemplateResultDTO(Map params) { + List list = new ArrayList<>(); + //用户所选规则 + String ruleId = params.get("ruleId").toString(); + String scoreStartTime = params.get("scoreStartTime").toString(); + Date scoreStartDateMonth = new Date(); + try { + scoreStartDateMonth = monthFormat.parse(scoreStartTime); + } catch (ParseException e) { + e.printStackTrace(); + } + Date scoreEndDateMonth = new Date(); + + KpiRuleEntity kpiRuleEntity = kpiRuleDao.selectById(ruleId); + + //考核周期赋值 + String kpiCycleName = ""; + if (kpiRuleEntity.getKpiCycle().equals(KpiCycleEnum.KPI_CYCLE_MONTH.getValue())) { + kpiCycleName = KpiCycleEnum.KPI_CYCLE_MONTH.getName(); + scoreEndDateMonth = scoreStartDateMonth; + } else if (kpiRuleEntity.getKpiCycle().equals(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue())) { + kpiCycleName = KpiCycleEnum.KPI_CYCLE_QUARTER.getName(); + scoreEndDateMonth = stepMonth(scoreStartDateMonth, 2); + } else if (kpiRuleEntity.getKpiCycle().equals(KpiCycleEnum.KPI_CYCLE_YEAR.getValue())) { + kpiCycleName = KpiCycleEnum.KPI_CYCLE_YEAR.getName(); + scoreEndDateMonth = stepMonth(scoreStartDateMonth, 11); + } + + // 用户拥有的所有部门权限 + List dataScopeDeptList = getDataScopeDeptList(); + + //调用admin模块查询部门信息详情 + UserSysDeptInfoFormDTO userSysDeptInfoFormDTO = new UserSysDeptInfoFormDTO(); + userSysDeptInfoFormDTO.setDeptIdList(dataScopeDeptList); + List typeKeyList = new ArrayList<>(); + typeKeyList.add(kpiRuleEntity.getDeptTypeKey()); + userSysDeptInfoFormDTO.setTypeKeyList(typeKeyList); + Result> result = this.queryUserSysDeptInfo(userSysDeptInfoFormDTO); + + if (result.getCode() == 0 && result.getData().size() > 0) { + List userSysDeptInfoResultDTOList = result.getData(); + for (UserSysDeptInfoResultDTO userSysDeptInfoResultDTO : userSysDeptInfoResultDTOList) { + + KpiManualScoreTemplateResultDTO kpiManualScoreTemplateResultDTO = new KpiManualScoreTemplateResultDTO(); + + kpiManualScoreTemplateResultDTO.setRuleName(kpiRuleEntity.getRuleName()); + kpiManualScoreTemplateResultDTO.setStreet(userSysDeptInfoResultDTO.getStreet()); + kpiManualScoreTemplateResultDTO.setCommunity(userSysDeptInfoResultDTO.getCommunity()); + kpiManualScoreTemplateResultDTO.setGrid(userSysDeptInfoResultDTO.getGrid()); + kpiManualScoreTemplateResultDTO.setDeptName(userSysDeptInfoResultDTO.getName()); + kpiManualScoreTemplateResultDTO.setKpiCycleName(kpiCycleName); + kpiManualScoreTemplateResultDTO.setScoreStartTime(dateFormat.format(getFirstDayDateOfMonth(scoreStartDateMonth))); + kpiManualScoreTemplateResultDTO.setScoreEndTime(dateFormat.format(getLastDayOfMonth(scoreEndDateMonth))); + kpiManualScoreTemplateResultDTO.setScore(null); + + kpiManualScoreTemplateResultDTO.setRuleId(kpiRuleEntity.getId()); + kpiManualScoreTemplateResultDTO.setDeptId(userSysDeptInfoResultDTO.getId().toString()); + kpiManualScoreTemplateResultDTO.setScoreStartDate(getFirstDayDateOfMonth(scoreStartDateMonth)); + kpiManualScoreTemplateResultDTO.setScoreEndDate(getLastDayOfMonth(scoreEndDateMonth)); + kpiManualScoreTemplateResultDTO.setParentDeptIds(userSysDeptInfoResultDTO.getPids()); + kpiManualScoreTemplateResultDTO.setParentDeptNames(userSysDeptInfoResultDTO.getParentNames()); + kpiManualScoreTemplateResultDTO.setAllDeptIds(userSysDeptInfoResultDTO.getPids() + "," + userSysDeptInfoResultDTO.getId()); + kpiManualScoreTemplateResultDTO.setAllDeptNames(userSysDeptInfoResultDTO.getParentNames() + "-" + userSysDeptInfoResultDTO.getName()); + kpiManualScoreTemplateResultDTO.setUserId(SecurityUser.getUserId().toString()); + list.add(kpiManualScoreTemplateResultDTO); + } + //删除临时表数据 + kpiManualScoreTempDao.deleteManualScoreTemp(SecurityUser.getUserId().toString(), + kpiRuleEntity.getId(), + dateFormat.format(getFirstDayDateOfMonth(scoreStartDateMonth))); + //插入临时表 + List tempEntityList = ConvertUtils.sourceToTarget(list, KpiManualScoreTempEntity.class); + kpiManualScoreTempService.insertBatch(tempEntityList, 200); + } + return list; + } + + /** + * @param file + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 导入手动打分记录 + * @Date 2019/12/5 15:46 + **/ + @Override + @Transactional(rollbackFor = Exception.class) + public Result importManualScoreExcel(MultipartFile file) { + File f = StreamUtils.conversionFile(file); + try { + //判断上传文件类型 + String originalFilename = file.getOriginalFilename(); + if (!originalFilename.contains(".xlsx") && !originalFilename.contains(".xls")) { + return new Result().error("请选择.xls或者.xlsx格式文件"); + } + ImportParams importParams = new ImportParams(); + List recordList = ExcelImportUtil.importExcel(f, KpiManualScoreTemplateExcel.class, importParams); + if (CollUtil.isEmpty(recordList)) { + return new Result().error("导入内容不能为空"); + } + //校验记录数是否一致 + List errorRecordList = new ArrayList<>(); + List tempEntityList = kpiManualScoreTempDao.selectListKpiManualScoreTemp(SecurityUser.getUserId().toString(), recordList); + if (CollUtil.isEmpty(tempEntityList) || tempEntityList.size() != recordList.size()) { + ImportExcelErrorResultDTO excelErrorResultDTO = new ImportExcelErrorResultDTO(); + excelErrorResultDTO.setErrorLine("0"); + excelErrorResultDTO.setErrorInfo("导入记录条数与导出模板不一致,请核对"); + errorRecordList.add(excelErrorResultDTO); + } + if (CollUtil.isNotEmpty(errorRecordList)) { + Result errorResult = new Result(); + errorResult.setCode(ErrorCode.INTERNAL_SERVER_ERROR); + return errorResult.ok(errorRecordList); + } + List kpiManualScoreEntityList = ConvertUtils.sourceToTarget(tempEntityList, KpiManualScoreEntity.class); + //循环插入：如果存在则删除原纪录 + for (KpiManualScoreEntity kpiManualScoreEntity : kpiManualScoreEntityList) { + baseDao.delete(getUniqueWrapper(kpiManualScoreEntity)); + baseDao.insert(kpiManualScoreEntity); + } + //删除临时表数据 + kpiManualScoreTempDao.deleteManualScoreTemp(SecurityUser.getUserId().toString(), + tempEntityList.get(0).getRuleId(), + tempEntityList.get(0).getScoreStartTime()); + } finally { +// logger.info("记得删除文件哦"); + this.deleteAllFilesOfDir(f); + } + return new Result(); + } + + /** + * 删除文件夹（强制删除） + * + * @param path + */ + public void deleteAllFilesOfDir(File path) { + if (null != path) { + if (!path.exists()) + return; + if (path.isFile()) { + boolean result = path.delete(); + int tryCount = 0; + while (!result && tryCount++ < 10) { + System.gc(); // 回收资源 + result = path.delete(); + } + } + File[] files = path.listFiles(); + if (null != files) { + for (int i = 0; i < files.length; i++) { + deleteAllFilesOfDir(files[i]); + } + } + path.delete(); + } + } + + @Override + public KpiManualScoreDTO get(String id) { + KpiManualScoreEntity entity = baseDao.selectById(id); + KpiManualScoreDTO kpiManualScoreDTO = ConvertUtils.sourceToTarget(entity, KpiManualScoreDTO.class); + try { + kpiManualScoreDTO.setScoreStartMonth(monthFormat.parse(monthFormat.format(kpiManualScoreDTO.getScoreStartDate()))); + } catch (ParseException e) { + e.printStackTrace(); + } + return kpiManualScoreDTO; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Result save(KpiManualScoreDTO dto) { + KpiRuleEntity kpiRuleEntity = kpiRuleDao.selectById(dto.getRuleId()); + //得分不能大于满分 + KpiManualScoreRuleEntity kpiManualScoreRuleEntity = kpiManualScoreRuleDao.selectOneKpiManualScoreRuleByRuleId(kpiRuleEntity.getId()); + if (null == kpiManualScoreRuleEntity) { + return new Result().error("没有找到关联的手动打分项"); + } else if (null != kpiManualScoreRuleEntity && dto.getScore() > kpiManualScoreRuleEntity.getFullMarks()) { + return new Result().error("得分不能高于满分"); + } + + // 考核部门基本信息 + Result sysDeptDTOResult=adminFeignClient.getSysDeptDTO(Long.valueOf(dto.getDeptId())); + if(!sysDeptDTOResult.success()){ + return new Result().error(sysDeptDTOResult.getMsg()); + } + if(!kpiManualScoreRuleEntity.getDeptTypeKey().equals(sysDeptDTOResult.getData().getTypeKey())){ + return new Result().error("所选部门不在当前规则考核范围内"); + } + + Date scoreEndDateMonth = new Date(); + if (kpiRuleEntity.getKpiCycle().equals(KpiCycleEnum.KPI_CYCLE_MONTH.getValue())) { + scoreEndDateMonth = dto.getScoreStartMonth(); + } else if (kpiRuleEntity.getKpiCycle().equals(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue())) { + scoreEndDateMonth = stepMonth(dto.getScoreStartMonth(), 2); + } else if (kpiRuleEntity.getKpiCycle().equals(KpiCycleEnum.KPI_CYCLE_YEAR.getValue())) { + scoreEndDateMonth = stepMonth(dto.getScoreStartMonth(), 11); + } + dto.setScoreStartDate(getFirstDayDateOfMonth(dto.getScoreStartMonth())); + dto.setScoreEndDate(getLastDayOfMonth(scoreEndDateMonth)); + //根据部门ID获取上级所有部门信息 + Result parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(dto.getDeptId()); + if(!parentAndAllDeptDTOResult.success()){ + return new Result().error(parentAndAllDeptDTOResult.getMsg()); + } + dto.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames()); + dto.setAllDeptIds(parentAndAllDeptDTOResult.getData().getAllDeptIds()); + dto.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames()); + dto.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds()); + KpiManualScoreEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreEntity.class); + baseDao.delete(getUniqueWrapper(entity)); + insert(entity); + return new Result(); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Result update(KpiManualScoreDTO dto) { + KpiManualScoreEntity entity = ConvertUtils.sourceToTarget(dto, KpiManualScoreEntity.class); + //得分不能大于满分 + KpiManualScoreRuleEntity kpiManualScoreRuleEntity = kpiManualScoreRuleDao.selectOneKpiManualScoreRuleByRuleId(dto.getRuleId()); + if (null == kpiManualScoreRuleEntity) { + return new Result().error("没有找到关联的手动打分项"); + } else if (null != kpiManualScoreRuleEntity && dto.getScore() > kpiManualScoreRuleEntity.getFullMarks()) { + return new Result().error("得分不能高于满分"); + } + updateById(entity); + return new Result(); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * @param entity + * @return com.baomidou.mybatisplus.core.conditions.query.QueryWrapper + * @Author yinzuomei + * @Description + * @Date 2019/12/6 13:58 + **/ + public QueryWrapper getUniqueWrapper(KpiManualScoreEntity entity) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(entity.getRuleId()), "RULE_ID", entity.getRuleId()) + .eq(StringUtils.isNotBlank(entity.getDeptId()), "DEPT_ID", entity.getDeptId()) + .eq("score_end_date", entity.getScoreEndDate()) + .eq("score_start_date", entity.getScoreStartDate()); + return wrapper; + } + + /** + * @param userSysDeptInfoFormDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author yinzuomei + * @Description + * @Date 2019/12/6 13:58 + **/ + public Result> queryUserSysDeptInfo(UserSysDeptInfoFormDTO userSysDeptInfoFormDTO) { + return adminFeignClient.queryUserSysDeptInfo(userSysDeptInfoFormDTO); + } + + /** + * @param + * @return java.util.List + * @Author yinzuomei + * @Description 用户拥有的所有部门权限 + * @Date 2019/12/5 16:29 + **/ + public List getDataScopeDeptList() { + Long userId = SecurityUser.getUserId(); + // 查询当前用户所具有的的数据权限 + UserDetail userDetail = userDetailRedis.get(userId); + // 用户拥有的所有部门权限 + return userDetail.getDeptIdList(); + } + + /** + * @param sourceDate + * @param month + * @return java.util.Date + * @Author yinzuomei + * @Description + * @Date 2019/12/5 13:46 + **/ + public Date stepMonth(Date sourceDate, int month) { + Calendar c = Calendar.getInstance(); + c.setTime(sourceDate); + c.add(Calendar.MONTH, month); + return c.getTime(); + } + + /** + * @param date + * @return java.util.Date + * @Author yinzuomei + * @Description 获取传入日期所在月的第一天 + * @Date 2019/12/5 13:46 + **/ + public Date getFirstDayDateOfMonth(Date date) { + + final Calendar cal = Calendar.getInstance(); + + cal.setTime(date); + + final int last = cal.getActualMinimum(Calendar.DAY_OF_MONTH); + + cal.set(Calendar.DAY_OF_MONTH, last); + + return cal.getTime(); + + } + + /** + * @param date + * @return java.util.Date + * @Author yinzuomei + * @Description 获取传入日期所在月的最后一天 + * @Date 2019/12/5 13:47 + **/ + public Date getLastDayOfMonth(Date date) { + + final Calendar cal = Calendar.getInstance(); + + cal.setTime(date); + + final int last = cal.getActualMaximum(Calendar.DAY_OF_MONTH); + + cal.set(Calendar.DAY_OF_MONTH, last); + + return cal.getTime(); + + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java deleted file mode 100644 index 02b1308f1..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiMetaDataServiceImpl.java +++ /dev/null @@ -1,579 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.commons.tools.constant.OrganizationTypeConstant; -import com.elink.esua.epdc.commons.tools.exception.RenException; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.*; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.constant.KpiScheduleCodeConstant; -import com.elink.esua.epdc.dao.KpiMetaDataDao; -import com.elink.esua.epdc.dto.KpiMetaDataDTO; -import com.elink.esua.epdc.dto.ScheduleJobParamDTO; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; -import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO; -import com.elink.esua.epdc.dto.result.KpiEventReportAmountResultDTO; -import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO; -import com.elink.esua.epdc.entity.KpiMetaDataEntity; -import com.elink.esua.epdc.enums.KpiCycleEnum; -import com.elink.esua.epdc.enums.KpiMetaDataEnum; -import com.elink.esua.epdc.feign.EventFeignClient; -import com.elink.esua.epdc.service.KpiMetaDataService; -import com.elink.esua.epdc.utils.DeptUtils; -import com.elink.esua.epdc.utils.KpiLocalDateUtils; -import com.google.common.collect.Lists; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.YearMonth; -import java.util.*; - -/** - * 绩效考核的元数据 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-16 - */ -@Slf4j -@Service -public class KpiMetaDataServiceImpl extends BaseServiceImpl implements KpiMetaDataService { - - @Autowired - private DeptUtils deptUtils; - - @Autowired - private EventFeignClient eventFeignClient; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, KpiMetaDataDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, KpiMetaDataDTO.class); - } - - private QueryWrapper getWrapper(Map params) { - String id = (String) params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public KpiMetaDataDTO get(String id) { - KpiMetaDataEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, KpiMetaDataDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(KpiMetaDataDTO dto) { - KpiMetaDataEntity entity = ConvertUtils.sourceToTarget(dto, KpiMetaDataEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(KpiMetaDataDTO dto) { - KpiMetaDataEntity entity = ConvertUtils.sourceToTarget(dto, KpiMetaDataEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - - /** - * 按考核周期进行元数据统计 - * - * @param kpiCycle - * @param dateStr - * @return void - * @author work@yujt.net.cn - * @date 2019/12/19 19:51 - */ - private void statMetaDataOfEventAmount(String kpiCycle, String dateStr) { - KpiMetaDataOfEventsFormDTO eventReportAmountFormDto = this.initKpiParam(kpiCycle, dateStr, KpiScheduleCodeConstant.META_DATA_PEOPLE_REPORT_AMOUNT); - if (null != eventReportAmountFormDto) { - int pageIndex = NumConstant.ONE; - - List gridList = deptUtils.getDeptIdList(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, NumConstant.TEN, pageIndex); - do { - eventReportAmountFormDto.setDeptIdList(gridList); - // 从events模块获取统计数据 - List reportAmountList = this.getMetaDateFromEventsModule(eventReportAmountFormDto); - // 组装元数据对象 - List kpiMetaDataEntities = this.packageMetaDataList(reportAmountList, eventReportAmountFormDto, kpiCycle); - // 删除已存在 并 批量插入 - this.deleteAndInsertBatch(kpiMetaDataEntities); - pageIndex++; - gridList = deptUtils.getDeptIdList(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, NumConstant.TEN, pageIndex); - } while (CollUtil.isNotEmpty(gridList)); - } - } - - /** - * 根据月、季、年 以及当前月份，初始化统计元数据值的参数，用于模块间调用 - * - * @param kpiCycle 月、季、年 - * @param dateStr 考核月某一天字符串 yyyy-MM-dd e.g. 2020-01-01 - * @param methodName 调用此方法的方法名，用于日志打印 - * @return java.util.Date 若返回空值：当前月份无法针对传入的考核周期进行考核 - * @author work@yujt.net.cn - * @date 2019/12/20 09:13 - */ - private KpiMetaDataOfEventsFormDTO initKpiParam(String kpiCycle, String dateStr, String methodName) { - KpiMetaDataOfEventsFormDTO metaDataFormDto = KpiLocalDateUtils.packKpiStartAndEndDate(kpiCycle, dateStr); - if (null == metaDataFormDto) { - log.error("当前时间：{}，无法按照{}执行绩效考核{}", LocalDateTime.now().toString(), kpiCycle, methodName); - return null; - } - log.info("开始执行：{}，当前时间：{}，考核周期：{}", methodName, LocalDateTime.now().toString(), kpiCycle); - return metaDataFormDto; - } - - /** - * 从events模块获取统计数据 - * - * @param eventReportAmountFormDto - * @return java.util.List - * @author work@yujt.net.cn - * @date 2019/12/19 19:50 - */ - private List getMetaDateFromEventsModule(KpiMetaDataOfEventsFormDTO eventReportAmountFormDto) { - Result> eventResult = eventFeignClient.statEventReportAmount(eventReportAmountFormDto); - if (!eventResult.success() || null == eventResult.getData()) { - log.error("统计事件上报数异常"); - throw new RenException("统计事件上报数异常"); - } - return eventResult.getData(); - } - - /** - * 组装元数据对象准备插入数据库 - * - * @param eventReportAmountList - * @param eventReportAmountFormDto - * @param kpiCycle - * @return java.util.List - * @author work@yujt.net.cn - * @date 2019/12/19 19:50 - */ - private List packageMetaDataList(List eventReportAmountList, - KpiMetaDataOfEventsFormDTO eventReportAmountFormDto, String kpiCycle) { - Date startDate = eventReportAmountFormDto.getStartDate(); - Date endDate = eventReportAmountFormDto.getEndDate(); - // 声明集合用于存放所有元数据对象 - List kpiMetaDataEntityList = Lists.newArrayList(); - KpiMetaDataEntity kpiMetaDataEntity; - for (KpiEventReportAmountResultDTO reportAmount : eventReportAmountList) { - // 群众反映问题总数 - kpiMetaDataEntity = packageMetaDataEntity(KpiMetaDataEnum.PEOPLE_REPORT_AMOUNT, BigDecimal.valueOf(reportAmount.getReportAmount()) - , reportAmount.getGridId(), OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, kpiCycle, startDate, endDate); - kpiMetaDataEntityList.add(kpiMetaDataEntity); - // 群众反映问题被响应总数 - kpiMetaDataEntity = packageMetaDataEntity(KpiMetaDataEnum.PEOPLE_REPORT_RESP_AMOUNT, BigDecimal.valueOf(reportAmount.getRespondAmount()) - , reportAmount.getGridId(), OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, kpiCycle, startDate, endDate); - kpiMetaDataEntityList.add(kpiMetaDataEntity); - } - return kpiMetaDataEntityList; - } - - /** - * 根据统计的居民满意度情况，组装元数据实体集合 - * - * @param peopleEvaluationDataList - * @param eventReportAmountFormDto - * @param kpiCycle - * @return java.util.List - * @author work@yujt.net.cn - * @date 2019/12/20 15:55 - */ - private List packageMetaDataByEvaluationList(List peopleEvaluationDataList, - KpiMetaDataOfEventsFormDTO eventReportAmountFormDto, String kpiCycle) { - Date startDate = eventReportAmountFormDto.getStartDate(); - Date endDate = eventReportAmountFormDto.getEndDate(); - // 声明集合用于存放所有元数据对象 - List kpiMetaDataEntityList = Lists.newArrayList(); - KpiMetaDataEntity kpiMetaDataEntity; - for (KpiEvaluationAmountResultDTO evaluationAmount : peopleEvaluationDataList) { - // 问题办理满意数 - kpiMetaDataEntity = packageMetaDataEntity(KpiMetaDataEnum.PEOPLE_HIGH_EVALUATION_AMOUNT, BigDecimal.valueOf(evaluationAmount.getHighAmount()) - , evaluationAmount.getDeptId(), OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, kpiCycle, startDate, endDate); - kpiMetaDataEntityList.add(kpiMetaDataEntity); - // 问题办理基本满意数 - kpiMetaDataEntity = packageMetaDataEntity(KpiMetaDataEnum.PEOPLE_MEDIUM_EVALUATION_AMOUNT, BigDecimal.valueOf(evaluationAmount.getMediumAmount()) - , evaluationAmount.getDeptId(), OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, kpiCycle, startDate, endDate); - kpiMetaDataEntityList.add(kpiMetaDataEntity); - // 问题办理不满意数 - kpiMetaDataEntity = packageMetaDataEntity(KpiMetaDataEnum.PEOPLE_LOW_EVALUATION_AMOUNT, BigDecimal.valueOf(evaluationAmount.getLowAmount()) - , evaluationAmount.getDeptId(), OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, kpiCycle, startDate, endDate); - kpiMetaDataEntityList.add(kpiMetaDataEntity); - } - return kpiMetaDataEntityList; - } - - /** - * 组装元数据对象 - * - * @param metaDataEnum 元数据类别枚举 - * @param dataValue 元数据值 - * @param deptId 部门id - * @param deptTypeKey 部门类别 - * @param kpiCycle 考核周期 - * @param startDate 考核开始日 - * @param endDate 考核结束日 - * @return com.elink.esua.epdc.entity.KpiMetaDataEntity - * @author work@yujt.net.cn - * @date 2019/12/20 14:05 - */ - private KpiMetaDataEntity packageMetaDataEntity(KpiMetaDataEnum metaDataEnum, BigDecimal dataValue, Long deptId, - String deptTypeKey, String kpiCycle, Date startDate, Date endDate) { - KpiMetaDataEntity kpiMetaDataEntity = new KpiMetaDataEntity(); - kpiMetaDataEntity.setDataCode(metaDataEnum.getValue()); - kpiMetaDataEntity.setDataName(metaDataEnum.getName()); - kpiMetaDataEntity.setDataValue(dataValue); - kpiMetaDataEntity.setDeptId(deptId); - kpiMetaDataEntity.setDeptTypeKey(deptTypeKey); - kpiMetaDataEntity.setKpiCycle(kpiCycle); - kpiMetaDataEntity.setStartDate(startDate); - kpiMetaDataEntity.setEndDate(endDate); - return kpiMetaDataEntity; - } - - - /** - * 根据考核周期，统计周期内群众对网格处理项目的满意率 - * - * @param kpiCycle - * @return void - * @author work@yujt.net.cn - * @date 2019/12/20 15:53 - */ - private void statMetaDataOfPeopleEvaluation(String kpiCycle, String dateStr) { - KpiMetaDataOfEventsFormDTO metaDataFormDto = this.initKpiParam(kpiCycle, dateStr, KpiScheduleCodeConstant.META_DATA_PEOPLE_EVALUATION); - if (null != metaDataFormDto) { - int pageIndex = NumConstant.ONE; - List gridList = deptUtils.getDeptIdList(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, NumConstant.TEN, pageIndex); - do { - metaDataFormDto.setDeptIdList(gridList); - // 从events模块查询数据 - List peopleEvaluationDataList = this.getMetaDataListOfPeopleEvaluation(metaDataFormDto); - // 组装元数据实体 - List kpiMetaDataEntities = this.packageMetaDataByEvaluationList(peopleEvaluationDataList, metaDataFormDto, kpiCycle); - // 删除已存在 并 批量插入 - this.deleteAndInsertBatch(kpiMetaDataEntities); - pageIndex++; - gridList = deptUtils.getDeptIdList(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY, NumConstant.TEN, pageIndex); - } while (CollUtil.isNotEmpty(gridList)); - } - } - - /** - * 调用events模块，查询群众满意度评价 - * - * @param metaDataFormDto - * @return java.util.List - * @author work@yujt.net.cn - * @date 2019/12/23 14:12 - */ - private List getMetaDataListOfPeopleEvaluation(KpiMetaDataOfEventsFormDTO metaDataFormDto) { - Result> eventResult = eventFeignClient.statPeopleEvaluationMetaData(metaDataFormDto); - if (!eventResult.success() || null == eventResult.getData()) { - log.error("方法{}执行失败，统计周期：{}至{}。", "getMetaDataListOfPeopleEvaluation", - DateUtils.format(metaDataFormDto.getStartDate()), DateUtils.format(metaDataFormDto.getEndDate())); - throw new RenException("调用events模块失败"); - } - return eventResult.getData(); - } - - /** - * 根据考核周期与部门类型，统计项目的网格呼叫数，呼叫被响应数，呼叫被办结数 - * - * @param kpiCycle 考核周期 - * @param deptTypeKey 部门类型 - * @return void - * @author work@yujt.net.cn - * @date 2019/12/23 14:06 - */ - private void statMetaDataOfItemHandleAmount(String kpiCycle, String dateStr, String deptTypeKey) { - KpiMetaDataOfEventsFormDTO metaDataFormDto = this.initKpiParam(kpiCycle, dateStr, KpiScheduleCodeConstant.META_DATA_ITEM_HANDLE_AMOUNT); - if (null != metaDataFormDto) { - int pageIndex = NumConstant.ONE; - List deptIdList = deptUtils.getDeptIdList(deptTypeKey, NumConstant.TEN, pageIndex); - do { - metaDataFormDto.setDeptIdList(deptIdList); - - List itemHandleAmountList = this.getHandleAmountListFromEvents(metaDataFormDto); - List kpiMetaDataEntities = this.packageMetaDataByItemHandleAmountList(itemHandleAmountList, metaDataFormDto, kpiCycle, deptTypeKey); - // 删除已存在 并 批量插入 - this.deleteAndInsertBatch(kpiMetaDataEntities); - pageIndex++; - deptIdList = deptUtils.getDeptIdList(deptTypeKey, NumConstant.TEN, pageIndex); - } while (CollUtil.isNotEmpty(deptIdList)); - } - } - - /** - * 组装元数据实体对象 - * - * @param itemHandleAmountList 网格呼叫数，呼叫被响应数，呼叫被办结数 - * @param metaDataFormDto 查询参数，主要是开始与结束时间 - * @param kpiCycle 考核周期 - * @param deptTypeKey 部门类型 - * @return java.util.List - * @author work@yujt.net.cn - * @date 2019/12/23 14:07 - */ - private List packageMetaDataByItemHandleAmountList( - List itemHandleAmountList, - KpiMetaDataOfEventsFormDTO metaDataFormDto, String kpiCycle, String deptTypeKey) { - - Date startDate = metaDataFormDto.getStartDate(); - Date endDate = metaDataFormDto.getEndDate(); - // 声明集合用于存放所有元数据对象 - List kpiMetaDataEntityList = Lists.newArrayList(); - KpiMetaDataEntity kpiMetaDataEntity; - - for (KpiItemHandleAmountResultDTO itemHandleAmount : itemHandleAmountList) { - kpiMetaDataEntity = packageMetaDataEntity(KpiMetaDataEnum.getByValue(itemHandleAmount.getMetaDataCode()), - BigDecimal.valueOf(itemHandleAmount.getMetaDataValue()), - itemHandleAmount.getDeptId(), deptTypeKey, kpiCycle, startDate, endDate); - kpiMetaDataEntityList.add(kpiMetaDataEntity); - } - - return kpiMetaDataEntityList; - } - - /** - * 调用events模块，统计网格呼叫数，呼叫被响应数，呼叫被办结数 - * - * @param metaDataFormDto - * @return java.util.List - * @author work@yujt.net.cn - * @date 2019/12/23 14:08 - */ - private List getHandleAmountListFromEvents(KpiMetaDataOfEventsFormDTO metaDataFormDto) { - Result> eventResult = eventFeignClient.statItemHandleAmount(metaDataFormDto); - if (!eventResult.success() || eventResult.getData() == null) { - log.error("方法{}执行失败，统计周期：{}至{}。", "getHandleAmountListFromEvents", - DateUtils.format(metaDataFormDto.getStartDate()), DateUtils.format(metaDataFormDto.getEndDate())); - throw new RenException("调用events模块失败"); - } - return eventResult.getData(); - } - - /** - * 先删除已有数据再批量插入元数据表 - * - * @param metaDateList - * @return void - * @author qushutong - * @date 2019/12/24 14:38 - */ - @Override - public void deleteAndInsertBatch(List metaDateList) { - baseDao.deleteListRepetitionMeta(metaDateList); - this.insertBatch(metaDateList); - } - - @Override - public void buildMetaData(String kpiScheduleCode) { - String jobParam = ModuleUtils.decodeFromBase64(kpiScheduleCode); - ScheduleJobParamDTO scheduleJobParam = new ScheduleJobParamDTO().getByJobParams(jobParam); - // 考核规则编码 - String ruleCode = scheduleJobParam.getRuleCode(); - String dateStr = scheduleJobParam.getDateStr(); - if (ruleCode.equals(KpiScheduleCodeConstant.META_DATA_PEOPLE_REPORT_AMOUNT)) { - this.statPeopleReportAmount(dateStr); - } else if (ruleCode.equals(KpiScheduleCodeConstant.META_DATA_PEOPLE_EVALUATION)) { - this.statPeopleEvaluation(dateStr); - } else if (ruleCode.equals(KpiScheduleCodeConstant.META_DATA_ITEM_HANDLE_AMOUNT)) { - this.statItemHandleAmount(dateStr); - } else if (ruleCode.equals(KpiScheduleCodeConstant.META_DATA_GRID_EVALUATION)) { - this.statGridEvaluation(dateStr); - } - } - - /** - * 群众事件上报总数 与 被响应总数 - * - * @param dateStr 考核月某一天字符串 yyyy-MM-dd e.g. 2020-01-01 - * @return void - * @author work@yujt.net.cn - * @date 2020/2/7 10:11 - */ - private void statPeopleReportAmount(String dateStr) { - statMetaDataOfEventAmount(KpiCycleEnum.KPI_CYCLE_MONTH.getValue(), dateStr); - statMetaDataOfEventAmount(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue(), dateStr); - statMetaDataOfEventAmount(KpiCycleEnum.KPI_CYCLE_YEAR.getValue(), dateStr); - } - - /** - * 统计网格内 群众对网格问题办理 满意度评价，存入元数据表 - * - * @param dateStr 考核月某一天字符串 yyyy-MM-dd e.g. 2020-01-01 - * @return void - * @author work@yujt.net.cn - * @date 2020/2/7 10:05 - */ - private void statPeopleEvaluation(String dateStr) { - statMetaDataOfPeopleEvaluation(KpiCycleEnum.KPI_CYCLE_MONTH.getValue(), dateStr); - statMetaDataOfPeopleEvaluation(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue(), dateStr); - statMetaDataOfPeopleEvaluation(KpiCycleEnum.KPI_CYCLE_YEAR.getValue(), dateStr); - } - - /*** - * 构建元数据 网格呼叫总数 网格响应呼叫数 - * @param dateStr 考核月某一天字符串 yyyy-MM-dd e.g. 2020-01-01 - * @return void - * @author qushutong - * @date 2019/12/18 18:21 - */ - private void statItemHandleAmount(String dateStr) { - statMetaDataOfItemHandleAmount(KpiCycleEnum.KPI_CYCLE_MONTH.getValue(), dateStr, OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT); - statMetaDataOfItemHandleAmount(KpiCycleEnum.KPI_CYCLE_MONTH.getValue(), dateStr, OrganizationTypeConstant.ORG_TYPE_STREET_PARTY); - - statMetaDataOfItemHandleAmount(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue(), dateStr, OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT); - statMetaDataOfItemHandleAmount(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue(), dateStr, OrganizationTypeConstant.ORG_TYPE_STREET_PARTY); - - statMetaDataOfItemHandleAmount(KpiCycleEnum.KPI_CYCLE_YEAR.getValue(), dateStr, OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT); - statMetaDataOfItemHandleAmount(KpiCycleEnum.KPI_CYCLE_YEAR.getValue(), dateStr, OrganizationTypeConstant.ORG_TYPE_STREET_PARTY); - } - - /*** - * 构建元数据 网格工作评议 - * @param dateStr 考核月某一天字符串 yyyy-MM-dd e.g. 2020-01-01 - * @return void - * @author qushutong - * @date 2019/12/20 14:48 - */ - private void statGridEvaluation(String dateStr) { - statMetaDataOfGridEvaluation(KpiCycleEnum.KPI_CYCLE_MONTH.getValue(), dateStr, OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT); - statMetaDataOfGridEvaluation(KpiCycleEnum.KPI_CYCLE_MONTH.getValue(), dateStr, OrganizationTypeConstant.ORG_TYPE_STREET_PARTY); - - statMetaDataOfGridEvaluation(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue(), dateStr, OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT); - statMetaDataOfGridEvaluation(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue(), dateStr, OrganizationTypeConstant.ORG_TYPE_STREET_PARTY); - - statMetaDataOfGridEvaluation(KpiCycleEnum.KPI_CYCLE_YEAR.getValue(), dateStr, OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT); - statMetaDataOfGridEvaluation(KpiCycleEnum.KPI_CYCLE_YEAR.getValue(), dateStr, OrganizationTypeConstant.ORG_TYPE_STREET_PARTY); - } - - /** - * 根据考核周期和部门类型 统计 网格对项目处理的满意度情况 - * - * @param kpiCycle 考核周期 - * @param dateStr 考核月某一天字符串 yyyy-MM-dd e.g. 2020-01-01 - * @param deptTypeKey 部门类型 - * @return void - * @author work@yujt.net.cn - * @date 2019/12/23 17:24 - */ - private void statMetaDataOfGridEvaluation(String kpiCycle, String dateStr, String deptTypeKey) { - // 获取考核周期开始日 - KpiMetaDataOfEventsFormDTO metaDataFormDto = this.initKpiParam(kpiCycle, dateStr, KpiScheduleCodeConstant.META_DATA_GRID_EVALUATION); - if (null != metaDataFormDto) { - // 声明页容量和页码 - int pageIndex = NumConstant.ONE; - - List gridList = deptUtils.getDeptIdList(deptTypeKey, NumConstant.TEN, pageIndex); - do { - metaDataFormDto.setDeptIdList(gridList); - // 从events模块获取统计数据 - List jobEvaluationDataList = this.getjobEvaluationDataModule(metaDataFormDto); - // 组装元数据对象 - List kpiMetaDataEntities = this.packageMetaDataByGridEvaluationList(jobEvaluationDataList, metaDataFormDto, kpiCycle, deptTypeKey); - // 删除已存在 并 批量插入 - this.deleteAndInsertBatch(kpiMetaDataEntities); - pageIndex++; - gridList = deptUtils.getDeptIdList(deptTypeKey, NumConstant.TEN, pageIndex); - } while (CollUtil.isNotEmpty(gridList)); - } - } - - - /** - * 组装元数据实体，包括 网格对项目处理 满意、基本满意、不满意的数量 - * - * @param evaluationDataList 满意评价统计结果 - * @param metaDataFormDto 考核周期开始、结束日 - * @param kpiCycle 考核周期 - * @param OrganizationType 部门类型 - * @return java.util.List - * @author work@yujt.net.cn - * @date 2019/12/23 17:18 - */ - private List packageMetaDataByGridEvaluationList(List evaluationDataList, - KpiMetaDataOfEventsFormDTO metaDataFormDto, String kpiCycle, String OrganizationType) { - Date startDate = metaDataFormDto.getStartDate(); - Date endDate = metaDataFormDto.getEndDate(); - // 声明集合用于存放所有元数据对象 - List kpiMetaDataEntityList = Lists.newArrayList(); - KpiMetaDataEntity kpiMetaDataEntity; - for (KpiEvaluationAmountResultDTO evaluationAmount : evaluationDataList) { - // 网格评价满意数 - kpiMetaDataEntity = packageMetaDataEntity(KpiMetaDataEnum.GRID_HIGH_EVALUATION_AMOUNT, BigDecimal.valueOf(evaluationAmount.getHighAmount()) - , evaluationAmount.getDeptId(), OrganizationType, kpiCycle, startDate, endDate); - kpiMetaDataEntityList.add(kpiMetaDataEntity); - // 网格评价基本满意数 - kpiMetaDataEntity = packageMetaDataEntity(KpiMetaDataEnum.GRID_MEDIUM_EVALUATION_AMOUNT, BigDecimal.valueOf(evaluationAmount.getMediumAmount()) - , evaluationAmount.getDeptId(), OrganizationType, kpiCycle, startDate, endDate); - kpiMetaDataEntityList.add(kpiMetaDataEntity); - // 网格评价不满意数 - kpiMetaDataEntity = packageMetaDataEntity(KpiMetaDataEnum.GRID_LOW_EVALUATION_AMOUNT, BigDecimal.valueOf(evaluationAmount.getLowAmount()) - , evaluationAmount.getDeptId(), OrganizationType, kpiCycle, startDate, endDate); - kpiMetaDataEntityList.add(kpiMetaDataEntity); - } - return kpiMetaDataEntityList; - } - - private List getjobEvaluationDataModule(KpiMetaDataOfEventsFormDTO metaDataFormDto) { - Result> listResult = eventFeignClient.statGridEvaluationMetaData(metaDataFormDto); - if (!listResult.success() || null == listResult.getData()) { - log.error("统计网格工作评议数异常"); - throw new RenException("统计网格工作评议数异常"); - } - return listResult.getData(); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java deleted file mode 100644 index 57b95a2ea..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java +++ /dev/null @@ -1,252 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.dao.KpiMetaDataDao; -import com.elink.esua.epdc.dao.KpiResultGridDao; -import com.elink.esua.epdc.dto.KpiMetaDataDTO; -import com.elink.esua.epdc.dto.KpiResultGridDTO; -import com.elink.esua.epdc.entity.KpiResultGridEntity; -import com.elink.esua.epdc.enums.KpiMetaDataEnum; -import com.elink.esua.epdc.enums.KpiResultGridDataEnum; -import com.elink.esua.epdc.redis.KpiResultGridRedis; -import com.elink.esua.epdc.service.KpiResultGridService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.*; - -/** - * 网格考核最终得分 - * - * @author work@yujt.net.cn - * @since v1.0.0 2019-12-17 - */ -@Service -public class KpiResultGridServiceImpl extends BaseServiceImpl implements KpiResultGridService { - - @Autowired - private KpiResultGridRedis kpiResultGridRedis; - @Autowired - private KpiResultGridDao kpiResultGridDao; - @Autowired - private KpiMetaDataDao kpiMetaDataDao; - - @Override - public PageData page(Map params) { - Integer page = Integer.parseInt(params.get("page").toString()); - Integer limit = Integer.parseInt(params.get("limit").toString()); - String allDeptIds = this.queryAffiliatedInstitutionsParams(params); - params.put("page",(page - 1) * limit); - params.put("limit", limit); - params.put("allDeptIds", allDeptIds); - int count = kpiResultGridDao.selectStatisticalInfoCount(params); - List list = kpiResultGridDao.selectStatisticalInfoList(params); - PageData pageData = new PageData(list,count); - return pageData; - } - - @Override - public List list(Map params) { - String allDeptIds = this.queryAffiliatedInstitutionsParams(params); - params.put("allDeptIds", allDeptIds); - List entityList = baseDao.list(params); - return entityList; - } - - /** - * @Description: 处理所属机构 查询条件 - * @Param: [params] - * @return: java.lang.String - * @Author: zy - * @Date: 2019-12-26 - */ - private String queryAffiliatedInstitutionsParams(Map params){ - String allDeptIds = ""; - if (params.get("streetId") != "" && params.get("streetId") != null){ - allDeptIds = params.get("streetId").toString(); //查询条件 街道 - } - if (params.get("communityId") != "" && params.get("communityId") != null){ - allDeptIds = params.get("communityId").toString(); //查询条件 社区 - } - if (params.get("gridId") != "" && params.get("gridId") != null){ - allDeptIds = params.get("gridId").toString(); //查询条件 网格 - } - return allDeptIds; - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - /** - * @Description: 返回考核统计 详情页详情 - * @Param: [id] - * @return: java.util.List - * 序号：rownum - * 规则：rule - * 详情：detail - * @Author: zy - * @Date: 2019-12-20 - */ - @Override - public List get(String id) { - List listMap = new ArrayList(); - //查询网格考核最终得分表, 拼接：履行抓基层党建工作职责得分 - KpiResultGridDTO workScore = this.getWorkDutyScore(id); - listMap.add(workScore); - //根据 部门ID(网格ID),开始时间,结束时间(年月日) 查询 绩效考核的元数据表, 根据枚举计算得分 - Map mapBigDecimal = this.gridProblemHandlingScore(workScore); - - // 拼接：群众反映问题网格响应率得分 - KpiResultGridDTO dto = new KpiResultGridDTO(); - StringBuilder responseDetail = new StringBuilder(); - responseDetail.append("群众反应问题总数："); - responseDetail.append(mapBigDecimal.get("peopleReportAmount") + ","); - responseDetail.append("群众反应问题响应数:" + mapBigDecimal.get("peopleReportRespAmount")); - dto.setRownum(2); - dto.setRule(KpiResultGridDataEnum.GRID_PROBLEM_RESPONSE_RATE_SCORE.getName()); - dto.setDetail(responseDetail.toString()); - listMap.add(dto); - - // 拼接：群群众反映问题网格办理满意率得分 - KpiResultGridDTO dto1 = new KpiResultGridDTO(); - StringBuilder satisfiedDetail = new StringBuilder(); - satisfiedDetail.append("调查总数：" + mapBigDecimal.get("total") + ";满意数：" + mapBigDecimal.get("peopleHighEvaluationAmount") + ";基本满意数：" - + mapBigDecimal.get("peopleMediumEvaluationAmount") + ";不满意数：" + mapBigDecimal.get("peopleLowEvaluationAmount")); - dto1.setRownum(3); - dto1.setRule(KpiResultGridDataEnum.GRID_PROBLEM_SATISFACTION_RATE_SCORE.getName()); - dto1.setDetail(satisfiedDetail.toString()); - listMap.add(dto1); - return listMap; - } - - /** - * @Description: 根据 网格考核最终得分表主键，拼接：履行抓基层党建工作职责得分 - * @Param: [id] - * @return: com.elink.esua.epdc.dto.KpiResultGridDTO - * @Author: zy - * @Date: 2019-12-20 - */ - public KpiResultGridDTO getWorkDutyScore(String id){ - KpiResultGridDTO kpiResultGridDTO = new KpiResultGridDTO(); - KpiResultGridEntity entity = baseDao.selectById(id); - StringBuilder detail = new StringBuilder(); - detail.append("评分部门:"); - if (entity.getAllDeptNames() != null && entity.getAllDeptNames() != ""){ - String[] split = entity.getAllDeptNames().split("-"); - if (split.length >= 2){ - detail.append(split[2] + ","); - }else { - detail.append(","); - } - }else { - detail.append(","); - } - SimpleDateFormat sim = new SimpleDateFormat("yyyy-MM-dd HH:mm"); - String scoreTime = sim.format(entity.getCreatedTime()); - detail.append("评分时间:" + scoreTime + ", 原始得分:" + entity.getManualScore()); - kpiResultGridDTO.setRownum(1); - kpiResultGridDTO.setRule(KpiResultGridDataEnum.BASIC_LEVEL_WORK_SCORE.getName()); - kpiResultGridDTO.setDetail(detail.toString()); - //用作后期查询,不生成导出列 - kpiResultGridDTO.setGridId(entity.getGridId()); - kpiResultGridDTO.setId(id); - kpiResultGridDTO.setStartDate(entity.getStartDate()); - kpiResultGridDTO.setEndDate(entity.getEndDate()); - return kpiResultGridDTO; - } - - /** - * @Description: 部门ID(网格ID),开始时间,结束时间(年月日) 查询 绩效考核的元数据表 - * @Param: {startDate}、{endDate}、{deptId} - * @return: com.elink.esua.epdc.dto.KpiResultGridDTO - * @Author: zy - * @Date: 2019-12-20 - */ - public Map gridProblemHandlingScore(KpiResultGridDTO kpiResultGridDTO){ - Map map = new HashMap(); - List dto = kpiMetaDataDao.queryGridProblemHandlingScore(kpiResultGridDTO); - BigDecimal peopleReportAmount = new BigDecimal(0); - BigDecimal peopleReportRespAmount = new BigDecimal(0); - BigDecimal peopleHighEvaluationAmount = new BigDecimal(0); - BigDecimal peopleMediumEvaluationAmount = new BigDecimal(0); - BigDecimal peopleLowEvaluationAmount = new BigDecimal(0); - BigDecimal total = new BigDecimal(0); - for (KpiMetaDataDTO kpiMetaDataDTO : dto){ - if (KpiMetaDataEnum.PEOPLE_REPORT_AMOUNT.getValue().equals(kpiMetaDataDTO.getDataCode())){ // 计算 群众反映问题总数 - peopleReportAmount = peopleReportAmount.add(kpiMetaDataDTO.getDataValue()); - }else if (KpiMetaDataEnum.PEOPLE_REPORT_RESP_AMOUNT.getValue().equals(kpiMetaDataDTO.getDataCode())){ //群众反映问题被响应数 - peopleReportRespAmount = peopleReportRespAmount.add(kpiMetaDataDTO.getDataValue()); - }else if (KpiMetaDataEnum.PEOPLE_HIGH_EVALUATION_AMOUNT.getValue().equals(kpiMetaDataDTO.getDataCode())){ //问题办理满意数 - peopleHighEvaluationAmount = peopleHighEvaluationAmount.add(kpiMetaDataDTO.getDataValue()); - }else if (KpiMetaDataEnum.PEOPLE_MEDIUM_EVALUATION_AMOUNT.getValue().equals(kpiMetaDataDTO.getDataCode())){ //问题办理基本满意数 - peopleMediumEvaluationAmount = peopleMediumEvaluationAmount.add(kpiMetaDataDTO.getDataValue()); - }else if (KpiMetaDataEnum.PEOPLE_LOW_EVALUATION_AMOUNT.getValue().equals(kpiMetaDataDTO.getDataCode())){ //问题办理不满意数 - peopleLowEvaluationAmount = peopleLowEvaluationAmount.add(kpiMetaDataDTO.getDataValue()); - } - } - total = total.add(peopleHighEvaluationAmount); - total = total.add(peopleMediumEvaluationAmount); - total = total.add(peopleLowEvaluationAmount); - map.put("peopleReportAmount",peopleReportAmount); - map.put("peopleReportRespAmount",peopleReportRespAmount); - map.put("peopleHighEvaluationAmount",peopleHighEvaluationAmount); - map.put("peopleMediumEvaluationAmount",peopleMediumEvaluationAmount); - map.put("peopleLowEvaluationAmount",peopleLowEvaluationAmount); - map.put("total",total); - return map; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(KpiResultGridDTO dto) { - KpiResultGridEntity entity = ConvertUtils.sourceToTarget(dto, KpiResultGridEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(KpiResultGridDTO dto) { - KpiResultGridEntity entity = ConvertUtils.sourceToTarget(dto, KpiResultGridEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultSuperiorServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultSuperiorServiceImpl.java deleted file mode 100644 index ac79825e2..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultSuperiorServiceImpl.java +++ /dev/null @@ -1,171 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.elink.esua.epdc.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.page.PageData; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.dao.KpiMetaDataDao; -import com.elink.esua.epdc.dao.KpiResultSuperiorDao; -import com.elink.esua.epdc.dto.KpiMetaDataDTO; -import com.elink.esua.epdc.dto.KpiResultGridDTO; -import com.elink.esua.epdc.dto.KpiResultSuperiorDTO; -import com.elink.esua.epdc.entity.KpiResultSuperiorEntity; -import com.elink.esua.epdc.enums.KpiMetaDataEnum; -import com.elink.esua.epdc.redis.KpiResultSuperiorRedis; -import com.elink.esua.epdc.service.KpiResultSuperiorService; -import com.sun.org.apache.bcel.internal.generic.NEW; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.util.*; - -/** - * 街道或区直绩效考核最终得分 - * - * @author qu qu@elink-cn.com - * @since v1.0.0 2019-12-23 - */ -@Service -public class KpiResultSuperiorServiceImpl extends BaseServiceImpl implements KpiResultSuperiorService { - - @Autowired - private KpiResultSuperiorRedis kpiResultSuperiorRedis; - @Autowired - private KpiResultSuperiorDao kpiResultSuperiorDao; - @Autowired - private KpiMetaDataDao kpiMetaDataDao; - @Override - public PageData page(Map params) { - Integer page = Integer.parseInt(params.get("page").toString()); - Integer limit = Integer.parseInt(params.get("limit").toString()); - String allDeptIds = this.queryAffiliatedInstitutionsParams(params); - params.put("page",(page - 1) * limit); - params.put("limit", limit); - params.put("allDeptIds", allDeptIds); - int count = kpiResultSuperiorDao.selectSuperiorInfoCount(params); - List list = kpiResultSuperiorDao.selectSuperiorInfoList(params); - PageData pageData = new PageData(list,count); - return pageData; - } - - @Override - public List list(Map params) { - String allDeptIds = this.queryAffiliatedInstitutionsParams(params); - params.put("allDeptIds", allDeptIds); - List dtoList = kpiResultSuperiorDao.exportSuperiorList(params); - - return dtoList; - } - - /** - * @Description: 处理所属机构 查询条件 - * @Param: [params] - * @return: java.lang.String - * @Author: zy - * @Date: 2019-12-26 - */ - private String queryAffiliatedInstitutionsParams(Map params){ - String allDeptIds = ""; - if (params.get("streetId") != "" && params.get("streetId") != null){ - allDeptIds = params.get("streetId").toString(); //查询条件 街道 - } - if (params.get("communityId") != "" && params.get("communityId") != null){ - allDeptIds = params.get("communityId").toString(); //查询条件 社区 - } - if (params.get("gridId") != "" && params.get("gridId") != null){ - allDeptIds = params.get("gridId").toString(); //查询条件 网格 - } - return allDeptIds; - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - /** - * @Description: 区直街道考核统计 详情页分数查询 - * @Param: [id] - * @return: com.elink.esua.epdc.dto.KpiResultSuperiorDTO - * @Author: zy - * @Date: 2019-12-24 - */ - @Override - public List get(String id) { - KpiResultSuperiorEntity entity = baseDao.selectById(id); - //根据网格id，开始时间、结束时间，查询 区直街道考核统计 详情页分数(响应网格呼叫事项数、工作评议满意数...)具体值 - KpiResultGridDTO kpiResultGridDTO = new KpiResultGridDTO(); - kpiResultGridDTO.setGridId(entity.getDeptId()); - kpiResultGridDTO.setStartDate(entity.getStartDate()); - kpiResultGridDTO.setEndDate(entity.getEndDate()); - List dtoMetaData = kpiMetaDataDao.queryGridProblemHandlingScore(kpiResultGridDTO); - List resultSuperiorList = new ArrayList(); - KpiResultSuperiorDTO resultSuperior = new KpiResultSuperiorDTO(); - resultSuperior.setId(entity.getId()); - String A = KpiMetaDataEnum.GRID_LOW_EVALUATION_AMOUNT.getValue(); - for (KpiMetaDataDTO K : dtoMetaData){ - if (KpiMetaDataEnum.GRID_CALL_SUPERIOR_AMOUNT.getValue().equals(K.getDataCode())){ // 网格呼叫总数 - resultSuperior.setGridCallSuperiorAmount(K.getDataValue()); - }else if (KpiMetaDataEnum.GRID_CALL_SUPERIOR_RESP_AMOUNT.getValue().equals(K.getDataCode())){ //网格呼叫被响应数 - resultSuperior.setGridCallSuperiorRespAmount(K.getDataValue()); - }else if (KpiMetaDataEnum.GRID_CALL_SUPERIOR_CLOSE_AMOUNT.getValue().equals(K.getDataCode())){ //网格呼叫被办结数 - resultSuperior.setGridCallSuperiorCloseAmount(K.getDataValue()); - }else if (KpiMetaDataEnum.GRID_HIGH_EVALUATION_AMOUNT.getValue().equals(K.getDataCode())){ //网格评议满意数 - resultSuperior.setGridHighEvaluationAmount(K.getDataValue()); - }else if (KpiMetaDataEnum.GRID_MEDIUM_EVALUATION_AMOUNT.getValue().equals(K.getDataCode())){ //网格评议基本满意数 - resultSuperior.setGridMediumEvaluationAmount(K.getDataValue()); - }else if (KpiMetaDataEnum.GRID_LOW_EVALUATION_AMOUNT.getValue().equals(K.getDataCode())){ //网格评议不满意数 - resultSuperior.setGridLowEvaluationAmount(K.getDataValue()); - } - } - resultSuperiorList.add(resultSuperior); - return resultSuperiorList; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(KpiResultSuperiorDTO dto) { - KpiResultSuperiorEntity entity = ConvertUtils.sourceToTarget(dto, KpiResultSuperiorEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(KpiResultSuperiorDTO dto) { - KpiResultSuperiorEntity entity = ConvertUtils.sourceToTarget(dto, KpiResultSuperiorEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - - -} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java index 0ec31e9b1..4f242317b 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiRuleServiceImpl.java @@ -19,34 +19,25 @@ package com.elink.esua.epdc.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.commons.tools.constant.StrConstant; -import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; -import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; -import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils; -import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.constant.KpiFieldConstant; -import com.elink.esua.epdc.constant.KpiScheduleCodeConstant; -import com.elink.esua.epdc.dao.*; -import com.elink.esua.epdc.dto.*; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; +import com.elink.esua.epdc.dao.KpiFormulaDao; +import com.elink.esua.epdc.dao.KpiRuleDao; +import com.elink.esua.epdc.dao.KpiRuleParamDao; +import com.elink.esua.epdc.dto.KpiRuleDTO; +import com.elink.esua.epdc.dto.KpiRuleParamDTO; import com.elink.esua.epdc.dto.form.KpiRuleSaveOrUpdateFormDTO; import com.elink.esua.epdc.dto.result.KpiRuleQueryResultDTO; -import com.elink.esua.epdc.entity.*; -import com.elink.esua.epdc.enums.KpiCycleEnum; -import com.elink.esua.epdc.enums.KpiRuleModeEnum; +import com.elink.esua.epdc.entity.KpiFormulaEntity; +import com.elink.esua.epdc.entity.KpiRuleEntity; +import com.elink.esua.epdc.entity.KpiRuleParamEntity; +import com.elink.esua.epdc.redis.KpiRuleRedis; +import com.elink.esua.epdc.service.KpiRuleParamService; import com.elink.esua.epdc.service.KpiRuleService; -import com.elink.esua.epdc.utils.DeptUtils; -import com.elink.esua.epdc.utils.KpiLocalDateUtils; -import com.google.common.collect.Lists; -import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,13 +45,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.script.Invocable; -import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.YearMonth; -import java.util.*; +import java.util.Arrays; +import java.util.List; +import java.util.Map; /** * 考核规则表 @@ -68,548 +55,218 @@ import java.util.*; * @author qu qu@elink-cn.com * @since v1.0.0 2019-11-27 */ -@Slf4j @Service public class KpiRuleServiceImpl extends BaseServiceImpl implements KpiRuleService { - private Logger logger = LoggerFactory.getLogger(getClass()); - /** - * 公式参数表 - */ - @Autowired - private KpiRuleParamDao kpiRuleParamDao; - /** - * 绩效考核公式表 - */ - @Autowired - private KpiFormulaDao kpiFormulaDao; - /** - * 考核规则表 - */ - @Autowired - private KpiRuleDao kpiRuleDao; - /** - * 绩效考核元数据表 - */ - @Autowired - private KpiMetaDataDao kpiMetaDataDao; - /** - * 网格考核最终得分表 - */ - @Autowired - private KpiResultGridDao kpiResultGridDao; - @Autowired - private DeptUtils deptUtils; - /** - * 网格考核最终得分 - */ - @Autowired - private KpiResultSuperiorDao kpiResultSuperiorDao; - - @Override - public PageData page(Map params) { - String ruleName = params.containsKey("ruleName") ? params.get("ruleName").toString() : null; - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.like(StringUtils.isNotBlank(ruleName), KpiFieldConstant.RULE_NAME, ruleName); - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - wrapper - ); - return getPageData(page, KpiRuleDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, KpiRuleDTO.class); - } - - private QueryWrapper getWrapper(Map params) { - String id = (String) params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public KpiRuleDTO get(String id) { - KpiRuleEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, KpiRuleDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(KpiRuleDTO dto) { - KpiRuleEntity entity = ConvertUtils.sourceToTarget(dto, KpiRuleEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(KpiRuleDTO dto) { - KpiRuleEntity entity = ConvertUtils.sourceToTarget(dto, KpiRuleEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - QueryWrapper kpiRuleParamEntityQueryWrapper = new QueryWrapper<>(); - kpiRuleParamEntityQueryWrapper.in(ids.length > NumConstant.ZERO, KpiFieldConstant.RULE_ID, ids); - kpiRuleParamDao.delete(kpiRuleParamEntityQueryWrapper); - } - - /** - * @param params - * @return com.elink.esua.epdc.commons.tools.page.PageData - * @Author yinzuomei - * @Description 列表查询 - * @Date 2019/11/27 13:29 - **/ - @Override - public PageData query(Map params) { - IPage page = getPage(params); - List list = baseDao.selectListKpiRuleQueryResultDTO(params); - return new PageData<>(list, page.getTotal()); - } - - /** - * @param id 考核规则表主键 - * @return com.elink.esua.epdc.dto.result.KpiRuleQueryResultDTO - * @Author yinzuomei - * @Description 查询详情 - * @Date 2019/11/27 15:17 - **/ - @Override - public KpiRuleQueryResultDTO queryDetailInfo(String id) { - KpiRuleQueryResultDTO kpiRuleQueryResultDTO = baseDao.queryDetailInfo(id); - String[] deptTypeKeys = kpiRuleQueryResultDTO.getDeptTypeKey().split(","); - kpiRuleQueryResultDTO.setDeptTypeKeys(deptTypeKeys); - return kpiRuleQueryResultDTO; - } - - /** - * @param dto - * @return void - * @Author yinzuomei - * @Description 新增 - * @Date 2019/11/27 16:27 - **/ - @Override - @Transactional(rollbackFor = Exception.class) - public Result add(KpiRuleSaveOrUpdateFormDTO dto) { - - this.checkKpiRuleSaveOrUpdateFormDTO(dto); - //考核部门类别 数组转字符串 - String deptTypeKey = StringUtils.join(dto.getDeptTypeKeys(), ","); - // 为null :手动打分上传的 单个deptTypeKey - if (deptTypeKey != null) { - // 新增公式规则 多个deptTypeKey - dto.setDeptTypeKey(deptTypeKey); - } - KpiRuleEntity entity = ConvertUtils.sourceToTarget(dto, KpiRuleEntity.class); - insert(entity); - // 元公式需要设置参数 - if (KpiRuleModeEnum.FORMULA.value().equals(dto.getRuleMode())) { - for (KpiRuleParamDTO kpiRuleParamDTO : dto.getRuleParamList()) { - kpiRuleParamDTO.setRuleId(entity.getId()); - KpiRuleParamEntity kpiRuleParamEntity = ConvertUtils.sourceToTarget(kpiRuleParamDTO, KpiRuleParamEntity.class); - kpiRuleParamDao.insert(kpiRuleParamEntity); - } - } - return new Result(); - } - - /** - * @param dto - * @return void - * @Author yinzuomei - * @Description 修改 - * @Date 2019/11/27 16:27 - **/ - @Override - @Transactional(rollbackFor = Exception.class) - public Result edit(KpiRuleSaveOrUpdateFormDTO dto) { - - this.checkKpiRuleSaveOrUpdateFormDTO(dto); - //考核部门类别 数组转字符串 - String deptTypeKey = StringUtils.join(dto.getDeptTypeKeys(), ","); - dto.setDeptTypeKey(deptTypeKey); - KpiRuleEntity entity = ConvertUtils.sourceToTarget(dto, KpiRuleEntity.class); - updateById(entity); - // 全部删除参数记录表 - kpiRuleParamDao.deleteByRuleId(entity.getId()); - if (KpiRuleModeEnum.FORMULA.value().equals(dto.getRuleMode())) { - for (KpiRuleParamDTO ruleParam : dto.getRuleParamList()) { - ruleParam.setId(null); - ruleParam.setRuleId(entity.getId()); - kpiRuleParamDao.insert(ConvertUtils.sourceToTarget(ruleParam, KpiRuleParamEntity.class)); - } - } - return new Result(); - } - - /** - * 校验考核规则保存时提交的数据 - * - * @param dto - * @return void - * @author yinzuomei - * @date 2019/12/18 19:45 - */ - private void checkKpiRuleSaveOrUpdateFormDTO(KpiRuleSaveOrUpdateFormDTO dto) { - if (StringUtils.isBlank(dto.getRuleName())) { - throw new RenException("规则名称不能为空"); - } - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(KpiFieldConstant.RULE_NAME, dto.getRuleName()); - wrapper.ne(StringUtils.isNotBlank(dto.getId()), FieldConstant.ID, dto.getId()); - if (baseDao.selectCount(wrapper) > NumConstant.ZERO) { - throw new RenException("规则名称已存在"); - } - if (KpiRuleModeEnum.FORMULA.value().equals(dto.getRuleMode())) { - // 是否缺少参数 - KpiFormulaEntity kpiFormulaEntity = kpiFormulaDao.selectById(dto.getReferenceId()); - if (CollUtil.isEmpty(dto.getRuleParamList()) && kpiFormulaEntity.getParamAmount() > 0) { - throw new RenException("请选择元公式入参"); - } - if (kpiFormulaEntity.getParamAmount() != dto.getRuleParamList().size()) { - throw new RenException("公式缺少入参"); - } - // 校验sort唯一性 - int sort = NumConstant.ZERO; - for (KpiRuleParamDTO kpiRuleParamDTO : dto.getRuleParamList()) { - if (kpiRuleParamDTO.getSort() == sort) { - throw new RenException("参数排序不唯一,请重新编辑"); - } - sort = kpiRuleParamDTO.getSort(); - } - } - } - - /** - * @param referenceIds - * @return java.util.List - * @Author yinzuomei - * @Description 根据引用id查询考核规则表记录 - * @Date 2019/12/2 15:00 - **/ - @Override - public List listKpiRuleEntityByRereferenceId(String[] referenceIds) { - QueryWrapper kpiRuleEntityQueryWrapper = new QueryWrapper<>(); - kpiRuleEntityQueryWrapper.in(KpiFieldConstant.REFERENCE_ID, referenceIds); - List kpiRuleEntityList = baseDao.selectList(kpiRuleEntityQueryWrapper); - return kpiRuleEntityList; - } - - @Override - public Result> listKpiRuleDTO() { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(KpiFieldConstant.RULE_MODE, KpiRuleModeEnum.MANMUAL_SCORE.value()); - wrapper.orderByDesc(FieldConstant.CREATED_TIME); - List kpiRuleEntityList = baseDao.selectList(wrapper); - List list = ConvertUtils.sourceToTarget(kpiRuleEntityList, KpiRuleDTO.class); - return new Result().ok(list); - } - - @Override - public void calcByRuleCode(String base64Param) { - - String jobParam = ModuleUtils.decodeFromBase64(base64Param); - ScheduleJobParamDTO scheduleJobParam = new ScheduleJobParamDTO().getByJobParams(jobParam); - // 考核规则编码 - String ruleCode = scheduleJobParam.getRuleCode(); - // 查询考核规则表 - KpiRuleDTO kpiRule = kpiRuleDao.queryKpiRuleMetaFormula(ruleCode); - String ruleMode = kpiRule.getRuleMode(); - if (StringUtils.isBlank(ruleMode) || !ruleMode.equals(KpiRuleModeEnum.FORMULA.value())) { - logger.error("规则编码{}对应的ruleMode不合法，方法中止。", ruleCode); - return; - } - String kpiCycle = kpiRule.getKpiCycle(); - KpiMetaDataOfEventsFormDTO metaDataOfEventsForm = KpiLocalDateUtils.packKpiStartAndEndDate(kpiCycle, scheduleJobParam.getDateStr()); - if (null == metaDataOfEventsForm) { - logger.error("当前时间：{}，无法按照规则编码{}计算绩效考核得分", LocalDateTime.now().toString(), ruleCode); - return; - } - Date startDate = metaDataOfEventsForm.getStartDate(); - // 考核结束日 - Date endDate = metaDataOfEventsForm.getEndDate(); - // 根据 考核规则表-外键(公式id)，查询绩效考核公式表，待运行公式方法 - KpiFormulaDTO kpiFormula = kpiFormulaDao.queryFormula(kpiRule.getReferenceId()); - // 初始化JavaScriptEngine引擎 - Invocable invocable = this.initInvocable(kpiFormula.getFormula(), ruleCode); - // 公式所有参数对应的元数据编码、升序排列 - List metaDateCodeList = this.getRuleParmOfMetaDateCodeList(kpiRule.getId()); - // 公式参数数量 - Integer paramAmount = kpiFormula.getParamAmount(); - // 公式方法名 - String functionName = kpiFormula.getFunctionName(); - // 部门类别 - String[] deptTypeKeyArray = kpiRule.getDeptTypeKey().split(StrConstant.COMMA); - if (null == deptTypeKeyArray || deptTypeKeyArray.length == NumConstant.ZERO) { - return; - } - for (String deptTypeKey : deptTypeKeyArray) { - int pageIndex = NumConstant.ONE; - List deptIdList = deptUtils.getDeptIdList(deptTypeKey, NumConstant.TWENTY, pageIndex); - do { - for (Long deptId : deptIdList) { - BigDecimal[] paramValue = selectArrayOfMetaDataValue(deptId, startDate, endDate, metaDateCodeList); - // 参数准备完全时，执行js运算 - if (paramValue.length == paramAmount) { - // 执行js中的函数 参数：js方法名 + 参数 - Double score = this.calcByJavaScript(invocable, functionName, ruleCode, paramValue); - this.packageFormulaResultToSaveOrUpdate(deptId, ruleCode, score, startDate, endDate, kpiCycle); - } - } - pageIndex++; - deptIdList = deptUtils.getDeptIdList(deptTypeKey, NumConstant.TWENTY, pageIndex); - } while (CollUtil.isNotEmpty(deptIdList)); - } - } - - /** - * 执行保存得分操作 - * - * @param deptId 部门id - * @param ruleCode 考核规则编码 - * @param score 得分 - * @param startDate 开始日 - * @param endDate 结束日 - * @param kpiCycle 考核周期 - * @return void - * @author work@yujt.net.cn - * @date 2019/12/25 10:56 - */ - private void packageFormulaResultToSaveOrUpdate(Long deptId, String ruleCode, Double score, Date startDate, Date endDate, String kpiCycle) { - switch (ruleCode) { - /** - * 基础网格平时工作成效 - */ - case KpiScheduleCodeConstant.GRID_WORK_SCORE_MONTH: - case KpiScheduleCodeConstant.GRID_WORK_SCORE_QUARTER: - case KpiScheduleCodeConstant.GRID_WORK_SCORE_YEAR: - this.saveOrUpdateGridKpiResult(deptId, score, startDate, endDate, kpiCycle); - break; - /** - * 基础网格考核最终得分 - */ - case KpiScheduleCodeConstant.GRID_FINAL_SCORE_MONTH: - case KpiScheduleCodeConstant.GRID_FINAL_SCORE_QUARTER: - case KpiScheduleCodeConstant.GRID_FINAL_SCORE_YEAR: - this.updateGridKpiFinalScore(deptId, score, startDate, endDate, kpiCycle); - break; - /** - * 区直/街道考核最终得分 - */ - case KpiScheduleCodeConstant.SUPERIOR_FINAL_SCORE_MONTH: - case KpiScheduleCodeConstant.SUPERIOR_FINAL_SCORE_QUARTER: - case KpiScheduleCodeConstant.SUPERIOR_FINAL_SCORE_YEAR: - this.saveSuperiorKpiResult(deptId, score, startDate, endDate, kpiCycle); - break; - default: - return; - } - } - - /** - * 使用JavaScriptEngine执行运算方法 - * - * @param invocable JavaScriptEngine引擎 - * @param functionName JavaScript方法名 - * @param ruleCode 考核规则编码 - * @param paramValue JavaScript方法所需所有参数 - * @return java.lang.Double - * @author work@yujt.net.cn - * @date 2019/12/25 10:28 - */ - private Double calcByJavaScript(Invocable invocable, String functionName, String ruleCode, BigDecimal[] paramValue) { - try { - return (Double) invocable.invokeFunction(functionName, paramValue); - } catch (Exception e) { - logger.error("javascipt执行失败，当前时间：{}，考核规则编码：{}", LocalDateTime.now().toString(), ruleCode); - throw new RenException("绩效考核定时任务执行失败2"); - } - } - - /** - * 更新网格考核结果表平时工作成效字段，更新失败则执行插入 - * - * @param deptId 网格id - * @param score 得分 - * @param startDate 开始日 - * @param endDate 结束日 - * @param kpiCycle 考核周期 - * @return void - * @author work@yujt.net.cn - * @date 2019/12/25 10:35 - */ - private void saveOrUpdateGridKpiResult(Long deptId, Double score, Date startDate, Date endDate, String kpiCycle) { - KpiResultGridEntity gridKpiResultEntity = new KpiResultGridEntity(); - BigDecimal kpiScore = BigDecimal.valueOf(score).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP); - gridKpiResultEntity.setWorkScore(kpiScore); - int update = kpiResultGridDao.update(gridKpiResultEntity, this.updateGridKpiResultWrapper(deptId, startDate, endDate, kpiCycle)); - if (update == NumConstant.ZERO) { - gridKpiResultEntity.setGridId(deptId); - gridKpiResultEntity.setStartDate(startDate); - gridKpiResultEntity.setEndDate(endDate); - gridKpiResultEntity.setKpiCycle(kpiCycle); - kpiResultGridDao.insert(gridKpiResultEntity); - } - } - - /** - * 更新网格考核最终的得分字段 - * - * @param deptId 网格id - * @param score 得分 - * @param startDate 开始日 - * @param endDate 结束日 - * @param kpiCycle 考核周期 - * @return void - * @author work@yujt.net.cn - * @date 2019/12/25 10:50 - */ - private void updateGridKpiFinalScore(Long deptId, Double score, Date startDate, Date endDate, String kpiCycle) { - KpiResultGridEntity gridKpiResultEntity = new KpiResultGridEntity(); - BigDecimal kpiScore = BigDecimal.valueOf(score).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP); - gridKpiResultEntity.setFinalScore(kpiScore); - kpiResultGridDao.update(gridKpiResultEntity, this.updateGridKpiResultWrapper(deptId, startDate, endDate, kpiCycle)); - } - - /** - * 组装更新网格考核结果表的wrapper - * - * @param deptId 网格id - * @param startDate 开始日 - * @param endDate 结束日 - * @param kpiCycle 考核周期 - * @return com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper - * @author work@yujt.net.cn - * @date 2019/12/25 10:49 - */ - private UpdateWrapper updateGridKpiResultWrapper(Long deptId, Date startDate, Date endDate, String kpiCycle) { - UpdateWrapper wrapper = new UpdateWrapper<>(); - wrapper.eq(FieldConstant.GRID_ID, deptId) - .eq(KpiFieldConstant.START_DATE, startDate) - .eq(KpiFieldConstant.END_DATE, endDate) - .eq(KpiFieldConstant.KPI_CYCLE, kpiCycle); - return wrapper; - } - - /** - * 插入 街道/区直考核结果表 - * - * @param deptId 部门id - * @param score 得分 - * @param startDate 开始日 - * @param endDate 结束日 - * @param kpiCycle 考核周期 - * @return void - * @author work@yujt.net.cn - * @date 2019/12/25 10:54 - */ - private void saveSuperiorKpiResult(Long deptId, Double score, Date startDate, Date endDate, String kpiCycle) { - //先删除 在插入 - kpiResultSuperiorDao.deleteByDeptIdAndKpiDate(deptId, startDate, endDate); - - DeptLevelAndLeaderDTO deptLevelInfo = deptUtils.getDeptLevelInfo(deptId, YesOrNoEnum.YES); - KpiResultSuperiorEntity kpiResultSuperiorEntity = new KpiResultSuperiorEntity(); - kpiResultSuperiorEntity.setStartDate(startDate); - kpiResultSuperiorEntity.setEndDate(endDate); - kpiResultSuperiorEntity.setKpiCycle(kpiCycle); - kpiResultSuperiorEntity.setFinalScore(BigDecimal.valueOf(score).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP)); - kpiResultSuperiorEntity.setDeptId(deptId); - kpiResultSuperiorEntity.setDeptTypeKey(deptLevelInfo.getTypeKey()); - kpiResultSuperiorEntity.setParentDeptIds(deptLevelInfo.getParentDeptIds()); - kpiResultSuperiorEntity.setParentDeptNames(deptLevelInfo.getParentDeptNames()); - kpiResultSuperiorEntity.setAllDeptIds(deptLevelInfo.getAllDeptIds()); - kpiResultSuperiorEntity.setAllDeptNames(deptLevelInfo.getAllDeptNames()); - kpiResultSuperiorDao.insert(kpiResultSuperiorEntity); - } - - /** - * 获取公式所有参数对应的元数据编码、升序排列 - * - * @param ruleId 规则id - * @return java.util.List - * @author work@yujt.net.cn - * @date 2019/12/25 09:53 - */ - private List getRuleParmOfMetaDateCodeList(String ruleId) { - // 根据 考核规则表-主键，查询公式参数表,排序：1,2,3,4,5 - List ruleParamList = kpiRuleParamDao.queryFormulaParam(ruleId); - List metaDateCodeList = Lists.newArrayList(); - for (int i = 0; i < ruleParamList.size(); i++) { - metaDateCodeList.add(ruleParamList.get(i).getMetaDataCode()); - } - return metaDateCodeList; - } - - /** - * 初始化javascipt的执行引擎 - * - * @param formula 公式运行方法（Javascript） - * @param ruleCode 规则编码 - * @return javax.script.Invocable - * @author work@yujt.net.cn - * @date 2019/12/24 17:22 - */ - private Invocable initInvocable(String formula, String ruleCode) { - ScriptEngine engine = new ScriptEngineManager().getEngineByName(StrConstant.JAVASCRIPT); - //执行js代码:参数为：公式运行方法 - try { - engine.eval(formula); - } catch (Exception e) { - logger.error("初始化javascipt执行引擎失败，当前时间：{}，考核规则编码：{}", LocalDateTime.now().toString(), ruleCode); - throw new RenException("绩效考核定时任务执行失败1"); - } - // 是否可调用方法 - boolean flag = engine instanceof Invocable; - if (!flag) { - logger.error("初始化javascipt执行引擎失败，当前时间：{}，考核规则编码：{}", LocalDateTime.now().toString(), ruleCode); - throw new RenException("绩效考核定时任务执行失败1"); - } - return (Invocable) engine; - } - - /** - * 根据公式参数，获取公式参数对应的元数据值 - * - * @param deptId 部门id - * @param startDate 考核周期开始日 - * @param endDate 考核周期结束日 - * @param metaDateCodeList 所有公式参数对应的元数据编码 - * @return java.math.BigDecimal[] - * @author work@yujt.net.cn - * @date 2019/12/25 11:02 - */ - private BigDecimal[] selectArrayOfMetaDataValue(Long deptId, Date startDate, Date endDate, List metaDateCodeList) { - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(KpiFieldConstant.START_DATE, startDate) - .eq(KpiFieldConstant.END_DATE, endDate) - .eq(KpiFieldConstant.DEPT_ID, deptId) - .in(KpiFieldConstant.DATA_CODE, metaDateCodeList); - - List metaDataList = kpiMetaDataDao.selectList(wrapper); - BigDecimal[] metaDataValueArray = new BigDecimal[metaDataList.size()]; - - String metaDataCode; - for (int i = 0; i < metaDateCodeList.size(); i++) { - metaDataCode = metaDateCodeList.get(i); - for (KpiMetaDataEntity kpiMetaDataEntity : metaDataList) { - if (kpiMetaDataEntity.getDataCode().equals(metaDataCode)) { - metaDataValueArray[i] = kpiMetaDataEntity.getDataValue(); - } - } - } - return metaDataValueArray; - } + private Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired + private KpiRuleRedis kpiRuleRedis; + + @Autowired + private KpiRuleParamService kpiRuleParamService; + + @Autowired + private KpiRuleParamDao kpiRuleParamDao; + @Autowired + private KpiFormulaDao kpiFormulaDao; + + @Override + public PageData page(Map params) { + String ruleName = params.containsKey("ruleName") ? params.get("ruleName").toString() : null; + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.like(StringUtils.isNotBlank(ruleName), "rule_name", ruleName); + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + wrapper + ); + return getPageData(page, KpiRuleDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, KpiRuleDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public KpiRuleDTO get(String id) { + KpiRuleEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, KpiRuleDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(KpiRuleDTO dto) { + KpiRuleEntity entity = ConvertUtils.sourceToTarget(dto, KpiRuleEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(KpiRuleDTO dto) { + KpiRuleEntity entity = ConvertUtils.sourceToTarget(dto, KpiRuleEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + QueryWrapper kpiRuleParamEntityQueryWrapper = new QueryWrapper<>(); + kpiRuleParamEntityQueryWrapper.in(ids.length>0,"RULE_ID",ids); + kpiRuleParamDao.delete(kpiRuleParamEntityQueryWrapper); + } + + /** + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @Author yinzuomei + * @Description 列表查询 + * @Date 2019/11/27 13:29 + **/ + @Override + public PageData query(Map params) { + IPage page = getPage(params); + List list = baseDao.selectListKpiRuleQueryResultDTO(params); + return new PageData<>(list, page.getTotal()); + } + + /** + * @param id 考核规则表主键 + * @return com.elink.esua.epdc.dto.result.KpiRuleQueryResultDTO + * @Author yinzuomei + * @Description 查询详情 + * @Date 2019/11/27 15:17 + **/ + @Override + public KpiRuleQueryResultDTO queryDetailInfo(String id) { + return baseDao.queryDetailInfo(id); + } + + /** + * @param dto + * @return void + * @Author yinzuomei + * @Description 新增 + * @Date 2019/11/27 16:27 + **/ + @Override + @Transactional(rollbackFor = Exception.class) + public Result add(KpiRuleSaveOrUpdateFormDTO dto) { + Result checkResult = this.checkKpiRuleSaveOrUpdateFormDTO(dto); + if (checkResult.getCode() != 0) { + return checkResult; + } + KpiRuleEntity entity = ConvertUtils.sourceToTarget(dto, KpiRuleEntity.class); + insert(entity); + //logger.info("规则表主键="+entity.getId()); + // 元公式需要设置参数 + if ("0".equals(dto.getRuleMode())) { + for (KpiRuleParamDTO kpiRuleParamDTO : dto.getRuleParamList()) { + kpiRuleParamDTO.setRuleId(entity.getId()); + KpiRuleParamEntity kpiRuleParamEntity = ConvertUtils.sourceToTarget(kpiRuleParamDTO, KpiRuleParamEntity.class); + kpiRuleParamDao.insert(kpiRuleParamEntity); + } + } + return new Result(); + } + + /** + * @param dto + * @return void + * @Author yinzuomei + * @Description 修改 + * @Date 2019/11/27 16:27 + **/ + @Override + @Transactional(rollbackFor = Exception.class) + public Result edit(KpiRuleSaveOrUpdateFormDTO dto) { + Result checkResult = this.checkKpiRuleSaveOrUpdateFormDTO(dto); + if (checkResult.getCode() != 0) { + return checkResult; + } + KpiRuleEntity entity = ConvertUtils.sourceToTarget(dto, KpiRuleEntity.class); + updateById(entity); + //logger.info("规则表主键="+entity.getId()); + //全部删除参数记录表 + int deleteResultNum = kpiRuleParamDao.deleteByRuleId(entity.getId()); + if ("0".equals(dto.getRuleMode())) { + for (KpiRuleParamDTO kpiRuleParamDTO : dto.getRuleParamList()) { + kpiRuleParamDTO.setId(null); + kpiRuleParamDTO.setRuleId(entity.getId()); + kpiRuleParamService.save(kpiRuleParamDTO); + } + } + return new Result(); + } + + public Result checkKpiRuleSaveOrUpdateFormDTO(KpiRuleSaveOrUpdateFormDTO dto) { + if (StringUtils.isNotBlank(dto.getRuleName())) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(dto.getRuleName()), "rule_name", dto.getRuleName()); + wrapper.ne(StringUtils.isNotBlank(dto.getId()), FieldConstant.ID, dto.getId()); + List list = baseDao.selectList(wrapper); + if (CollUtil.isNotEmpty(list)) { + return new Result().error("规则名称已存在"); + } + }else{ + return new Result().error("规则名称不能为空"); + } + if (("0").equals(dto.getRuleMode())) { + //是否缺少参数 + KpiFormulaEntity kpiFormulaEntity = kpiFormulaDao.selectById(dto.getReferenceId()); + if ((null == dto.getRuleParamList() || dto.getRuleParamList().size() == 0) + && kpiFormulaEntity.getParamAmount() > 0) { + return new Result().error("请选择元公式入参"); + } + if (kpiFormulaEntity.getParamAmount() != dto.getRuleParamList().size()) { + return new Result().error("公式缺少入参"); + } + //校验sort唯一性 + int sort = 0; + for (KpiRuleParamDTO kpiRuleParamDTO : dto.getRuleParamList()) { + if (kpiRuleParamDTO.getSort() == sort) { + return new Result().error("参数排序不唯一,请重新编辑"); + } + sort = kpiRuleParamDTO.getSort(); + } + } + return new Result(); + } + + /** + * @param referenceIds + * @return java.util.List + * @Author yinzuomei + * @Description 根据引用id查询考核规则表记录 + * @Date 2019/12/2 15:00 + **/ + @Override + public List listKpiRuleEntityByRereferenceId(String[] referenceIds) { + QueryWrapper kpiRuleEntityQueryWrapper = new QueryWrapper<>(); + kpiRuleEntityQueryWrapper.in("reference_id", referenceIds); + List kpiRuleEntityList = baseDao.selectList(kpiRuleEntityQueryWrapper); + return kpiRuleEntityList; + } + + @Override + public Result> listKpiRuleDTO() { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("rule_mode",1); + wrapper.orderByDesc("CREATED_TIME"); + List kpiRuleEntityList=baseDao.selectList(wrapper); + List list= ConvertUtils.sourceToTarget(kpiRuleEntityList, KpiRuleDTO.class); + return new Result().ok(list); + } } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitIssueServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitIssueServiceImpl.java index 147f68f6d..d1db57ed1 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitIssueServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitIssueServiceImpl.java @@ -26,8 +26,10 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.dao.KpiTimeLimitIssueDao; import com.elink.esua.epdc.dto.KpiTimeLimitIssueDTO; import com.elink.esua.epdc.entity.KpiTimeLimitIssueEntity; +import com.elink.esua.epdc.redis.KpiTimeLimitIssueRedis; import com.elink.esua.epdc.service.KpiTimeLimitIssueService; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -44,6 +46,9 @@ import java.util.Map; @Service public class KpiTimeLimitIssueServiceImpl extends BaseServiceImpl implements KpiTimeLimitIssueService { + @Autowired + private KpiTimeLimitIssueRedis kpiTimeLimitIssueRedis; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitItemServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitItemServiceImpl.java index 0cd45aba4..28b44ee8e 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitItemServiceImpl.java @@ -21,21 +21,18 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.commons.tools.constant.StrConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.KpiTimeLimitItemDao; import com.elink.esua.epdc.dto.KpiTimeLimitItemDTO; -import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO; -import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO; +import com.elink.esua.epdc.dto.category.form.CategoryInfoFormDTO; +import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO; import com.elink.esua.epdc.entity.KpiTimeLimitItemEntity; import com.elink.esua.epdc.feign.EventFeignClient; import com.elink.esua.epdc.redis.KpiTimeLimitItemRedis; import com.elink.esua.epdc.service.KpiTimeLimitItemService; -import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.io.File; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -57,12 +55,11 @@ import java.util.Map; public class KpiTimeLimitItemServiceImpl extends BaseServiceImpl implements KpiTimeLimitItemService { private Logger logger = LoggerFactory.getLogger(getClass()); - @Autowired - private EventFeignClient eventFeignClient; + private KpiTimeLimitItemRedis kpiTimeLimitItemRedis; @Autowired - private KpiTimeLimitItemRedis kpiTimeLimitItemRedis; + private EventFeignClient eventFeignClient; @Override public PageData page(Map params) { @@ -83,8 +80,8 @@ public class KpiTimeLimitItemServiceImpl extends BaseServiceImpl getWrapper(Map params) { - String id = (String) params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -101,55 +98,44 @@ public class KpiTimeLimitItemServiceImpl extends BaseServiceImpl selectedCategoryIds = dto.getCategoryIds(); - // 用户选择的所有部门id（去重之后） - List distinctCategoryIds = Lists.newArrayList(); - - for (Long[] oneOptionCategoryIdArray : selectedCategoryIds) { - for (Long categoryId : oneOptionCategoryIdArray) { - if (!distinctCategoryIds.contains(categoryId)) { - distinctCategoryIds.add(categoryId); - } + for (String categoryIds : dto.getCategoryIds()) { + categoryIds = categoryIds.replaceAll("\\[", "").replaceAll("\\]", "").replace("\"", ""); + String[] categoryIdArray = categoryIds.split(","); + String categoryId = categoryIdArray[categoryIdArray.length - 1]; + CategoryInfoFormDTO categoryInfoFormDTO = new CategoryInfoFormDTO(); + Long[] ids = new Long[1]; + ids[0] = Long.valueOf(categoryId); + categoryInfoFormDTO.setIds(ids); + Result> res = eventFeignClient.queryCategoryInfo(categoryInfoFormDTO); + if (res.getCode() != 0 || CollUtil.isEmpty(res.getData()) || res.getData().size() == 0) { + return new Result().error("查询分类详情失败" + res.getMsg()); } - } - CategoryInfoFormDTO categoryInfoFormDto = new CategoryInfoFormDTO(); - categoryInfoFormDto.setIds(distinctCategoryIds.toArray(new Long[distinctCategoryIds.size()])); - Result> eventResult = eventFeignClient.queryCategoryInfo(categoryInfoFormDto); - if (!eventResult.success() || CollUtil.isEmpty(eventResult.getData())) { - return new Result().error(); - } - - List categoryInfoList = eventResult.getData(); - - KpiTimeLimitItemEntity timeLimit; - List entityList = Lists.newArrayList(); - - for (CategoryInfoResultDTO categoryInfo : categoryInfoList) { - timeLimit = new KpiTimeLimitItemEntity(); - - timeLimit.setValidCloseTime(dto.getValidCloseTime()); - timeLimit.setValidRespondTime(dto.getValidRespondTime()); - - timeLimit.setCategoryId(categoryInfo.getId()); - // 父id为根节点0，表示一级类别，不拼接根节点 - if (categoryInfo.getPids().equals(NumConstant.ZERO_STR)) { - timeLimit.setAllCategoryIds(String.valueOf(categoryInfo.getId())); - timeLimit.setAllCategoryNames(categoryInfo.getCategoryName()); - } else { - timeLimit.setAllCategoryIds(categoryInfo.getPids().concat(StrConstant.COMMA).concat(String.valueOf(categoryInfo.getId()))); - timeLimit.setAllCategoryNames(categoryInfo.getParentNames().concat(StrConstant.HYPHEN.concat(categoryInfo.getCategoryName()))); + String allCategoryNames = ""; + String parentCategoryIds = ""; + String parentCategoryNames = ""; + CategoryInfoResultDTO categoryInfoResultDTO = res.getData().get(0); + for (String parentName : categoryInfoResultDTO.getParentNames()) { + parentCategoryNames += (parentName + "-"); } - - timeLimit.setParentCategoryIds(categoryInfo.getPids()); - timeLimit.setParentCategoryNames(categoryInfo.getParentNames()); - entityList.add(timeLimit); - - kpiTimeLimitItemRedis.setTimelimitItem(timeLimit); + //去除最后一个- + parentCategoryNames = parentCategoryNames.substring(0, parentCategoryNames.length() - 1); + allCategoryNames = parentCategoryNames + "-" + categoryInfoResultDTO.getCategoryName(); + int index = categoryIds.lastIndexOf(","); +// logger.info("最后一个逗号所在的位置"+index); + parentCategoryIds = categoryIds.substring(0, index); + dto.setCategoryId(categoryId); + dto.setAllCategoryIds(categoryIds); + dto.setAllCategoryNames(allCategoryNames); + dto.setParentCategoryIds(parentCategoryIds); + dto.setParentCategoryNames(parentCategoryNames); + KpiTimeLimitItemEntity entity = ConvertUtils.sourceToTarget(dto, KpiTimeLimitItemEntity.class); + // 删除已存在的记录 + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(categoryId), "CATEGORY_ID", categoryId); + baseDao.delete(wrapper); + //插入 + insert(entity); } - - baseDao.deleteBatchByCategoryIds(distinctCategoryIds); - this.insertBatch(entityList, NumConstant.THIRTY); - return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/DeptUtils.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/DeptUtils.java deleted file mode 100644 index e3824f39a..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/DeptUtils.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.elink.esua.epdc.utils; - -import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; -import com.elink.esua.epdc.commons.tools.exception.RenException; -import com.elink.esua.epdc.commons.tools.redis.RedisKeys; -import com.elink.esua.epdc.commons.tools.redis.RedisUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO; -import com.elink.esua.epdc.feign.AdminFeignClient; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * 获取部门信息 - * - * @author work@yujt.net.cn - * @date 2019/12/18 14:52 - */ -@Component -public class DeptUtils { - - @Autowired - private AdminFeignClient adminFeignClient; - - @Autowired - private RedisUtils redisUtils; - - /** - * 获取部门信息 - * - * @param deptId 部门id - * @param yesOrNo 是否需要获取网格长姓名 - * @return com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO - * @author work@yujt.net.cn - * @date 2019/12/18 15:02 - */ - public DeptLevelAndLeaderDTO getDeptLevelInfo(Long deptId, YesOrNoEnum yesOrNo) { - DeptLevelAndLeaderDTO dto = (DeptLevelAndLeaderDTO) redisUtils.get(RedisKeys.getDeptOptionKey(deptId)); - if (null != dto) { - // 已取到网格长姓名或者不需要网格长姓名 直接返回 - if ((StringUtils.isNotBlank(dto.getLeaderName()) || YesOrNoEnum.NO.value().equals(yesOrNo.value()))) { - return dto; - } - } - Result result = adminFeignClient.getDeptInfoById(deptId, yesOrNo.value()); - if (!result.success() || result.getData() == null) { - throw new RenException("获取机构信息失败"); - } - return result.getData(); - } - - - /** - * 按部门类型，分页查询部门列表 - * - * @param typeKey 部门类型 - * @param pageSize 页容量 - * @param pageIndex 页码 - * @return java.util.List - * @author work@yujt.net.cn - * @date 2019/12/18 20:01 - */ - public List getDeptIdList(String typeKey, Integer pageSize, Integer pageIndex) { - Result> adminResult = adminFeignClient.pageDeptIdByTypeKey(typeKey, pageSize, pageIndex); - if (!adminResult.success()) { - throw new RenException("获取机构信息失败"); - } - return adminResult.getData(); - } -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/KpiLocalDateUtils.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/KpiLocalDateUtils.java deleted file mode 100644 index 3d2df0d2c..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/utils/KpiLocalDateUtils.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.elink.esua.epdc.utils; - -import com.elink.esua.epdc.commons.tools.constant.NumConstant; -import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils; -import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO; -import com.elink.esua.epdc.enums.KpiCycleEnum; -import org.apache.commons.lang3.StringUtils; - -import java.time.LocalDate; -import java.time.YearMonth; - -/** - * 绩效考核相关日期工具 - * - * @author work@yujt.net.cn - * @date 2019/12/24 17:26 - */ -public class KpiLocalDateUtils { - - /** - * 获取考核周期开始日 - * - * @param kpiCycle 考核周期 月、季、年 - * @return java.util.Date - * @author work@yujt.net.cn - * @date 2019/12/24 17:28 - */ - /*public static Date getKpiCycoleStartDate(String kpiCycle) { - return getKpiCycoleStartDate(kpiCycle, YearMonth.now().minusMonths(NumConstant.ONE_L)); - }*/ - - /** - * 根据考核周期和考核月份获取考核周期开始时间 - * - * @param kpiCycle 考核周期 - * @param dateStr 考核月某一天字符串 yyyy-MM-dd e.g. 2020-01-01 - * @return java.util.Date - * @author work@yujt.net.cn - * @date 2020/2/6 14:22 - */ - /*public static Date getKpiCycoleStartDate(String kpiCycle, String dateStr) { - if (StringUtils.isBlank(dateStr)) { - return getKpiCycoleStartDate(kpiCycle); - } - LocalDate kpiDate = LocalDate.parse(dateStr); - return getKpiCycoleStartDate(kpiCycle, YearMonth.of(kpiDate.getYear(), kpiDate.getMonthValue())); - }*/ - - /** - * 根据考核周期和考核月份获取考核周期开始时间 - * - * @param kpiCycle 考核周期 - * @param kpiYearMonth 考核月份 - * @return java.util.Date - * @author work@yujt.net.cn - * @date 2020/2/6 14:22 - */ - /*private static Date getKpiCycoleStartDate(String kpiCycle, YearMonth kpiYearMonth) { - LocalDate startDate = null; - if (KpiCycleEnum.KPI_CYCLE_MONTH.getValue().equals(kpiCycle)) { - startDate = kpiYearMonth.minusMonths(NumConstant.ONE).atDay(NumConstant.ONE); - } else if (KpiCycleEnum.KPI_CYCLE_QUARTER.getValue().equals(kpiCycle)) { - int monthValue = kpiYearMonth.getMonthValue(); - if (monthValue == NumConstant.ONE || monthValue == NumConstant.FOUR || monthValue == NumConstant.SEVEN || monthValue == NumConstant.TEN) { - startDate = kpiYearMonth.minusMonths(NumConstant.THREE).atDay(NumConstant.ONE); - } - } else if (KpiCycleEnum.KPI_CYCLE_YEAR.getValue().equals(kpiCycle)) { - if (kpiYearMonth.getMonthValue() == NumConstant.ONE) { - startDate = kpiYearMonth.minusMonths(NumConstant.TWELVE).atDay(NumConstant.ONE); - } - } - if (null == startDate) { - return null; - } - return LocalDateUtils.localDateToDate(startDate); - }*/ - - - /** - * 根据考核周期和考核月份获取考核周期开始时间和结束时间 - *

- *

  • dateStr为空，自动获取当前月份的，上个 月/季/年 的开始和结束时间
    • - *
  • dateStr不为空，获取dateStr的，上个 月/季/年 的开始和结束时间
    • - *

    - * - * @param kpiCycle 考核周期 - * @param dateStr 考核月某一天字符串 yyyy-MM-dd e.g. 2020-01-01 - * @return com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO - * @author work@yujt.net.cn - * @date 2020/2/7 15:06 - */ - public static KpiMetaDataOfEventsFormDTO packKpiStartAndEndDate(String kpiCycle, String dateStr) { - // 执行考核的时间 - LocalDate kpiDate = LocalDate.now(); - if (StringUtils.isNotBlank(dateStr)) { - kpiDate = LocalDate.parse(dateStr); - } - // 执行考核的月份 - YearMonth kpiYearMonth = YearMonth.of(kpiDate.getYear(), kpiDate.getMonthValue()); - - // 考核期开始日 - LocalDate startDate = null; - // 考核期结束日 - LocalDate endDate = null; - if (KpiCycleEnum.KPI_CYCLE_MONTH.getValue().equals(kpiCycle)) { - startDate = kpiYearMonth.minusMonths(NumConstant.ONE_L).atDay(NumConstant.ONE); - } else if (KpiCycleEnum.KPI_CYCLE_QUARTER.getValue().equals(kpiCycle)) { - int monthValue = kpiYearMonth.getMonthValue(); - if (monthValue == NumConstant.ONE || monthValue == NumConstant.FOUR || monthValue == NumConstant.SEVEN || monthValue == NumConstant.TEN) { - startDate = kpiYearMonth.minusMonths(NumConstant.THREE).atDay(NumConstant.ONE); - } - } else if (KpiCycleEnum.KPI_CYCLE_YEAR.getValue().equals(kpiCycle)) { - if (kpiYearMonth.getMonthValue() == NumConstant.ONE) { - startDate = kpiYearMonth.minusMonths(NumConstant.TWELVE).atDay(NumConstant.ONE); - } - } - // 执行考核的时间和考核周期不匹配 - if (null == startDate) { - return null; - } - - endDate = kpiYearMonth.minusMonths(NumConstant.ONE_L).atEndOfMonth(); - - KpiMetaDataOfEventsFormDTO dto = new KpiMetaDataOfEventsFormDTO(); - dto.setStartDate(LocalDateUtils.localDateToDate(startDate)); - dto.setEndDate(LocalDateUtils.localDateToDate(endDate)); - return dto; - } -} diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/application.yml index 5ebb07edf..f754286a1 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/application.yml @@ -1,22 +1,3 @@ -#server: -# port: @server.port@ -# servlet: -# context-path: /kpi -# -#nacos: -# config: -# server-addr: @nacos.server-addr@ -# type: YAML -# namespace: @nacos.config.namespace@ -# group: @nacos.config.group@ -# dataId: epdc-kpi-server -# bootstrap: -# enable: true -# log: -# enable: @nacos.config.bootstrap.log.enable@ -#spring: -# application: -# name: epdc-kpi-server server: port: @server.port@ servlet: diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiFormulaDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiFormulaDao.xml index b0324df3e..6cfe4092c 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiFormulaDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiFormulaDao.xml @@ -33,20 +33,4 @@ ORDER BY ekf.CREATED_TIME DESC - - - diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreDao.xml index 307176dcc..b64f4b426 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiManualScoreDao.xml @@ -3,13 +3,47 @@ - - delete from epdc_kpi_manual_score where - rule_id = #{ruleId} and dept_id = #{deptId} and score_start_date = #{scoreStartDate} and score_end_date = #{scoreEndDate} - + + + + + + + + + + + + + + + + + + - SELECT kmc.id, kmc.rule_id, @@ -29,20 +63,18 @@ kr.kpi_cycle, kmc.score_start_date, kmc.score_end_date - FROM epdc_kpi_manual_score kmc - left join epdc_kpi_rule kr on(kmc.RULE_ID=kr.id) + FROM + epdc_kpi_manual_score kmc + left join epdc_kpi_rule kr + on(kmc.RULE_ID=kr.id) WHERE kmc.del_flag = '0' - - AND kmc.rule_id =#{ruleId} - - - AND DATE_FORMAT( kmc.score_start_date, '%Y-%m' ) BETWEEN #{scoreStartDate} AND #{scoreStartDate} - - - AND kmc.all_dept_ids like concat('%',#{allDeptIds},'%') - + + AND kmc.rule_id =#{ruleId} + + + AND DATE_FORMAT( kmc.score_start_date, '%Y-%m' ) BETWEEN #{scoreStartDate} AND #{scoreStartDate} + ORDER BY kmc.CREATED_TIME DESC - diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMetaDataDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMetaDataDao.xml deleted file mode 100644 index 9bd92b965..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiMetaDataDao.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - DELETE - FROM - epdc_kpi_meta_data - WHERE - - (#{metaListItem.deptId}=epdc_kpi_meta_data.dept_id - AND #{metaListItem.startDate}=epdc_kpi_meta_data.start_date - AND #{metaListItem.endDate}=epdc_kpi_meta_data.end_date - AND #{metaListItem.dataCode}=epdc_kpi_meta_data.data_code - ) - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml deleted file mode 100644 index dec0e489d..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultGridDao.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml deleted file mode 100644 index e15d17e8b..000000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiResultSuperiorDao.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - delete from epdc_kpi_result_superior where dept_id = #{deptId} and start_date = #{startDate} and end_date = #{endDate} - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleDao.xml index e808b9720..bc84be77b 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleDao.xml @@ -129,21 +129,4 @@ and ekr.id=#{id} - - diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleParamDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleParamDao.xml index 358c5a535..2928504c6 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleParamDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiRuleParamDao.xml @@ -19,18 +19,4 @@ delete from epdc_kpi_rule_param where rule_id=#{id} - - - diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiTimeLimitItemDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiTimeLimitItemDao.xml index a35805931..83044e824 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiTimeLimitItemDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiTimeLimitItemDao.xml @@ -3,10 +3,22 @@ - - delete from epdc_kpi_time_limit_item where category_id in - #{item} - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml index 2a2c91a0b..68027a37d 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/src/main/resources/application.yml @@ -1,4 +1,4 @@ - server: +server: port: @server.port@ servlet: context-path: /message diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcInformationFormDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcInformationFormDTO.java index 6ad274a6a..17428cd70 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcInformationFormDTO.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcInformationFormDTO.java @@ -62,9 +62,9 @@ public class EpdcInformationFormDTO implements Serializable { /** * AppInformationBusinessEnum * 消息所属业务类型：event事件审核；issueComment议题评论；issueReply议题评论回复；itemComment项目评论；itemReply项目评论回复； - * issueApprove支持议题；itemApprove支持项目；issueCommentApprove议题评论支持；issueCommentOppose议题评论反对； - * itemCommentApprove项目评论支持；itemCommentOppose项目评论反对；issue议题处理； - * item项目处理；groupInvited社群邀请等; volunteer志愿者审核;activity爱心互助活动;points积分商城 + * issueApprove支持议题；itemApprove支持项目；issueCommentApprove议题评论支持；issueCommentOppose议题评论反对； + * itemCommentApprove项目评论支持；itemCommentOppose项目评论反对；issue议题处理； + * item项目处理；groupInvited社群邀请等 */ @NotBlank(message = "消息所属业务类型不能为空") private String businessType; diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml index bf3739422..e3877629b 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml @@ -45,10 +45,7 @@ epdc-admin-client 1.0.0 - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - + @@ -129,13 +126,6 @@ false 47.104.224.45:8848 - @@ -159,13 +149,6 @@ true 47.104.224.45:8848 - diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java index 2e561ce91..ff65dd5cd 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppInformationController.java @@ -59,19 +59,6 @@ public class EpdcAppInformationController { return this.informationService.saveInformation(formDto); } - /** - * @param epdcInformationFormDTOList - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 批量发送消息 - * @Date 2020/2/7 21:04 - **/ - @PostMapping("saveList") - public Result saveInformation(@RequestBody List epdcInformationFormDTOList) { - ValidatorUtils.validateEntity(epdcInformationFormDTOList); - return this.informationService.saveInformationList(epdcInformationFormDTOList); - } - /** * 消息已读 * @@ -112,4 +99,4 @@ public class EpdcAppInformationController { public Result selectOneFristByUserId(@PathVariable("userId") String userId) { return informationService.selectOneFristByUserId(userId); } -} +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java index 76b296d18..889972dc5 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/InformationService.java @@ -137,13 +137,4 @@ public interface InformationService extends BaseService { * @date 2019/9/11 19:05 */ Result selectOneFristByUserId(String userId); - - /** - * @param epdcInformationFormDTOList - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei 批量给用户发消息 - * @Description saveInformationList - * @Date 2020/2/7 21:04 - **/ - Result saveInformationList(List epdcInformationFormDTOList); -} +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java index 3f1d2309b..c9f7d5fe7 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/InformationServiceImpl.java @@ -20,11 +20,11 @@ package com.elink.esua.epdc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.InformationDao; import com.elink.esua.epdc.dto.InformationDTO; @@ -132,14 +132,4 @@ public class InformationServiceImpl extends BaseServiceImpl selectOneFristByUserId(String userId) { return new Result().ok(baseDao.selectOneFristByUserId(userId)); } - - @Override - public Result saveInformationList(List epdcInformationFormDTOList) { - List entityList = ConvertUtils.sourceToTarget(epdcInformationFormDTOList, InformationEntity.class); - for (InformationEntity entity : entityList) { - entity.setReadFlag(YesOrNoEnum.NO.value()); - } - this.insertBatch(entityList); - return new Result(); - } -} +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml index d0fc65437..5e6f0761b 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/application.yml @@ -1,23 +1,3 @@ -#server: -# port: @server.port@ -# servlet: -# context-path: /news -# -#nacos: -# config: -# server-addr: @nacos.server-addr@ -# type: YAML -# namespace: @nacos.config.namespace@ -# group: @nacos.config.group@ -# dataId: epdc-news-server -# bootstrap: -# enable: true -# log: -# enable: @nacos.config.bootstrap.log.enable@ -# -#spring: -# application: -# name: epdc-news-server server: port: @server.port@ servlet: diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml index a5b65ccfe..6f7f5d09b 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml @@ -57,7 +57,7 @@ - - - - - - - - - - - - - - - - - - - diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagDao.xml index 342b01090..22ebfc9b6 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagDao.xml @@ -6,7 +6,6 @@ - @@ -16,26 +15,5 @@ - - - - - + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagRelationDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagRelationDao.xml index dcde4d493..e7c8bc663 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagRelationDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserTagRelationDao.xml @@ -15,16 +15,5 @@ - - UPDATE epdc_user_tag_relation r - SET r.del_flag='1' - WHERE r.del_flag='0' - AND r.USER_ID = #{userId} - and r.TAG_ID in( - select eut.id - from epdc_user_tag eut - where eut.DEL_FLAG='0' - and eut.TAG_CODE=#{tagCode} - ) - - + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml deleted file mode 100644 index bf22de960..000000000 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UPDATE epdc_volunteer_info - SET - UPDATED_BY = #{updatedBy} - ,UPDATED_TIME = #{updatedTime} - ,AUDIT_STATUS = #{auditStatus} - ,FAILURE_REASON = #{failureReason} - ,AUDIT_TIME = #{auditTime} - ,AUDITOR = #{auditor} - WHERE ID = #{id} - - - - - - - - - - - - UPDATE epdc_volunteer_info - SET KINDNESS_TIME = ( KINDNESS_TIME + #{kindnessTime} ), - PARTICIPATION_NUM = ( PARTICIPATION_NUM + 1 ) - WHERE - USER_ID = #{userId} - AND DEL_FLAG = '0' - - diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/config/WebServiceConfig.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/config/WebServiceConfig.java index d032a46f5..c0cbba341 100644 --- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/config/WebServiceConfig.java +++ b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/config/WebServiceConfig.java @@ -10,23 +10,23 @@ import org.springframework.context.annotation.Configuration; import javax.xml.ws.Endpoint; /** - * @Description + * @Description TODO * @Author yinzuomei * @Date 2019/12/30 12:55 */ @Configuration public class WebServiceConfig { - @Autowired - private Bus bus; - @Autowired - private CityGridInterfaceServiceWebService cityGridInterfaceServiceWebService; + @Autowired + private Bus bus; + @Autowired + private CityGridInterfaceServiceWebService cityGridInterfaceServiceWebService; - @Bean - public Endpoint endpointUserService() { - EndpointImpl endpoint = new EndpointImpl(bus, cityGridInterfaceServiceWebService); - endpoint.publish("/CityGridInterfaceServiceWebService");//接口发布在 /CityGridInterfaceServiceWebService 目录下 - return endpoint; - } + @Bean + public Endpoint endpointUserService() { + EndpointImpl endpoint = new EndpointImpl(bus,cityGridInterfaceServiceWebService); + endpoint.publish("/CityGridInterfaceServiceWebService");//接口发布在 /CityGridInterfaceServiceWebService 目录下 + return endpoint; + } } diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/form/TestDTO.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/form/TestDTO.java index e7419ce9f..6f9be79c7 100644 --- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/form/TestDTO.java +++ b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/dto/form/TestDTO.java @@ -6,20 +6,20 @@ import javax.xml.bind.annotation.*; import java.io.Serializable; /** - * @Description + * @Description TODO * @Author yinzuomei * @Date 2019/12/30 17:28 */ -@XmlRootElement(name = "user") +@XmlRootElement(name="user") @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "user", propOrder = {"userId", "userName"}) +@XmlType(name = "user",propOrder = {"userId","userName"}) @Data public class TestDTO implements Serializable { - private static final long serialVersionUID = 1677005211935252496L; - @XmlElement(name = "userId", required = true) - private String userId; - @XmlElement(name = "userName", required = true) - private String userName; + private static final long serialVersionUID = 1677005211935252496L; + @XmlElement(name = "userId",required = true) + private String userId; + @XmlElement(name = "userName",required = true) + private String userName; } diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/utils/JaxbUtil.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/utils/JaxbUtil.java index ab035fc97..a834ed356 100644 --- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/utils/JaxbUtil.java +++ b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/utils/JaxbUtil.java @@ -1,7 +1,7 @@ package com.elink.esua.epdc.utils; /** - * @Description + * @Description TODO * @Author yinzuomei * @Date 2019/12/30 17:46 */ diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml index 02a22a0f8..1d99d06de 100644 --- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml @@ -226,10 +226,8 @@ 111 111 - - - wx5d3e97461d248397 - bfed51b731e53db9affb9e6131e7ae12 + wxdd8530c5f4926766 + 5bf4fb813145431b3493a10aa7e041e9 diff --git a/esua-epdc/epdc-module/pom.xml b/esua-epdc/epdc-module/pom.xml index 170c1d0c9..15df87d47 100644 --- a/esua-epdc/epdc-module/pom.xml +++ b/esua-epdc/epdc-module/pom.xml @@ -22,13 +22,13 @@ epdc-heart epdc-news epdc-events + epdc-neighbor epdc-services epdc-user epdc-demo epdc-group epdc-websocket epdc-kpi - epdc-points epdc-webservice epdc-custom epdc-analysis diff --git a/esua-epdc/k8s/kongcun/app-master/mysql/mysql-config.yml b/esua-epdc/k8s/kongcun/app-master/mysql/mysql-config.yml deleted file mode 100644 index bec1eecf7..000000000 --- a/esua-epdc/k8s/kongcun/app-master/mysql/mysql-config.yml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: mysql-master-config - namespace: epdc-mysql - labels: - config: mysql-master-config -data: - mysqld.cnf: |- - [mysqld] - pid-file = /var/run/mysqld/mysqld.pid - socket = /var/run/mysqld/mysqld.sock - datadir = /var/lib/mysql - log-error = /var/log/mysql/error.log - # By default we only accept connections from localhost - # bind-address = 127.0.0.1 - # Disabling symbolic-links is recommended to prevent assorted security risks - symbolic-links=0 - sql_mode='STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' - # 允许最大连接数 - max_connections=200 - # 允许连接失败的次数。这是为了防止有人从该主机试图攻击数据库系统 - max_connect_errors=10 - # 创建新表时将使用的默认存储引擎 - default-storage-engine=INNODB - # 默认使用“mysql_native_password”插件认证 - default_authentication_plugin=mysql_native_password - server-id=164 - log-bin=master-bin - log-bin-index=master-bin.index diff --git a/esua-epdc/k8s/kongcun/app-master/mysql/mysql-deploy.yml b/esua-epdc/k8s/kongcun/app-master/mysql/mysql-deploy.yml deleted file mode 100644 index fdabdc889..000000000 --- a/esua-epdc/k8s/kongcun/app-master/mysql/mysql-deploy.yml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: mysql-master-deploy - namespace: epdc-mysql - labels: - deploy: mysql-master-deploy -spec: - replicas: 1 - selector: - matchLabels: - app: mysql-master-pod - template: - metadata: - labels: - app: mysql-master-pod - spec: - containers: - - name: mysql-master-container - image: mysql:8.0 - env: - - name: MYSQL_ROOT_PASSWORD #以下是设置MySQL数据库的密码 - valueFrom: - secretKeyRef: - name: mysql-master-secret - key: mysql-user-root-pwd - ports: - - containerPort: 3306 - protocol: TCP - name: mysql-master-tcp-3306 - volumeMounts: - - name: mysql-master-persistent-storage - mountPath: /var/lib/mysql #MySQL容器的数据都是存在这个目录的，要对这个目录做数据持久化 - - name: mysql-master-config-volume #表示一个挂载点的名称 - mountPath: /etc/mysql/mysql.conf.d/ #表示新挂载点的路径，这里就是mysql配置文件的路径 - volumes: - - name: mysql-master-persistent-storage - persistentVolumeClaim: - claimName: mysql-master-pvc #指定pvc的名称 - - name: mysql-master-config-volume #表示挂载点的名称 - configMap: #使用configmap - name: mysql-master-config diff --git a/esua-epdc/k8s/kongcun/app-master/mysql/mysql-pv.yml b/esua-epdc/k8s/kongcun/app-master/mysql/mysql-pv.yml deleted file mode 100644 index 18ff7b812..000000000 --- a/esua-epdc/k8s/kongcun/app-master/mysql/mysql-pv.yml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: mysql-master-pv - namespace: epdc-mysql - labels: - pv: mysql-master-pv -spec: - accessModes: - - ReadWriteOnce #访问模式定义为只能以读写的方式挂载到单个节点 - capacity: - storage: 100Gi - persistentVolumeReclaimPolicy: Retain - storageClassName: nfs - nfs: - path: /mnt/nfsdata/mysql-master - server: 172.16.0.7 diff --git a/esua-epdc/k8s/kongcun/app-master/mysql/mysql-pvc.yml b/esua-epdc/k8s/kongcun/app-master/mysql/mysql-pvc.yml deleted file mode 100644 index f3373ae78..000000000 --- a/esua-epdc/k8s/kongcun/app-master/mysql/mysql-pvc.yml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: mysql-master-pvc - namespace: epdc-mysql - labels: - pvc: mysql-master-pvc -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 100Gi - storageClassName: managed-nfs-storage - selector: - matchLabels: - pv: mysql-master-pv diff --git a/esua-epdc/k8s/kongcun/app-master/mysql/mysql-secret.yml b/esua-epdc/k8s/kongcun/app-master/mysql/mysql-secret.yml deleted file mode 100644 index 404545628..000000000 --- a/esua-epdc/k8s/kongcun/app-master/mysql/mysql-secret.yml +++ /dev/null @@ -1,11 +0,0 @@ -#键的值是经过base64编码的 -#在Linux里运行命令“echo -n dbuser | base64”获得“dbuser”的编码 -apiVersion: v1 -kind: Secret -metadata: - name: mysql-master-secret - namespace: epdc-mysql - labels: - secret: mysql-master-secret -data: - mysql-user-root-pwd: ZXBkY19rb25nY3VuQDE0MDU= diff --git a/esua-epdc/k8s/kongcun/app-master/mysql/mysql-svc.yml b/esua-epdc/k8s/kongcun/app-master/mysql/mysql-svc.yml deleted file mode 100644 index 70b104759..000000000 --- a/esua-epdc/k8s/kongcun/app-master/mysql/mysql-svc.yml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: mysql-master-svc - namespace: epdc-mysql - labels: - svc: mysql-master-svc -spec: - type: NodePort - ports: - - port: 3306 - protocol: TCP - targetPort: 3306 - nodePort: 33306 - selector: - app: mysql-master-pod diff --git a/esua-epdc/k8s/kongcun/app-master/nacos/nacos-cm.yml b/esua-epdc/k8s/kongcun/app-master/nacos/nacos-cm.yml deleted file mode 100644 index e36532865..000000000 --- a/esua-epdc/k8s/kongcun/app-master/nacos/nacos-cm.yml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: nacos-cm - namespace: epdc-nacos -data: - mysql.master.db.name: "nacos_devtest" - mysql.master.port: "3306" - mysql.slave.port: "3306" - mysql.master.user: "nacos" - mysql.master.password: "nacos" diff --git a/esua-epdc/k8s/kongcun/app-master/nacos/nacos-pvc-nfs.yml b/esua-epdc/k8s/kongcun/app-master/nacos/nacos-pvc-nfs.yml deleted file mode 100644 index ac857b09f..000000000 --- a/esua-epdc/k8s/kongcun/app-master/nacos/nacos-pvc-nfs.yml +++ /dev/null @@ -1,132 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: nacos -spec: - serviceName: nacos-headless - replicas: 2 - template: - metadata: - labels: - app: nacos - annotations: - pod.alpha.kubernetes.io/initialized: "true" - spec: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: "app" - operator: In - values: - - nacos - topologyKey: "kubernetes.io/hostname" - serviceAccountName: nfs-client-provisioner - initContainers: - - name: peer-finder-plugin-install - image: nacos/nacos-peer-finder-plugin:latest - imagePullPolicy: Always - volumeMounts: - - mountPath: "/home/nacos/plugins/peer-finder" - name: plugindir - containers: - - name: nacos - imagePullPolicy: Always - image: nacos/nacos-server:latest - resources: - requests: - memory: "2Gi" - cpu: "500m" - ports: - - containerPort: 8848 - name: client-port - env: - - name: NACOS_REPLICAS - value: "3" - - name: SERVICE_NAME - value: "nacos-headless" - - name: POD_NAMESPACE - valueFrom: - fieldRef: - apiVersion: v1 - fieldPath: metadata.namespace - - name: MYSQL_MASTER_SERVICE_DB_NAME - valueFrom: - configMapKeyRef: - name: nacos-cm - key: mysql.master.db.name - - name: MYSQL_MASTER_SERVICE_PORT - valueFrom: - configMapKeyRef: - name: nacos-cm - key: mysql.master.port - - name: MYSQL_SLAVE_SERVICE_PORT - valueFrom: - configMapKeyRef: - name: nacos-cm - key: mysql.slave.port - - name: MYSQL_MASTER_SERVICE_USER - valueFrom: - configMapKeyRef: - name: nacos-cm - key: mysql.master.user - - name: MYSQL_MASTER_SERVICE_PASSWORD - valueFrom: - configMapKeyRef: - name: nacos-cm - key: mysql.master.password - - name: NACOS_SERVER_PORT - value: "8848" - - name: PREFER_HOST_MODE - value: "hostname" - readinessProbe: - httpGet: - port: client-port - path: /nacos/v1/console/health/readiness - initialDelaySeconds: 60 - timeoutSeconds: 3 - livenessProbe: - httpGet: - port: client-port - path: /nacos/v1/console/health/liveness - initialDelaySeconds: 60 - timeoutSeconds: 3 - volumeMounts: - - name: plugindir - mountPath: /home/nacos/plugins/peer-finder - - name: datadir - mountPath: /home/nacos/data - - name: logdir - mountPath: /home/nacos/logs - volumeClaimTemplates: - - metadata: - name: plugindir - annotations: - volume.beta.kubernetes.io/storage-class: "managed-nfs-storage" - spec: - accessModes: [ "ReadWriteMany" ] - resources: - requests: - storage: 5Gi - - metadata: - name: datadir - annotations: - volume.beta.kubernetes.io/storage-class: "managed-nfs-storage" - spec: - accessModes: [ "ReadWriteMany" ] - resources: - requests: - storage: 5Gi - - metadata: - name: logdir - annotations: - volume.beta.kubernetes.io/storage-class: "managed-nfs-storage" - spec: - accessModes: [ "ReadWriteMany" ] - resources: - requests: - storage: 5Gi - selector: - matchLabels: - app: nacos diff --git a/esua-epdc/k8s/kongcun/app-master/nacos/nacos-svc.yml b/esua-epdc/k8s/kongcun/app-master/nacos/nacos-svc.yml deleted file mode 100644 index ec1af420a..000000000 --- a/esua-epdc/k8s/kongcun/app-master/nacos/nacos-svc.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: nacos-headless - namespace: epdc-nacos - labels: - app: nacos - annotations: - service.alpha.kubernetes.io/tolerate-unready-endpoints: "true" -spec: - ports: - - port: 8848 - name: server - targetPort: 8848 - clusterIP: None - selector: - app: nacos diff --git a/esua-epdc/k8s/kongcun/app-master/nfs/nfs-deployment.yml b/esua-epdc/k8s/kongcun/app-master/nfs/nfs-deployment.yml deleted file mode 100644 index 0b2efd137..000000000 --- a/esua-epdc/k8s/kongcun/app-master/nfs/nfs-deployment.yml +++ /dev/null @@ -1,35 +0,0 @@ -kind: Deployment -apiVersion: apps/v1 -metadata: - name: nfs-client-provisioner -spec: - replicas: 1 - strategy: - type: Recreate - selector: - matchLabels: - app: nfs-client-provisioner - template: - metadata: - labels: - app: nfs-client-provisioner - spec: - serviceAccountName: nfs-client-provisioner - containers: - - name: nfs-client-provisioner - image: quay.io/external_storage/nfs-client-provisioner:latest - volumeMounts: - - name: nfs-client-root - mountPath: /persistentvolumes - env: - - name: PROVISIONER_NAME - value: fuseim.pri/ifs - - name: NFS_SERVER - value: 172.16.0.8 - - name: NFS_PATH - value: /mnt/nfs/data - volumes: - - name: nfs-client-root - nfs: - server: 172.16.0.8 - path: /mnt/nfs/data diff --git a/esua-epdc/k8s/kongcun/app-master/nfs/nfs-rbac.yml b/esua-epdc/k8s/kongcun/app-master/nfs/nfs-rbac.yml deleted file mode 100644 index 92c1e4718..000000000 --- a/esua-epdc/k8s/kongcun/app-master/nfs/nfs-rbac.yml +++ /dev/null @@ -1,42 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: nfs-client-provisioner - ---- - -kind: ClusterRole -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: nfs-client-provisioner-runner -rules: - - apiGroups: [""] - resources: ["persistentvolumes"] - verbs: ["get", "list", "watch", "create", "delete"] - - apiGroups: [""] - resources: ["persistentvolumeclaims"] - verbs: ["get", "list", "watch", "update"] - - apiGroups: ["storage.k8s.io"] - resources: ["storageclasses"] - verbs: ["get", "list", "watch"] - - apiGroups: [""] - resources: ["events"] - verbs: ["list", "watch", "create", "update", "patch"] - - apiGroups: [""] - resources: ["endpoints"] - verbs: ["create", "delete", "get", "list", "watch", "patch", "update"] - ---- - -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: run-nfs-client-provisioner -subjects: - - kind: ServiceAccount - name: nfs-client-provisioner - namespace: default -roleRef: - kind: ClusterRole - name: nfs-client-provisioner-runner - apiGroup: rbac.authorization.k8s.io diff --git a/esua-epdc/k8s/kongcun/app-master/nfs/storageclass-nfs.yml b/esua-epdc/k8s/kongcun/app-master/nfs/storageclass-nfs.yml deleted file mode 100644 index d20235804..000000000 --- a/esua-epdc/k8s/kongcun/app-master/nfs/storageclass-nfs.yml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: course-nfs-storage -provisioner: fuseim.pri/ifs # or choose another name, must match deployment's env PROVISIONER_NAME' diff --git a/esua-epdc/k8s/kongcun/app-master/nginx/nginx-deploy.yml b/esua-epdc/k8s/kongcun/app-master/nginx/nginx-deploy.yml deleted file mode 100644 index 4d8ad1a38..000000000 --- a/esua-epdc/k8s/kongcun/app-master/nginx/nginx-deploy.yml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: nginx-deploy - namespace: epdc-nginx - labels: - deploy: nginx-deploy -spec: - replicas: 1 - selector: - matchLabels: - app: nginx-pod - template: - metadata: - labels: - app: nginx-pod - spec: - containers: - - name: nginx-container - image: nginx - ports: - - containerPort: 443 - name: nginx-443 - volumeMounts: - - name: nginx-persistent-storage-01 - mountPath: /usr/share/nginx/html - - name: nginx-persistent-storage-02 - mountPath: /etc/nginx #MySQL容器的数据都是存在这个目录的，要对这个目录做数据持久化 - readOnly: true - - name: nginx-persistent-storage-03 #表示一个挂载点的名称 - mountPath: /var/log/nginx #表示新挂载点的路径，这里就是mysql配置文件的路径 - volumes: - - name: nginx-persistent-storage-01 - persistentVolumeClaim: - claimName: nginx-data-pvc #指定pvc的名称 - - name: nginx-persistent-storage-02 - persistentVolumeClaim: - claimName: nginx-etc-pvc - - name: nginx-persistent-storage-03 - persistentVolumeClaim: - claimName: nginx-log-pvc diff --git a/esua-epdc/k8s/kongcun/app-master/nginx/nginx-pv.yml b/esua-epdc/k8s/kongcun/app-master/nginx/nginx-pv.yml deleted file mode 100644 index ed9c372ff..000000000 --- a/esua-epdc/k8s/kongcun/app-master/nginx/nginx-pv.yml +++ /dev/null @@ -1,60 +0,0 @@ -#nginx数据PV -apiVersion: v1 -kind: PersistentVolume -metadata: - name: nginx-data-pv - namespace: epdc-nginx - labels: - pv: nginx-data-pv -spec: - accessModes: - - ReadWriteOnce #访问模式定义为只能以读写的方式挂载到单个节点 - capacity: - storage: 2Gi - persistentVolumeReclaimPolicy: Retain - storageClassName: nfs - nfs: - path: /mnt/nfsdata/nginx/data - server: 172.16.0.7 - ---- - -#nginx配置PV -apiVersion: v1 -kind: PersistentVolume -metadata: - name: nginx-etc-pv - namespace: epdc-nginx - labels: - pv: nginx-etc-pv -spec: - accessModes: - - ReadWriteOnce #访问模式定义为只能以读写的方式挂载到单个节点 - capacity: - storage: 1Gi - persistentVolumeReclaimPolicy: Retain - storageClassName: nfs - nfs: - path: /mnt/nfsdata/nginx/etc - server: 172.16.0.7 - ---- - -#nginx日志PV -apiVersion: v1 -kind: PersistentVolume -metadata: - name: nginx-log-pv - namespace: epdc-nginx - labels: - pv: nginx-log-pv -spec: - accessModes: - - ReadWriteOnce #访问模式定义为只能以读写的方式挂载到单个节点 - capacity: - storage: 2Gi - persistentVolumeReclaimPolicy: Retain - storageClassName: nfs - nfs: - path: /mnt/nfsdata/nginx/log - server: 172.16.0.7 diff --git a/esua-epdc/k8s/kongcun/app-master/nginx/nginx-pvc.yml b/esua-epdc/k8s/kongcun/app-master/nginx/nginx-pvc.yml deleted file mode 100644 index fa021eb1d..000000000 --- a/esua-epdc/k8s/kongcun/app-master/nginx/nginx-pvc.yml +++ /dev/null @@ -1,61 +0,0 @@ -#nginx数据PVC -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: nginx-data-pvc - namespace: epdc-nginx - labels: - pvc: nginx-data-pvc -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Gi - storageClassName: nfs - selector: - matchLabels: - pv: nginx-data-pv - ---- - -#nginx配置PVC -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: nginx-etc-pvc - namespace: epdc-nginx - labels: - pvc: nginx-etc-pvc -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi - storageClassName: nfs - selector: - matchLabels: - pv: nginx-etc-pv - ---- - -#nginx日志PVC - -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: nginx-log-pvc - namespace: epdc-nginx - labels: - pvc: nginx-log-pvc -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 2Gi - storageClassName: nfs - selector: - matchLabels: - pv: nginx-log-pv diff --git a/esua-epdc/k8s/kongcun/app-master/nginx/nginx-svc.yml b/esua-epdc/k8s/kongcun/app-master/nginx/nginx-svc.yml deleted file mode 100644 index af4cf986d..000000000 --- a/esua-epdc/k8s/kongcun/app-master/nginx/nginx-svc.yml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: nginx-svc - namespace: epdc-nginx - labels: - svc: nginx-svc -spec: - type: NodePort - ports: - - port: 443 - protocol: TCP - targetPort: 443 - nodePort: 443 - selector: - app: mysql-master-pod diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml index acac2690f..dd49e5c39 100644 --- a/esua-epdc/pom.xml +++ b/esua-epdc/pom.xml @@ -38,7 +38,6 @@ prod registry.cn-qingdao.aliyuncs.com/esua-epdc-shibei/ 9508 - 2.1.1.RELEASE @@ -72,12 +71,6 @@ seata-all ${seata.version} - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - 2.1.1.RELEASE - @@ -123,6 +116,22 @@ + + + + + + + + + + + + + + + + elink-release aliyun nexus @@ -131,14 +140,6 @@ true - - centerl-release - centerl - https://repo1.maven.org/maven2/ - - true - - sonatype sonatype nexus